diff --git a/src/lib/ae_utils.ts b/src/lib/ae_utils/ae_utils.ts
similarity index 100%
rename from src/lib/ae_utils.ts
rename to src/lib/ae_utils/ae_utils.ts
diff --git a/src/lib/ae_utils__datetime_format.ts b/src/lib/ae_utils/ae_utils__datetime_format.ts
similarity index 100%
rename from src/lib/ae_utils__datetime_format.ts
rename to src/lib/ae_utils/ae_utils__datetime_format.ts
diff --git a/src/lib/ae_utils__perm_checks.ts b/src/lib/ae_utils/ae_utils__perm_checks.ts
similarity index 100%
rename from src/lib/ae_utils__perm_checks.ts
rename to src/lib/ae_utils/ae_utils__perm_checks.ts
diff --git a/src/lib/element_access_type.svelte b/src/lib/element_access_type.svelte
index b6f209af..11516fe2 100644
--- a/src/lib/element_access_type.svelte
+++ b/src/lib/element_access_type.svelte
@@ -3,7 +3,7 @@ import { createEventDispatcher, onMount, tick } from 'svelte';
 
 // import { liveQuery } from "dexie";
 
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 // Ideally the Event related stores should not be imported here?
 import { events_loc } from '$lib/ae_events_stores';
diff --git a/src/lib/element_app_cfg.svelte b/src/lib/element_app_cfg.svelte
index 8814f7b6..430f532b 100644
--- a/src/lib/element_app_cfg.svelte
+++ b/src/lib/element_app_cfg.svelte
@@ -2,7 +2,7 @@
 import { createEventDispatcher, onMount } from 'svelte';
 import { RadioGroup, RadioItem } from '@skeletonlabs/skeleton';
 
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 
 let notes: null|string = null;
diff --git a/src/lib/element_data_store.svelte b/src/lib/element_data_store.svelte
index ca32a084..b43b6851 100644
--- a/src/lib/element_data_store.svelte
+++ b/src/lib/element_data_store.svelte
@@ -5,7 +5,7 @@ import { onMount } from 'svelte';
 
 import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger, ae_trig } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import type { key_val } from '$lib/ae_stores';
 
 export let expire_minutes: number = 10;
diff --git a/src/lib/element_data_store_v2.svelte b/src/lib/element_data_store_v2.svelte
index 137d344c..4b4eb4a3 100644
--- a/src/lib/element_data_store_v2.svelte
+++ b/src/lib/element_data_store_v2.svelte
@@ -6,7 +6,7 @@ import { Modal } from 'flowbite-svelte';
 
 import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger, ae_trig } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import type { key_val } from '$lib/ae_stores';
 
 export let log_lvl: number = 1;
diff --git a/src/lib/element_input_file.svelte b/src/lib/element_input_file.svelte
index 88766500..0fdefcca 100644
--- a/src/lib/element_input_file.svelte
+++ b/src/lib/element_input_file.svelte
@@ -2,7 +2,7 @@
 import { createEventDispatcher, onMount, tick } from 'svelte';
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { api } from '$lib/api';
 import { core_func } from '$lib/ae_core_functions';
 import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
diff --git a/src/lib/element_input_files_tbl.svelte b/src/lib/element_input_files_tbl.svelte
index 8a6a0750..044baa1d 100644
--- a/src/lib/element_input_files_tbl.svelte
+++ b/src/lib/element_input_files_tbl.svelte
@@ -2,7 +2,7 @@
 import { createEventDispatcher, onMount, tick } from 'svelte';
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { api } from '$lib/api';
 import { core_func } from '$lib/ae_core_functions';
 import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
diff --git a/src/lib/element_manage_event_file_li.svelte b/src/lib/element_manage_event_file_li.svelte
index 7188b0d4..cf86b261 100644
--- a/src/lib/element_manage_event_file_li.svelte
+++ b/src/lib/element_manage_event_file_li.svelte
@@ -4,7 +4,7 @@ import { clipboard } from '@skeletonlabs/skeleton';
 // import { liveQuery } from "dexie";
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
diff --git a/src/lib/element_manage_event_file_li_all.svelte b/src/lib/element_manage_event_file_li_all.svelte
index 060fb018..ba8c3838 100644
--- a/src/lib/element_manage_event_file_li_all.svelte
+++ b/src/lib/element_manage_event_file_li_all.svelte
@@ -4,7 +4,7 @@
 import { liveQuery } from "dexie";
 
 import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { api } from '$lib/api';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
diff --git a/src/lib/element_manage_event_file_li_direct.svelte b/src/lib/element_manage_event_file_li_direct.svelte
index 75fa1f54..0a947225 100644
--- a/src/lib/element_manage_event_file_li_direct.svelte
+++ b/src/lib/element_manage_event_file_li_direct.svelte
@@ -4,7 +4,7 @@
 import { liveQuery } from "dexie";
 
 import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { api } from '$lib/api';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
diff --git a/src/lib/element_obj_tbl_row.svelte b/src/lib/element_obj_tbl_row.svelte
index 47604286..548fa98b 100644
--- a/src/lib/element_obj_tbl_row.svelte
+++ b/src/lib/element_obj_tbl_row.svelte
@@ -3,7 +3,7 @@ import { onMount } from 'svelte';
 
 // This (ae) is only used for utilities
 // import { ae } from 'aether_npm_lib';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 
 // These (slct_*) are only used internally for this component. Not needed???
 // import { slct_obj_id, slct_obj_li_type, slct_obj_type } from '../admin/stores_admin.js';
diff --git a/src/routes/admin/+layout.svelte b/src/routes/admin/+layout.svelte
index 870ad296..87d28ead 100644
--- a/src/routes/admin/+layout.svelte
+++ b/src/routes/admin/+layout.svelte
@@ -8,7 +8,7 @@ import type { Writable } from 'svelte/store';
 import { localStorageStore } from '@skeletonlabs/skeleton';
 
 import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct } from '$lib/ae_stores';
 import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores';
diff --git a/src/routes/admin/+page.svelte b/src/routes/admin/+page.svelte
index ed262fb7..9173d177 100644
--- a/src/routes/admin/+page.svelte
+++ b/src/routes/admin/+page.svelte
@@ -8,7 +8,7 @@ import { onMount } from 'svelte';
 // import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 // import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 
 import Element_data_store from '$lib/element_data_store_v2.svelte';
 import Element_sql_qry from '$lib/element_sql_qry.svelte';
diff --git a/src/routes/core/+layout.svelte b/src/routes/core/+layout.svelte
index 2c673b1e..1873e6ee 100644
--- a/src/routes/core/+layout.svelte
+++ b/src/routes/core/+layout.svelte
@@ -8,7 +8,7 @@ import { onMount } from 'svelte';
 // import { localStorageStore } from '@skeletonlabs/skeleton';
 
 import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct } from '$lib/ae_stores';
 import { events_loc, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
diff --git a/src/routes/core/+page.svelte b/src/routes/core/+page.svelte
index 075e7948..395e398b 100644
--- a/src/routes/core/+page.svelte
+++ b/src/routes/core/+page.svelte
@@ -9,7 +9,7 @@ import { goto, invalidate, pushState, replaceState } from '$app/navigation';
 // import { clipboard, FileDropzone, getModalStore, localStorageStore, ProgressRadial, RadioGroup, RadioItem, TabGroup, Tab, TabAnchor } from '@skeletonlabs/skeleton';
 
 import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { api } from '$lib/api';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
diff --git a/src/routes/core/ae_comp__person_obj_tbl.svelte b/src/routes/core/ae_comp__person_obj_tbl.svelte
index 4f6f6df3..4789a29c 100644
--- a/src/routes/core/ae_comp__person_obj_tbl.svelte
+++ b/src/routes/core/ae_comp__person_obj_tbl.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 // Imports
 // import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 
 import { liveQuery } from "dexie";
 import { db_core } from "$lib/db_core";
diff --git a/src/routes/core/person/[person_id]/+page.svelte b/src/routes/core/person/[person_id]/+page.svelte
index 95b545aa..0195ea53 100644
--- a/src/routes/core/person/[person_id]/+page.svelte
+++ b/src/routes/core/person/[person_id]/+page.svelte
@@ -6,7 +6,7 @@ export let data: any;
 
 // Imports
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { api } from '$lib/api';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 import Element_data_store from '$lib/element_data_store_v2.svelte';
diff --git a/src/routes/core/person_view.svelte b/src/routes/core/person_view.svelte
index 54b91465..6adfe53b 100644
--- a/src/routes/core/person_view.svelte
+++ b/src/routes/core/person_view.svelte
@@ -8,7 +8,7 @@ import { liveQuery } from "dexie";
 const dispatch = createEventDispatcher();
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
diff --git a/src/routes/events/[event_id]/(launcher)/+layout.svelte b/src/routes/events/[event_id]/(launcher)/+layout.svelte
index c311da92..97390876 100644
--- a/src/routes/events/[event_id]/(launcher)/+layout.svelte
+++ b/src/routes/events/[event_id]/(launcher)/+layout.svelte
@@ -7,7 +7,7 @@ import { onMount } from 'svelte';
 import { sineIn } from 'svelte/easing';
 import { liveQuery } from "dexie";
 import { Drawer, Footer } from 'flowbite-svelte';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { db_events } from "$lib/db_events";
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_sess, events_slct, events_trigger, events_trig } from '$lib/ae_events_stores';
diff --git a/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte b/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte
index bf73ce5d..6b0ad31f 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte
@@ -7,7 +7,7 @@ import { browser } from '$app/environment';
 import { onMount } from 'svelte';
 
 // import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { api } from '$lib/api';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
diff --git a/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte b/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte
index 194b2bad..3f3e3ad6 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte
@@ -4,7 +4,7 @@
 import { goto } from '$app/navigation';
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
 import Element_data_store from '$lib/element_data_store_v2.svelte';
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 76f6373e..79a37d27 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 
 import { liveQuery } from "dexie";
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 8ad2eeae..344b1b07 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
 import Launcher_file_cont from './launcher_file_cont.svelte';
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 04323a92..8468a0a3 100644
--- a/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte
+++ b/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte
@@ -3,7 +3,7 @@ import { goto } from '$app/navigation';
 // import { liveQuery } from "dexie";
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { db_events } from "$lib/db_events";
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
diff --git a/src/routes/events/[event_id]/+page.svelte b/src/routes/events/[event_id]/+page.svelte
index 52b2c75d..4e200d54 100644
--- a/src/routes/events/[event_id]/+page.svelte
+++ b/src/routes/events/[event_id]/+page.svelte
@@ -8,7 +8,7 @@ import { browser } from '$app/environment';
 // import { goto, invalidate, pushState, replaceState } from '$app/navigation';
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 import Comp_event_session_obj_li from '../../events_pres_mgmt/ae_comp__event_session_obj_li.svelte';
 
diff --git a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte
index f1b423b0..07d1d091 100644
--- a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte
+++ b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte
@@ -10,7 +10,7 @@ import { onMount } from 'svelte';
 import { clipboard } from '@skeletonlabs/skeleton';
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 
 let ae_promises: key_val = {};
diff --git a/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte b/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte
index c90217a9..cb0e97e7 100644
--- a/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte
+++ b/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte
@@ -8,7 +8,7 @@ import { liveQuery } from "dexie";
 // const dispatch = createEventDispatcher();
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
 import Element_data_store from '$lib/element_data_store_v2.svelte';
 
diff --git a/src/routes/events/[event_id]/reports/+page.svelte b/src/routes/events/[event_id]/reports/+page.svelte
index 9813cde5..e83b50fe 100644
--- a/src/routes/events/[event_id]/reports/+page.svelte
+++ b/src/routes/events/[event_id]/reports/+page.svelte
@@ -7,7 +7,7 @@ let log_lvl = 0;
 import { onMount } from 'svelte';
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 import Comp_event_file_obj_tbl from '../../../events_pres_mgmt/ae_comp__event_file_obj_tbl.svelte';
 import Comp_event_session_obj_tbl from '../../../events_pres_mgmt/ae_comp__event_session_obj_tbl_wrapper.svelte';
diff --git a/src/routes/events_badges/+layout.svelte b/src/routes/events_badges/+layout.svelte
index 2a163675..62d70545 100644
--- a/src/routes/events_badges/+layout.svelte
+++ b/src/routes/events_badges/+layout.svelte
@@ -8,7 +8,7 @@ import type { Writable } from 'svelte/store';
 import { localStorageStore } from '@skeletonlabs/skeleton';
 
 import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct } from '$lib/ae_stores';
 import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores';
diff --git a/src/routes/events_badges/+page.svelte b/src/routes/events_badges/+page.svelte
index d28a9226..8f4bdd67 100644
--- a/src/routes/events_badges/+page.svelte
+++ b/src/routes/events_badges/+page.svelte
@@ -8,7 +8,7 @@ import { onMount } from 'svelte';
 import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 
 import Element_data_store from '$lib/element_data_store_v2.svelte';
 
diff --git a/src/routes/events_badges/review/+layout.ts b/src/routes/events_badges/review/+layout.ts
index a66229e9..3df120cb 100644
--- a/src/routes/events_badges/review/+layout.ts
+++ b/src/routes/events_badges/review/+layout.ts
@@ -3,7 +3,7 @@
 import { get } from 'svelte/store';
 
 import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 // import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores';
diff --git a/src/routes/events_badges/review/+page.svelte b/src/routes/events_badges/review/+page.svelte
index 3f1d4d63..e1dbb18f 100644
--- a/src/routes/events_badges/review/+page.svelte
+++ b/src/routes/events_badges/review/+page.svelte
@@ -6,7 +6,7 @@ import { onMount } from 'svelte';
 
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import { events_func } from '$lib/ae_events_functions';
 import { liveQuery } from "dexie";
diff --git a/src/routes/events_badges/stats/+layout.ts b/src/routes/events_badges/stats/+layout.ts
index 63c9ca0e..6d3ae0e6 100644
--- a/src/routes/events_badges/stats/+layout.ts
+++ b/src/routes/events_badges/stats/+layout.ts
@@ -3,7 +3,7 @@
 import { get } from 'svelte/store';
 
 import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 // import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores';
diff --git a/src/routes/events_badges/stats/+page.svelte b/src/routes/events_badges/stats/+page.svelte
index ca7a82da..af949685 100644
--- a/src/routes/events_badges/stats/+page.svelte
+++ b/src/routes/events_badges/stats/+page.svelte
@@ -13,7 +13,7 @@ import { onMount } from 'svelte';
 
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import { events_func } from '$lib/ae_events_functions';
 import { liveQuery } from "dexie";
diff --git a/src/routes/events_leads/+layout.svelte b/src/routes/events_leads/+layout.svelte
index 45d0dac5..bfca87bc 100644
--- a/src/routes/events_leads/+layout.svelte
+++ b/src/routes/events_leads/+layout.svelte
@@ -6,7 +6,7 @@ import { goto } from '$app/navigation';
 import { onMount } from 'svelte';
 
 // import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores';
 
diff --git a/src/routes/events_leads/+page.svelte b/src/routes/events_leads/+page.svelte
index 0c670a17..44ab3ec2 100644
--- a/src/routes/events_leads/+page.svelte
+++ b/src/routes/events_leads/+page.svelte
@@ -6,7 +6,7 @@
 import { onMount } from 'svelte';
 import { goto, invalidate, pushState, replaceState } from '$app/navigation';
 
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import { liveQuery } from "dexie";
 import { db_events } from "$lib/db_events";
diff --git a/src/routes/events_leads/exhibit/[slug]/+page.svelte b/src/routes/events_leads/exhibit/[slug]/+page.svelte
index 00a24f23..cadb5bd9 100644
--- a/src/routes/events_leads/exhibit/[slug]/+page.svelte
+++ b/src/routes/events_leads/exhibit/[slug]/+page.svelte
@@ -9,7 +9,7 @@ import { goto, invalidate, pushState, replaceState } from '$app/navigation';
 import { clipboard, FileDropzone, getModalStore, localStorageStore, ProgressRadial, RadioGroup, RadioItem, TabGroup, Tab, TabAnchor } from '@skeletonlabs/skeleton';
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import { liveQuery } from "dexie";
 import { db_events } from "$lib/db_events";
diff --git a/src/routes/events_leads/exhibit/[slug]/leads_add_scan backup.svelte b/src/routes/events_leads/exhibit/[slug]/leads_add_scan backup.svelte
index 5211c92c..e61b5f2f 100644
--- a/src/routes/events_leads/exhibit/[slug]/leads_add_scan backup.svelte	
+++ b/src/routes/events_leads/exhibit/[slug]/leads_add_scan backup.svelte	
@@ -1,7 +1,7 @@
 <script lang="ts">
 console.log(`ae_events_leads exhibit [slug] leads_add_scan.svelte`, $events_slct);
 
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { liveQuery } from "dexie";
 import { db_events } from "$lib/db_events";
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
@@ -663,9 +663,9 @@ function handle_qr_camera(event) {
 
         <!-- <div class=""> -->
         <Element_qr_scanner
-            start_qr_scanner={$events_sess.leads.qr_scan_start} 
-            show_qr_scan_result={true} 
-            show_qr_manual_badge_id_entry_option={true} 
+            start_qr_scanner={$events_sess.leads.qr_scan_start}
+            show_qr_scan_result={true}
+            show_qr_manual_badge_id_entry_option={true}
             on:qr_scan_result={handle_qr_scan_result}
             on:qr_camera={handle_qr_camera}
             />
diff --git a/src/routes/events_leads/exhibit/[slug]/leads_add_scan.svelte b/src/routes/events_leads/exhibit/[slug]/leads_add_scan.svelte
index 18f8cd99..be171564 100644
--- a/src/routes/events_leads/exhibit/[slug]/leads_add_scan.svelte
+++ b/src/routes/events_leads/exhibit/[slug]/leads_add_scan.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 console.log(`ae_events_leads exhibit [slug] leads_add_scan.svelte`, $events_slct);
 
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { liveQuery } from "dexie";
 import { db_events } from "$lib/db_events";
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
@@ -207,11 +207,11 @@ function handle_qr_camera(event) {
         Please check your browser's permissions.
     {/if}
 </p>
-<!-- 
+<!--
 <Element_qr_scanner
-    start_qr_scanner={false} 
-    show_qr_scan_result={true} 
-    show_qr_manual_badge_id_entry_option={true} 
+    start_qr_scanner={false}
+    show_qr_scan_result={true}
+    show_qr_manual_badge_id_entry_option={true}
     on:qr_scan_result={handle_qr_scan_result}
     on:qr_camera={handle_qr_camera}
     /> -->
@@ -728,26 +728,26 @@ function handle_qr_camera(event) {
 
         {#if !$ae_loc.qr_scanner_version || $ae_loc.qr_scanner_version == 'one'}
         <Element_qr_scanner
-            start_qr_scanner={$events_sess.leads.qr_scan_start} 
-            show_qr_scan_result={true} 
-            show_qr_manual_badge_id_entry_option={true} 
+            start_qr_scanner={$events_sess.leads.qr_scan_start}
+            show_qr_scan_result={true}
+            show_qr_manual_badge_id_entry_option={true}
             on:qr_scan_result={handle_qr_scan_result}
             on:qr_camera={handle_qr_camera}
             />
         {:else if $ae_loc.qr_scanner_version == 'two'}
         <Element_qr_scanner_v2
-            start_qr_scanner={$events_sess.leads.qr_scan_start} 
-            show_qr_scan_result={true} 
-            show_qr_manual_badge_id_entry_option={true} 
+            start_qr_scanner={$events_sess.leads.qr_scan_start}
+            show_qr_scan_result={true}
+            show_qr_manual_badge_id_entry_option={true}
             on:qr_scan_result={handle_qr_scan_result}
             on:qr_camera={handle_qr_camera}
             />
             <!-- v2 -->
         {:else if $ae_loc.qr_scanner_version == 'dev'}
         <Element_qr_scanner_dev
-            start_qr_scanner={$events_sess.leads.qr_scan_start} 
-            show_qr_scan_result={true} 
-            show_qr_manual_badge_id_entry_option={true} 
+            start_qr_scanner={$events_sess.leads.qr_scan_start}
+            show_qr_scan_result={true}
+            show_qr_manual_badge_id_entry_option={true}
             on:qr_scan_result={handle_qr_scan_result}
             on:qr_camera={handle_qr_camera}
             />
diff --git a/src/routes/events_leads/exhibit/[slug]/leads_list.svelte b/src/routes/events_leads/exhibit/[slug]/leads_list.svelte
index 2f67bade..4005e167 100644
--- a/src/routes/events_leads/exhibit/[slug]/leads_list.svelte
+++ b/src/routes/events_leads/exhibit/[slug]/leads_list.svelte
@@ -3,7 +3,7 @@
 // console.log(`ae_events_leads exhibit [slug] leads_list.svelte data:`, data);
 
 import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 import { liveQuery } from "dexie";
 import { db_events } from "$lib/db_events";
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
diff --git a/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte b/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte
index 14b4ad91..d0ba30a7 100644
--- a/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte
+++ b/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte
@@ -2,7 +2,7 @@
 console.log(`ae_events_leads exhibit [slug] leads_manage.svelte`);
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { liveQuery } from "dexie";
 import { db_events } from "$lib/db_events";
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
diff --git a/src/routes/events_leads/exhibit/[slug]/leads_payment.svelte b/src/routes/events_leads/exhibit/[slug]/leads_payment.svelte
index 7eba0bc9..ea410df4 100644
--- a/src/routes/events_leads/exhibit/[slug]/leads_payment.svelte
+++ b/src/routes/events_leads/exhibit/[slug]/leads_payment.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { liveQuery } from "dexie";
 import { db_events } from "$lib/db_events";
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
diff --git a/src/routes/events_leads/exhibit/[slug]/leads_view_lead.svelte b/src/routes/events_leads/exhibit/[slug]/leads_view_lead.svelte
index b12cdfc0..2d55b404 100644
--- a/src/routes/events_leads/exhibit/[slug]/leads_view_lead.svelte
+++ b/src/routes/events_leads/exhibit/[slug]/leads_view_lead.svelte
@@ -4,7 +4,7 @@ console.log(`ae_events_leads exhibit [slug] leads_view.svelte`);
 import { fade } from 'svelte/transition';
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { liveQuery } from "dexie";
 import { db_events } from "$lib/db_events";
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
diff --git a/src/routes/events_pres_mgmt/+layout.svelte b/src/routes/events_pres_mgmt/+layout.svelte
index d0a0190b..62716615 100644
--- a/src/routes/events_pres_mgmt/+layout.svelte
+++ b/src/routes/events_pres_mgmt/+layout.svelte
@@ -7,7 +7,7 @@ import { browser } from '$app/environment';
 import { goto } from '$app/navigation';
 
 import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 import { ae_loc, ae_sess, ae_api, slct } from '$lib/ae_stores';
 import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
 // import { events_func } from '$lib/ae_events_functions';
diff --git a/src/routes/events_pres_mgmt/+page.svelte b/src/routes/events_pres_mgmt/+page.svelte
index a5a3624d..03c776a3 100644
--- a/src/routes/events_pres_mgmt/+page.svelte
+++ b/src/routes/events_pres_mgmt/+page.svelte
@@ -10,7 +10,7 @@ import { liveQuery } from "dexie";
 import { db_events } from "$lib/db_events";
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_file_obj_tbl.svelte b/src/routes/events_pres_mgmt/ae_comp__event_file_obj_tbl.svelte
index ee5192e3..870ae977 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_file_obj_tbl.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_file_obj_tbl.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 // Imports
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import { clipboard } from '@skeletonlabs/skeleton';
 import { liveQuery } from "dexie";
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presentation_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presentation_obj_li.svelte
index 31bd9ca1..10b56f99 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_presentation_obj_li.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_presentation_obj_li.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 // Imports
 // import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import { liveQuery } from "dexie";
 // import { core_func } from '$lib/ae_core_functions';
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presenter_form_agree.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presenter_form_agree.svelte
index 5d8ad4cd..6e69f180 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_presenter_form_agree.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_presenter_form_agree.svelte
@@ -6,7 +6,7 @@ console.log(`ae_events_pres_mgmt session [slug] form_agree.svelte`);
 // import { liveQuery } from "dexie";
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import Element_data_store from '$lib/element_data_store_v2.svelte';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte
index 512a34b2..6b3ad368 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 // Imports
 import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { api, send_email } from '$lib/api';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
@@ -12,7 +12,7 @@ import { db_events } from "$lib/db_events";
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
 import { events_func } from '$lib/ae_events_functions';
-	import { ae_util } from '$lib/ae_utils';
+	import { ae_util } from '$lib/ae_utils/ae_utils';
 
 // Exports
 export let container_class_li: string|Array<string> = [];
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte
index 4d27d03c..ae9ac9ff 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 // Imports
 // import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 
 // import { liveQuery } from "dexie";
 // import { db_events } from "$lib/db_events";
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte
index b8eb4e09..6915d123 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_li.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 // Imports
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 import Comp_event_presenter_obj_li from './ae_comp__event_presenter_obj_li_wrapper.svelte';
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl.svelte
index ad5bbd08..09622b72 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_session_obj_tbl.svelte
@@ -3,7 +3,7 @@
 // import type { key_val } from '$lib/ae_stores';
 
 // import { liveQuery } from "dexie";
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 // Imports - events specific
 import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
 // import { db_events } from "$lib/db_events";
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_poc_form_agree.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_poc_form_agree.svelte
index 2ef381b3..fd1256cf 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_session_poc_form_agree.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_session_poc_form_agree.svelte
@@ -4,7 +4,7 @@ export let log_lvl = 0;
 
 // Imports (external and then internal)
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
 import { events_func } from '$lib/ae_events_functions';
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_session_poc_profile.svelte b/src/routes/events_pres_mgmt/ae_comp__event_session_poc_profile.svelte
index 9d183687..11df5577 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_session_poc_profile.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_session_poc_profile.svelte
@@ -6,7 +6,7 @@ import { browser } from '$app/environment';
 import { clipboard } from '@skeletonlabs/skeleton';
 // import { liveQuery } from "dexie";
 
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 
 // Import components and elements
 import Element_input_files_tbl from '$lib/element_input_files_tbl.svelte';
diff --git a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
index 70d95820..31530bb6 100644
--- a/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/event/[slug]/+page.svelte
@@ -8,7 +8,7 @@ import { browser } from '$app/environment';
 // import { goto, invalidate, pushState, replaceState } from '$app/navigation';
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 import Comp_event_session_obj_li from '../../ae_comp__event_session_obj_li.svelte';
 
diff --git a/src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte b/src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte
index e51deec2..20b1b33c 100644
--- a/src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte
@@ -7,7 +7,7 @@ export let log_lvl = 1;
 import { browser } from '$app/environment';
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import Element_data_store from '$lib/element_data_store_v2.svelte';
 
 import { liveQuery } from "dexie";
diff --git a/src/routes/events_pres_mgmt/presenter_view.svelte b/src/routes/events_pres_mgmt/presenter_view.svelte
index 82c93554..f1a9b329 100644
--- a/src/routes/events_pres_mgmt/presenter_view.svelte
+++ b/src/routes/events_pres_mgmt/presenter_view.svelte
@@ -10,7 +10,7 @@ import { browser } from '$app/environment';
 const dispatch = createEventDispatcher();
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
diff --git a/src/routes/events_pres_mgmt/session/[slug]/+page.svelte b/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
index ad18612b..b81aab50 100644
--- a/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
@@ -9,7 +9,7 @@ import { Modal } from 'flowbite-svelte';
 import { onMount } from 'svelte';
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import Element_data_store from '$lib/element_data_store_v2.svelte';
 
 let ae_promises: key_val = {};
diff --git a/src/routes/events_pres_mgmt/session_view.svelte b/src/routes/events_pres_mgmt/session_view.svelte
index bc86c2ec..d8e729ac 100644
--- a/src/routes/events_pres_mgmt/session_view.svelte
+++ b/src/routes/events_pres_mgmt/session_view.svelte
@@ -10,7 +10,7 @@ import { Modal } from 'flowbite-svelte';
 // const dispatch = createEventDispatcher();
 
 import type { key_val } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import Element_ae_crud from '$lib/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 
diff --git a/src/routes/events_speakers/+page.svelte b/src/routes/events_speakers/+page.svelte
index ec500d20..1314e682 100644
--- a/src/routes/events_speakers/+page.svelte
+++ b/src/routes/events_speakers/+page.svelte
@@ -18,7 +18,7 @@ const modalStore = getModalStore();
 import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 import { core_func } from '$lib/ae_core_functions';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import type { key_val } from '$lib/ae_stores';
 
 import Edit_modal_event_presenter_obj from './10_edit_modal__event_presenter_obj.svelte';
diff --git a/src/routes/events_speakers/10_edit_modal__event_presenter_obj.svelte b/src/routes/events_speakers/10_edit_modal__event_presenter_obj.svelte
index 95604e95..62c7db82 100644
--- a/src/routes/events_speakers/10_edit_modal__event_presenter_obj.svelte
+++ b/src/routes/events_speakers/10_edit_modal__event_presenter_obj.svelte
@@ -33,7 +33,7 @@ export let container_class_li = '';
 const modalStore = getModalStore();
 
 
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 import type { key_val } from '$lib/ae_stores';
diff --git a/src/routes/events_speakers/10_list__event_presenter_obj.svelte b/src/routes/events_speakers/10_list__event_presenter_obj.svelte
index 16152104..1e0ab06f 100644
--- a/src/routes/events_speakers/10_list__event_presenter_obj.svelte
+++ b/src/routes/events_speakers/10_list__event_presenter_obj.svelte
@@ -6,7 +6,7 @@ import { onMount } from 'svelte';
 // const modalStore = getModalStore();
 
 // *** Import Aether core variables and functions
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { ae } from 'aether_npm_lib';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 
diff --git a/src/routes/events_speakers/10_view_modal__event_presenter_obj.svelte b/src/routes/events_speakers/10_view_modal__event_presenter_obj.svelte
index ebcce312..300f813f 100644
--- a/src/routes/events_speakers/10_view_modal__event_presenter_obj.svelte
+++ b/src/routes/events_speakers/10_view_modal__event_presenter_obj.svelte
@@ -8,7 +8,7 @@ import { onMount } from 'svelte';
 import { clipboard, FileDropzone, getModalStore, localStorageStore, ProgressRadial, RadioGroup, RadioItem, TabGroup, Tab, TabAnchor } from '@skeletonlabs/skeleton';
 import type { Writable } from 'svelte/store';
 
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 
diff --git a/src/routes/events_speakers/[slug]/+page.svelte b/src/routes/events_speakers/[slug]/+page.svelte
index 475262c5..be5b4ff5 100644
--- a/src/routes/events_speakers/[slug]/+page.svelte
+++ b/src/routes/events_speakers/[slug]/+page.svelte
@@ -19,7 +19,7 @@ const modalStore = getModalStore();
 
 import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import type { key_val } from '$lib/ae_stores';
 
 import Edit_modal_event_presenter from '../10_edit_modal__event_presenter_obj.svelte';
diff --git a/src/routes/hosted_files/+page.svelte b/src/routes/hosted_files/+page.svelte
index ae504e5d..4d449081 100644
--- a/src/routes/hosted_files/+page.svelte
+++ b/src/routes/hosted_files/+page.svelte
@@ -7,7 +7,7 @@ import { onMount } from 'svelte';
 
 import { api } from '$lib/api.js';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import type { key_val } from '$lib/ae_stores';
 
 export let container_class_li = [];
diff --git a/src/routes/notes/+layout.svelte b/src/routes/notes/+layout.svelte
index 79ca9457..05d929c6 100644
--- a/src/routes/notes/+layout.svelte
+++ b/src/routes/notes/+layout.svelte
@@ -7,7 +7,7 @@ import { browser } from '$app/environment';
 import { goto } from '$app/navigation';
 
 import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils';
+// import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct } from '$lib/ae_stores';
 import { notes_loc, notes_slct, notes_trigger } from '$lib/ae_notes_stores';
diff --git a/src/routes/notes/+page.svelte b/src/routes/notes/+page.svelte
index cbb81a57..efe9ea7c 100644
--- a/src/routes/notes/+page.svelte
+++ b/src/routes/notes/+page.svelte
@@ -10,7 +10,7 @@ import { liveQuery } from "dexie";
 import { db_notes } from "$lib/db_notes";
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 import { notes_loc, notes_slct, notes_trigger } from '$lib/ae_notes_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 
diff --git a/src/routes/sponsorships/+page.svelte b/src/routes/sponsorships/+page.svelte
index fbe89de7..0c9c1814 100644
--- a/src/routes/sponsorships/+page.svelte
+++ b/src/routes/sponsorships/+page.svelte
@@ -18,7 +18,7 @@ const modalStore = getModalStore();
 import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 import { core_func } from '$lib/ae_core_functions';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import type { key_val } from '$lib/ae_stores';
 import { spons_func } from '$lib/ae_sponsorships_functions';
 
diff --git a/src/routes/sponsorships/10_edit_modal__sponsorship_obj.svelte b/src/routes/sponsorships/10_edit_modal__sponsorship_obj.svelte
index 398bcf6a..1ff9a82b 100644
--- a/src/routes/sponsorships/10_edit_modal__sponsorship_obj.svelte
+++ b/src/routes/sponsorships/10_edit_modal__sponsorship_obj.svelte
@@ -35,7 +35,7 @@ export let container_class_li = '';
 const modalStore = getModalStore();
 
 
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 import type { key_val } from '$lib/ae_stores';
diff --git a/src/routes/sponsorships/10_list__sponsorship_obj.svelte b/src/routes/sponsorships/10_list__sponsorship_obj.svelte
index 513a46b1..a4a7ee5a 100644
--- a/src/routes/sponsorships/10_list__sponsorship_obj.svelte
+++ b/src/routes/sponsorships/10_list__sponsorship_obj.svelte
@@ -6,7 +6,7 @@ import { onMount } from 'svelte';
 // const modalStore = getModalStore();
 
 // *** Import Aether core variables and functions
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { ae } from 'aether_npm_lib';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 
diff --git a/src/routes/sponsorships/10_view_modal__sponsorship_obj.svelte b/src/routes/sponsorships/10_view_modal__sponsorship_obj.svelte
index 530ffc29..d36d5e55 100644
--- a/src/routes/sponsorships/10_view_modal__sponsorship_obj.svelte
+++ b/src/routes/sponsorships/10_view_modal__sponsorship_obj.svelte
@@ -13,7 +13,7 @@ const store_current_tab: Writable<string> = localStorageStore('ae_sponsorships_c
 console.log(`store_current_tab:`, $store_current_tab);
 
 
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 import type { key_val } from '$lib/ae_stores';
diff --git a/src/routes/sponsorships/[slug]/+page.svelte b/src/routes/sponsorships/[slug]/+page.svelte
index 78d006d9..0efa97d0 100644
--- a/src/routes/sponsorships/[slug]/+page.svelte
+++ b/src/routes/sponsorships/[slug]/+page.svelte
@@ -19,7 +19,7 @@ const modalStore = getModalStore();
 
 import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
-import { ae_util } from '$lib/ae_utils';
+import { ae_util } from '$lib/ae_utils/ae_utils';
 import type { key_val } from '$lib/ae_stores';
 
 import Edit_modal_sponsorship_obj from '../10_edit_modal__sponsorship_obj.svelte';
@@ -304,7 +304,7 @@ $: if (testing) {
 
 {:else}
 <div class="text-center m-4">
-    The CHOW 2024 sponsor Hub has closed. If you have changes to your gala RSVP list please email Laurie VanBenschoten, <a href="mailto:lvanbenschoten@marinesanctuary.org" class="text-blue-500">lvanbenschoten@marinesanctuary.org</a>, AND Erin Quigg, <a href="mailto:erinq@preconevents.com" class="text-blue-500">erinq@preconevents.com</a>. 
+    The CHOW 2024 sponsor Hub has closed. If you have changes to your gala RSVP list please email Laurie VanBenschoten, <a href="mailto:lvanbenschoten@marinesanctuary.org" class="text-blue-500">lvanbenschoten@marinesanctuary.org</a>, AND Erin Quigg, <a href="mailto:erinq@preconevents.com" class="text-blue-500">erinq@preconevents.com</a>.
 </div>
 {/if}