diff --git a/src/app/admin/baseline/page.tsx b/app/admin/baseline/page.tsx
similarity index 100%
rename from src/app/admin/baseline/page.tsx
rename to app/admin/baseline/page.tsx
diff --git a/src/app/admin/configuration/page.tsx b/app/admin/configuration/page.tsx
similarity index 100%
rename from src/app/admin/configuration/page.tsx
rename to app/admin/configuration/page.tsx
diff --git a/src/app/admin/insights/page.tsx b/app/admin/insights/page.tsx
similarity index 100%
rename from src/app/admin/insights/page.tsx
rename to app/admin/insights/page.tsx
diff --git a/src/app/admin/layout.tsx b/app/admin/layout.tsx
similarity index 100%
rename from src/app/admin/layout.tsx
rename to app/admin/layout.tsx
diff --git a/src/app/admin/outdated/page.tsx b/app/admin/outdated/page.tsx
similarity index 100%
rename from src/app/admin/outdated/page.tsx
rename to app/admin/outdated/page.tsx
diff --git a/src/app/admin/photos/[photoId]/edit/page.tsx b/app/admin/photos/[photoId]/edit/page.tsx
similarity index 100%
rename from src/app/admin/photos/[photoId]/edit/page.tsx
rename to app/admin/photos/[photoId]/edit/page.tsx
diff --git a/src/app/admin/photos/page.tsx b/app/admin/photos/page.tsx
similarity index 100%
rename from src/app/admin/photos/page.tsx
rename to app/admin/photos/page.tsx
diff --git a/src/app/admin/tags/[tag]/edit/page.tsx b/app/admin/tags/[tag]/edit/page.tsx
similarity index 100%
rename from src/app/admin/tags/[tag]/edit/page.tsx
rename to app/admin/tags/[tag]/edit/page.tsx
diff --git a/src/app/admin/tags/page.tsx b/app/admin/tags/page.tsx
similarity index 100%
rename from src/app/admin/tags/page.tsx
rename to app/admin/tags/page.tsx
diff --git a/src/app/admin/uploads/[uploadPath]/page.tsx b/app/admin/uploads/[uploadPath]/page.tsx
similarity index 100%
rename from src/app/admin/uploads/[uploadPath]/page.tsx
rename to app/admin/uploads/[uploadPath]/page.tsx
diff --git a/src/app/admin/uploads/page.tsx b/app/admin/uploads/page.tsx
similarity index 100%
rename from src/app/admin/uploads/page.tsx
rename to app/admin/uploads/page.tsx
diff --git a/src/app/api/auth/[...nextauth]/route.ts b/app/api/auth/[...nextauth]/route.ts
similarity index 100%
rename from src/app/api/auth/[...nextauth]/route.ts
rename to app/api/auth/[...nextauth]/route.ts
diff --git a/src/app/api/route.ts b/app/api/route.ts
similarity index 100%
rename from src/app/api/route.ts
rename to app/api/route.ts
diff --git a/src/app/api/storage/presigned-url/[key]/route.ts b/app/api/storage/presigned-url/[key]/route.ts
similarity index 100%
rename from src/app/api/storage/presigned-url/[key]/route.ts
rename to app/api/storage/presigned-url/[key]/route.ts
diff --git a/src/app/api/storage/vercel-blob/route.ts b/app/api/storage/vercel-blob/route.ts
similarity index 100%
rename from src/app/api/storage/vercel-blob/route.ts
rename to app/api/storage/vercel-blob/route.ts
diff --git a/src/app/error.tsx b/app/error.tsx
similarity index 100%
rename from src/app/error.tsx
rename to app/error.tsx
diff --git a/src/app/feed/page.tsx b/app/feed/page.tsx
similarity index 100%
rename from src/app/feed/page.tsx
rename to app/feed/page.tsx
diff --git a/src/app/film-demo/animate/page.tsx b/app/film-demo/animate/page.tsx
similarity index 100%
rename from src/app/film-demo/animate/page.tsx
rename to app/film-demo/animate/page.tsx
diff --git a/src/app/film-demo/page.tsx b/app/film-demo/page.tsx
similarity index 100%
rename from src/app/film-demo/page.tsx
rename to app/film-demo/page.tsx
diff --git a/src/app/film/[simulation]/[photoId]/page.tsx b/app/film/[simulation]/[photoId]/page.tsx
similarity index 100%
rename from src/app/film/[simulation]/[photoId]/page.tsx
rename to app/film/[simulation]/[photoId]/page.tsx
diff --git a/src/app/film/[simulation]/image/route.tsx b/app/film/[simulation]/image/route.tsx
similarity index 100%
rename from src/app/film/[simulation]/image/route.tsx
rename to app/film/[simulation]/image/route.tsx
diff --git a/src/app/film/[simulation]/page.tsx b/app/film/[simulation]/page.tsx
similarity index 100%
rename from src/app/film/[simulation]/page.tsx
rename to app/film/[simulation]/page.tsx
diff --git a/src/app/focal/[focal]/[photoId]/page.tsx b/app/focal/[focal]/[photoId]/page.tsx
similarity index 100%
rename from src/app/focal/[focal]/[photoId]/page.tsx
rename to app/focal/[focal]/[photoId]/page.tsx
diff --git a/src/app/focal/[focal]/image/route.tsx b/app/focal/[focal]/image/route.tsx
similarity index 100%
rename from src/app/focal/[focal]/image/route.tsx
rename to app/focal/[focal]/image/route.tsx
diff --git a/src/app/focal/[focal]/page.tsx b/app/focal/[focal]/page.tsx
similarity index 100%
rename from src/app/focal/[focal]/page.tsx
rename to app/focal/[focal]/page.tsx
diff --git a/src/app/grid/page.tsx b/app/grid/page.tsx
similarity index 100%
rename from src/app/grid/page.tsx
rename to app/grid/page.tsx
diff --git a/src/app/home-image/route.tsx b/app/home-image/route.tsx
similarity index 100%
rename from src/app/home-image/route.tsx
rename to app/home-image/route.tsx
diff --git a/src/app/layout.tsx b/app/layout.tsx
similarity index 97%
rename from src/app/layout.tsx
rename to app/layout.tsx
index 26171370..1b2292cd 100644
--- a/src/app/layout.tsx
+++ b/app/layout.tsx
@@ -16,11 +16,11 @@ import { ThemeProvider } from 'next-themes';
 import Nav from '@/app-core/Nav';
 import Footer from '@/app-core/Footer';
 import CommandK from '@/app-core/CommandK';
-import SwrConfigClient from '../state/SwrConfigClient';
+import SwrConfigClient from '@/state/SwrConfigClient';
 import AdminBatchEditPanel from '@/admin/AdminBatchEditPanel';
 import ShareModals from '@/share/ShareModals';
 
-import '../../tailwind.css';
+import '../tailwind.css';
 
 export const metadata: Metadata = {
   title: SITE_TITLE,
diff --git a/src/app/not-found.tsx b/app/not-found.tsx
similarity index 100%
rename from src/app/not-found.tsx
rename to app/not-found.tsx
diff --git a/src/app/og/all/page.tsx b/app/og/all/page.tsx
similarity index 100%
rename from src/app/og/all/page.tsx
rename to app/og/all/page.tsx
diff --git a/src/app/og/sample/page.tsx b/app/og/sample/page.tsx
similarity index 100%
rename from src/app/og/sample/page.tsx
rename to app/og/sample/page.tsx
diff --git a/src/app/p/[photoId]/image/route.tsx b/app/p/[photoId]/image/route.tsx
similarity index 100%
rename from src/app/p/[photoId]/image/route.tsx
rename to app/p/[photoId]/image/route.tsx
diff --git a/src/app/p/[photoId]/page.tsx b/app/p/[photoId]/page.tsx
similarity index 100%
rename from src/app/p/[photoId]/page.tsx
rename to app/p/[photoId]/page.tsx
diff --git a/src/app/page.tsx b/app/page.tsx
similarity index 100%
rename from src/app/page.tsx
rename to app/page.tsx
diff --git a/src/app/shot-on/[make]/[model]/[photoId]/page.tsx b/app/shot-on/[make]/[model]/[photoId]/page.tsx
similarity index 100%
rename from src/app/shot-on/[make]/[model]/[photoId]/page.tsx
rename to app/shot-on/[make]/[model]/[photoId]/page.tsx
diff --git a/src/app/shot-on/[make]/[model]/image/route.tsx b/app/shot-on/[make]/[model]/image/route.tsx
similarity index 100%
rename from src/app/shot-on/[make]/[model]/image/route.tsx
rename to app/shot-on/[make]/[model]/image/route.tsx
diff --git a/src/app/shot-on/[make]/[model]/page.tsx b/app/shot-on/[make]/[model]/page.tsx
similarity index 100%
rename from src/app/shot-on/[make]/[model]/page.tsx
rename to app/shot-on/[make]/[model]/page.tsx
diff --git a/src/app/sign-in/page.tsx b/app/sign-in/page.tsx
similarity index 100%
rename from src/app/sign-in/page.tsx
rename to app/sign-in/page.tsx
diff --git a/src/app/tag/[tag]/[photoId]/page.tsx b/app/tag/[tag]/[photoId]/page.tsx
similarity index 100%
rename from src/app/tag/[tag]/[photoId]/page.tsx
rename to app/tag/[tag]/[photoId]/page.tsx
diff --git a/src/app/tag/[tag]/image/route.tsx b/app/tag/[tag]/image/route.tsx
similarity index 100%
rename from src/app/tag/[tag]/image/route.tsx
rename to app/tag/[tag]/image/route.tsx
diff --git a/src/app/tag/[tag]/page.tsx b/app/tag/[tag]/page.tsx
similarity index 100%
rename from src/app/tag/[tag]/page.tsx
rename to app/tag/[tag]/page.tsx
diff --git a/src/app/tag/hidden/[photoId]/page.tsx b/app/tag/hidden/[photoId]/page.tsx
similarity index 100%
rename from src/app/tag/hidden/[photoId]/page.tsx
rename to app/tag/hidden/[photoId]/page.tsx
diff --git a/src/app/tag/hidden/page.tsx b/app/tag/hidden/page.tsx
similarity index 100%
rename from src/app/tag/hidden/page.tsx
rename to app/tag/hidden/page.tsx
diff --git a/src/app/template-image-tight/route.tsx b/app/template-image-tight/route.tsx
similarity index 100%
rename from src/app/template-image-tight/route.tsx
rename to app/template-image-tight/route.tsx
diff --git a/src/app/template-image/route.tsx b/app/template-image/route.tsx
similarity index 100%
rename from src/app/template-image/route.tsx
rename to app/template-image/route.tsx
diff --git a/src/app/template-url/route.tsx b/app/template-url/route.tsx
similarity index 100%
rename from src/app/template-url/route.tsx
rename to app/template-url/route.tsx