diff --git a/src/App.tsx b/src/App.tsx
index 554cd6c..6db5d73 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -4,10 +4,10 @@ import { I18nProvider } from "./i18n";
 import { PublicLayout } from "./layouts/PublicLayout";
 import { Home } from "./pages/Home";
 import { Browse } from "./pages/Browse";
-import { CategoryPage } from "./pages/CategoryPage";
-import { SearchPage } from "./pages/SearchPage";
+import { CategoryPage } from "./pages/Category";
+import { SearchPage } from "./pages/Search";
 import { PostRedirect } from "./pages/PostRedirect";
-import { AboutPage } from "./pages/AboutPage";
+import { AboutPage } from "./pages/About";
 import { adminUiPrefix } from "./adminPaths";
 import { AdminRouteTree } from "./adminRouteTree";
 import { AdminRouterModeProvider } from "./adminRouterMode";
@@ -15,7 +15,7 @@ import { ImageLightboxProvider } from "./components/messageStream/overlays/Image
 import { VideoPlayerProvider } from "./components/messageStream/overlays/VideoPlayer";
 
 const WalletPage = lazy(() =>
-  import("./pages/WalletPage").then((module) => ({
+  import("./pages/Wallet").then((module) => ({
     default: module.WalletPage,
   })),
 );
diff --git a/src/AppAdminOnly.tsx b/src/AppAdminOnly.tsx
index 10e013c..f319cd3 100644
--- a/src/AppAdminOnly.tsx
+++ b/src/AppAdminOnly.tsx
@@ -3,11 +3,11 @@ import { I18nProvider } from "./i18n";
 import { adminUiPrefix } from "./adminPaths";
 import { AdminRouterModeProvider } from "./adminRouterMode";
 import { AdminLayout } from "./layouts/AdminLayout";
-import { AdminLogin } from "./pages/admin/AdminLogin";
-import { AdminDashboard } from "./pages/admin/AdminDashboard";
-import { AdminResources } from "./pages/admin/AdminResources";
-import { AdminResourceForm } from "./pages/admin/AdminResourceForm";
-import { AdminSearchLogs } from "./pages/admin/AdminSearchLogs";
+import { AdminLogin } from "./pages/admin/Login";
+import { AdminDashboard } from "./pages/admin/Dashboard";
+import { AdminResources } from "./pages/admin/Resources";
+import { AdminResourceForm } from "./pages/admin/ResourceForm";
+import { AdminSearchLogs } from "./pages/admin/SearchLogs";
 
 function NotFound() {
   return (
diff --git a/src/adminRouteTree.tsx b/src/adminRouteTree.tsx
index ec88f60..2e56071 100644
--- a/src/adminRouteTree.tsx
+++ b/src/adminRouteTree.tsx
@@ -1,11 +1,11 @@
 import { Route } from "react-router-dom";
 import { adminUiPrefix } from "./adminPaths";
 import { AdminLayout } from "./layouts/AdminLayout";
-import { AdminLogin } from "./pages/admin/AdminLogin";
-import { AdminDashboard } from "./pages/admin/AdminDashboard";
-import { AdminResources } from "./pages/admin/AdminResources";
-import { AdminResourceForm } from "./pages/admin/AdminResourceForm";
-import { AdminSearchLogs } from "./pages/admin/AdminSearchLogs";
+import { AdminLogin } from "./pages/admin/Login";
+import { AdminDashboard } from "./pages/admin/Dashboard";
+import { AdminResources } from "./pages/admin/Resources";
+import { AdminResourceForm } from "./pages/admin/ResourceForm";
+import { AdminSearchLogs } from "./pages/admin/SearchLogs";
 
 /** Shared between full `App` (when admin enabled) and `AppAdminOnly`. */
 export function AdminRouteTree() {
diff --git a/src/pages/AboutPage.tsx b/src/pages/About/index.tsx
similarity index 89%
rename from src/pages/AboutPage.tsx
rename to src/pages/About/index.tsx
index e78c483..f2a9cc3 100644
--- a/src/pages/AboutPage.tsx
+++ b/src/pages/About/index.tsx
@@ -1,4 +1,4 @@
-import { useI18n } from "../i18n";
+import { useI18n } from "../../i18n";
 
 export function AboutPage() {
   const { t } = useI18n();
diff --git a/src/pages/Browse.tsx b/src/pages/Browse/index.tsx
similarity index 73%
rename from src/pages/Browse.tsx
rename to src/pages/Browse/index.tsx
index ae5f239..b5af555 100644
--- a/src/pages/Browse.tsx
+++ b/src/pages/Browse/index.tsx
@@ -1,5 +1,5 @@
-import { MessageStream } from "../components/messageStream/MessageStream";
-import { useI18n } from "../i18n";
+import { MessageStream } from "../../components/messageStream/MessageStream";
+import { useI18n } from "../../i18n";
 
 export function Browse() {
   const { t } = useI18n();
diff --git a/src/pages/CategoryPage.tsx b/src/pages/Category/index.tsx
similarity index 81%
rename from src/pages/CategoryPage.tsx
rename to src/pages/Category/index.tsx
index 2fc87ab..55fab9c 100644
--- a/src/pages/CategoryPage.tsx
+++ b/src/pages/Category/index.tsx
@@ -1,8 +1,8 @@
 import { useEffect, useState } from "react";
 import { useParams } from "react-router-dom";
-import { getJSON, itemsOrEmpty, type Category } from "../api";
-import { MessageStream } from "../components/messageStream/MessageStream";
-import { langQuery, useI18n } from "../i18n";
+import { getJSON, itemsOrEmpty, type Category } from "../../api";
+import { MessageStream } from "../../components/messageStream/MessageStream";
+import { langQuery, useI18n } from "../../i18n";
 
 export function CategoryPage() {
   const { slug = "" } = useParams();
diff --git a/src/pages/Home.tsx b/src/pages/Home/index.tsx
similarity index 91%
rename from src/pages/Home.tsx
rename to src/pages/Home/index.tsx
index 7a78464..a5f339f 100644
--- a/src/pages/Home.tsx
+++ b/src/pages/Home/index.tsx
@@ -1,22 +1,22 @@
 import { ChevronRight } from "lucide-react";
 import { Link } from "react-router-dom";
 import { useEffect, useRef, useState } from "react";
-import { getJSON, itemsOrEmpty, type Category } from "../api";
-import { CategoryIcon } from "../components/CategoryIcon";
-import { FigmaBanner } from "../components/FigmaBanner";
+import { getJSON, itemsOrEmpty, type Category } from "../../api";
+import { CategoryIcon } from "../../components/CategoryIcon";
+import { FigmaBanner } from "../../components/FigmaBanner";
 import {
   ComingSoonLatestUpdateRow,
   LatestUpdateRow,
-} from "../components/LatestUpdateRow";
-import { RecommendedCard } from "../components/RecommendedCard";
-import { SectionHeader } from "../components/SectionHeader";
-import { langQuery, useI18n } from "../i18n";
-import { categoryCardLines } from "../utils/categoryDisplay";
+} from "../../components/LatestUpdateRow";
+import { RecommendedCard } from "../../components/RecommendedCard";
+import { SectionHeader } from "../../components/SectionHeader";
+import { langQuery, useI18n } from "../../i18n";
+import { categoryCardLines } from "../../utils/categoryDisplay";
 import {
   postToResource,
   type PostBackedResource,
-} from "../utils/postResourceAdapter";
-import type { Post } from "../types/post";
+} from "../../utils/postResourceAdapter";
+import type { Post } from "../../types/post";
 
 export function Home() {
   const { t, lang } = useI18n();
diff --git a/src/pages/PostRedirect.tsx b/src/pages/PostRedirect/index.tsx
similarity index 77%
rename from src/pages/PostRedirect.tsx
rename to src/pages/PostRedirect/index.tsx
index 65460ea..6875c57 100644
--- a/src/pages/PostRedirect.tsx
+++ b/src/pages/PostRedirect/index.tsx
@@ -1,10 +1,10 @@
 import { useEffect } from "react";
 import { useNavigate, useParams } from "react-router-dom";
-import { getJSON } from "../api";
-import { langQuery, useI18n } from "../i18n";
-import { MOCK_POSTS } from "../mocks/mockPosts";
-import { POST_STREAM_USES_MOCK } from "../components/messageStream/hooks/usePostStream";
-import type { Post } from "../types/post";
+import { getJSON } from "../../api";
+import { langQuery, useI18n } from "../../i18n";
+import { MOCK_POSTS } from "../../mocks/mockPosts";
+import { POST_STREAM_USES_MOCK } from "../../components/messageStream/hooks/usePostStream";
+import type { Post } from "../../types/post";
 
 export function PostRedirect() {
   const { id } = useParams();
diff --git a/src/pages/SearchPage.tsx b/src/pages/Search/index.tsx
similarity index 91%
rename from src/pages/SearchPage.tsx
rename to src/pages/Search/index.tsx
index 83efa0c..678bc60 100644
--- a/src/pages/SearchPage.tsx
+++ b/src/pages/Search/index.tsx
@@ -1,15 +1,15 @@
 import { useEffect, useMemo, useState } from "react";
 import { useSearchParams } from "react-router-dom";
-import { getJSON, itemsOrEmpty, postJSON } from "../api";
-import { langQuery, useI18n } from "../i18n";
+import { getJSON, itemsOrEmpty, postJSON } from "../../api";
+import { langQuery, useI18n } from "../../i18n";
 import {
   LANG_OPTIONS,
   languageLabel,
   sourceLanguageQuery,
-} from "../i18nLanguages";
-import { MessageBubble } from "../components/messageStream/MessageBubble";
-import { typeFilterLabel } from "../resourceTypeLabels";
-import type { Post } from "../types/post";
+} from "../../i18nLanguages";
+import { MessageBubble } from "../../components/messageStream/MessageBubble";
+import { typeFilterLabel } from "../../resourceTypeLabels";
+import type { Post } from "../../types/post";
 
 const types = [
   "all",
diff --git a/src/pages/WalletPage.tsx b/src/pages/Wallet/index.tsx
similarity index 89%
rename from src/pages/WalletPage.tsx
rename to src/pages/Wallet/index.tsx
index 200a8e4..cb75c41 100644
--- a/src/pages/WalletPage.tsx
+++ b/src/pages/Wallet/index.tsx
@@ -1,9 +1,9 @@
 import { RainbowKitProvider, darkTheme } from "@rainbow-me/rainbowkit";
 import { WagmiProvider } from "wagmi";
 import "@rainbow-me/rainbowkit/styles.css";
-import { WalletLoginControls } from "../components/WalletLoginControls";
-import { useI18n } from "../i18n";
-import { wagmiConfig } from "../wagmiConfig";
+import { WalletLoginControls } from "../../components/WalletLoginControls";
+import { useI18n } from "../../i18n";
+import { wagmiConfig } from "../../wagmiConfig";
 
 export function WalletPage() {
   const { t } = useI18n();
diff --git a/src/pages/admin/AdminDashboard.tsx b/src/pages/admin/Dashboard/index.tsx
similarity index 94%
rename from src/pages/admin/AdminDashboard.tsx
rename to src/pages/admin/Dashboard/index.tsx
index cf40261..223e769 100644
--- a/src/pages/admin/AdminDashboard.tsx
+++ b/src/pages/admin/Dashboard/index.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
-import { getJSONAuth } from "../../api";
-import { getToken } from "../../admin/token";
-import { useAdminT } from "../../admin/useAdminT";
+import { getJSONAuth } from "../../../api";
+import { getToken } from "../../../admin/token";
+import { useAdminT } from "../../../admin/useAdminT";
 
 type Dash = {
   totalResources: number;
diff --git a/src/pages/admin/AdminLogin.tsx b/src/pages/admin/Login/index.tsx
similarity index 88%
rename from src/pages/admin/AdminLogin.tsx
rename to src/pages/admin/Login/index.tsx
index f8f1ebb..501226b 100644
--- a/src/pages/admin/AdminLogin.tsx
+++ b/src/pages/admin/Login/index.tsx
@@ -1,10 +1,10 @@
 import { useState } from "react";
 import { useNavigate } from "react-router-dom";
-import { postJSON } from "../../api";
-import { setToken } from "../../admin/token";
-import { useAdminT } from "../../admin/useAdminT";
-import { useAdminRouterMode } from "../../adminRouterMode";
-import { adminUiPrefix } from "../../adminPaths";
+import { postJSON } from "../../../api";
+import { setToken } from "../../../admin/token";
+import { useAdminT } from "../../../admin/useAdminT";
+import { useAdminRouterMode } from "../../../adminRouterMode";
+import { adminUiPrefix } from "../../../adminPaths";
 
 export function AdminLogin() {
   const t = useAdminT();
diff --git a/src/pages/admin/AdminResourceForm.tsx b/src/pages/admin/ResourceForm/index.tsx
similarity index 97%
rename from src/pages/admin/AdminResourceForm.tsx
rename to src/pages/admin/ResourceForm/index.tsx
index 735b538..8cc4350 100644
--- a/src/pages/admin/AdminResourceForm.tsx
+++ b/src/pages/admin/ResourceForm/index.tsx
@@ -7,12 +7,12 @@ import {
   putJSON,
   uploadFile,
   type Category,
-} from "../../api";
-import { getToken } from "../../admin/token";
-import { useAdminT } from "../../admin/useAdminT";
-import { resourceTypeDisplay } from "../../resourceTypeLabels";
-import { adminUiPrefix } from "../../adminPaths";
-import { useAdminRouterMode } from "../../adminRouterMode";
+} from "../../../api";
+import { getToken } from "../../../admin/token";
+import { useAdminT } from "../../../admin/useAdminT";
+import { resourceTypeDisplay } from "../../../resourceTypeLabels";
+import { adminUiPrefix } from "../../../adminPaths";
+import { useAdminRouterMode } from "../../../adminRouterMode";
 
 const types = [
   "image",
diff --git a/src/pages/admin/AdminResources.tsx b/src/pages/admin/Resources/index.tsx
similarity index 94%
rename from src/pages/admin/AdminResources.tsx
rename to src/pages/admin/Resources/index.tsx
index 3bc4256..a1611fd 100644
--- a/src/pages/admin/AdminResources.tsx
+++ b/src/pages/admin/Resources/index.tsx
@@ -6,12 +6,12 @@ import {
   itemsOrEmpty,
   type AdminResource,
   type Category,
-} from "../../api";
-import { getToken } from "../../admin/token";
-import { resourceTypeDisplay } from "../../resourceTypeLabels";
-import { useAdminT } from "../../admin/useAdminT";
-import { adminUiPrefix } from "../../adminPaths";
-import { useAdminRouterMode } from "../../adminRouterMode";
+} from "../../../api";
+import { getToken } from "../../../admin/token";
+import { resourceTypeDisplay } from "../../../resourceTypeLabels";
+import { useAdminT } from "../../../admin/useAdminT";
+import { adminUiPrefix } from "../../../adminPaths";
+import { useAdminRouterMode } from "../../../adminRouterMode";
 
 function statusLabel(t: (k: string) => string, s: string) {
   if (s === "published") return t("published");
diff --git a/src/pages/admin/AdminSearchLogs.tsx b/src/pages/admin/SearchLogs/index.tsx
similarity index 91%
rename from src/pages/admin/AdminSearchLogs.tsx
rename to src/pages/admin/SearchLogs/index.tsx
index 6868091..905293b 100644
--- a/src/pages/admin/AdminSearchLogs.tsx
+++ b/src/pages/admin/SearchLogs/index.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
-import { getJSONAuth } from "../../api";
-import { getToken } from "../../admin/token";
-import { useAdminT } from "../../admin/useAdminT";
+import { getJSONAuth } from "../../../api";
+import { getToken } from "../../../admin/token";
+import { useAdminT } from "../../../admin/useAdminT";
 
 type Row = { id: number; query: string; createdAt: string };