diff --git a/src/lib/api.ts b/src/lib/api/api.ts
similarity index 100%
rename from src/lib/api.ts
rename to src/lib/api/api.ts
diff --git a/src/lib/analytics.svelte b/src/lib/app_components/analytics.svelte
similarity index 100%
rename from src/lib/analytics.svelte
rename to src/lib/app_components/analytics.svelte
diff --git a/src/lib/e_app_access_type.svelte b/src/lib/app_components/e_app_access_type.svelte
similarity index 100%
rename from src/lib/e_app_access_type.svelte
rename to src/lib/app_components/e_app_access_type.svelte
diff --git a/src/lib/e_app_cfg.svelte b/src/lib/app_components/e_app_cfg.svelte
similarity index 100%
rename from src/lib/e_app_cfg.svelte
rename to src/lib/app_components/e_app_cfg.svelte
diff --git a/src/lib/e_app_clipboard.svelte b/src/lib/app_components/e_app_clipboard.svelte
similarity index 100%
rename from src/lib/e_app_clipboard.svelte
rename to src/lib/app_components/e_app_clipboard.svelte
diff --git a/src/lib/e_app_codemirror_v5.svelte b/src/lib/app_components/e_app_codemirror_v5.svelte
similarity index 100%
rename from src/lib/e_app_codemirror_v5.svelte
rename to src/lib/app_components/e_app_codemirror_v5.svelte
diff --git a/src/lib/e_app_debug_menu.svelte b/src/lib/app_components/e_app_debug_menu.svelte
similarity index 100%
rename from src/lib/e_app_debug_menu.svelte
rename to src/lib/app_components/e_app_debug_menu.svelte
diff --git a/src/lib/e_app_help_tech.svelte b/src/lib/app_components/e_app_help_tech.svelte
similarity index 100%
rename from src/lib/e_app_help_tech.svelte
rename to src/lib/app_components/e_app_help_tech.svelte
diff --git a/src/lib/e_app_sign_in_out.svelte b/src/lib/app_components/e_app_sign_in_out.svelte
similarity index 100%
rename from src/lib/e_app_sign_in_out.svelte
rename to src/lib/app_components/e_app_sign_in_out.svelte
diff --git a/src/lib/e_app_sys_menu.svelte b/src/lib/app_components/e_app_sys_menu.svelte
similarity index 100%
rename from src/lib/e_app_sys_menu.svelte
rename to src/lib/app_components/e_app_sys_menu.svelte
diff --git a/src/lib/e_app_theme.svelte b/src/lib/app_components/e_app_theme.svelte
similarity index 100%
rename from src/lib/e_app_theme.svelte
rename to src/lib/app_components/e_app_theme.svelte
diff --git a/src/lib/electron_native.js b/src/lib/electron/electron_native.js
similarity index 100%
rename from src/lib/electron_native.js
rename to src/lib/electron/electron_native.js
diff --git a/src/lib/electron_relay.js b/src/lib/electron/electron_relay.js
similarity index 100%
rename from src/lib/electron_relay.js
rename to src/lib/electron/electron_relay.js
diff --git a/src/lib/element_ae_crud.svelte b/src/lib/elements/element_ae_crud.svelte
similarity index 100%
rename from src/lib/element_ae_crud.svelte
rename to src/lib/elements/element_ae_crud.svelte
diff --git a/src/lib/element_ae_crud_v2.svelte b/src/lib/elements/element_ae_crud_v2.svelte
similarity index 100%
rename from src/lib/element_ae_crud_v2.svelte
rename to src/lib/elements/element_ae_crud_v2.svelte
diff --git a/src/lib/element_data_store.svelte b/src/lib/elements/element_data_store.svelte
similarity index 100%
rename from src/lib/element_data_store.svelte
rename to src/lib/elements/element_data_store.svelte
diff --git a/src/lib/element_data_store_v2.svelte b/src/lib/elements/element_data_store_v2.svelte
similarity index 100%
rename from src/lib/element_data_store_v2.svelte
rename to src/lib/elements/element_data_store_v2.svelte
diff --git a/src/lib/element_input_file.svelte b/src/lib/elements/element_input_file.svelte
similarity index 100%
rename from src/lib/element_input_file.svelte
rename to src/lib/elements/element_input_file.svelte
diff --git a/src/lib/element_input_files_tbl.svelte b/src/lib/elements/element_input_files_tbl.svelte
similarity index 100%
rename from src/lib/element_input_files_tbl.svelte
rename to src/lib/elements/element_input_files_tbl.svelte
diff --git a/src/lib/element_input_v2.svelte b/src/lib/elements/element_input_v2.svelte
similarity index 100%
rename from src/lib/element_input_v2.svelte
rename to src/lib/elements/element_input_v2.svelte
diff --git a/src/lib/element_manage_event_file_li.svelte b/src/lib/elements/element_manage_event_file_li.svelte
similarity index 100%
rename from src/lib/element_manage_event_file_li.svelte
rename to src/lib/elements/element_manage_event_file_li.svelte
diff --git a/src/lib/element_manage_event_file_li_all.svelte b/src/lib/elements/element_manage_event_file_li_all.svelte
similarity index 100%
rename from src/lib/element_manage_event_file_li_all.svelte
rename to src/lib/elements/element_manage_event_file_li_all.svelte
diff --git a/src/lib/element_manage_event_file_li_direct.svelte b/src/lib/elements/element_manage_event_file_li_direct.svelte
similarity index 100%
rename from src/lib/element_manage_event_file_li_direct.svelte
rename to src/lib/elements/element_manage_event_file_li_direct.svelte
diff --git a/src/lib/element_manage_hosted_file_li.svelte b/src/lib/elements/element_manage_hosted_file_li.svelte
similarity index 100%
rename from src/lib/element_manage_hosted_file_li.svelte
rename to src/lib/elements/element_manage_hosted_file_li.svelte
diff --git a/src/lib/element_manage_hosted_file_li_all.svelte b/src/lib/elements/element_manage_hosted_file_li_all.svelte
similarity index 100%
rename from src/lib/element_manage_hosted_file_li_all.svelte
rename to src/lib/elements/element_manage_hosted_file_li_all.svelte
diff --git a/src/lib/element_obj_tbl_row.svelte b/src/lib/elements/element_obj_tbl_row.svelte
similarity index 100%
rename from src/lib/element_obj_tbl_row.svelte
rename to src/lib/elements/element_obj_tbl_row.svelte
diff --git a/src/lib/element_sql_qry.svelte b/src/lib/elements/element_sql_qry.svelte
similarity index 100%
rename from src/lib/element_sql_qry.svelte
rename to src/lib/elements/element_sql_qry.svelte
diff --git a/src/lib/element_tiptap_editor.scss b/src/lib/elements/element_tiptap_editor.scss
similarity index 100%
rename from src/lib/element_tiptap_editor.scss
rename to src/lib/elements/element_tiptap_editor.scss
diff --git a/src/lib/element_tiptap_editor.svelte b/src/lib/elements/element_tiptap_editor.svelte
similarity index 100%
rename from src/lib/element_tiptap_editor.svelte
rename to src/lib/elements/element_tiptap_editor.svelte
diff --git a/src/lib/element_websocket_v2.svelte b/src/lib/elements/element_websocket_v2.svelte
similarity index 100%
rename from src/lib/element_websocket_v2.svelte
rename to src/lib/elements/element_websocket_v2.svelte
diff --git a/src/lib/ae_events_stores.ts b/src/lib/stores/ae_events_stores.ts
similarity index 100%
rename from src/lib/ae_events_stores.ts
rename to src/lib/stores/ae_events_stores.ts
diff --git a/src/lib/ae_idaa_stores.ts b/src/lib/stores/ae_idaa_stores.ts
similarity index 100%
rename from src/lib/ae_idaa_stores.ts
rename to src/lib/stores/ae_idaa_stores.ts
diff --git a/src/lib/ae_stores.ts b/src/lib/stores/ae_stores.ts
similarity index 100%
rename from src/lib/ae_stores.ts
rename to src/lib/stores/ae_stores.ts
diff --git a/src/lib/ae_string_snippets.ts b/src/lib/utils/ae_string_snippets.ts
similarity index 100%
rename from src/lib/ae_string_snippets.ts
rename to src/lib/utils/ae_string_snippets.ts
diff --git a/src/lib/index.ts b/src/lib/utils/index.ts
similarity index 100%
rename from src/lib/index.ts
rename to src/lib/utils/index.ts
diff --git a/src/lib/utils.ts b/src/lib/utils/utils.ts
similarity index 100%
rename from src/lib/utils.ts
rename to src/lib/utils/utils.ts