diff --git a/src/lib/app_components/e_app_sys_menu.svelte b/src/lib/app_components/e_app_sys_menu.svelte
index 1c687f42..6a62bca5 100644
--- a/src/lib/app_components/e_app_sys_menu.svelte
+++ b/src/lib/app_components/e_app_sys_menu.svelte
@@ -24,10 +24,10 @@ import {
 // import { ae_util } from '$lib/ae_utils/ae_utils';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 
-import Element_access_type from '$lib/e_app_access_type.svelte';
-import Element_app_cfg from '$lib/e_app_cfg.svelte';
-import Element_sign_in_out from '$lib/e_app_sign_in_out.svelte';
-import Element_theme from '$lib/e_app_theme.svelte';
+import Element_access_type from '$lib/app_components/e_app_access_type.svelte';
+import Element_app_cfg from '$lib/app_components/e_app_cfg.svelte';
+import Element_sign_in_out from '$lib/app_components/e_app_sign_in_out.svelte';
+import Element_theme from '$lib/app_components/e_app_theme.svelte';
 
 // *** Setup Svelte properties
 interface Props {
diff --git a/src/lib/elements/element_manage_event_file_li.svelte b/src/lib/elements/element_manage_event_file_li.svelte
index 584ba026..e43441f7 100644
--- a/src/lib/elements/element_manage_event_file_li.svelte
+++ b/src/lib/elements/element_manage_event_file_li.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { onMount } from 'svelte';
 // import { liveQuery } from "dexie";
-import MyClipboard from '$lib/e_app_clipboard.svelte';
+import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
 
 import type { key_val } from '$lib/ae_stores';
 import { ae_util } from '$lib/ae_utils/ae_utils';
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 26762a23..b87c185d 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -48,9 +48,9 @@ import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
 import { events_loc, events_slct } from '$lib/ae_events_stores';
 // import type { key_val } from '$lib/ae_stores';
 
-import MyClipboard from '$lib/e_app_clipboard.svelte';
-import E_app_debug_menu from '$lib/e_app_debug_menu.svelte';
-import E_app_sys_menu from '$lib/e_app_sys_menu.svelte';
+import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
+import E_app_debug_menu from '$lib/app_components/e_app_debug_menu.svelte';
+import E_app_sys_menu from '$lib/app_components/e_app_sys_menu.svelte';
 // import Element_access_type from '$lib/element_access_type.svelte';
 // import Element_app_cfg from '$lib/element_app_cfg.svelte';
 // import Element_sign_in_out from '$lib/element_sign_in_out.svelte';
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 9cf13b37..d08fa34e 100644
--- a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte
+++ b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte
@@ -26,7 +26,7 @@ import Element_manage_event_file_li_wrap from '$lib/element_manage_event_file_li
 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';
-import MyClipboard from '$lib/e_app_clipboard.svelte';
+import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
 
 
 // Exports
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 6e2372ea..773d5c16 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
@@ -20,7 +20,7 @@ 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 MyClipboard from '$lib/e_app_clipboard.svelte';
+import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
 
 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';
diff --git a/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_profile.svelte b/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_profile.svelte
index a6e0497e..97255d9a 100644
--- a/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_profile.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_profile.svelte
@@ -20,7 +20,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 } from '$lib/ae_events_stores';
 import { events_func } from '$lib/ae_events_functions';
 // import { db_events } from "$lib/db_events";
-import MyClipboard from '$lib/e_app_clipboard.svelte';
+import MyClipboard from '$lib/app_components/e_app_clipboard.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 2db8e4a0..52749ab0 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
@@ -32,7 +32,7 @@ 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 MyClipboard from '$lib/e_app_clipboard.svelte';
+import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
 
 let ae_promises: key_val = $state({});
 let ae_tmp: key_val = $state({});
diff --git a/src/routes/events/ae_comp__event_file_obj_tbl.svelte b/src/routes/events/ae_comp__event_file_obj_tbl.svelte
index 0956a177..9fd42c82 100644
--- a/src/routes/events/ae_comp__event_file_obj_tbl.svelte
+++ b/src/routes/events/ae_comp__event_file_obj_tbl.svelte
@@ -41,7 +41,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_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
 // import { events_func } from '$lib/ae_events_functions';
-import MyClipboard from '$lib/e_app_clipboard.svelte';
+import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
 
 
 // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
diff --git a/src/routes/idaa/(idaa)/archives/+page.svelte b/src/routes/idaa/(idaa)/archives/+page.svelte
index 809abe28..cf0ce9a3 100644
--- a/src/routes/idaa/(idaa)/archives/+page.svelte
+++ b/src/routes/idaa/(idaa)/archives/+page.svelte
@@ -27,7 +27,7 @@ import { idaa_loc, idaa_sess, idaa_slct, idaa_trig } from '$lib/ae_idaa_stores';
 // import { archives_func } from '$lib/ae_archives/ae_archives_functions';
 
 import Comp__archive_obj_li from './ae_idaa_comp__archive_obj_li.svelte';
-import Help_tech from '$lib/e_app_help_tech.svelte';
+import Help_tech from '$lib/app_components/e_app_help_tech.svelte';
 
 
 let lq__archive_obj_li = $derived(liveQuery(async () => {
diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte
index 32a4b9c1..96b359e9 100644
--- a/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte
+++ b/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte
@@ -34,7 +34,7 @@ import Archive_content_obj_li from './ae_idaa_comp__archive_content_obj_li.svelt
 import Archive_content_obj_id_edit from './ae_idaa_comp__archive_content_obj_id_edit.svelte';
 // import Media_player from './../ae_idaa_comp__media_player.svelte';
 import Modal_media_player from './ae_idaa_comp__modal_media_player.svelte';
-import Help_tech from '$lib/e_app_help_tech.svelte';
+import Help_tech from '$lib/app_components/e_app_help_tech.svelte';
 
 
 // let ae_promises: key_val = {};
diff --git a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_options.svelte b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_options.svelte
index df774ce4..8480568f 100644
--- a/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_options.svelte
+++ b/src/routes/idaa/(idaa)/bb/ae_idaa_comp__post_options.svelte
@@ -17,7 +17,7 @@ import { goto } from '$app/navigation';
 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, idaa_prom } from '$lib/ae_idaa_stores';
 import { posts_func } from '$lib/ae_posts/ae_posts_functions';
-import Help_tech from '$lib/e_app_help_tech.svelte';
+import Help_tech from '$lib/app_components/e_app_help_tech.svelte';
 
 // let ae_promises: key_val = {};
 // let ae_tmp: key_val = {};
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte b/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte
index 50864248..42d4effa 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/[event_id]/+page.svelte
@@ -25,7 +25,7 @@ import { idaa_loc, idaa_sess, idaa_slct, idaa_trig, idaa_prom } from '$lib/ae_id
 
 import Event_obj_id_edit from '.././ae_idaa_comp__event_obj_id_edit.svelte';
 import Event_obj_id_view from '.././ae_idaa_comp__event_obj_id_view.svelte';
-import Help_tech from '$lib/e_app_help_tech.svelte';
+import Help_tech from '$lib/app_components/e_app_help_tech.svelte';
 
 // *** Quickly pull out data from parent(s)
 let ae_acct = data[$slct.account_id];
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_view.svelte b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_view.svelte
index 8fe255e5..7448daf2 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_view.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_view.svelte
@@ -6,7 +6,7 @@ import { browser } from '$app/environment';
 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 { idaa_loc, idaa_sess, idaa_slct, idaa_trig } from '$lib/ae_idaa_stores';
-import MyClipboard from '$lib/e_app_clipboard.svelte';
+import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
 
 export let lq__event_obj: any;
 
diff --git a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_li.svelte b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_li.svelte
index 9286c3aa..6f64919f 100644
--- a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_li.svelte
+++ b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_li.svelte
@@ -28,7 +28,7 @@ import { ae_util } from '$lib/ae_utils/ae_utils';
 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 { idaa_loc, idaa_sess, idaa_slct, idaa_trig } from '$lib/ae_idaa_stores';
-import MyClipboard from '$lib/e_app_clipboard.svelte';
+import MyClipboard from '$lib/app_components/e_app_clipboard.svelte';
 
 
 if (browser) {
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 2ab0cec2..a1022723 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
@@ -22,7 +22,7 @@ import { core_func } from '$lib/ae_core/ae_core_functions';
 import { idaa_loc, idaa_sess, idaa_slct, idaa_trig, idaa_prom } from '$lib/ae_idaa_stores';
 import { events_func } from '$lib/ae_events_functions';
 
-import Help_tech from '$lib/e_app_help_tech.svelte';
+import Help_tech from '$lib/app_components/e_app_help_tech.svelte';
 
 // export let event_id_random_li: Array<string>;
 
diff --git a/src/routes/journals/+layout.svelte b/src/routes/journals/+layout.svelte
index 1bd4e54e..7902819e 100644
--- a/src/routes/journals/+layout.svelte
+++ b/src/routes/journals/+layout.svelte
@@ -23,7 +23,7 @@ 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 Help_tech from '$lib/e_app_help_tech.svelte';
+import Help_tech from '$lib/app_components/e_app_help_tech.svelte';
 
 // *** Setup Svelte properties
 interface Props {
diff --git a/src/routes/journals/ae_comp__journal_entry_obj_id_view.svelte b/src/routes/journals/ae_comp__journal_entry_obj_id_view.svelte
index d6c2a6f4..1d9f80ab 100644
--- a/src/routes/journals/ae_comp__journal_entry_obj_id_view.svelte
+++ b/src/routes/journals/ae_comp__journal_entry_obj_id_view.svelte
@@ -51,7 +51,7 @@ let llm_api_model = $journals_loc?.llm__api_model; // 'dgrzone-deepseek-8b-quick
 
 // import E_app_codemirror from '$lib/e_app_codemirror.svelte';
 // import E_app_codemirror_v4 from '$lib/e_app_codemirror_v4.svelte';
-import E_app_codemirror_v5 from '$lib/e_app_codemirror_v5.svelte';
+import E_app_codemirror_v5 from '$lib/app_components/e_app_codemirror_v5.svelte';
 // import {javascript} from "@codemirror/lang-javascript";
 // import {markdown} from "@codemirror/lang-markdown";
 
diff --git a/src/routes/journals/modal_journals_config.svelte b/src/routes/journals/modal_journals_config.svelte
index fb8e8a29..90a42113 100644
--- a/src/routes/journals/modal_journals_config.svelte
+++ b/src/routes/journals/modal_journals_config.svelte
@@ -33,7 +33,7 @@ import { Modal } from 'flowbite-svelte';
 
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
 import { journals_loc, journals_sess, journals_slct, journals_prom, journals_trig } from '$lib/ae_journals/ae_journals_stores';
-import E_app_codemirror_v5 from '$lib/e_app_codemirror_v5.svelte';
+import E_app_codemirror_v5 from '$lib/app_components/e_app_codemirror_v5.svelte';
 
 </script>