diff --git a/src/lib/ae_events_functions.ts b/src/lib/ae_events/ae_events_functions.ts
similarity index 100%
rename from src/lib/ae_events_functions.ts
rename to src/lib/ae_events/ae_events_functions.ts
diff --git a/src/lib/elements/element_manage_event_file_li.svelte b/src/lib/elements/element_manage_event_file_li.svelte
index e4a44cf3..54fd731e 100644
--- a/src/lib/elements/element_manage_event_file_li.svelte
+++ b/src/lib/elements/element_manage_event_file_li.svelte
@@ -23,7 +23,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import AE_Comp_Hosted_Files_Download_Button from '$lib/ae_core/ae_comp__hosted_files_download_button.svelte';
     import { Check, Clock, Download, Eye, EyeOff, FileImage, FolderOpen, Laptop, LoaderCircle, Monitor, Pencil, RefreshCw, Save, Trash2, TriangleAlert } from '@lucide/svelte';
     interface Props {
diff --git a/src/lib/elements/element_manage_event_file_li_all.svelte b/src/lib/elements/element_manage_event_file_li_all.svelte
index 74c4f30b..37238155 100644
--- a/src/lib/elements/element_manage_event_file_li_all.svelte
+++ b/src/lib/elements/element_manage_event_file_li_all.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     interface Props {
-        // import { events_func } from '$lib/ae_events_functions';
+        // import { events_func } from '$lib/ae_events/ae_events_functions';
         container_class_li?: string | Array<string>;
         link_to_type: string;
         link_to_id: string;
diff --git a/src/lib/elements/element_manage_event_file_li_direct.svelte b/src/lib/elements/element_manage_event_file_li_direct.svelte
index f0147ef1..5764a6c1 100644
--- a/src/lib/elements/element_manage_event_file_li_direct.svelte
+++ b/src/lib/elements/element_manage_event_file_li_direct.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     interface Props {
         log_lvl?: number;
-        // import { events_func } from '$lib/ae_events_functions';
+        // import { events_func } from '$lib/ae_events/ae_events_functions';
         container_class_li?: string | Array<string>;
         link_to_type: string;
         link_to_id: string;
diff --git a/src/lib/elements/element_manage_hosted_file_li_all.svelte b/src/lib/elements/element_manage_hosted_file_li_all.svelte
index dc67eb2d..c609bfda 100644
--- a/src/lib/elements/element_manage_hosted_file_li_all.svelte
+++ b/src/lib/elements/element_manage_hosted_file_li_all.svelte
@@ -14,7 +14,7 @@
     // import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores';
 
     interface Props {
-        // import { events_func } from '$lib/ae_events_functions';
+        // import { events_func } from '$lib/ae_events/ae_events_functions';
         class_li_default?: string; // |Array<string>;
         class_li?: string; // |Array<string>;
         link_to_type: string;
diff --git a/src/routes/core/ae_comp__person_obj_tbl.svelte b/src/routes/core/ae_comp__person_obj_tbl.svelte
index 335b9d16..28062c29 100644
--- a/src/routes/core/ae_comp__person_obj_tbl.svelte
+++ b/src/routes/core/ae_comp__person_obj_tbl.svelte
@@ -17,7 +17,7 @@
     import { Building2, ListOrdered, Mail, Unlink, User, UserCheck } from '@lucide/svelte';
     // import { core_func } from '$lib/ae_core_functions';
     // import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores';
-    // import { events_func } from '$lib/ae_events_functions';
+    // import { events_func } from '$lib/ae_events/ae_events_functions';
 
     interface Props {
         // Exports
diff --git a/src/routes/core/people/[person_id]/+page.svelte b/src/routes/core/people/[person_id]/+page.svelte
index 58ba4ce1..78fefdd7 100644
--- a/src/routes/core/people/[person_id]/+page.svelte
+++ b/src/routes/core/people/[person_id]/+page.svelte
@@ -24,7 +24,7 @@
         slct_trigger
     } from '$lib/stores/ae_stores';
     // import { events_loc, events_sess, slct, events_trigger } from '$lib/stores/ae_events_stores';
-    // import { events_func } from '$lib/ae_events_functions';
+    // import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Person_view from './../../person_view.svelte';
     import Person_form from './../ae_comp__person_form.svelte';
diff --git a/src/routes/core/person_view.svelte b/src/routes/core/person_view.svelte
index 55c18c73..fd4b7c81 100644
--- a/src/routes/core/person_view.svelte
+++ b/src/routes/core/person_view.svelte
@@ -30,7 +30,7 @@
     import { Archive, BookOpen, Building2, Check, Eye, EyeOff, Fingerprint, IdCard, Key, LoaderCircle, Mail, Save, Star, Tag, ToggleLeft, ToggleRight, TriangleAlert, User, UserRound } from '@lucide/svelte';
     // import { db_events } from "$lib/db_events";
     // import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores';
-    // import { events_func } from '$lib/ae_events_functions';
+    // import { events_func } from '$lib/ae_events/ae_events_functions';
 
     let ae_placeholder_li: key_val = {};
     let ae_promises: key_val = $state({}); // Promise<any>;
diff --git a/src/routes/events/+layout.ts b/src/routes/events/+layout.ts
index a0220a37..5efe168e 100644
--- a/src/routes/events/+layout.ts
+++ b/src/routes/events/+layout.ts
@@ -3,7 +3,7 @@ console.log(`ae_events +layout.ts`);
 
 // Imports
 // import { browser } from '$app/environment';
-// import { events_func } from '$lib/ae_events_functions';
+// import { events_func } from '$lib/ae_events/ae_events_functions';
 
 export async function load({ parent }) {
     const log_lvl: number = 0;
diff --git a/src/routes/events/+page.ts b/src/routes/events/+page.ts
index 3e343be9..a0dfceae 100644
--- a/src/routes/events/+page.ts
+++ b/src/routes/events/+page.ts
@@ -1,7 +1,7 @@
 /** @type {import('./$types').PageLoad} */
 
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 export async function load({ parent }) {
     const log_lvl: number = 0;
diff --git a/src/routes/events/[event_id]/(badges)/badges/+page.svelte b/src/routes/events/[event_id]/(badges)/badges/+page.svelte
index dd392f57..33d03428 100644
--- a/src/routes/events/[event_id]/(badges)/badges/+page.svelte
+++ b/src/routes/events/[event_id]/(badges)/badges/+page.svelte
@@ -24,7 +24,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Comp_badge_search from './ae_comp__badge_search.svelte';
     import Comp_badge_obj_li from './ae_comp__badge_obj_li.svelte';
diff --git a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/+page.ts b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/+page.ts
index 120d1309..6de2f9bf 100644
--- a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/+page.ts
+++ b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/+page.ts
@@ -2,7 +2,7 @@
 console.log(`Events - Badges [badge_id] +page.ts start`);
 
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 // This file needs to load the Event Badge ID. It should also include the associated Event Badge Template for the specific badge ID.
 export async function load({ params, parent, url }) {
diff --git a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_print_controls.svelte b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_print_controls.svelte
index 825fc700..84cea78b 100644
--- a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_print_controls.svelte
+++ b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_print_controls.svelte
@@ -20,7 +20,7 @@
 
     import type { key_val } from '$lib/stores/ae_stores';
     import { ae_api, ae_loc } from '$lib/stores/ae_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { browser } from '$app/environment';
     import { Check, ChevronDown, ChevronRight, Eye, EyeOff, Info, LoaderCircle, Pencil, Printer, RotateCcw, X } from '@lucide/svelte';
     interface Props {
diff --git a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_review_form.svelte b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_review_form.svelte
index 824f851a..edb3a61f 100644
--- a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_review_form.svelte
+++ b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/ae_comp__badge_review_form.svelte
@@ -34,7 +34,7 @@
     import { browser } from '$app/environment';
     import type { key_val } from '$lib/stores/ae_stores';
     import { ae_api, ae_loc } from '$lib/stores/ae_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { core_func } from '$lib/ae_core/ae_core_functions';
     import { ae_util } from '$lib/ae_utils/ae_utils';
     import { Modal } from 'flowbite-svelte';
diff --git a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/print/+page.ts b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/print/+page.ts
index cbce69b0..b8230410 100644
--- a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/print/+page.ts
+++ b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/print/+page.ts
@@ -2,7 +2,7 @@
 console.log(`Events - Badges [badge_id]/print +page.ts start`);
 
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 // Loads badge + template for the print page (non-blocking background refresh)
 export async function load({ params, parent }) {
diff --git a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/review/+page.ts b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/review/+page.ts
index 64f6a6c9..b57e29de 100644
--- a/src/routes/events/[event_id]/(badges)/badges/[badge_id]/review/+page.ts
+++ b/src/routes/events/[event_id]/(badges)/badges/[badge_id]/review/+page.ts
@@ -2,7 +2,7 @@
 console.log(`Events - Badges [badge_id]/review +page.ts start`);
 
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 // Loads badge + template for the review page (non-blocking background refresh)
 export async function load({ params, parent }) {
diff --git a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_create_form.svelte b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_create_form.svelte
index d60b42ce..345b0921 100644
--- a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_create_form.svelte
+++ b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_create_form.svelte
@@ -2,7 +2,7 @@
     // import { createEventDispatcher } from 'svelte';
     import { Loader2 } from '@lucide/svelte';
     import type { key_val } from '$lib/stores/ae_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { ae_api } from '$lib/stores/ae_stores';
 
     interface Props {
diff --git a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_upload_form.svelte b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_upload_form.svelte
index e19b0ad6..6294ca99 100644
--- a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_upload_form.svelte
+++ b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_upload_form.svelte
@@ -2,7 +2,7 @@
     // import { createEventDispatcher } from 'svelte';
     import { Loader2 } from '@lucide/svelte';
     import type { key_val } from '$lib/stores/ae_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { ae_api } from '$lib/stores/ae_stores';
 
     interface Props {
diff --git a/src/routes/events/[event_id]/(badges)/badges/print_list/+page.svelte b/src/routes/events/[event_id]/(badges)/badges/print_list/+page.svelte
index 04edcf60..cd68acbd 100644
--- a/src/routes/events/[event_id]/(badges)/badges/print_list/+page.svelte
+++ b/src/routes/events/[event_id]/(badges)/badges/print_list/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { liveQuery } from 'dexie';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { ae_api } from '$lib/stores/ae_stores';
     import { events_slct } from '$lib/stores/ae_events_stores';
     import Comp_badge_obj_view from '../[badge_id]/ae_comp__badge_obj_view.svelte';
diff --git a/src/routes/events/[event_id]/(badges)/templates/+page.svelte b/src/routes/events/[event_id]/(badges)/templates/+page.svelte
index 3fd7be21..ade0b8c8 100644
--- a/src/routes/events/[event_id]/(badges)/templates/+page.svelte
+++ b/src/routes/events/[event_id]/(badges)/templates/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { liveQuery } from 'dexie';
     import { Pencil, Plus, Trash2 } from '@lucide/svelte';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { ae_api } from '$lib/stores/ae_stores';
     import { Modal } from 'flowbite-svelte';
     import Comp_badge_template_form from './ae_comp__badge_template_form.svelte';
diff --git a/src/routes/events/[event_id]/(badges)/templates/ae_comp__badge_template_form.svelte b/src/routes/events/[event_id]/(badges)/templates/ae_comp__badge_template_form.svelte
index 0e937fab..1f517f4f 100644
--- a/src/routes/events/[event_id]/(badges)/templates/ae_comp__badge_template_form.svelte
+++ b/src/routes/events/[event_id]/(badges)/templates/ae_comp__badge_template_form.svelte
@@ -2,7 +2,7 @@
     import { untrack } from 'svelte';
     import { Loader2 } from '@lucide/svelte';
     import type { key_val } from '$lib/stores/ae_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { ae_api } from '$lib/stores/ae_stores';
 
     interface Props {
diff --git a/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte b/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte
index 5f95f868..70a2bc6b 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte
@@ -63,7 +63,7 @@
         events_trigger,
         events_trig
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Launcher_cfg from '../launcher_cfg.svelte';
     import Launcher_menu from '../launcher_menu.svelte';
diff --git a/src/routes/events/[event_id]/(launcher)/launcher/+layout.ts b/src/routes/events/[event_id]/(launcher)/launcher/+layout.ts
index ca6e19de..c5c97d7c 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher/+layout.ts
+++ b/src/routes/events/[event_id]/(launcher)/launcher/+layout.ts
@@ -3,7 +3,7 @@ console.log(`Events - [event_id] launcher +layout.ts start`);
 
 // import { error } from '@sveltejs/kit';
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 export async function load({ params, parent }) {
     // route
diff --git a/src/routes/events/[event_id]/(launcher)/launcher/+page.svelte b/src/routes/events/[event_id]/(launcher)/launcher/+page.svelte
index ab386902..e363e148 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher/+page.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher/+page.svelte
@@ -9,7 +9,7 @@
     import { goto } from '$app/navigation';
     import { ae_api } from '$lib/stores/ae_stores';
     import { db_events } from '$lib/ae_events/db_events';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     // Magic redirect: when ?session_id= is present but no event_location_id is in the route
     // (e.g. navigating here from the Presenter View which has no location context),
diff --git a/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.ts b/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.ts
index 302b3813..a9321f14 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.ts
+++ b/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.ts
@@ -3,7 +3,7 @@ import { error } from '@sveltejs/kit';
 console.log(`ae events launcher [event_location_id] +page.ts: start`);
 
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 export async function load({ params, parent, url }) {
     // route
diff --git a/src/routes/events/[event_id]/(launcher)/launcher_background_sync.svelte b/src/routes/events/[event_id]/(launcher)/launcher_background_sync.svelte
index b3413b6c..38211aa6 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_background_sync.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_background_sync.svelte
@@ -7,7 +7,7 @@
     import { onMount, onDestroy } from 'svelte';
     import { ae_loc, ae_api } from '$lib/stores/ae_stores';
     import { events_loc, events_slct, events_sess } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { ae_util } from '$lib/ae_utils/ae_utils';
     import { db_events } from '$lib/ae_events/db_events';
     import * as native from '$lib/electron/electron_relay';
diff --git a/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte b/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte
index 08cfb1e1..1418fb34 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte
@@ -62,7 +62,7 @@
         events_sess,
         events_slct
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { AlertCircle, AlertTriangle, BarChart2, CalendarDays, FolderOpen, Laptop, LoaderCircle, Monitor, Save, Send } from '@lucide/svelte';
     import AE_Comp_Hosted_Files_Download_Button from '$lib/ae_core/ae_comp__hosted_files_download_button.svelte';
 
diff --git a/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte b/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte
index 66017564..9437177b 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte
@@ -114,7 +114,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Event_launcher_file_cont from './launcher_file_cont.svelte';
     import Menu_location_list_menu from './menu_location_list.svelte';
diff --git a/src/routes/events/[event_id]/(launcher)/launcher_presentation_view.svelte b/src/routes/events/[event_id]/(launcher)/launcher_presentation_view.svelte
index 8995ae95..5c8803a2 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_presentation_view.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_presentation_view.svelte
@@ -10,7 +10,7 @@
     import { db_events } from '$lib/ae_events/db_events';
     import { ae_loc, ae_api } from '$lib/stores/ae_stores';
     import { events_loc, events_sess } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import Event_launcher_file_cont from './launcher_file_cont.svelte';
 
     // Staggered Load: Trigger deep fetch only when the presentation ID changes.
diff --git a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte
index abde4aaa..d987c5ee 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte
@@ -29,7 +29,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    // import { events_func } from '$lib/ae_events_functions';
+    // import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Event_launcher_file_cont from './launcher_file_cont.svelte';
     import { Archive, User, Users } from '@lucide/svelte';
diff --git a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte
index 80fae65c..cb17124a 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte
@@ -29,7 +29,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    // import { events_func } from '$lib/ae_events_functions';
+    // import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Event_launcher_file_cont from './launcher_file_cont.svelte';
     import { Archive, User, Users } from '@lucide/svelte';
diff --git a/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte b/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte
index 6b7235a1..f1ab20eb 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte
@@ -38,7 +38,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { AlertTriangle, Archive, Barcode, Image, LoaderCircle, Monitor, User, Users } from '@lucide/svelte';
     // Event Session (Main View Trigger)
     // WHY: We use a simple derived observable. The template handles the $ prefix.
diff --git a/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte b/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte
index 79bf0c1b..9a40bc30 100644
--- a/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte
+++ b/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte
@@ -73,7 +73,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { Check, LoaderCircle } from '@lucide/svelte';
     // export let slct_event_session_id: any;
 
diff --git a/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte b/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte
index 2c336a18..1d72fca9 100644
--- a/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte
+++ b/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte
@@ -90,7 +90,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { CalendarCheck, CalendarDays, Check, EyeOff, Image, LoaderCircle } from '@lucide/svelte';
     // export let slct__event_session_id: any;
 
diff --git a/src/routes/events/[event_id]/(leads)/leads/+layout.ts b/src/routes/events/[event_id]/(leads)/leads/+layout.ts
index 37cc4414..6ee93f7a 100644
--- a/src/routes/events/[event_id]/(leads)/leads/+layout.ts
+++ b/src/routes/events/[event_id]/(leads)/leads/+layout.ts
@@ -3,7 +3,7 @@
  * Leads Module Level Layout Loader.
  */
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 export async function load({ params, parent }) {
     const parent_data = await parent();
diff --git a/src/routes/events/[event_id]/(leads)/leads/+page.svelte b/src/routes/events/[event_id]/(leads)/leads/+page.svelte
index a45556e8..1738e9f5 100644
--- a/src/routes/events/[event_id]/(leads)/leads/+page.svelte
+++ b/src/routes/events/[event_id]/(leads)/leads/+page.svelte
@@ -9,7 +9,7 @@
     } from '$lib/stores/ae_events_stores';
     import { ae_api, ae_loc } from '$lib/stores/ae_stores';
     import { page } from '$app/state';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { LoaderCircle, Store } from '@lucide/svelte';
     import Comp_exhibit_search from './ae_comp__exhibit_search.svelte';
 
diff --git a/src/routes/events/[event_id]/(leads)/leads/+page.ts b/src/routes/events/[event_id]/(leads)/leads/+page.ts
index a17b760b..75066f69 100644
--- a/src/routes/events/[event_id]/(leads)/leads/+page.ts
+++ b/src/routes/events/[event_id]/(leads)/leads/+page.ts
@@ -3,7 +3,7 @@
  * Exhibit Finder Page Loader.
  */
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 export async function load({ params, parent }) {
     const parent_data = await parent();
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/+layout.ts b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/+layout.ts
index d16b2112..2614110d 100644
--- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/+layout.ts
+++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/+layout.ts
@@ -3,7 +3,7 @@
  * Exhibitor Dashboard Loader.
  */
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 import { events_slct } from '$lib/stores/ae_events_stores';
 
 export async function load({ params, parent }) {
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/+page.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/+page.svelte
index 6f23acc2..d2ba69ee 100644
--- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/+page.svelte
+++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/+page.svelte
@@ -9,7 +9,7 @@
     } from '$lib/stores/ae_events_stores';
     import { ae_api, ae_loc } from '$lib/stores/ae_stores';
     import { page } from '$app/state';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { ae_util } from '$lib/ae_utils/ae_utils';
     import { CreditCard, Download, LayoutGrid, List as ListIcon, LoaderCircle, Plus, Settings } from '@lucide/svelte';
     import Comp_exhibit_tracking_search from './ae_comp__exhibit_tracking_search.svelte';
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_custom_questions.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_custom_questions.svelte
index 460440e9..6bd9c44b 100644
--- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_custom_questions.svelte
+++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_custom_questions.svelte
@@ -5,7 +5,7 @@
      */
     import { untrack } from 'svelte';
     import { ae_api } from '$lib/stores/ae_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { List, LoaderCircle, MessageSquare, Plus, Save, Trash2 } from '@lucide/svelte';
     interface Props {
         exhibit_id: string;
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_license_list.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_license_list.svelte
index c36158f5..75779233 100644
--- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_license_list.svelte
+++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__exhibit_license_list.svelte
@@ -5,7 +5,7 @@
      */
     import { untrack } from 'svelte';
     import { ae_api } from '$lib/stores/ae_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { Key, LoaderCircle, Mail, Plus, Save, Trash2, User, Users } from '@lucide/svelte';
     interface Props {
         exhibit_id: string;
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__lead_manual_search.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__lead_manual_search.svelte
index a2ae08fd..fc9c8787 100644
--- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__lead_manual_search.svelte
+++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__lead_manual_search.svelte
@@ -8,7 +8,7 @@
     import { db_events } from '$lib/ae_events/db_events';
     import { ae_api } from '$lib/stores/ae_stores';
     import { events_loc } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { Eye, LoaderCircle, Search, ShieldOff, UserPlus } from '@lucide/svelte';
     import type { ae_EventBadge } from '$lib/types/ae_types';
     import { ae_util } from '$lib/ae_utils/ae_utils';
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__lead_qr_scanner.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__lead_qr_scanner.svelte
index a8dbdf40..6bf9d416 100644
--- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__lead_qr_scanner.svelte
+++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_comp__lead_qr_scanner.svelte
@@ -13,7 +13,7 @@
     import { db_events } from '$lib/ae_events/db_events';
     import { ae_api } from '$lib/stores/ae_stores';
     import { events_loc } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import Element_qr_scanner_v3 from '$lib/elements/element_qr_scanner_v3.svelte';
     import { ae_util } from '$lib/ae_utils/ae_utils';
     import { CircleAlert, CircleCheck, Eye, LoaderCircle, ShieldOff, UserPlus } from '@lucide/svelte';
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_tab__manage.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_tab__manage.svelte
index 70cf3bd3..9bb44df9 100644
--- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_tab__manage.svelte
+++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/ae_tab__manage.svelte
@@ -8,7 +8,7 @@
     import { db_events } from '$lib/ae_events/db_events';
     import { ae_api, ae_loc } from '$lib/stores/ae_stores';
     import { events_loc, events_sess } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
     import Comp_exhibit_license_list from './ae_comp__exhibit_license_list.svelte';
     import Comp_exhibit_custom_questions from './ae_comp__exhibit_custom_questions.svelte';
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/+page.ts b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/+page.ts
index a20838d7..350966d3 100644
--- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/+page.ts
+++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/+page.ts
@@ -4,7 +4,7 @@
  * Responsible for loading a single exhibit tracking record and its associated badge data.
  */
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 export async function load({ params, parent }) {
     const parent_data = await parent();
diff --git a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/ae_comp__lead_detail_form.svelte b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/ae_comp__lead_detail_form.svelte
index 5ff4e708..3368c425 100644
--- a/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/ae_comp__lead_detail_form.svelte
+++ b/src/routes/events/[event_id]/(leads)/leads/exhibit/[exhibit_id]/lead/[exhibit_tracking_id]/ae_comp__lead_detail_form.svelte
@@ -20,7 +20,7 @@
      */
     import { untrack } from 'svelte';
     import { ae_api } from '$lib/stores/ae_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { CircleCheck, LoaderCircle, Save } from '@lucide/svelte';
     interface Props {
         exhibit_tracking_id: string;
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/+layout.ts b/src/routes/events/[event_id]/(pres_mgmt)/+layout.ts
index 50ac3a29..df9b9e7e 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/+layout.ts
+++ b/src/routes/events/[event_id]/(pres_mgmt)/+layout.ts
@@ -1,7 +1,7 @@
 /** @type {import('./$types').LayoutLoad} */
 
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 export async function load({ parent }) {
     const log_lvl: number = 0;
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/device/device/ae_comp__event_device_obj_li.svelte b/src/routes/events/[event_id]/(pres_mgmt)/device/device/ae_comp__event_device_obj_li.svelte
index 9fe17f5b..f0901052 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/device/device/ae_comp__event_device_obj_li.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/device/device/ae_comp__event_device_obj_li.svelte
@@ -38,7 +38,7 @@
         events_trigger,
         events_trig_kv
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
     import { Barcode, Camera, ChevronDown, ChevronUp, Eye, EyeOff, HeartPulse, Laptop, LoaderCircle, MessageCircle, RefreshCw, TriangleAlert } from '@lucide/svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/event_page_menu.svelte b/src/routes/events/[event_id]/(pres_mgmt)/event_page_menu.svelte
index f097ccfd..5b056ceb 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/event_page_menu.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/event_page_menu.svelte
@@ -17,7 +17,7 @@
         events_loc,
         events_slct
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import { api } from '$lib/api/api';
     import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/+page.ts b/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/+page.ts
index 8a9780be..0c0d0fb1 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/+page.ts
+++ b/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/+page.ts
@@ -3,7 +3,7 @@
 console.log(`ae_events_pres_mgmt_event [event_location_id] +page.ts start`);
 
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 export async function load({ params, parent }) {
     // route
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_page_menu.svelte b/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_page_menu.svelte
index 2de81fcd..29348845 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_page_menu.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_page_menu.svelte
@@ -22,7 +22,7 @@
         events_loc,
         events_slct
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import { api } from '$lib/api/api';
     import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_view.svelte b/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_view.svelte
index 2b0125b5..8437529a 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_view.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/location/[event_location_id]/location_view.svelte
@@ -44,7 +44,7 @@
         events_trigger,
         events_trig_kv
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { Barcode, Eye, EyeOff, Key, Plane, Send } from '@lucide/svelte';
     // Exports
     // export let event_location_id: string;
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/locations/+page.svelte b/src/routes/events/[event_id]/(pres_mgmt)/locations/+page.svelte
index 72786c5d..fdbc28ea 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/locations/+page.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/locations/+page.svelte
@@ -39,7 +39,7 @@
         events_trigger,
         events_trig_kv
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Comp_event_location_obj_li from './ae_comp__event_location_obj_li.svelte';
     import Locations_page_menu from './locations_page_menu.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/locations/ae_comp__event_location_obj_li.svelte b/src/routes/events/[event_id]/(pres_mgmt)/locations/ae_comp__event_location_obj_li.svelte
index a92b12e6..ae80f24c 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/locations/ae_comp__event_location_obj_li.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/locations/ae_comp__event_location_obj_li.svelte
@@ -33,7 +33,7 @@
         events_trigger,
         events_trig_kv
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Comp_event_session_obj_li from '../../../ae_comp__event_session_obj_li_wrapper.svelte';
     import Element_ae_obj_field_editor_v3 from '$lib/elements/element_ae_obj_field_editor_v3.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/pres_mgmt/+page.svelte b/src/routes/events/[event_id]/(pres_mgmt)/pres_mgmt/+page.svelte
index 66af379f..a3618d17 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/pres_mgmt/+page.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/pres_mgmt/+page.svelte
@@ -32,7 +32,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Comp_event_files_upload from '../../../ae_comp__event_files_upload.svelte';
     import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_event_file_li_direct.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.svelte
index d74569e4..7dcb5288 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.svelte
@@ -32,7 +32,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Comp_event_files_upload from '../../../../ae_comp__event_files_upload.svelte';
     import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_event_file_li_direct.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.ts b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.ts
index c0df5b09..2d9847b4 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.ts
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/+page.ts
@@ -2,7 +2,7 @@
 console.log(`ae_p_event_presenter [presenter_id] +page.ts: start`);
 
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 export async function load({ params, parent }) {
     // route
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
index 4ffeeab4..725a6068 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
@@ -34,7 +34,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { Check, CheckCircle, LoaderCircle, TriangleAlert, X } from '@lucide/svelte';
     let ae_promises: key_val = $state({});
     // let ae_tmp: key_val = {};
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_page_menu.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_page_menu.svelte
index 987d59ce..d3a0baaf 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_page_menu.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_page_menu.svelte
@@ -22,7 +22,7 @@
         events_loc,
         events_slct
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import { api } from '$lib/api/api';
     import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte
index 1433e2b6..9234ab91 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte
@@ -43,7 +43,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { Asterisk, BookOpen, Building2, Check, CircleUser, Fingerprint, IdCard, Link, LoaderCircle, Mail, Pencil, Plus, RefreshCw, Save, Tag, Unlink, User, UserCheck, UserRound } from '@lucide/svelte';
     // Exports
 
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/ae_comp__event_presenter_obj_li.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/ae_comp__event_presenter_obj_li.svelte
index cc7f00a6..78609183 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/ae_comp__event_presenter_obj_li.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/ae_comp__event_presenter_obj_li.svelte
@@ -39,7 +39,7 @@
         events_trigger,
         events_trig_kv
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { ae_util } from '$lib/ae_utils/ae_utils';
     import { Check, FileText, ListOrdered, Mail, Plus, RefreshCw, Star, User, UserX, Users, X } from '@lucide/svelte';
     $effect(() => {
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/reports/+page.svelte b/src/routes/events/[event_id]/(pres_mgmt)/reports/+page.svelte
index 8b7930d1..23d6fbef 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/reports/+page.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/reports/+page.svelte
@@ -32,7 +32,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Event_reports_page_menu from './event_reports_page_menu.svelte';
     import Reports_sessions from './reports_sessions.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/reports/reports_files.svelte b/src/routes/events/[event_id]/(pres_mgmt)/reports/reports_files.svelte
index 33805fa6..ca88d537 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/reports/reports_files.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/reports/reports_files.svelte
@@ -70,7 +70,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import Comp_event_file_obj_tbl from '../../../ae_comp__event_file_obj_tbl_wrapper.svelte';
     import { ArrowUpDown, List, LoaderCircle } from '@lucide/svelte';
     let ae_promises: key_val = $state({});
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/reports/reports_presenters.svelte b/src/routes/events/[event_id]/(pres_mgmt)/reports/reports_presenters.svelte
index 7b775c5f..5a5ef9e8 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/reports/reports_presenters.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/reports/reports_presenters.svelte
@@ -76,7 +76,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import Comp_event_presenter_obj_tbl from './../presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte';
     import { ArrowUpDown, Check, IdCard, List, LoaderCircle, ToggleLeft, ToggleRight, X } from '@lucide/svelte';
     let ae_promises: key_val = $state({});
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/reports/reports_sessions.svelte b/src/routes/events/[event_id]/(pres_mgmt)/reports/reports_sessions.svelte
index 5238c8e6..3fe886d3 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/reports/reports_sessions.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/reports/reports_sessions.svelte
@@ -76,7 +76,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import Comp_event_session_obj_tbl from '../../../ae_comp__event_session_obj_tbl_wrapper.svelte';
     import { Check, IdCard, LoaderCircle, ToggleLeft, ToggleRight, X } from '@lucide/svelte';
     let ae_promises: key_val = $state({});
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/+page.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/+page.svelte
index fcd02419..7c1923b1 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/+page.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/+page.svelte
@@ -15,7 +15,7 @@
     import { db_events } from '$lib/ae_events/db_events';
     import { ae_snip, ae_loc, ae_api, slct } from '$lib/stores/ae_stores';
     import { events_loc, events_sess, events_slct } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Session_view from './session_view.svelte';
     import Session_page_menu from './session_page_menu.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/+page.ts b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/+page.ts
index 6ca81182..9eb8222a 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/+page.ts
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/+page.ts
@@ -3,7 +3,7 @@ import { error } from '@sveltejs/kit';
 console.log(`ae_p_event_session [session_id] +page.ts start`);
 
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 export async function load({ params, parent }) {
     const log_lvl: number = 0;
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
index d26ce21e..677a3fc4 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
@@ -26,7 +26,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     // Import components and elements
     import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_profile.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_profile.svelte
index fa715c2b..e3df132a 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_profile.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/ae_comp__event_session_poc_profile.svelte
@@ -28,7 +28,7 @@
         events_slct,
         events_trigger
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     // import { db_events } from "$lib/db_events";
     import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
     import { BookOpen, Check, LoaderCircle, Save } from '@lucide/svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_page_menu.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_page_menu.svelte
index 484165dc..841bcba4 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_page_menu.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_page_menu.svelte
@@ -24,7 +24,7 @@
         events_loc,
         events_slct
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import { api } from '$lib/api/api';
     import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
index b8fa9167..3bed94e7 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
@@ -24,7 +24,7 @@
     import { core_func } from '$lib/ae_core/ae_core_functions';
     import { ae_snip, ae_loc, ae_api } from '$lib/stores/ae_stores';
     import { events_loc, events_sess, events_slct } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Comp_event_session_poc_profile from './ae_comp__event_session_poc_profile.svelte';
     import Comp_event_session_poc_form_agree from './ae_comp__event_session_poc_form_agree.svelte';
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/ae_comp__event_session_alert.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/ae_comp__event_session_alert.svelte
index 2353a9e2..f3086185 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/ae_comp__event_session_alert.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/ae_comp__event_session_alert.svelte
@@ -36,7 +36,7 @@
     // *** Import Svelte specific
 
     import { api } from '$lib/api/api';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     // *** Import Aether specific variables and functions
     import {
diff --git a/src/routes/events/[event_id]/+layout.ts b/src/routes/events/[event_id]/+layout.ts
index 686a2e5e..0db57367 100644
--- a/src/routes/events/[event_id]/+layout.ts
+++ b/src/routes/events/[event_id]/+layout.ts
@@ -3,7 +3,7 @@ console.log(`Events - [event_id] +layout.ts`);
 
 import { error } from '@sveltejs/kit';
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 export async function load({ params, parent }) {
     // route
diff --git a/src/routes/events/[event_id]/settings/+page.svelte b/src/routes/events/[event_id]/settings/+page.svelte
index 9063e6bd..f6123b2b 100644
--- a/src/routes/events/[event_id]/settings/+page.svelte
+++ b/src/routes/events/[event_id]/settings/+page.svelte
@@ -5,7 +5,7 @@
     import { liveQuery } from 'dexie';
     import { db_events, type Event } from '$lib/ae_events/db_events';
     import { onMount } from 'svelte';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { ae_loc, ae_api } from '$lib/stores/ae_stores';
     import AE_Comp_Editor_CodeMirror from '$lib/elements/element_editor_codemirror.svelte';
     import Ae_comp_event_settings_form from './ae_comp__event_settings_form.svelte';
diff --git a/src/routes/events/ae_comp__event_file_obj_tbl.svelte b/src/routes/events/ae_comp__event_file_obj_tbl.svelte
index 639c6bde..2b59ad41 100644
--- a/src/routes/events/ae_comp__event_file_obj_tbl.svelte
+++ b/src/routes/events/ae_comp__event_file_obj_tbl.svelte
@@ -48,7 +48,7 @@
         slct_trigger
     } from '$lib/stores/ae_stores';
     // import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores';
-    // import { events_func } from '$lib/ae_events_functions';
+    // import { events_func } from '$lib/ae_events/ae_events_functions';
     import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
     import AE_Comp_Hosted_Files_Download_Button from '$lib/ae_core/ae_comp__hosted_files_download_button.svelte';
     import { Check, Download, FileImage, FileSpreadsheet, ListOrdered, LoaderCircle, Presentation, ToggleLeft, ToggleRight, TriangleAlert, User } from '@lucide/svelte';
diff --git a/src/routes/events/ae_comp__event_files_upload.svelte b/src/routes/events/ae_comp__event_files_upload.svelte
index 109bbaa7..fcbabaf1 100644
--- a/src/routes/events/ae_comp__event_files_upload.svelte
+++ b/src/routes/events/ae_comp__event_files_upload.svelte
@@ -23,7 +23,7 @@
         events_slct,
         events_trig
     } from '$lib/stores/ae_events_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { db_events } from '$lib/ae_events/db_events';
 
     interface Props {
diff --git a/src/routes/events/ae_comp__event_presentation_obj_li.svelte b/src/routes/events/ae_comp__event_presentation_obj_li.svelte
index 04bf569c..4e599b15 100644
--- a/src/routes/events/ae_comp__event_presentation_obj_li.svelte
+++ b/src/routes/events/ae_comp__event_presentation_obj_li.svelte
@@ -31,7 +31,7 @@
         slct,
         slct_trigger
     } from '$lib/stores/ae_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import {
         events_loc,
         events_sess,
diff --git a/src/routes/events/ae_comp__event_session_obj_li.svelte b/src/routes/events/ae_comp__event_session_obj_li.svelte
index f0c19b5c..a7d8cb64 100644
--- a/src/routes/events/ae_comp__event_session_obj_li.svelte
+++ b/src/routes/events/ae_comp__event_session_obj_li.svelte
@@ -36,7 +36,7 @@
     import Element_manage_event_file_li from '$lib/elements/element_manage_event_file_li_direct.svelte';
     import Comp_event_session_alert from './[event_id]/(pres_mgmt)/session/ae_comp__event_session_alert.svelte';
 
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import { ae_loc, ae_api, ae_snip } from '$lib/stores/ae_stores';
     import {
         events_loc,
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/+layout.svelte b/src/routes/idaa/(idaa)/recovery_meetings/+layout.svelte
index 56f41e23..6b88967f 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/+layout.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/+layout.svelte
@@ -22,7 +22,7 @@
         idaa_trig,
         idaa_prom
     } from '$lib/stores/ae_idaa_stores';
-    // import { events_func } from '$lib/ae_events_functions';
+    // import { events_func } from '$lib/ae_events/ae_events_functions';
 
     interface Props {
         /** @type {import('./$types').LayoutData} */
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/+layout.ts b/src/routes/idaa/(idaa)/recovery_meetings/+layout.ts
index 9ca3ab4a..5596b790 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/+layout.ts
+++ b/src/routes/idaa/(idaa)/recovery_meetings/+layout.ts
@@ -3,7 +3,7 @@
 
 // import { error } from '@sveltejs/kit';
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 export async function load({ params, parent }) {
     // route
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
index 8b9e0f2b..54b1737b 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
@@ -21,7 +21,7 @@
         idaa_trig
     } from '$lib/stores/ae_idaa_stores';
     import { ae_loc, ae_api } from '$lib/stores/ae_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Element_data_store from '$lib/elements/element_data_store_v3.svelte';
     import Comp__event_obj_qry from './ae_idaa_comp__event_obj_qry.svelte';
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte b/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte
index bbae9747..60e8069a 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte
@@ -26,7 +26,7 @@
         slct_trigger
     } from '$lib/stores/ae_stores';
     import { db_events } from '$lib/ae_events/db_events';
-    // import { events_func } from '$lib/ae_events_functions';
+    // import { events_func } from '$lib/ae_events/ae_events_functions';
     import {
         idaa_loc,
         idaa_sess,
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.ts b/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.ts
index 6611f177..e99b1f89 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.ts
+++ b/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.ts
@@ -4,7 +4,7 @@ console.log(`ae_p_idaa_events [event_id] +page.ts start`);
 
 // import { error } from '@sveltejs/kit';
 import { browser } from '$app/environment';
-import { events_func } from '$lib/ae_events_functions';
+import { events_func } from '$lib/ae_events/ae_events_functions';
 
 export const load = (async ({ params, parent }) => {
     // route
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_edit.svelte b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_edit.svelte
index 90e3a062..2712b91a 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_edit.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_edit.svelte
@@ -37,7 +37,7 @@
         idaa_slct,
         idaa_trig
     } from '$lib/stores/ae_idaa_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
     import AE_Comp_Editor_TipTap from '$lib/elements/element_editor_tiptap.svelte';
 
     if (!$idaa_slct.event_obj) {
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_qry.svelte b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_qry.svelte
index 7095f34a..959bd79e 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_qry.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_qry.svelte
@@ -31,7 +31,7 @@
         idaa_trig,
         idaa_prom
     } from '$lib/stores/ae_idaa_stores';
-    import { events_func } from '$lib/ae_events_functions';
+    import { events_func } from '$lib/ae_events/ae_events_functions';
 
     import Help_tech from '$lib/app_components/e_app_help_tech.svelte';