diff --git a/apps/app/src/components/portal/UserAvatarMenu.vue b/apps/app/src/components/portal/UserAvatarMenu.vue
index 65d58968..aec62c4c 100644
--- a/apps/app/src/components/portal/UserAvatarMenu.vue
+++ b/apps/app/src/components/portal/UserAvatarMenu.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { useAuthStore } from '@/stores/useAuthStore'
+import { usePortalAuthStore } from '@/stores/portal/usePortalAuthStore'
 
-const authStore = useAuthStore()
+const authStore = usePortalAuthStore()
 const router = useRouter()
 
 const userInitials = computed(() => {
diff --git a/apps/app/src/components/portal/event/InformatieTab.vue b/apps/app/src/components/portal/event/InformatieTab.vue
index 6f71fb28..27e636eb 100644
--- a/apps/app/src/components/portal/event/InformatieTab.vue
+++ b/apps/app/src/components/portal/event/InformatieTab.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { usePortalStore } from '@/stores/usePortalStore'
+import { usePortalStore } from '@/stores/portal/usePortalStore'
 
 defineProps<{
   eventId: string
diff --git a/apps/app/src/components/portal/event/OverzichtTab.vue b/apps/app/src/components/portal/event/OverzichtTab.vue
index 89f68a1a..96642325 100644
--- a/apps/app/src/components/portal/event/OverzichtTab.vue
+++ b/apps/app/src/components/portal/event/OverzichtTab.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import StatusCard from '@/components/portal/StatusCard.vue'
-import { usePortalStore } from '@/stores/usePortalStore'
+import { usePortalStore } from '@/stores/portal/usePortalStore'
 import { useMyShifts } from '@/composables/api/usePortalShifts'
 import type { PortalPersonPayload } from '@/types/portal'
 
diff --git a/apps/app/src/pages/portal/advance/[token].vue b/apps/app/src/pages/portal/advance/[token].vue
index 32c7ccef..28bf7dee 100644
--- a/apps/app/src/pages/portal/advance/[token].vue
+++ b/apps/app/src/pages/portal/advance/[token].vue
@@ -2,9 +2,10 @@
 definePage({
   name: 'artist-advance',
   meta: {
-    layout: 'portal',
+    layout: 'PortalLayout',
     requiresAuth: false,
     requiresToken: true,
+    context: 'portal',
   },
 })
 
diff --git a/apps/app/src/pages/portal/evenementen/[eventId].vue b/apps/app/src/pages/portal/evenementen/[eventId].vue
index 1ccb6857..d0f26581 100644
--- a/apps/app/src/pages/portal/evenementen/[eventId].vue
+++ b/apps/app/src/pages/portal/evenementen/[eventId].vue
@@ -1,15 +1,16 @@
 <script setup lang="ts">
-import OverzichtTab from '@/components/event/OverzichtTab.vue'
-import RoosterTab from '@/components/event/RoosterTab.vue'
-import ClaimenTab from '@/components/event/ClaimenTab.vue'
-import InformatieTab from '@/components/event/InformatieTab.vue'
-import { usePortalStore } from '@/stores/usePortalStore'
+import OverzichtTab from '@/components/portal/event/OverzichtTab.vue'
+import RoosterTab from '@/components/portal/event/RoosterTab.vue'
+import ClaimenTab from '@/components/portal/event/ClaimenTab.vue'
+import InformatieTab from '@/components/portal/event/InformatieTab.vue'
+import { usePortalStore } from '@/stores/portal/usePortalStore'
 
 definePage({
   name: 'portal-event-detail',
   meta: {
-    layout: 'portal',
+    layout: 'PortalLayout',
     requiresAuth: true,
+    context: 'portal',
     navMode: 'event',
   },
 })
diff --git a/apps/app/src/pages/portal/evenementen/index.vue b/apps/app/src/pages/portal/evenementen/index.vue
index 05836b31..89fb253f 100644
--- a/apps/app/src/pages/portal/evenementen/index.vue
+++ b/apps/app/src/pages/portal/evenementen/index.vue
@@ -1,12 +1,13 @@
 <script setup lang="ts">
 import EventCard from '@/components/portal/EventCard.vue'
-import { usePortalStore } from '@/stores/usePortalStore'
+import { usePortalStore } from '@/stores/portal/usePortalStore'
 
 definePage({
   name: 'portal-evenementen',
   meta: {
-    layout: 'portal',
+    layout: 'PortalLayout',
     requiresAuth: true,
+    context: 'portal',
     navMode: 'platform',
     navTitle: 'Mijn evenementen',
   },
diff --git a/apps/app/src/pages/portal/profiel.vue b/apps/app/src/pages/portal/profiel.vue
index 0c73d63c..c0b12173 100644
--- a/apps/app/src/pages/portal/profiel.vue
+++ b/apps/app/src/pages/portal/profiel.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { useAuthStore } from '@/stores/useAuthStore'
-import { usePortalStore } from '@/stores/usePortalStore'
+import { usePortalAuthStore } from '@/stores/portal/usePortalAuthStore'
+import { usePortalStore } from '@/stores/portal/usePortalStore'
 import { useUpdateProfile, useUpdatePassword } from '@/composables/api/usePortalProfile'
 import {
   useMfaStatus,
@@ -19,14 +19,15 @@ import type { ApiErrorResponse } from '@/types/api'
 definePage({
   name: 'portal-profiel',
   meta: {
-    layout: 'portal',
+    layout: 'PortalLayout',
     requiresAuth: true,
+    context: 'portal',
     navMode: 'platform',
     navTitle: 'Mijn profiel',
   },
 })
 
-const authStore = useAuthStore()
+const authStore = usePortalAuthStore()
 const portal = usePortalStore()
 const router = useRouter()
 const route = useRoute()
diff --git a/apps/app/src/pages/portal/registreren/index.vue b/apps/app/src/pages/portal/registreren/index.vue
index d61d289f..cbce50bf 100644
--- a/apps/app/src/pages/portal/registreren/index.vue
+++ b/apps/app/src/pages/portal/registreren/index.vue
@@ -2,8 +2,9 @@
 definePage({
   name: 'volunteer-register-info',
   meta: {
-    layout: 'blank',
+    layout: 'PortalLayout',
     requiresAuth: false,
+    context: 'portal',
   },
 })
 </script>
diff --git a/apps/app/src/pages/portal/shifts/index.vue b/apps/app/src/pages/portal/shifts/index.vue
index 02bedc8a..5a994900 100644
--- a/apps/app/src/pages/portal/shifts/index.vue
+++ b/apps/app/src/pages/portal/shifts/index.vue
@@ -1,17 +1,18 @@
 <script setup lang="ts">
 import { useAllMyShifts } from '@/composables/api/usePortalShifts'
-import { useAuthStore } from '@/stores/useAuthStore'
+import { usePortalAuthStore } from '@/stores/portal/usePortalAuthStore'
 import type { AllMyShiftsAssignment } from '@/types/portal-shift'
 
 definePage({
   name: 'portal-shifts',
   meta: {
-    layout: 'portal',
+    layout: 'PortalLayout',
     requiresAuth: true,
+    context: 'portal',
   },
 })
 
-const auth = useAuthStore()
+const auth = usePortalAuthStore()
 const { data: eventGroups, isLoading, isError, refetch } = useAllMyShifts()
 
 const statusConfig: Record<string, { label: string; color: string }> = {
diff --git a/apps/app/src/pages/portal/wachtwoord-instellen.vue b/apps/app/src/pages/portal/wachtwoord-instellen.vue
index d1f18461..ecb4b165 100644
--- a/apps/app/src/pages/portal/wachtwoord-instellen.vue
+++ b/apps/app/src/pages/portal/wachtwoord-instellen.vue
@@ -9,8 +9,9 @@ import { apiClient } from '@/lib/axios'
 definePage({
   name: 'set-password',
   meta: {
-    layout: 'blank',
+    layout: 'PortalLayout',
     requiresAuth: false,
+    context: 'portal',
   },
 })
 
diff --git a/apps/app/src/pages/register/[public_token].vue b/apps/app/src/pages/register/[public_token].vue
index 27ad1fbc..01cbc615 100644
--- a/apps/app/src/pages/register/[public_token].vue
+++ b/apps/app/src/pages/register/[public_token].vue
@@ -1,25 +1,24 @@
 <script setup lang="ts">
 import { emailValidator } from '@core/utils/validators'
-import FieldRenderer from '@/components/public-form/FieldRenderer.vue'
-import FormConfirmation from '@/components/public-form/FormConfirmation.vue'
-import FormErrorState from '@/components/public-form/FormErrorState.vue'
-import FormStepper from '@/components/public-form/FormStepper.vue'
-import SubmitterDetails from '@/components/public-form/SubmitterDetails.vue'
+import FieldRenderer from '@/components/shared/public-form/FieldRenderer.vue'
+import FormConfirmation from '@/components/shared/public-form/FormConfirmation.vue'
+import FormErrorState from '@/components/shared/public-form/FormErrorState.vue'
+import FormStepper from '@/components/shared/public-form/FormStepper.vue'
+import SubmitterDetails from '@/components/shared/public-form/SubmitterDetails.vue'
 import { extractErrorBody, useFetchPublicFormSchema } from '@/composables/api/usePublicForm'
 import { usePublicFormSections } from '@/composables/api/usePublicFormSections'
 import { usePublicFormTimeSlots } from '@/composables/api/usePublicFormTimeSlots'
 import { useFormDraft } from '@/composables/useFormDraft'
-import { isStepValid, useFormSteps } from '@form-schema/composables/useFormSteps'
-import { formatFieldValue } from '@form-schema/composables/formatFieldValue'
+import { isStepValid, useFormSteps } from '@/composables/forms/composables/useFormSteps'
+import { formatFieldValue } from '@/composables/forms/composables/formatFieldValue'
 import { providePublicFormLocale, providePublicFormToken } from '@/composables/publicFormInjection'
-import { FormFieldType } from '@form-schema/types/formBuilder'
-import type { FormErrorCode, PublicFormField } from '@form-schema/types/formBuilder'
+import { FormFieldType } from '@/composables/forms/types/formBuilder'
+import type { FormErrorCode, PublicFormField } from '@/composables/forms/types/formBuilder'
 
 definePage({
   name: 'public-form-register',
   meta: {
-    layout: 'blank',
-    requiresAuth: false,
+    layout: 'PublicLayout',
   },
 })
 
diff --git a/apps/app/src/pages/register/success.vue b/apps/app/src/pages/register/success.vue
index 40898336..9b4beca3 100644
--- a/apps/app/src/pages/register/success.vue
+++ b/apps/app/src/pages/register/success.vue
@@ -1,17 +1,15 @@
 <script setup lang="ts">
-import { useAuthStore } from '@/stores/useAuthStore'
+import { usePortalAuthStore } from '@/stores/portal/usePortalAuthStore'
 
 definePage({
   name: 'register-success',
   meta: {
-    layout: 'portal',
-    requiresAuth: false,
-    navMode: 'platform',
+    layout: 'PublicLayout',
   },
 })
 
 const route = useRoute('register-success')
-const authStore = useAuthStore()
+const authStore = usePortalAuthStore()
 
 const eventName = computed(() => (route.query.event as string) || 'het evenement')
 const bannerUrl = computed(() => (route.query.banner as string) || null)
diff --git a/apps/app/src/stores/portal/.gitkeep b/apps/app/src/stores/portal/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/apps/portal/src/stores/useAuthStore.ts b/apps/app/src/stores/portal/usePortalAuthStore.ts
similarity index 94%
rename from apps/portal/src/stores/useAuthStore.ts
rename to apps/app/src/stores/portal/usePortalAuthStore.ts
index e659716c..5e354ee8 100644
--- a/apps/portal/src/stores/useAuthStore.ts
+++ b/apps/app/src/stores/portal/usePortalAuthStore.ts
@@ -3,7 +3,7 @@ import { computed, ref } from 'vue'
 import { apiClient } from '@/lib/axios'
 import type { AuthMeUser } from '@/types/portal'
 
-export const useAuthStore = defineStore('auth', () => {
+export const usePortalAuthStore = defineStore('portalAuth', () => {
   const user = ref<AuthMeUser | null>(null)
   const isInitialized = ref(false)
 
@@ -14,7 +14,7 @@ export const useAuthStore = defineStore('auth', () => {
   }
 
   async function resetPortalStoresSync(): Promise<void> {
-    const { usePortalStore } = await import('@/stores/usePortalStore')
+    const { usePortalStore } = await import('@/stores/portal/usePortalStore')
     usePortalStore().reset()
   }
 
diff --git a/apps/portal/src/stores/usePortalStore.ts b/apps/app/src/stores/portal/usePortalStore.ts
similarity index 100%
rename from apps/portal/src/stores/usePortalStore.ts
rename to apps/app/src/stores/portal/usePortalStore.ts