diff --git a/app/(pages)/(public)/(auth)/authenticate/route.ts b/app/(pages)/(auth)/authenticate/route.ts
similarity index 100%
rename from app/(pages)/(public)/(auth)/authenticate/route.ts
rename to app/(pages)/(auth)/authenticate/route.ts
diff --git a/app/(pages)/(public)/(auth)/change-password/page.tsx b/app/(pages)/(auth)/change-password/page.tsx
similarity index 100%
rename from app/(pages)/(public)/(auth)/change-password/page.tsx
rename to app/(pages)/(auth)/change-password/page.tsx
diff --git a/app/(pages)/(public)/(auth)/confirmation-sent/page.tsx b/app/(pages)/(auth)/confirmation-sent/page.tsx
similarity index 100%
rename from app/(pages)/(public)/(auth)/confirmation-sent/page.tsx
rename to app/(pages)/(auth)/confirmation-sent/page.tsx
diff --git a/app/(pages)/(private)/subjects/(group)/@archived/loading.tsx b/app/(pages)/(auth)/forgot-password/email-sent/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/subjects/(group)/@archived/loading.tsx
rename to app/(pages)/(auth)/forgot-password/email-sent/loading.tsx
diff --git a/app/(pages)/(public)/(auth)/forgot-password/email-sent/page.tsx b/app/(pages)/(auth)/forgot-password/email-sent/page.tsx
similarity index 100%
rename from app/(pages)/(public)/(auth)/forgot-password/email-sent/page.tsx
rename to app/(pages)/(auth)/forgot-password/email-sent/page.tsx
diff --git a/app/(pages)/(public)/(auth)/forgot-password/page.tsx b/app/(pages)/(auth)/forgot-password/page.tsx
similarity index 100%
rename from app/(pages)/(public)/(auth)/forgot-password/page.tsx
rename to app/(pages)/(auth)/forgot-password/page.tsx
diff --git a/app/(pages)/(public)/(auth)/layout.tsx b/app/(pages)/(auth)/layout.tsx
similarity index 100%
rename from app/(pages)/(public)/(auth)/layout.tsx
rename to app/(pages)/(auth)/layout.tsx
diff --git a/app/(pages)/(public)/(auth)/sign-in/page.tsx b/app/(pages)/(auth)/sign-in/page.tsx
similarity index 100%
rename from app/(pages)/(public)/(auth)/sign-in/page.tsx
rename to app/(pages)/(auth)/sign-in/page.tsx
diff --git a/app/(pages)/(public)/(auth)/sign-up/page.tsx b/app/(pages)/(auth)/sign-up/page.tsx
similarity index 100%
rename from app/(pages)/(public)/(auth)/sign-up/page.tsx
rename to app/(pages)/(auth)/sign-up/page.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/@modal/(lg)/template.tsx b/app/(pages)/(public)/share/[subjectId]/@modal/(lg)/template.tsx
deleted file mode 100644
index b6ffeff1..00000000
--- a/app/(pages)/(public)/share/[subjectId]/@modal/(lg)/template.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import PageModal from '@/_components/page-modal';
-import { ReactNode } from 'react';
-
-interface LayoutProps {
-  children: ReactNode;
-}
-
-const Template = ({ children }: LayoutProps) => (
-  <PageModal className="max-w-4xl">{children}</PageModal>
-);
-
-export default Template;
diff --git a/app/(pages)/(public)/share/[subjectId]/@modal/(md)/layout.tsx b/app/(pages)/(public)/share/[subjectId]/@modal/(md)/layout.tsx
deleted file mode 100644
index 2bae46a7..00000000
--- a/app/(pages)/(public)/share/[subjectId]/@modal/(md)/layout.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import PageModal from '@/_components/page-modal';
-
-const Layout = PageModal;
-
-export default Layout;
diff --git a/app/(pages)/(public)/share/[subjectId]/@modal/[...default]/page.tsx b/app/(pages)/(public)/share/[subjectId]/@modal/[...default]/page.tsx
deleted file mode 100644
index c2a317bf..00000000
--- a/app/(pages)/(public)/share/[subjectId]/@modal/[...default]/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-const Page = () => null;
-
-export default Page;
diff --git a/app/(pages)/(public)/share/[subjectId]/@modal/default.tsx b/app/(pages)/(public)/share/[subjectId]/@modal/default.tsx
deleted file mode 100644
index 79f2366c..00000000
--- a/app/(pages)/(public)/share/[subjectId]/@modal/default.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-const Default = () => null;
-
-export default Default;
diff --git a/app/(pages)/(public)/share/[subjectId]/default.tsx b/app/(pages)/(public)/share/[subjectId]/default.tsx
deleted file mode 100644
index 79f2366c..00000000
--- a/app/(pages)/(public)/share/[subjectId]/default.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-const Default = () => null;
-
-export default Default;
diff --git a/app/(pages)/(private)/inputs/layout.tsx b/app/(pages)/(with-nav)/inputs/layout.tsx
similarity index 100%
rename from app/(pages)/(private)/inputs/layout.tsx
rename to app/(pages)/(with-nav)/inputs/layout.tsx
diff --git a/app/(pages)/(private)/inputs/loading.tsx b/app/(pages)/(with-nav)/inputs/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/inputs/loading.tsx
rename to app/(pages)/(with-nav)/inputs/loading.tsx
diff --git a/app/(pages)/(private)/inputs/page.tsx b/app/(pages)/(with-nav)/inputs/page.tsx
similarity index 100%
rename from app/(pages)/(private)/inputs/page.tsx
rename to app/(pages)/(with-nav)/inputs/page.tsx
diff --git a/app/(pages)/(private)/layout.tsx b/app/(pages)/(with-nav)/layout.tsx
similarity index 95%
rename from app/(pages)/(private)/layout.tsx
rename to app/(pages)/(with-nav)/layout.tsx
index 9766ff2c..bfb225a8 100644
--- a/app/(pages)/(private)/layout.tsx
+++ b/app/(pages)/(with-nav)/layout.tsx
@@ -9,10 +9,9 @@ import { ReactNode } from 'react';
 
 interface LayoutProps {
   children: ReactNode;
-  modal: ReactNode;
 }
 
-const Layout = async ({ children, modal }: LayoutProps) => {
+const Layout = async ({ children }: LayoutProps) => {
   const [{ count }, user] = await Promise.all([
     countNotifications(),
     getCurrentUser(),
@@ -67,7 +66,6 @@ const Layout = async ({ children, modal }: LayoutProps) => {
         </nav>
       )}
       {children}
-      {modal}
     </div>
   );
 };
diff --git a/app/(pages)/(private)/subjects/[subjectId]/(group)/(group)/events/loading.tsx b/app/(pages)/(with-nav)/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/subjects/[subjectId]/(group)/(group)/events/loading.tsx
rename to app/(pages)/(with-nav)/loading.tsx
diff --git a/app/(pages)/(private)/notifications/[tab]/page.tsx b/app/(pages)/(with-nav)/notifications/[tab]/page.tsx
similarity index 100%
rename from app/(pages)/(private)/notifications/[tab]/page.tsx
rename to app/(pages)/(with-nav)/notifications/[tab]/page.tsx
diff --git a/app/(pages)/(private)/notifications/layout.tsx b/app/(pages)/(with-nav)/notifications/layout.tsx
similarity index 100%
rename from app/(pages)/(private)/notifications/layout.tsx
rename to app/(pages)/(with-nav)/notifications/layout.tsx
diff --git a/app/(pages)/(private)/notifications/[tab]/loading.tsx b/app/(pages)/(with-nav)/notifications/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/notifications/[tab]/loading.tsx
rename to app/(pages)/(with-nav)/notifications/loading.tsx
diff --git a/app/(pages)/(public)/(auth)/forgot-password/email-sent/loading.tsx b/app/(pages)/(with-nav)/subjects/(list)/@archived/loading.tsx
similarity index 100%
rename from app/(pages)/(public)/(auth)/forgot-password/email-sent/loading.tsx
rename to app/(pages)/(with-nav)/subjects/(list)/@archived/loading.tsx
diff --git a/app/(pages)/(private)/subjects/(group)/@archived/page.tsx b/app/(pages)/(with-nav)/subjects/(list)/@archived/page.tsx
similarity index 100%
rename from app/(pages)/(private)/subjects/(group)/@archived/page.tsx
rename to app/(pages)/(with-nav)/subjects/(list)/@archived/page.tsx
diff --git a/app/(pages)/(private)/subjects/(group)/layout.tsx b/app/(pages)/(with-nav)/subjects/(list)/layout.tsx
similarity index 100%
rename from app/(pages)/(private)/subjects/(group)/layout.tsx
rename to app/(pages)/(with-nav)/subjects/(list)/layout.tsx
diff --git a/app/(pages)/(private)/subjects/(group)/loading.tsx b/app/(pages)/(with-nav)/subjects/(list)/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/subjects/(group)/loading.tsx
rename to app/(pages)/(with-nav)/subjects/(list)/loading.tsx
diff --git a/app/(pages)/(private)/subjects/(group)/page.tsx b/app/(pages)/(with-nav)/subjects/(list)/page.tsx
similarity index 100%
rename from app/(pages)/(private)/subjects/(group)/page.tsx
rename to app/(pages)/(with-nav)/subjects/(list)/page.tsx
diff --git a/app/(pages)/(private)/subjects/[subjectId]/(group)/(group)/events/page.tsx b/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/events/page.tsx
similarity index 100%
rename from app/(pages)/(private)/subjects/[subjectId]/(group)/(group)/events/page.tsx
rename to app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/events/page.tsx
diff --git a/app/(pages)/(private)/subjects/[subjectId]/(group)/(group)/insights/page.tsx b/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/insights/page.tsx
similarity index 100%
rename from app/(pages)/(private)/subjects/[subjectId]/(group)/(group)/insights/page.tsx
rename to app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/insights/page.tsx
diff --git a/app/(pages)/(private)/subjects/[subjectId]/(group)/(group)/layout.tsx b/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/layout.tsx
similarity index 100%
rename from app/(pages)/(private)/subjects/[subjectId]/(group)/(group)/layout.tsx
rename to app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/layout.tsx
diff --git a/app/(pages)/(private)/subjects/[subjectId]/(group)/(group)/insights/loading.tsx b/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/subjects/[subjectId]/(group)/(group)/insights/loading.tsx
rename to app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/(subject)/loading.tsx
diff --git a/app/(pages)/(private)/subjects/[subjectId]/(group)/layout.tsx b/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/layout.tsx
similarity index 100%
rename from app/(pages)/(private)/subjects/[subjectId]/(group)/layout.tsx
rename to app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/layout.tsx
diff --git a/app/(pages)/(private)/subjects/[subjectId]/(group)/loading.tsx b/app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/subjects/[subjectId]/(group)/loading.tsx
rename to app/(pages)/(with-nav)/subjects/[subjectId]/(subject-loading)/loading.tsx
diff --git a/app/(pages)/(private)/subjects/[subjectId]/events.csv/route.ts b/app/(pages)/(with-nav)/subjects/[subjectId]/events.csv/route.ts
similarity index 100%
rename from app/(pages)/(private)/subjects/[subjectId]/events.csv/route.ts
rename to app/(pages)/(with-nav)/subjects/[subjectId]/events.csv/route.ts
diff --git a/app/(pages)/(private)/subjects/[subjectId]/join/[shareCode]/page.tsx b/app/(pages)/(with-nav)/subjects/[subjectId]/join/[shareCode]/page.tsx
similarity index 100%
rename from app/(pages)/(private)/subjects/[subjectId]/join/[shareCode]/page.tsx
rename to app/(pages)/(with-nav)/subjects/[subjectId]/join/[shareCode]/page.tsx
diff --git a/app/(pages)/(private)/templates/layout.tsx b/app/(pages)/(with-nav)/templates/layout.tsx
similarity index 100%
rename from app/(pages)/(private)/templates/layout.tsx
rename to app/(pages)/(with-nav)/templates/layout.tsx
diff --git a/app/(pages)/(private)/templates/loading.tsx b/app/(pages)/(with-nav)/templates/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/templates/loading.tsx
rename to app/(pages)/(with-nav)/templates/loading.tsx
diff --git a/app/(pages)/(private)/templates/page.tsx b/app/(pages)/(with-nav)/templates/page.tsx
similarity index 100%
rename from app/(pages)/(private)/templates/page.tsx
rename to app/(pages)/(with-nav)/templates/page.tsx
diff --git a/app/(pages)/(private)/@modal/(lg)/template.tsx b/app/(pages)/@modal/(lg)/layout.tsx
similarity index 72%
rename from app/(pages)/(private)/@modal/(lg)/template.tsx
rename to app/(pages)/@modal/(lg)/layout.tsx
index b6ffeff1..a156e4b8 100644
--- a/app/(pages)/(private)/@modal/(lg)/template.tsx
+++ b/app/(pages)/@modal/(lg)/layout.tsx
@@ -5,8 +5,8 @@ interface LayoutProps {
   children: ReactNode;
 }
 
-const Template = ({ children }: LayoutProps) => (
+const Layout = ({ children }: LayoutProps) => (
   <PageModal className="max-w-4xl">{children}</PageModal>
 );
 
-export default Template;
+export default Layout;
diff --git a/app/(pages)/(private)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/edit/loading.tsx b/app/(pages)/@modal/(lg)/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/edit/loading.tsx
rename to app/(pages)/@modal/(lg)/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/loading.tsx b/app/(pages)/@modal/(lg)/share/[subjectId]/insights/[insightId]/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/loading.tsx
rename to app/(pages)/@modal/(lg)/share/[subjectId]/insights/[insightId]/loading.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/@modal/(lg)/insights/[insightId]/page.tsx b/app/(pages)/@modal/(lg)/share/[subjectId]/insights/[insightId]/page.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/@modal/(lg)/insights/[insightId]/page.tsx
rename to app/(pages)/@modal/(lg)/share/[subjectId]/insights/[insightId]/page.tsx
diff --git a/app/(pages)/(private)/@modal/(lg)/subjects/[subjectId]/insights/create/loading.tsx b/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/edit/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(lg)/subjects/[subjectId]/insights/create/loading.tsx
rename to app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/edit/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/edit/page.tsx b/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/edit/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/edit/page.tsx
rename to app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/edit/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/inputs/[inputId]/loading.tsx b/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/inputs/[inputId]/loading.tsx
rename to app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/page.tsx b/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/page.tsx
rename to app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/[insightId]/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/inputs/create/from-input/[inputId]/loading.tsx b/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/create/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/inputs/create/from-input/[inputId]/loading.tsx
rename to app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/create/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(lg)/subjects/[subjectId]/insights/create/page.tsx b/app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/create/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(lg)/subjects/[subjectId]/insights/create/page.tsx
rename to app/(pages)/@modal/(lg)/subjects/[subjectId]/insights/create/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/account/[tab]/loading.tsx b/app/(pages)/@modal/(md)/account/[tab]/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/account/[tab]/loading.tsx
rename to app/(pages)/@modal/(md)/account/[tab]/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/account/[tab]/page.tsx b/app/(pages)/@modal/(md)/account/[tab]/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/account/[tab]/page.tsx
rename to app/(pages)/@modal/(md)/account/[tab]/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/account/layout.tsx b/app/(pages)/@modal/(md)/account/layout.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/account/layout.tsx
rename to app/(pages)/@modal/(md)/account/layout.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/inputs/create/loading.tsx b/app/(pages)/@modal/(md)/inputs/[inputId]/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/inputs/create/loading.tsx
rename to app/(pages)/@modal/(md)/inputs/[inputId]/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/inputs/[inputId]/page.tsx b/app/(pages)/@modal/(md)/inputs/[inputId]/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/inputs/[inputId]/page.tsx
rename to app/(pages)/@modal/(md)/inputs/[inputId]/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/edit/loading.tsx b/app/(pages)/@modal/(md)/inputs/create/from-input/[inputId]/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/edit/loading.tsx
rename to app/(pages)/@modal/(md)/inputs/create/from-input/[inputId]/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/inputs/create/from-input/[inputId]/page.tsx b/app/(pages)/@modal/(md)/inputs/create/from-input/[inputId]/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/inputs/create/from-input/[inputId]/page.tsx
rename to app/(pages)/@modal/(md)/inputs/create/from-input/[inputId]/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/edit/loading.tsx b/app/(pages)/@modal/(md)/inputs/create/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/edit/loading.tsx
rename to app/(pages)/@modal/(md)/inputs/create/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/inputs/create/page.tsx b/app/(pages)/@modal/(md)/inputs/create/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/inputs/create/page.tsx
rename to app/(pages)/@modal/(md)/inputs/create/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/template.tsx b/app/(pages)/@modal/(md)/layout.tsx
similarity index 54%
rename from app/(pages)/(private)/@modal/(md)/template.tsx
rename to app/(pages)/@modal/(md)/layout.tsx
index 59b69c6b..0223f33a 100644
--- a/app/(pages)/(private)/@modal/(md)/template.tsx
+++ b/app/(pages)/@modal/(md)/layout.tsx
@@ -5,8 +5,6 @@ interface LayoutProps {
   children: ReactNode;
 }
 
-const Template = ({ children }: LayoutProps) => (
-  <PageModal>{children}</PageModal>
-);
+const Layout = ({ children }: LayoutProps) => <PageModal>{children}</PageModal>;
 
-export default Template;
+export default Layout;
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/loading.tsx b/app/(pages)/@modal/(md)/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/loading.tsx
rename to app/(pages)/@modal/(md)/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/event-types/create/loading.tsx b/app/(pages)/@modal/(md)/share/[subjectId]/events/[eventId]/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/event-types/create/loading.tsx
rename to app/(pages)/@modal/(md)/share/[subjectId]/events/[eventId]/loading.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/@modal/(md)/events/[eventId]/page.tsx b/app/(pages)/@modal/(md)/share/[subjectId]/events/[eventId]/page.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/@modal/(md)/events/[eventId]/page.tsx
rename to app/(pages)/@modal/(md)/share/[subjectId]/events/[eventId]/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/events/[eventId]/loading.tsx b/app/(pages)/@modal/(md)/share/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/events/[eventId]/loading.tsx
rename to app/(pages)/@modal/(md)/share/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/loading.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/@modal/(md)/training-plans/[missionId]/sessions/[sessionId]/page.tsx b/app/(pages)/@modal/(md)/share/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/page.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/@modal/(md)/training-plans/[missionId]/sessions/[sessionId]/page.tsx
rename to app/(pages)/@modal/(md)/share/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/page.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/training-plans/[missionId]/sessions/loading.tsx b/app/(pages)/@modal/(md)/share/[subjectId]/training-plans/[missionId]/sessions/loading.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/training-plans/[missionId]/sessions/loading.tsx
rename to app/(pages)/@modal/(md)/share/[subjectId]/training-plans/[missionId]/sessions/loading.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/training-plans/[missionId]/sessions/page.tsx b/app/(pages)/@modal/(md)/share/[subjectId]/training-plans/[missionId]/sessions/page.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/training-plans/[missionId]/sessions/page.tsx
rename to app/(pages)/@modal/(md)/share/[subjectId]/training-plans/[missionId]/sessions/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/edit/loading.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/edit/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/edit/loading.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/edit/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/edit/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/edit/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/edit/page.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/edit/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/edit/loading.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/edit/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/edit/loading.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/edit/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/edit/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/edit/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/edit/page.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/edit/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/loading.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/loading.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/page.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/event-types/[eventTypeId]/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/from-session/[sessionId]/loading.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/event-types/create/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/from-session/[sessionId]/loading.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/event-types/create/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/event-types/create/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/event-types/create/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/event-types/create/page.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/event-types/create/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/loading.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/events/[eventId]/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/loading.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/events/[eventId]/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/events/[eventId]/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/events/[eventId]/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/events/[eventId]/page.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/events/[eventId]/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/loading.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/edit/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/loading.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/edit/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/edit/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/edit/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/edit/page.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/edit/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/create/loading.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/edit/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/create/loading.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/edit/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/edit/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/edit/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/edit/page.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/edit/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/create/loading.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/create/loading.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/page.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/[sessionId]/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/templates/[templateId]/loading.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/from-session/[sessionId]/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/templates/[templateId]/loading.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/from-session/[sessionId]/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/from-session/[sessionId]/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/from-session/[sessionId]/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/from-session/[sessionId]/page.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/from-session/[sessionId]/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/templates/create/from-event-type/[eventTypeId]/loading.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/templates/create/from-event-type/[eventTypeId]/loading.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/page.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/create/[order]/page.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/templates/create/loading.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/loading.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/templates/create/loading.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/page.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/[missionId]/sessions/page.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/@modal/(lg)/insights/[insightId]/loading.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/create/loading.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/@modal/(lg)/insights/[insightId]/loading.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/create/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/create/page.tsx b/app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/create/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/[subjectId]/training-plans/create/page.tsx
rename to app/(pages)/@modal/(md)/subjects/[subjectId]/training-plans/create/page.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/@modal/(md)/events/[eventId]/loading.tsx b/app/(pages)/@modal/(md)/subjects/create/loading.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/@modal/(md)/events/[eventId]/loading.tsx
rename to app/(pages)/@modal/(md)/subjects/create/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/subjects/create/page.tsx b/app/(pages)/@modal/(md)/subjects/create/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/subjects/create/page.tsx
rename to app/(pages)/@modal/(md)/subjects/create/page.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/@modal/(md)/training-plans/[missionId]/sessions/[sessionId]/loading.tsx b/app/(pages)/@modal/(md)/templates/[templateId]/loading.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/@modal/(md)/training-plans/[missionId]/sessions/[sessionId]/loading.tsx
rename to app/(pages)/@modal/(md)/templates/[templateId]/loading.tsx
diff --git a/app/(pages)/(private)/@modal/(md)/templates/[templateId]/page.tsx b/app/(pages)/@modal/(md)/templates/[templateId]/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/templates/[templateId]/page.tsx
rename to app/(pages)/@modal/(md)/templates/[templateId]/page.tsx
diff --git a/app/(pages)/@modal/(md)/templates/create/from-event-type/[eventTypeId]/loading.tsx b/app/(pages)/@modal/(md)/templates/create/from-event-type/[eventTypeId]/loading.tsx
new file mode 100644
index 00000000..e3d948d8
--- /dev/null
+++ b/app/(pages)/@modal/(md)/templates/create/from-event-type/[eventTypeId]/loading.tsx
@@ -0,0 +1,5 @@
+import PageModalLoading from '@/_components/page-modal-loading';
+
+const Loading = PageModalLoading;
+
+export default Loading;
diff --git a/app/(pages)/(private)/@modal/(md)/templates/create/from-event-type/[eventTypeId]/page.tsx b/app/(pages)/@modal/(md)/templates/create/from-event-type/[eventTypeId]/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/templates/create/from-event-type/[eventTypeId]/page.tsx
rename to app/(pages)/@modal/(md)/templates/create/from-event-type/[eventTypeId]/page.tsx
diff --git a/app/(pages)/@modal/(md)/templates/create/loading.tsx b/app/(pages)/@modal/(md)/templates/create/loading.tsx
new file mode 100644
index 00000000..e3d948d8
--- /dev/null
+++ b/app/(pages)/@modal/(md)/templates/create/loading.tsx
@@ -0,0 +1,5 @@
+import PageModalLoading from '@/_components/page-modal-loading';
+
+const Loading = PageModalLoading;
+
+export default Loading;
diff --git a/app/(pages)/(private)/@modal/(md)/templates/create/page.tsx b/app/(pages)/@modal/(md)/templates/create/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/(md)/templates/create/page.tsx
rename to app/(pages)/@modal/(md)/templates/create/page.tsx
diff --git a/app/(pages)/(private)/@modal/[...default]/page.tsx b/app/(pages)/@modal/[...default]/page.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/[...default]/page.tsx
rename to app/(pages)/@modal/[...default]/page.tsx
diff --git a/app/(pages)/(private)/@modal/default.tsx b/app/(pages)/@modal/default.tsx
similarity index 100%
rename from app/(pages)/(private)/@modal/default.tsx
rename to app/(pages)/@modal/default.tsx
diff --git a/app/(pages)/(private)/default.tsx b/app/(pages)/default.tsx
similarity index 100%
rename from app/(pages)/(private)/default.tsx
rename to app/(pages)/default.tsx
diff --git a/app/(pages)/layout.tsx b/app/(pages)/layout.tsx
index ff6e3dd7..8730b006 100644
--- a/app/(pages)/layout.tsx
+++ b/app/(pages)/layout.tsx
@@ -5,16 +5,8 @@ import { ReactNode } from 'react';
 import { twMerge } from 'tailwind-merge';
 import '../../tailwind.css';
 
-const figtree = Figtree({ subsets: ['latin'], variable: '--font-body' });
-
-const inconsolata = Inconsolata({
-  subsets: ['latin'],
-  variable: '--font-mono',
-});
-
-interface LayoutProps {
-  children: ReactNode;
-}
+const sans = Figtree({ subsets: ['latin'], variable: '--font-body' });
+const mono = Inconsolata({ subsets: ['latin'], variable: '--font-mono' });
 
 export const metadata = {
   description:
@@ -32,10 +24,16 @@ export const viewport: Viewport = {
   width: 'device-width',
 };
 
-const Layout = ({ children }: LayoutProps) => (
-  <html className={twMerge(figtree.variable, inconsolata.variable)} lang="en">
+interface LayoutProps {
+  children: ReactNode;
+  modal: ReactNode;
+}
+
+const Layout = ({ children, modal }: LayoutProps) => (
+  <html className={twMerge(sans.variable, mono.variable)} lang="en">
     <body>
       {children}
+      {modal}
       <Analytics />
     </body>
   </html>
diff --git a/app/(pages)/(public)/share/[subjectId]/(group)/(group)/events/loading.tsx b/app/(pages)/loading.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/(group)/(group)/events/loading.tsx
rename to app/(pages)/loading.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/(group)/(group)/events/page.tsx b/app/(pages)/share/[subjectId]/(subject-loading)/(subject)/events/page.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/(group)/(group)/events/page.tsx
rename to app/(pages)/share/[subjectId]/(subject-loading)/(subject)/events/page.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/(group)/(group)/insights/page.tsx b/app/(pages)/share/[subjectId]/(subject-loading)/(subject)/insights/page.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/(group)/(group)/insights/page.tsx
rename to app/(pages)/share/[subjectId]/(subject-loading)/(subject)/insights/page.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/(group)/(group)/layout.tsx b/app/(pages)/share/[subjectId]/(subject-loading)/(subject)/layout.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/(group)/(group)/layout.tsx
rename to app/(pages)/share/[subjectId]/(subject-loading)/(subject)/layout.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/(group)/(group)/insights/loading.tsx b/app/(pages)/share/[subjectId]/(subject-loading)/(subject)/loading.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/(group)/(group)/insights/loading.tsx
rename to app/(pages)/share/[subjectId]/(subject-loading)/(subject)/loading.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/(group)/layout.tsx b/app/(pages)/share/[subjectId]/(subject-loading)/layout.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/(group)/layout.tsx
rename to app/(pages)/share/[subjectId]/(subject-loading)/layout.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/(group)/loading.tsx b/app/(pages)/share/[subjectId]/(subject-loading)/loading.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/(group)/loading.tsx
rename to app/(pages)/share/[subjectId]/(subject-loading)/loading.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/events.csv/route.tsx b/app/(pages)/share/[subjectId]/events.csv/route.tsx
similarity index 100%
rename from app/(pages)/(public)/share/[subjectId]/events.csv/route.tsx
rename to app/(pages)/share/[subjectId]/events.csv/route.tsx
diff --git a/app/(pages)/(public)/share/[subjectId]/layout.tsx b/app/(pages)/share/[subjectId]/layout.tsx
similarity index 94%
rename from app/(pages)/(public)/share/[subjectId]/layout.tsx
rename to app/(pages)/share/[subjectId]/layout.tsx
index d1c6fd5d..8dbced09 100644
--- a/app/(pages)/(public)/share/[subjectId]/layout.tsx
+++ b/app/(pages)/share/[subjectId]/layout.tsx
@@ -6,15 +6,10 @@ import { ReactNode } from 'react';
 
 interface LayoutProps {
   children: ReactNode;
-  modal: ReactNode;
   params: { subjectId: string };
 }
 
-const Layout = async ({
-  children,
-  modal,
-  params: { subjectId },
-}: LayoutProps) => {
+const Layout = async ({ children, params: { subjectId } }: LayoutProps) => {
   const [{ data: subject }, user] = await Promise.all([
     getSubject(subjectId),
     getCurrentUser(),
@@ -67,7 +62,6 @@ const Layout = async ({
         </div>
       </div>
       <div className="mx-auto max-w-lg pb-20">{children}</div>
-      {modal}
     </>
   );
 };
diff --git a/app/(pages)/share/[subjectId]/loading.tsx b/app/(pages)/share/[subjectId]/loading.tsx
new file mode 100644
index 00000000..a626e9fb
--- /dev/null
+++ b/app/(pages)/share/[subjectId]/loading.tsx
@@ -0,0 +1,5 @@
+import Spinner from '@/_components/spinner';
+
+const Loading = () => <Spinner className="mx-auto my-16" />;
+
+export default Loading;