diff --git a/src/lib/ae_core/ae_comp__hosted_files_clip_video_v1.svelte b/src/lib/ae_core/ae_comp__hosted_files_clip_video_v1.svelte
index 6673ff00..a60c18b8 100644
--- a/src/lib/ae_core/ae_comp__hosted_files_clip_video_v1.svelte
+++ b/src/lib/ae_core/ae_comp__hosted_files_clip_video_v1.svelte
@@ -3,7 +3,7 @@ export let log_lvl: number = 0;
 
 // Imports
 // Import components and elements
-import Element_input_files_tbl from '$lib/element_input_files_tbl.svelte';
+import Element_input_files_tbl from '$lib/elements/element_input_files_tbl.svelte';
 
 // Import storage, functions, and libraries
 import type { key_val } from '$lib/ae_stores';
diff --git a/src/lib/ae_core/ae_comp__hosted_files_upload.svelte b/src/lib/ae_core/ae_comp__hosted_files_upload.svelte
index b0cfd2a2..bedea605 100644
--- a/src/lib/ae_core/ae_comp__hosted_files_upload.svelte
+++ b/src/lib/ae_core/ae_comp__hosted_files_upload.svelte
@@ -3,7 +3,7 @@ export let log_lvl: number = 0;
 
 // Imports
 // Import components and elements
-import Element_input_files_tbl from '$lib/element_input_files_tbl.svelte';
+import Element_input_files_tbl from '$lib/elements/element_input_files_tbl.svelte';
 
 // Import storage, functions, and libraries
 import type { key_val } from '$lib/ae_stores';
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 e896cf9b..17e41993 100644
--- a/src/lib/elements/element_manage_event_file_li_all.svelte
+++ b/src/lib/elements/element_manage_event_file_li_all.svelte
@@ -25,7 +25,7 @@ import type { key_val } from '$lib/ae_stores';
 // 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 Element_manage_event_file_li from '$lib/element_manage_event_file_li.svelte';
+import Element_manage_event_file_li from '$lib/elements/element_manage_event_file_li.svelte';
 
 // 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/elements/element_manage_event_file_li_direct.svelte b/src/lib/elements/element_manage_event_file_li_direct.svelte
index 7991ed52..ef474675 100644
--- a/src/lib/elements/element_manage_event_file_li_direct.svelte
+++ b/src/lib/elements/element_manage_event_file_li_direct.svelte
@@ -27,7 +27,7 @@ import type { key_val } from '$lib/ae_stores';
 // 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 Element_manage_event_file_li from '$lib/element_manage_event_file_li.svelte';
+import Element_manage_event_file_li from '$lib/elements/element_manage_event_file_li.svelte';
 
 // 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/elements/element_manage_hosted_file_li_all.svelte b/src/lib/elements/element_manage_hosted_file_li_all.svelte
index cc2f9a68..7829238c 100644
--- a/src/lib/elements/element_manage_hosted_file_li_all.svelte
+++ b/src/lib/elements/element_manage_hosted_file_li_all.svelte
@@ -7,7 +7,7 @@ import type { key_val } from '$lib/ae_stores';
 // 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 Element_manage_hosted_file_li from '$lib/element_manage_hosted_file_li.svelte';
+import Element_manage_hosted_file_li from '$lib/elements/element_manage_hosted_file_li.svelte';
 
 // 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/elements/element_sql_qry.svelte b/src/lib/elements/element_sql_qry.svelte
index b2a23377..19618b01 100644
--- a/src/lib/elements/element_sql_qry.svelte
+++ b/src/lib/elements/element_sql_qry.svelte
@@ -4,7 +4,7 @@ import { onMount } from 'svelte';
 // *** Import Aether core variables and functions
 import type { key_val } from '$lib/ae_stores';
 // import { api, Element_obj_tbl_row } from 'aether_npm_lib';
-import Element_obj_tbl_row from '$lib/element_obj_tbl_row.svelte';
+import Element_obj_tbl_row from '$lib/elements/element_obj_tbl_row.svelte';
 import { post_object } from '$lib/ae_api/api_post_object';
 
 // *** Import Aether core components
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 79d9690b..958bb821 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -16,7 +16,7 @@ import {
 // import { PUBLIC_TESTING } from '$env/static/public';
 // console.log(`AE Config - +page.svelte PUBLIC_TESTING:`, PUBLIC_TESTING);
 
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 
 // import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
diff --git a/src/routes/admin/+page.svelte b/src/routes/admin/+page.svelte
index e3618ce8..12e0f243 100644
--- a/src/routes/admin/+page.svelte
+++ b/src/routes/admin/+page.svelte
@@ -10,8 +10,8 @@ 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/ae_utils';
 
-import Element_data_store from '$lib/element_data_store_v2.svelte';
-import Element_sql_qry from '$lib/element_sql_qry.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
+import Element_sql_qry from '$lib/elements/element_sql_qry.svelte';
 // import Element_obj_tbl_row from '$lib/element_obj_tbl_row.svelte';
 
 
diff --git a/src/routes/core/person/[person_id]/+page.svelte b/src/routes/core/person/[person_id]/+page.svelte
index 0918bb50..8576a451 100644
--- a/src/routes/core/person/[person_id]/+page.svelte
+++ b/src/routes/core/person/[person_id]/+page.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 Element_ae_crud from '$lib/element_ae_crud.svelte';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 
 import { liveQuery } from "dexie";
 // import { core_func } from '$lib/ae_core_functions';
diff --git a/src/routes/core/person_view.svelte b/src/routes/core/person_view.svelte
index 63845c12..b28443ae 100644
--- a/src/routes/core/person_view.svelte
+++ b/src/routes/core/person_view.svelte
@@ -13,7 +13,7 @@ import { liveQuery } from "dexie";
 import type { key_val } from '$lib/ae_stores';
 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_ae_crud from '$lib/elements/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 
 import { core_func } from '$lib/ae_core/ae_core_functions';
diff --git a/src/routes/events/+layout.svelte b/src/routes/events/+layout.svelte
index 525bcd2b..ec894674 100644
--- a/src/routes/events/+layout.svelte
+++ b/src/routes/events/+layout.svelte
@@ -14,13 +14,11 @@ import {
     RefreshCw,
     Satellite
 } from '@lucide/svelte';
-// import { Modal } from '@skeletonlabs/skeleton-svelte';
 
 // *** Import Aether specific variables and functions
 import type { key_val } from '$lib/ae_stores';
-// import { ae_util } from '$lib/ae_utils/ae_utils';
 import { ae_loc, ae_sess, ae_api, slct } from '$lib/ae_stores';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
 
 interface Props {
@@ -30,9 +28,6 @@ interface Props {
 }
 
 let { data, children }: Props = $props();
-// import { events_func } from '$lib/ae_events_functions';
-
-// import Element_data_store from '$lib/element_data_store_v2.svelte';
 
 $events_loc.qry__enabled = 'enabled';
 $events_loc.qry__hidden = 'not_hidden';
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 9dd20ff3..8f2c34cb 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte
@@ -67,7 +67,7 @@ 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';
 
-import Element_ae_crud from '$lib/element_ae_crud.svelte';
+import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
 
 
 // *** Functions and Logic
diff --git a/src/routes/events/[event_id]/+page.svelte b/src/routes/events/[event_id]/+page.svelte
index c42a7a7c..a1ac93f0 100644
--- a/src/routes/events/[event_id]/+page.svelte
+++ b/src/routes/events/[event_id]/+page.svelte
@@ -28,7 +28,7 @@ import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_ev
 import { events_func } from '$lib/ae_events_functions';
 
 import Comp_event_files_upload from '../ae_comp__event_files_upload.svelte';
-import Element_manage_event_file_li_wrap from '$lib/element_manage_event_file_li_direct.svelte';
+import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_event_file_li_direct.svelte';
 import Event_page_menu from './event_page_menu.svelte';
 
 
diff --git a/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte b/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte
index bff5ee54..3b495d8c 100644
--- a/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte
+++ b/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte
@@ -26,7 +26,7 @@ import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$
 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 Element_ae_crud from '$lib/element_ae_crud.svelte';
+import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
 
 
 if (log_lvl) {
diff --git a/src/routes/events/[event_id]/event_page_menu.svelte b/src/routes/events/[event_id]/event_page_menu.svelte
index da1f82eb..e85ba037 100644
--- a/src/routes/events/[event_id]/event_page_menu.svelte
+++ b/src/routes/events/[event_id]/event_page_menu.svelte
@@ -18,8 +18,8 @@ import { core_func } from '$lib/ae_core/ae_core_functions';
 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 Element_ae_crud from '$lib/element_ae_crud.svelte';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 import Comp__events_menu_nav from '../ae_comp__events_menu_nav.svelte';
 import Comp__pres_mgmt_menu_opts from '../ae_comp__events_menu_opts.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 2fb157ef..276fcc96 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
@@ -27,7 +27,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv }
 
 import Comp_event_files_upload from '../../../ae_comp__event_files_upload.svelte';
 import Comp_event_session_obj_li from '../../../ae_comp__event_session_obj_li.svelte';
-import Element_manage_event_file_li_wrap from '$lib/element_manage_event_file_li_direct.svelte';
+import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_event_file_li_direct.svelte';
 import Location_view from './location_view.svelte';
 import Location_page_menu from './location_page_menu.svelte';
 
diff --git a/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte b/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte
index 52dcfc5e..deb1ee69 100644
--- a/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte
+++ b/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte
@@ -14,8 +14,8 @@ import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$
 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 Element_ae_crud from '$lib/element_ae_crud.svelte';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 import Comp__events_menu_nav from '../../../ae_comp__events_menu_nav.svelte';
 
 let ae_tmp: key_val = $state({});
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 9b82137b..16fc9220 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
@@ -21,8 +21,8 @@ import { liveQuery } from "dexie";
 
 import type { key_val } from '$lib/ae_stores';
 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 Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 
 let ae_promises: key_val = $state({});
 // let ae_tmp: key_val = {};
diff --git a/src/routes/events/[event_id]/locations/+page.svelte b/src/routes/events/[event_id]/locations/+page.svelte
index 333fed35..e5dbeb2a 100644
--- a/src/routes/events/[event_id]/locations/+page.svelte
+++ b/src/routes/events/[event_id]/locations/+page.svelte
@@ -14,7 +14,7 @@ import { onMount } from 'svelte';
 
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 
 let ae_promises: key_val = {};
 let ae_tmp: key_val = {};
diff --git a/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte b/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte
index 57e533a8..504aa487 100644
--- a/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte
+++ b/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte
@@ -22,7 +22,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv }
 import { events_func } from '$lib/ae_events_functions';
 
 import Comp_event_session_obj_li from '../../ae_comp__event_session_obj_li_wrapper.svelte';
-import Element_ae_crud_v2 from '$lib/element_ae_crud_v2.svelte';
+import Element_ae_crud_v2 from '$lib/elements/element_ae_crud_v2.svelte';
 import Comp_event_device_obj_li from './../device/ae_comp__event_device_obj_li_wrapper.svelte';
 
 // if (log_lvl) {
diff --git a/src/routes/events/[event_id]/locations/locations_page_menu.svelte b/src/routes/events/[event_id]/locations/locations_page_menu.svelte
index e0fc68e3..6547abfd 100644
--- a/src/routes/events/[event_id]/locations/locations_page_menu.svelte
+++ b/src/routes/events/[event_id]/locations/locations_page_menu.svelte
@@ -14,7 +14,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv }
 // import { events_func } from '$lib/ae_events_functions';
 
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 import Comp__events_menu_nav from './../../ae_comp__events_menu_nav.svelte';
 
 // let ae_tmp: key_val = {};
diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte
index d08fa34e..9dc4c37a 100644
--- a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte
+++ b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte
@@ -11,7 +11,7 @@ let { data, log_lvl = 0 }: Props = $props();
 import { browser } from '$app/environment';
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 
 import { liveQuery } from "dexie";
 import { Modal } from 'flowbite-svelte';
@@ -22,7 +22,7 @@ import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_ev
 import { events_func } from '$lib/ae_events_functions';
 
 import Comp_event_files_upload from '../../../ae_comp__event_files_upload.svelte';
-import Element_manage_event_file_li_wrap from '$lib/element_manage_event_file_li_direct.svelte';
+import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_event_file_li_direct.svelte';
 import Comp_event_presenter_form_agree from './ae_comp__event_presenter_form_agree.svelte';
 import Presenter_view from './presenter_view.svelte';
 import Presenter_page_menu from './presenter_page_menu.svelte';
diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
index 3ee93c7d..913de9ab 100644
--- a/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
+++ b/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte
@@ -17,7 +17,7 @@ console.log(`ae_events_pres_mgmt session [slug] form_agree.svelte`);
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
 import { api } from '$lib/api/api';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
 
 import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte
index 918df91e..2347a4d8 100644
--- a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte
+++ b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte
@@ -16,8 +16,8 @@ import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$
 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 Element_ae_crud from '$lib/element_ae_crud.svelte';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 import Comp__events_menu_nav from './../../../ae_comp__events_menu_nav.svelte';
 
 let ae_tmp: key_val = $state({});
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 773d5c16..c2511f5c 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
@@ -18,7 +18,7 @@ import { browser } from '$app/environment';
 import type { key_val } from '$lib/ae_stores';
 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_ae_crud from '$lib/elements/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
 
diff --git a/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte b/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte
index 0d1d962a..cfa138c2 100644
--- a/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte
+++ b/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte
@@ -12,7 +12,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv }
 // import { events_func } from '$lib/ae_events_functions';
 
 // import Element_ae_crud from '$lib/element_ae_crud.svelte';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 import Comp__events_menu_nav from './../../ae_comp__events_menu_nav.svelte';
 
 
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 6ec0259d..3ee6af18 100644
--- a/src/routes/events/[event_id]/session/[session_id]/+page.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/+page.svelte
@@ -14,7 +14,7 @@ import { Modal } from 'flowbite-svelte';
 
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 
 let ae_promises: key_val = {};
 let ae_tmp: key_val = {};
@@ -29,7 +29,7 @@ import { events_func } from '$lib/ae_events_functions';
 
 import Comp_event_files_upload from '../../../ae_comp__event_files_upload.svelte';
 import Comp_event_presenter_form_agree from '../../presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte';
-import Element_manage_event_file_li_wrap from '$lib/element_manage_event_file_li_direct.svelte';
+import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_event_file_li_direct.svelte';
 import Session_view from './session_view.svelte';
 import Session_page_menu from './session_page_menu.svelte';
 import Comp_event_session_alert from '../ae_comp__event_session_alert.svelte';
diff --git a/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte b/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
index 7e616fb8..117cdac7 100644
--- a/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte
@@ -17,7 +17,7 @@ import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_ev
 import { events_func } from '$lib/ae_events_functions';
 
 // Import components and elements
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 
 // Local Variables
 let ae_promises: key_val = $state({});
diff --git a/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte b/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte
index 0d59c93f..068c0724 100644
--- a/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte
@@ -22,8 +22,8 @@ import { core_func } from '$lib/ae_core/ae_core_functions';
 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 Element_ae_crud from '$lib/element_ae_crud.svelte';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 import Sign_in_out from '../../sign_in_out.svelte';
 import Comp__events_menu_nav from '../../../ae_comp__events_menu_nav.svelte';
 // import Comp__global_menu_opts from '$lib/ae_comp__global_menu_opts.svelte';
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 52749ab0..4fde2eea 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
@@ -30,7 +30,7 @@ import { Modal } from 'flowbite-svelte';
 
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
-import Element_ae_crud from '$lib/element_ae_crud.svelte';
+import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
 
diff --git a/src/routes/events/ae_comp__event_files_upload.svelte b/src/routes/events/ae_comp__event_files_upload.svelte
index cc6ece09..bef496d4 100644
--- a/src/routes/events/ae_comp__event_files_upload.svelte
+++ b/src/routes/events/ae_comp__event_files_upload.svelte
@@ -36,7 +36,7 @@ let {
 
 // Imports
 // Import components and elements
-import Element_input_files_tbl from '$lib/element_input_files_tbl.svelte';
+import Element_input_files_tbl from '$lib/elements/element_input_files_tbl.svelte';
 
 // Import storage, functions, and libraries
 import type { key_val } from '$lib/ae_stores';
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 06dc42a0..b3c76ba8 100644
--- a/src/routes/events/ae_comp__event_presentation_obj_li.svelte
+++ b/src/routes/events/ae_comp__event_presentation_obj_li.svelte
@@ -24,11 +24,9 @@ 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_kv } from '$lib/ae_events_stores';
-import { events_func } from '$lib/ae_events_functions';
-
-import Element_ae_crud from '$lib/element_ae_crud.svelte';
+import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
 import Comp_event_presenter_obj_li from '../events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte';
-import Element_manage_event_file_li_wrap from '$lib/element_manage_event_file_li_all.svelte';
+import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_event_file_li_all.svelte';
 
 
 // export let link_to_type: string;
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 13cfcea2..c352e999 100644
--- a/src/routes/events/ae_comp__event_session_obj_li.svelte
+++ b/src/routes/events/ae_comp__event_session_obj_li.svelte
@@ -38,10 +38,10 @@ let {
 // *** Import Aether specific variables and functions
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
-import Element_ae_crud_v2 from '$lib/element_ae_crud_v2.svelte';
+import Element_ae_crud_v2 from '$lib/elements/element_ae_crud_v2.svelte';
 // import Element_data_store from '$lib/element_data_store_v2.svelte';
 import Comp_event_presenter_obj_li from '../events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte';
-import Element_manage_event_file_li from '$lib/element_manage_event_file_li_direct.svelte';
+import Element_manage_event_file_li from '$lib/elements/element_manage_event_file_li_direct.svelte';
 
 import Comp_event_session_alert from '../events/[event_id]/session/ae_comp__event_session_alert.svelte';
 
diff --git a/src/routes/events_badges/+page.svelte b/src/routes/events_badges/+page.svelte
index f99d0eaf..f7c3a24a 100644
--- a/src/routes/events_badges/+page.svelte
+++ b/src/routes/events_badges/+page.svelte
@@ -10,7 +10,7 @@ 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/ae_utils';
 
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 
 
 onMount(() => {
diff --git a/src/routes/events_badges/review/+page.svelte b/src/routes/events_badges/review/+page.svelte
index 0e271355..4898880a 100644
--- a/src/routes/events_badges/review/+page.svelte
+++ b/src/routes/events_badges/review/+page.svelte
@@ -14,8 +14,8 @@ import { db_events } from "$lib/ae_events/db_events";
 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 Element_qr_scanner from '$lib/element_qr_scanner.svelte';
-import Element_ae_crud from '$lib/element_ae_crud.svelte';
+import Element_qr_scanner from '$lib/elements/element_qr_scanner.svelte';
+import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
 
 import { goto } from '$app/navigation';
 
diff --git a/src/routes/events_badges/stats/+page.svelte b/src/routes/events_badges/stats/+page.svelte
index d0b31d1a..c9dcadba 100644
--- a/src/routes/events_badges/stats/+page.svelte
+++ b/src/routes/events_badges/stats/+page.svelte
@@ -21,8 +21,8 @@ import { db_events } from "$lib/ae_events/db_events";
 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 Element_qr_scanner from '$lib/element_qr_scanner.svelte';
-import Element_ae_crud from '$lib/element_ae_crud.svelte';
+import Element_qr_scanner from '$lib/elements/element_qr_scanner.svelte';
+import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
 
 import { goto } from '$app/navigation';
 
diff --git a/src/routes/events_leads/+page.svelte b/src/routes/events_leads/+page.svelte
index 1ba9580f..bfd78d88 100644
--- a/src/routes/events_leads/+page.svelte
+++ b/src/routes/events_leads/+page.svelte
@@ -13,7 +13,7 @@ import { db_events } from "$lib/ae_events/db_events";
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
 
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 
 
 let event_exhibit_obj_li = liveQuery(
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 fbfec909..c6d2c55c 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	
@@ -9,7 +9,7 @@ import { ae_loc, ae_sess, ae_api, 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';
 
-import Element_qr_scanner from '$lib/element_qr_scanner.svelte';
+import Element_qr_scanner from '$lib/elements/element_qr_scanner.svelte';
 
 
 // TEMPORARY: For testing and development
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 4bc0d2ce..983dde6a 100644
--- a/src/routes/events_leads/exhibit/[slug]/leads_add_scan.svelte
+++ b/src/routes/events_leads/exhibit/[slug]/leads_add_scan.svelte
@@ -9,9 +9,9 @@ import { ae_loc, ae_sess, ae_api, 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';
 
-import Element_qr_scanner from '$lib/element_qr_scanner.svelte';
-import Element_qr_scanner_v2 from '$lib/element_qr_scanner_v2.svelte';
-import Element_qr_scanner_dev from '$lib/element_qr_scanner_dev.svelte';
+import Element_qr_scanner from '$lib/elements/element_qr_scanner.svelte';
+import Element_qr_scanner_v2 from '$lib/elements/element_qr_scanner_v2.svelte';
+import Element_qr_scanner_dev from '$lib/elements/element_qr_scanner_dev.svelte';
 
 
 // TEMPORARY: For testing and development???
diff --git a/src/routes/events_leads/exhibit/[slug]/leads_list.svelte b/src/routes/events_leads/exhibit/[slug]/leads_list.svelte
index d66f82ed..8b5ce3b1 100644
--- a/src/routes/events_leads/exhibit/[slug]/leads_list.svelte
+++ b/src/routes/events_leads/exhibit/[slug]/leads_list.svelte
@@ -10,7 +10,7 @@ import { ae_loc, ae_sess, ae_api, 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';
 
-import Element_ae_crud from '$lib/element_ae_crud.svelte';
+import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
 import Leads_view_lead from './leads_view_lead.svelte';
 
 let ae_promises: key_val = {};
diff --git a/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte b/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte
index f9401f3b..dc250082 100644
--- a/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte
+++ b/src/routes/events_leads/exhibit/[slug]/leads_manage.svelte
@@ -9,7 +9,7 @@ import { ae_loc, ae_sess, ae_api, 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';
 
-import Element_ae_crud from '$lib/element_ae_crud.svelte';
+import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
 
 // These will likely be used for patch/update triggers. Maybe delete?
 let ae_triggers: key_val = {};
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 a5dc78e4..d7b6e341 100644
--- a/src/routes/events_leads/exhibit/[slug]/leads_view_lead.svelte
+++ b/src/routes/events_leads/exhibit/[slug]/leads_view_lead.svelte
@@ -11,7 +11,7 @@ import { ae_loc, ae_sess, ae_api, 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';
 
-import Element_ae_crud from '$lib/element_ae_crud.svelte';
+import Element_ae_crud from '$lib/elements/element_ae_crud.svelte';
 
 let ae_promises: key_val = {}; // Promise<any>;
 
diff --git a/src/routes/hosted_files/+layout.svelte b/src/routes/hosted_files/+layout.svelte
index 889b0b95..70b82dda 100644
--- a/src/routes/hosted_files/+layout.svelte
+++ b/src/routes/hosted_files/+layout.svelte
@@ -19,7 +19,7 @@ import {
 // 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/ae_core_functions';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 
 interface Props {
     /** @type {import('./$types').LayoutData} */
diff --git a/src/routes/hosted_files/+page.svelte b/src/routes/hosted_files/+page.svelte
index cb98ab77..b0464cc2 100644
--- a/src/routes/hosted_files/+page.svelte
+++ b/src/routes/hosted_files/+page.svelte
@@ -10,7 +10,7 @@ import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 import type { key_val } from '$lib/ae_stores';
 
 
-import Element_manage_hosted_file_li_wrap from '$lib/element_manage_hosted_file_li_all.svelte';
+import Element_manage_hosted_file_li_wrap from '$lib/elements/element_manage_hosted_file_li_all.svelte';
 
 let { data } = $props();
 
diff --git a/src/routes/hosted_files/video_util/+page.svelte b/src/routes/hosted_files/video_util/+page.svelte
index 719debdc..a4e4e2ad 100644
--- a/src/routes/hosted_files/video_util/+page.svelte
+++ b/src/routes/hosted_files/video_util/+page.svelte
@@ -15,7 +15,7 @@ import Comp_hosted_files_upload from '$lib/ae_core/ae_comp__hosted_files_upload.
 import Comp_hosted_files_clip_video from '$lib/ae_core/ae_comp__hosted_files_clip_video.svelte';
 import Comp_hosted_files_clip_video_li from '$lib/ae_core/ae_comp__hosted_files_clip_video_li.svelte';
 
-import Element_manage_hosted_file_li_wrap from '$lib/element_manage_hosted_file_li_all.svelte';
+import Element_manage_hosted_file_li_wrap from '$lib/elements/element_manage_hosted_file_li_all.svelte';
 
 let { data } = $props();
 
diff --git a/src/routes/hosted_files/video_util/hold_video_util.svelte b/src/routes/hosted_files/video_util/hold_video_util.svelte
index 1f6de9fc..cbc3eb93 100644
--- a/src/routes/hosted_files/video_util/hold_video_util.svelte
+++ b/src/routes/hosted_files/video_util/hold_video_util.svelte
@@ -9,7 +9,7 @@ import Comp_hosted_files_upload from '$lib/ae_core/ae_comp__hosted_files_upload.
 import Comp_hosted_files_clip_video from '$lib/ae_core/ae_comp__hosted_files_clip_video.svelte';
 import Comp_hosted_files_clip_video_li from '$lib/ae_core/ae_comp__hosted_files_clip_video_li.svelte';
 
-import Element_manage_hosted_file_li_wrap from '$lib/element_manage_hosted_file_li_all.svelte';
+import Element_manage_hosted_file_li_wrap from '$lib/elements/element_manage_hosted_file_li_all.svelte';
 
 
 let log_lvl = 1;
diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte
index 8e65e82d..b631eaec 100644
--- a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte
+++ b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte
@@ -11,9 +11,9 @@ import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$
 import { idaa_loc, idaa_sess, idaa_slct } from '$lib/ae_idaa_stores';
 import { archives_func } from '$lib/ae_archives/ae_archives_functions';
 
-import Tiptap_editor from '$lib/element_tiptap_editor.svelte';
+import Tiptap_editor from '$lib/elements/element_tiptap_editor.svelte';
 import Comp_hosted_files_upload from '$lib/ae_core/ae_comp__hosted_files_upload.svelte';
-import Element_manage_hosted_file_li_wrap from '$lib/element_manage_hosted_file_li_all.svelte';
+import Element_manage_hosted_file_li_wrap from '$lib/elements/element_manage_hosted_file_li_all.svelte';
 
 interface Props {
     log_lvl?: number;
diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_obj_id_edit.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_obj_id_edit.svelte
index 7eea5544..795c967a 100644
--- a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_obj_id_edit.svelte
+++ b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_obj_id_edit.svelte
@@ -12,7 +12,7 @@ import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$
 import { idaa_loc, idaa_sess, idaa_slct } from '$lib/ae_idaa_stores';
 import { archives_func } from '$lib/ae_archives/ae_archives_functions';
 
-import Tiptap_editor from '$lib/element_tiptap_editor.svelte';
+import Tiptap_editor from '$lib/elements/element_tiptap_editor.svelte';
 
 interface Props {
     log_lvl?: number;
diff --git a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_comment_obj_id_edit.svelte b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_comment_obj_id_edit.svelte
index f5b4c47f..94fa1f2f 100644
--- a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_comment_obj_id_edit.svelte
+++ b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_comment_obj_id_edit.svelte
@@ -26,7 +26,7 @@ import { api } from '$lib/api/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';
 import { posts_func } from '$lib/ae_posts/ae_posts_functions';
-import Tiptap_editor from '$lib/element_tiptap_editor.svelte';
+import Tiptap_editor from '$lib/elements/element_tiptap_editor.svelte';
 
 let prom_api__post_comment_obj: any = $state();
 
diff --git a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_obj_id_edit.svelte b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_obj_id_edit.svelte
index 5791fdc2..832a8f1d 100644
--- a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_obj_id_edit.svelte
+++ b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_obj_id_edit.svelte
@@ -27,7 +27,7 @@ import { api } from '$lib/api/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';
 import { posts_func } from '$lib/ae_posts/ae_posts_functions';
-import Tiptap_editor from '$lib/element_tiptap_editor.svelte';
+import Tiptap_editor from '$lib/elements/element_tiptap_editor.svelte';
 import Comp_hosted_files_upload from '$lib/ae_core/ae_comp__hosted_files_upload.svelte';
 
 // let obj_changed = $state(false);
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
index 8e48d5c3..3c1724ad 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte
@@ -26,7 +26,7 @@ import { db_events } from "$lib/ae_events/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';
 
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 
 import Comp__event_obj_qry from './ae_idaa_comp__event_obj_qry.svelte';
 import Comp__event_obj_li_wrapper from './ae_idaa_comp__event_obj_li_wrapper.svelte';
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 c3edba41..b6747a11 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
@@ -29,7 +29,7 @@ import { api } from '$lib/api/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, idaa_trig } from '$lib/ae_idaa_stores';
 import { events_func } from '$lib/ae_events_functions';
-import Tiptap_editor from '$lib/element_tiptap_editor.svelte';
+import Tiptap_editor from '$lib/elements/element_tiptap_editor.svelte';
 
 // export let container_class_li = [];
 
diff --git a/src/routes/idaa/+layout.svelte b/src/routes/idaa/+layout.svelte
index cf910002..72478755 100644
--- a/src/routes/idaa/+layout.svelte
+++ b/src/routes/idaa/+layout.svelte
@@ -22,7 +22,7 @@ import {
 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/ae_core_functions';
 import { idaa_loc, idaa_sess, idaa_slct } from '$lib/ae_idaa_stores';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 
 // const modalRegistry: Record<string, ModalComponent> = {
 // 	// Set a unique modal ID, then pass the component reference
diff --git a/src/routes/journals/+layout.svelte b/src/routes/journals/+layout.svelte
index 7902819e..ef1177b9 100644
--- a/src/routes/journals/+layout.svelte
+++ b/src/routes/journals/+layout.svelte
@@ -22,7 +22,7 @@ import type { key_val } from '$lib/ae_stores';
 import { ae_loc, ae_sess, ae_api, slct } from '$lib/ae_stores';
 import { journals_loc, journals_slct, journals_trig } from '$lib/ae_journals/ae_journals_stores';
 // import { journals_func } from '$lib/ae_journals/ae_journals_functions';
-import Element_data_store from '$lib/element_data_store_v2.svelte';
+import Element_data_store from '$lib/elements/element_data_store_v2.svelte';
 import Help_tech from '$lib/app_components/e_app_help_tech.svelte';
 
 // *** Setup Svelte properties
diff --git a/src/routes/journals/ae_comp__journal_entry_obj_file_li.svelte b/src/routes/journals/ae_comp__journal_entry_obj_file_li.svelte
index 5e20df9b..2bdec091 100644
--- a/src/routes/journals/ae_comp__journal_entry_obj_file_li.svelte
+++ b/src/routes/journals/ae_comp__journal_entry_obj_file_li.svelte
@@ -9,7 +9,7 @@ import { journals_loc, journals_sess, journals_slct, journals_trig, journals_pro
 import { journals_func } from '$lib/ae_journals/ae_journals_functions';
 
 import Comp_hosted_files_upload from '$lib/ae_core/ae_comp__hosted_files_upload.svelte';
-import Element_manage_hosted_file_li_wrap from '$lib/element_manage_hosted_file_li_all.svelte';
+import Element_manage_hosted_file_li_wrap from '$lib/elements/element_manage_hosted_file_li_all.svelte';
 
 
 interface Props {