diff --git a/apps/web/app/_trpc/HydrateClient.tsx b/apps/web/_app/_trpc/HydrateClient.tsx
similarity index 100%
rename from apps/web/app/_trpc/HydrateClient.tsx
rename to apps/web/_app/_trpc/HydrateClient.tsx
diff --git a/apps/web/app/_trpc/client.ts b/apps/web/_app/_trpc/client.ts
similarity index 100%
rename from apps/web/app/_trpc/client.ts
rename to apps/web/_app/_trpc/client.ts
diff --git a/apps/web/app/_trpc/createHydrateClient.tsx b/apps/web/_app/_trpc/createHydrateClient.tsx
similarity index 100%
rename from apps/web/app/_trpc/createHydrateClient.tsx
rename to apps/web/_app/_trpc/createHydrateClient.tsx
diff --git a/apps/web/app/_trpc/createTRPCNextLayout.ts b/apps/web/_app/_trpc/createTRPCNextLayout.ts
similarity index 100%
rename from apps/web/app/_trpc/createTRPCNextLayout.ts
rename to apps/web/_app/_trpc/createTRPCNextLayout.ts
diff --git a/apps/web/app/_trpc/serverClient.ts b/apps/web/_app/_trpc/serverClient.ts
similarity index 100%
rename from apps/web/app/_trpc/serverClient.ts
rename to apps/web/_app/_trpc/serverClient.ts
diff --git a/apps/web/app/_trpc/ssgInit.ts b/apps/web/_app/_trpc/ssgInit.ts
similarity index 100%
rename from apps/web/app/_trpc/ssgInit.ts
rename to apps/web/_app/_trpc/ssgInit.ts
diff --git a/apps/web/app/_trpc/ssrInit.ts b/apps/web/_app/_trpc/ssrInit.ts
similarity index 100%
rename from apps/web/app/_trpc/ssrInit.ts
rename to apps/web/_app/_trpc/ssrInit.ts
diff --git a/apps/web/app/_trpc/trpc-provider.tsx b/apps/web/_app/_trpc/trpc-provider.tsx
similarity index 100%
rename from apps/web/app/_trpc/trpc-provider.tsx
rename to apps/web/_app/_trpc/trpc-provider.tsx
diff --git a/apps/web/app/_types.ts b/apps/web/_app/_types.ts
similarity index 100%
rename from apps/web/app/_types.ts
rename to apps/web/_app/_types.ts
diff --git a/apps/web/app/_utils.tsx b/apps/web/_app/_utils.tsx
similarity index 100%
rename from apps/web/app/_utils.tsx
rename to apps/web/_app/_utils.tsx
diff --git a/apps/web/app/error.tsx b/apps/web/_app/error.tsx
similarity index 100%
rename from apps/web/app/error.tsx
rename to apps/web/_app/error.tsx
diff --git a/apps/web/app/future/(individual-page-wrapper)/apps/[slug]/layout.tsx b/apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/layout.tsx
similarity index 100%
rename from apps/web/app/future/(individual-page-wrapper)/apps/[slug]/layout.tsx
rename to apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/layout.tsx
diff --git a/apps/web/app/future/(individual-page-wrapper)/apps/[slug]/page.tsx b/apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/page.tsx
similarity index 100%
rename from apps/web/app/future/(individual-page-wrapper)/apps/[slug]/page.tsx
rename to apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/page.tsx
diff --git a/apps/web/app/future/(individual-page-wrapper)/apps/[slug]/setup/page.tsx b/apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/setup/page.tsx
similarity index 100%
rename from apps/web/app/future/(individual-page-wrapper)/apps/[slug]/setup/page.tsx
rename to apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/setup/page.tsx
diff --git a/apps/web/app/future/(individual-page-wrapper)/apps/categories/[category]/page.tsx b/apps/web/_app/future/(individual-page-wrapper)/apps/categories/[category]/page.tsx
similarity index 100%
rename from apps/web/app/future/(individual-page-wrapper)/apps/categories/[category]/page.tsx
rename to apps/web/_app/future/(individual-page-wrapper)/apps/categories/[category]/page.tsx
diff --git a/apps/web/app/future/(individual-page-wrapper)/apps/categories/page.tsx b/apps/web/_app/future/(individual-page-wrapper)/apps/categories/page.tsx
similarity index 100%
rename from apps/web/app/future/(individual-page-wrapper)/apps/categories/page.tsx
rename to apps/web/_app/future/(individual-page-wrapper)/apps/categories/page.tsx
diff --git a/apps/web/app/future/(individual-page-wrapper)/apps/installed/[category]/layout.tsx b/apps/web/_app/future/(individual-page-wrapper)/apps/installed/[category]/layout.tsx
similarity index 100%
rename from apps/web/app/future/(individual-page-wrapper)/apps/installed/[category]/layout.tsx
rename to apps/web/_app/future/(individual-page-wrapper)/apps/installed/[category]/layout.tsx
diff --git a/apps/web/app/future/(individual-page-wrapper)/apps/installed/[category]/page.tsx b/apps/web/_app/future/(individual-page-wrapper)/apps/installed/[category]/page.tsx
similarity index 100%
rename from apps/web/app/future/(individual-page-wrapper)/apps/installed/[category]/page.tsx
rename to apps/web/_app/future/(individual-page-wrapper)/apps/installed/[category]/page.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(admin-layout)/layout.tsx b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/layout.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(admin-layout)/layout.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/layout.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/[category]/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/[category]/page.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/[category]/page.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/[category]/page.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/page.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/page.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/page.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/flags/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/flags/page.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/flags/page.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/flags/page.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/impersonation/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/impersonation/page.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/impersonation/page.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/impersonation/page.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/oAuth/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/oAuth/page.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/oAuth/page.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/oAuth/page.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/page.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/page.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/page.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(layout)/event-types/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(layout)/event-types/page.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(layout)/event-types/page.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(layout)/event-types/page.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(layout)/layout.tsx b/apps/web/_app/future/(shared-page-wrapper)/(layout)/layout.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(layout)/layout.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(layout)/layout.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(no-layout)/layout.tsx b/apps/web/_app/future/(shared-page-wrapper)/(no-layout)/layout.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(no-layout)/layout.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(no-layout)/layout.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(no-layout)/settings/admin/oAuth/oAuthView/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(no-layout)/settings/admin/oAuth/oAuthView/page.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(no-layout)/settings/admin/oAuth/oAuthView/page.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(no-layout)/settings/admin/oAuth/oAuthView/page.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/layout.tsx b/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/layout.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(settings-layout)/layout.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/layout.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx
diff --git a/apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx b/apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx
similarity index 100%
rename from apps/web/app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx
rename to apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx
diff --git a/apps/web/app/global-error.tsx b/apps/web/_app/global-error.tsx
similarity index 100%
rename from apps/web/app/global-error.tsx
rename to apps/web/_app/global-error.tsx
diff --git a/apps/web/app/layout.tsx b/apps/web/_app/layout.tsx
similarity index 100%
rename from apps/web/app/layout.tsx
rename to apps/web/_app/layout.tsx