From 8ec01a1d64694e4f99b1118cf087fdb2af9d1b09 Mon Sep 17 00:00:00 2001
From: Scott Idem <stidem@gmail.com>
Date: Wed, 30 Oct 2024 18:40:47 -0400
Subject: [PATCH] More moving of files around. Hopefully nothing is broken
 again.

---
 src/lib/{ => ae_core}/ae_core_functions.ts                    | 0
 src/lib/{ => ae_notes}/ae_notes__note.ts                      | 0
 src/lib/{ => ae_notes}/ae_notes_functions.ts                  | 2 +-
 src/lib/{ => ae_notes}/ae_notes_stores.ts                     | 0
 src/lib/{ => ae_posts}/ae_posts__post.ts                      | 2 +-
 src/lib/{ => ae_posts}/ae_posts__post_comment.ts              | 0
 src/lib/{ => ae_posts}/ae_posts_functions.ts                  | 4 ++--
 src/lib/element_ae_crud.svelte                                | 2 +-
 src/lib/element_input_file.svelte                             | 2 +-
 src/lib/element_input_files_tbl.svelte                        | 2 +-
 src/routes/+layout.ts                                         | 2 +-
 src/routes/core/+page.svelte                                  | 2 +-
 src/routes/core/person/[person_id]/+page.ts                   | 2 +-
 src/routes/core/person_view.svelte                            | 2 +-
 .../del_events_pres_mgmt/event/[slug]/delete_+page.svelte     | 2 +-
 .../events/[event_id]/(launcher)/launcher_file_cont.svelte    | 2 +-
 .../location/[event_location_id]/location_view.svelte         | 2 +-
 src/routes/events/[event_id]/locations/+page.svelte           | 2 +-
 .../[event_id]/presenter/[presenter_id]/presenter_view.svelte | 2 +-
 .../presenter/ae_comp__event_presenter_obj_li.svelte          | 2 +-
 .../events/[event_id]/session/[session_id]/+page.svelte       | 2 +-
 .../[event_id]/session/[session_id]/session_view.svelte       | 2 +-
 src/routes/events/ae_comp__event_session_obj_li.svelte        | 2 +-
 src/routes/events_speakers/+layout.ts                         | 2 +-
 src/routes/events_speakers/+page.svelte                       | 2 +-
 src/routes/idaa/(idaa)/bb/+layout.ts                          | 2 +-
 src/routes/idaa/(idaa)/bb/+page.svelte                        | 4 ++--
 src/routes/idaa/(idaa)/recovery_meetings/+page.svelte         | 2 +-
 .../recovery_meetings/ae_idaa_comp__event_obj_id_edit.svelte  | 2 +-
 .../recovery_meetings/ae_idaa_comp__event_obj_qry.svelte      | 2 +-
 src/routes/notes/+layout.svelte                               | 4 ++--
 src/routes/notes/+page.svelte                                 | 2 +-
 src/routes/notes/+page.ts                                     | 2 +-
 src/routes/sponsorships/+layout.ts                            | 2 +-
 src/routes/sponsorships/+page.svelte                          | 2 +-
 35 files changed, 34 insertions(+), 34 deletions(-)
 rename src/lib/{ => ae_core}/ae_core_functions.ts (100%)
 rename src/lib/{ => ae_notes}/ae_notes__note.ts (100%)
 rename src/lib/{ => ae_notes}/ae_notes_functions.ts (93%)
 rename src/lib/{ => ae_notes}/ae_notes_stores.ts (100%)
 rename src/lib/{ => ae_posts}/ae_posts__post.ts (99%)
 rename src/lib/{ => ae_posts}/ae_posts__post_comment.ts (100%)
 rename src/lib/{ => ae_posts}/ae_posts_functions.ts (92%)

diff --git a/src/lib/ae_core_functions.ts b/src/lib/ae_core/ae_core_functions.ts
similarity index 100%
rename from src/lib/ae_core_functions.ts
rename to src/lib/ae_core/ae_core_functions.ts
diff --git a/src/lib/ae_notes__note.ts b/src/lib/ae_notes/ae_notes__note.ts
similarity index 100%
rename from src/lib/ae_notes__note.ts
rename to src/lib/ae_notes/ae_notes__note.ts
diff --git a/src/lib/ae_notes_functions.ts b/src/lib/ae_notes/ae_notes_functions.ts
similarity index 93%
rename from src/lib/ae_notes_functions.ts
rename to src/lib/ae_notes/ae_notes_functions.ts
index 8464438e..65d02b83 100644
--- a/src/lib/ae_notes_functions.ts
+++ b/src/lib/ae_notes/ae_notes_functions.ts
@@ -7,7 +7,7 @@ import {
     update_ae_obj__note,
     // qry__note,
     db_save_ae_obj_li__note,
-} from "$lib/ae_notes__note";
+} from "$lib/ae_notes/ae_notes__note";
 
 
 let export_obj = {
diff --git a/src/lib/ae_notes_stores.ts b/src/lib/ae_notes/ae_notes_stores.ts
similarity index 100%
rename from src/lib/ae_notes_stores.ts
rename to src/lib/ae_notes/ae_notes_stores.ts
diff --git a/src/lib/ae_posts__post.ts b/src/lib/ae_posts/ae_posts__post.ts
similarity index 99%
rename from src/lib/ae_posts__post.ts
rename to src/lib/ae_posts/ae_posts__post.ts
index c6c6883d..83a38927 100644
--- a/src/lib/ae_posts__post.ts
+++ b/src/lib/ae_posts/ae_posts__post.ts
@@ -3,7 +3,7 @@ import { api } from '$lib/api';
 
 import { db_posts } from "$lib/db_posts";
 
-import { load_ae_obj_li__post_comment } from "$lib/ae_posts__post_comment";
+import { load_ae_obj_li__post_comment } from "$lib/ae_posts/ae_posts__post_comment";
 
 let ae_promises: key_val = {};
 
diff --git a/src/lib/ae_posts__post_comment.ts b/src/lib/ae_posts/ae_posts__post_comment.ts
similarity index 100%
rename from src/lib/ae_posts__post_comment.ts
rename to src/lib/ae_posts/ae_posts__post_comment.ts
diff --git a/src/lib/ae_posts_functions.ts b/src/lib/ae_posts/ae_posts_functions.ts
similarity index 92%
rename from src/lib/ae_posts_functions.ts
rename to src/lib/ae_posts/ae_posts_functions.ts
index 20b7087a..c2d3c890 100644
--- a/src/lib/ae_posts_functions.ts
+++ b/src/lib/ae_posts/ae_posts_functions.ts
@@ -7,7 +7,7 @@ import {
     update_ae_obj__post,
     // qry__post,
     db_save_ae_obj_li__post,
-} from "$lib/ae_posts__post";
+} from "$lib/ae_posts/ae_posts__post";
 
 
 import {
@@ -17,7 +17,7 @@ import {
     update_ae_obj__post_comment,
     // qry__post_comment,
     db_save_ae_obj_li__post_comment,
-} from "$lib/ae_posts__post_comment";
+} from "$lib/ae_posts/ae_posts__post_comment";
 
 
 let export_obj = {
diff --git a/src/lib/element_ae_crud.svelte b/src/lib/element_ae_crud.svelte
index 73ff371a..ff98d909 100644
--- a/src/lib/element_ae_crud.svelte
+++ b/src/lib/element_ae_crud.svelte
@@ -5,7 +5,7 @@ import { createEventDispatcher, onMount } from 'svelte';
 // *** Import Aether core variables and functions
 import type { key_val } from '$lib/ae_stores';
 // import { api } from '$lib/api';
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 // import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 
 // *** Import Aether core components
diff --git a/src/lib/element_input_file.svelte b/src/lib/element_input_file.svelte
index 0fdefcca..90b7a640 100644
--- a/src/lib/element_input_file.svelte
+++ b/src/lib/element_input_file.svelte
@@ -4,7 +4,7 @@ import { createEventDispatcher, onMount, tick } from 'svelte';
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { api } from '$lib/api';
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 
 export let element_id = 'svelte_input_file_element';
diff --git a/src/lib/element_input_files_tbl.svelte b/src/lib/element_input_files_tbl.svelte
index 044baa1d..cb6567e1 100644
--- a/src/lib/element_input_files_tbl.svelte
+++ b/src/lib/element_input_files_tbl.svelte
@@ -4,7 +4,7 @@ import { createEventDispatcher, onMount, tick } from 'svelte';
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
 // import { api } from '$lib/api';
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 
 // export let element_id = 'svelte_input_file_element';
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 383d024b..f26fdb4f 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -5,7 +5,7 @@ import { error } from '@sveltejs/kit';
 
 // 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 { core_func } from '$lib/ae_core/ae_core_functions';
 import type { key_val } from '$lib/ae_stores';
 
 import { PUBLIC_AE_API_PROTOCOL, PUBLIC_AE_API_SERVER, PUBLIC_AE_API_BAK_SERVER, PUBLIC_AE_API_PORT, PUBLIC_AE_API_PATH, PUBLIC_AE_API_SECRET_KEY, PUBLIC_AE_API_CRUD_SUPER_KEY, PUBLIC_AE_NO_ACCOUNT_ID, PUBLIC_AE_NO_ACCOUNT_ID_TOKEN } from '$env/static/public';
diff --git a/src/routes/core/+page.svelte b/src/routes/core/+page.svelte
index 395e398b..d3a86121 100644
--- a/src/routes/core/+page.svelte
+++ b/src/routes/core/+page.svelte
@@ -16,7 +16,7 @@ import type { key_val } from '$lib/ae_stores';
 import Comp_person_obj_tbl from './ae_comp__person_obj_tbl.svelte';
 
 // import { liveQuery } from "dexie";
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 // import { db_core } from "$lib/db_core";
 // 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';
diff --git a/src/routes/core/person/[person_id]/+page.ts b/src/routes/core/person/[person_id]/+page.ts
index eff26504..7faa313c 100644
--- a/src/routes/core/person/[person_id]/+page.ts
+++ b/src/routes/core/person/[person_id]/+page.ts
@@ -2,7 +2,7 @@
 import { error } from '@sveltejs/kit';
 console.log(`ae core person [person_id] +page.ts: start`);
 
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 
 export async function load({ params, parent }) { // route
     let log_lvl = 0;
diff --git a/src/routes/core/person_view.svelte b/src/routes/core/person_view.svelte
index 6adfe53b..84323743 100644
--- a/src/routes/core/person_view.svelte
+++ b/src/routes/core/person_view.svelte
@@ -13,7 +13,7 @@ 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';
 
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { db_core } from "$lib/db_core";
 // import { db_events } from "$lib/db_events";
diff --git a/src/routes/del_events_pres_mgmt/event/[slug]/delete_+page.svelte b/src/routes/del_events_pres_mgmt/event/[slug]/delete_+page.svelte
index 22dbf525..8fe80a84 100644
--- a/src/routes/del_events_pres_mgmt/event/[slug]/delete_+page.svelte
+++ b/src/routes/del_events_pres_mgmt/event/[slug]/delete_+page.svelte
@@ -13,7 +13,7 @@ import { ae_util } from '$lib/ae_utils/ae_utils';
 import Comp_event_session_obj_li from '../../ae_comp__event_session_obj_li.svelte';
 
 import { liveQuery } from "dexie";
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 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]/(launcher)/launcher_file_cont.svelte b/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte
index 2f17534e..acb5388d 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte
@@ -9,7 +9,7 @@ import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api';
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 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/[event_id]/location/[event_location_id]/location_view.svelte b/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte
index 5942f76f..61ae728a 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
@@ -16,7 +16,7 @@ let ae_promises: key_val = {};
 // let ae_tmp: key_val = {};
 // let ae_triggers: key_val = {};
 
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 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';
diff --git a/src/routes/events/[event_id]/locations/+page.svelte b/src/routes/events/[event_id]/locations/+page.svelte
index dc2be760..1a20709c 100644
--- a/src/routes/events/[event_id]/locations/+page.svelte
+++ b/src/routes/events/[event_id]/locations/+page.svelte
@@ -17,7 +17,7 @@ let ae_tmp: key_val = {};
 let ae_triggers: key_val = {};
 
 import { liveQuery } from "dexie";
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 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';
diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte
index e7885d60..65dd55e5 100644
--- a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte
+++ b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte
@@ -13,7 +13,7 @@ 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 { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { db_events } from "$lib/db_events";
 import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li.svelte
index bcd45db5..da9bce79 100644
--- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li.svelte
+++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li.svelte
@@ -7,7 +7,7 @@ import type { key_val } from '$lib/ae_stores';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 
 import { liveQuery } from "dexie";
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 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';
diff --git a/src/routes/events/[event_id]/session/[session_id]/+page.svelte b/src/routes/events/[event_id]/session/[session_id]/+page.svelte
index 7a3b8492..7b0e8062 100644
--- a/src/routes/events/[event_id]/session/[session_id]/+page.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/+page.svelte
@@ -17,7 +17,7 @@ let ae_tmp: key_val = {};
 let ae_triggers: key_val = {};
 
 import { liveQuery } from "dexie";
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 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';
diff --git a/src/routes/events/[event_id]/session/[session_id]/session_view.svelte b/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
index 86e7de6b..4c7ddb51 100644
--- a/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
@@ -20,7 +20,7 @@ let ae_promises: key_val = {};
 let ae_tmp: key_val = {};
 let ae_triggers: key_val = {};
 
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 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';
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 9ab40f49..1a49c642 100644
--- a/src/routes/events/ae_comp__event_session_obj_li.svelte
+++ b/src/routes/events/ae_comp__event_session_obj_li.svelte
@@ -8,7 +8,7 @@ import Comp_event_presenter_obj_li from '../events/[event_id]/presenter/ae_comp_
 import Element_manage_event_file_li from '$lib/element_manage_event_file_li_direct.svelte';
 
 // import { liveQuery } from "dexie";
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 // 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';
diff --git a/src/routes/events_speakers/+layout.ts b/src/routes/events_speakers/+layout.ts
index b51e3b0a..61d0e4e0 100644
--- a/src/routes/events_speakers/+layout.ts
+++ b/src/routes/events_speakers/+layout.ts
@@ -6,7 +6,7 @@ console.log(`ae_events_speakers +layout.ts start`);
 
 // 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 { core_func } from '$lib/ae_core/ae_core_functions';
 // import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores';
 import { events_func } from '$lib/ae_events_functions';
 
diff --git a/src/routes/events_speakers/+page.svelte b/src/routes/events_speakers/+page.svelte
index 49a657fa..a2e888db 100644
--- a/src/routes/events_speakers/+page.svelte
+++ b/src/routes/events_speakers/+page.svelte
@@ -17,7 +17,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 { core_func } from '$lib/ae_core/ae_core_functions';
 import { ae_util } from '$lib/ae_utils/ae_utils';
 import type { key_val } from '$lib/ae_stores';
 
diff --git a/src/routes/idaa/(idaa)/bb/+layout.ts b/src/routes/idaa/(idaa)/bb/+layout.ts
index 4d940a61..b38101b5 100644
--- a/src/routes/idaa/(idaa)/bb/+layout.ts
+++ b/src/routes/idaa/(idaa)/bb/+layout.ts
@@ -3,7 +3,7 @@ console.log(`IDAA BB - [account_id] +layout.ts start`);
 
 import { error } from '@sveltejs/kit';
 import { browser } from '$app/environment';
-import { posts_func } from '$lib/ae_posts_functions';
+import { posts_func } from '$lib/ae_posts/ae_posts_functions';
 
 export async function load({ params, parent }) { // route
     let log_lvl = 0;
diff --git a/src/routes/idaa/(idaa)/bb/+page.svelte b/src/routes/idaa/(idaa)/bb/+page.svelte
index 76ced725..17c7a587 100644
--- a/src/routes/idaa/(idaa)/bb/+page.svelte
+++ b/src/routes/idaa/(idaa)/bb/+page.svelte
@@ -12,11 +12,11 @@ import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
 
 import { liveQuery } from "dexie";
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 import { db_posts } from "$lib/db_posts";
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { idaa_loc, idaa_sess, idaa_slct, idaa_trigger } from '$lib/ae_idaa_stores';
-import { posts_func } from '$lib/ae_posts_functions';
+import { posts_func } from '$lib/ae_posts/ae_posts_functions';
 
 import Comp__post_obj_li from './ae_idaa_comp__post_obj_li.svelte';
 import Comp__post_obj_id_view from './ae_idaa_comp__post_obj_id_view.svelte';
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
index 79cef963..dc62dc50 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
@@ -16,7 +16,7 @@ import { idaa_loc, idaa_sess, idaa_slct } from '$lib/ae_idaa_stores';
 // import Comp_event_session_obj_li from '../../events_pres_mgmt/ae_comp__event_session_obj_li.svelte';
 
 import { liveQuery } from "dexie";
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 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_func } from '$lib/ae_events_functions';
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 99401fd8..ca988593 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
@@ -5,7 +5,7 @@ import { fade } from 'svelte/transition';
 // import Editor from '@tinymce/tinymce-svelte';
 
 import { ae_util } from '$lib/ae_utils/ae_utils';
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 import { api } from '$lib/api';
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { idaa_loc, idaa_sess, idaa_slct } from '$lib/ae_idaa_stores';
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 9b9d1e83..eb000a0e 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
@@ -7,7 +7,7 @@ import { onMount } from 'svelte';
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
-import { core_func } from '$lib/ae_core_functions';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 import { idaa_loc, idaa_sess, idaa_slct } from '$lib/ae_idaa_stores';
 import { events_func } from '$lib/ae_events_functions';
 
diff --git a/src/routes/notes/+layout.svelte b/src/routes/notes/+layout.svelte
index 05d929c6..ca783e62 100644
--- a/src/routes/notes/+layout.svelte
+++ b/src/routes/notes/+layout.svelte
@@ -10,8 +10,8 @@ import type { key_val } from '$lib/ae_stores';
 // 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';
-import { notes_func } from '$lib/ae_notes_functions';
+import { notes_loc, notes_slct, notes_trigger } from '$lib/ae_notes/ae_notes_stores';
+import { notes_func } from '$lib/ae_notes/ae_notes_functions';
 
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 
diff --git a/src/routes/notes/+page.svelte b/src/routes/notes/+page.svelte
index efe9ea7c..f2585065 100644
--- a/src/routes/notes/+page.svelte
+++ b/src/routes/notes/+page.svelte
@@ -9,7 +9,7 @@ import { api } from '$lib/api';
 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 { notes_loc, notes_slct, notes_trigger } from '$lib/ae_notes/ae_notes_stores';
 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/notes/+page.ts b/src/routes/notes/+page.ts
index 5ec2dc6b..3fb75b3c 100644
--- a/src/routes/notes/+page.ts
+++ b/src/routes/notes/+page.ts
@@ -1,7 +1,7 @@
 /** @type {import('./$types').PageLoad} */
 
 import { error } from '@sveltejs/kit';
-import { notes_func } from '$lib/ae_notes_functions';
+import { notes_func } from '$lib/ae_notes/ae_notes_functions';
 
 export async function load({ parent }) {
     let log_lvl = 0;
diff --git a/src/routes/sponsorships/+layout.ts b/src/routes/sponsorships/+layout.ts
index 6ff60f7b..4dcb20bc 100644
--- a/src/routes/sponsorships/+layout.ts
+++ b/src/routes/sponsorships/+layout.ts
@@ -7,7 +7,7 @@ console.log(`ae_sponsorships +layout.ts start`);
 // import type { key_val } from '$lib/ae_stores';
 // 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 { core_func } from '$lib/ae_core/ae_core_functions';
 import { spons_func } from '$lib/ae_sponsorships_functions';
 
 
diff --git a/src/routes/sponsorships/+page.svelte b/src/routes/sponsorships/+page.svelte
index 0c9c1814..8faeed86 100644
--- a/src/routes/sponsorships/+page.svelte
+++ b/src/routes/sponsorships/+page.svelte
@@ -17,7 +17,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 { core_func } from '$lib/ae_core/ae_core_functions';
 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';