diff --git a/src/lib/ae_events__event.ts b/src/lib/ae_events/ae_events__event.ts
similarity index 100%
rename from src/lib/ae_events__event.ts
rename to src/lib/ae_events/ae_events__event.ts
diff --git a/src/lib/ae_events__event_badge.ts b/src/lib/ae_events/ae_events__event_badge.ts
similarity index 100%
rename from src/lib/ae_events__event_badge.ts
rename to src/lib/ae_events/ae_events__event_badge.ts
diff --git a/src/lib/ae_events__event_device.ts b/src/lib/ae_events/ae_events__event_device.ts
similarity index 100%
rename from src/lib/ae_events__event_device.ts
rename to src/lib/ae_events/ae_events__event_device.ts
diff --git a/src/lib/ae_events__event_file.ts b/src/lib/ae_events/ae_events__event_file.ts
similarity index 100%
rename from src/lib/ae_events__event_file.ts
rename to src/lib/ae_events/ae_events__event_file.ts
diff --git a/src/lib/ae_events__event_location.ts b/src/lib/ae_events/ae_events__event_location.ts
similarity index 99%
rename from src/lib/ae_events__event_location.ts
rename to src/lib/ae_events/ae_events__event_location.ts
index c69477ba..7849f9e1 100644
--- a/src/lib/ae_events__event_location.ts
+++ b/src/lib/ae_events/ae_events__event_location.ts
@@ -3,8 +3,8 @@ import { api } from '$lib/api';
 
 import { db_events } from "$lib/db_events";
 
-import { load_ae_obj_li__event_device } from "$lib/ae_events__event_device";
-import { load_ae_obj_li__event_file } from "$lib/ae_events__event_file";
+import { load_ae_obj_li__event_device } from "$lib/ae_events/ae_events__event_device";
+import { load_ae_obj_li__event_file } from "$lib/ae_events/ae_events__event_file";
 import { load_ae_obj_li__event_session } from './ae_events__event_session';
 
 let ae_promises: key_val = {};
diff --git a/src/lib/ae_events__event_presentation.ts b/src/lib/ae_events/ae_events__event_presentation.ts
similarity index 98%
rename from src/lib/ae_events__event_presentation.ts
rename to src/lib/ae_events/ae_events__event_presentation.ts
index a34fe327..e456bbde 100644
--- a/src/lib/ae_events__event_presentation.ts
+++ b/src/lib/ae_events/ae_events__event_presentation.ts
@@ -2,8 +2,8 @@ import type { key_val } from '$lib/ae_stores';
 import { api } from '$lib/api';
 
 import { db_events } from "$lib/db_events";
-import { load_ae_obj_li__event_file } from "$lib/ae_events__event_file";
-import { load_ae_obj_li__event_presenter } from "$lib/ae_events__event_presenter";
+import { load_ae_obj_li__event_file } from "$lib/ae_events/ae_events__event_file";
+import { load_ae_obj_li__event_presenter } from "$lib/ae_events/ae_events__event_presenter";
 
 let ae_promises: key_val = {};
 
diff --git a/src/lib/ae_events__event_presenter.ts b/src/lib/ae_events/ae_events__event_presenter.ts
similarity index 99%
rename from src/lib/ae_events__event_presenter.ts
rename to src/lib/ae_events/ae_events__event_presenter.ts
index f731f28e..09d71d06 100644
--- a/src/lib/ae_events__event_presenter.ts
+++ b/src/lib/ae_events/ae_events__event_presenter.ts
@@ -2,7 +2,7 @@ import type { key_val } from '$lib/ae_stores';
 import { api } from '$lib/api';
 
 import { db_events } from "$lib/db_events";
-import { load_ae_obj_li__event_file } from "$lib/ae_events__event_file";
+import { load_ae_obj_li__event_file } from "$lib/ae_events/ae_events__event_file";
 
 let ae_promises: key_val = {};
 
diff --git a/src/lib/ae_events__event_session.ts b/src/lib/ae_events/ae_events__event_session.ts
similarity index 99%
rename from src/lib/ae_events__event_session.ts
rename to src/lib/ae_events/ae_events__event_session.ts
index 9f3497db..bc2db6df 100644
--- a/src/lib/ae_events__event_session.ts
+++ b/src/lib/ae_events/ae_events__event_session.ts
@@ -3,8 +3,8 @@ import { api } from '$lib/api';
 
 import { db_events } from "$lib/db_events";
 
-import { load_ae_obj_li__event_file } from "$lib/ae_events__event_file";
-import { load_ae_obj_li__event_presentation } from "$lib/ae_events__event_presentation";
+import { load_ae_obj_li__event_file } from "$lib/ae_events/ae_events__event_file";
+import { load_ae_obj_li__event_presentation } from "$lib/ae_events/ae_events__event_presentation";
 
 let ae_promises: key_val = {};
 
diff --git a/src/lib/ae_events__exhibit.ts b/src/lib/ae_events/ae_events__exhibit.ts
similarity index 100%
rename from src/lib/ae_events__exhibit.ts
rename to src/lib/ae_events/ae_events__exhibit.ts
diff --git a/src/lib/ae_events_functions.ts b/src/lib/ae_events_functions.ts
index 14738fbd..f6afccde 100644
--- a/src/lib/ae_events_functions.ts
+++ b/src/lib/ae_events_functions.ts
@@ -1,8 +1,8 @@
 // This file is used to export all the functions that are used for Aether Events related functions.
 
 // Import all the functions from this library:
-import * as events from "$lib/ae_events__event";
-import * as events_device from "$lib/ae_events__event_device";
+import * as events from "$lib/ae_events/ae_events__event";
+import * as events_device from "$lib/ae_events/ae_events__event_device";
 
 import {
     load_ae_obj_id__event_file,
@@ -13,7 +13,7 @@ import {
     qry__event_file,
     search__event_file,
     db_save_ae_obj_li__event_file,
-} from "$lib/ae_events__event_file";
+} from "$lib/ae_events/ae_events__event_file";
 
 import {
     handle_load_ae_obj_id__exhibit,
@@ -24,7 +24,7 @@ import {
     handle_update_ae_obj__exhibit_tracking,
     handle_download_export__event_exhibit_tracking,
     handle_db_save_ae_obj_li__exhibitor,
-} from "$lib/ae_events__exhibit";
+} from "$lib/ae_events/ae_events__exhibit";
 
 import {
     load_ae_obj_id__event_location,
@@ -32,7 +32,7 @@ import {
     create_ae_obj__event_location,
     update_ae_obj__event_location,
     db_save_ae_obj_li__event_location,
-} from "$lib/ae_events__event_location";
+} from "$lib/ae_events/ae_events__event_location";
 
 import {
     load_ae_obj_id__event_session,
@@ -43,7 +43,7 @@ import {
     search__event_session,
     db_save_ae_obj_li__event_session,
     email_sign_in__event_session,
-} from "$lib/ae_events__event_session";
+} from "$lib/ae_events/ae_events__event_session";
 
 import {
     load_ae_obj_id__event_presentation,
@@ -51,7 +51,7 @@ import {
     create_ae_obj__event_presentation,
     update_ae_obj__event_presentation,
     db_save_ae_obj_li__event_presentation,
-} from "$lib/ae_events__event_presentation";
+} from "$lib/ae_events/ae_events__event_presentation";
 
 import {
     load_ae_obj_id__event_presenter,
@@ -62,14 +62,14 @@ import {
     search__event_presenter,
     db_save_ae_obj_li__event_presenter,
     email_sign_in__event_presenter,
-} from "$lib/ae_events__event_presenter";
+} from "$lib/ae_events/ae_events__event_presenter";
 
 import {
     handle_load_ae_obj_id__badge,
     handle_load_ae_obj_li__badge,
     handle_search__event_badge,
     handle_db_save_ae_obj_li__badge,
-} from "$lib/ae_events__event_badge";
+} from "$lib/ae_events/ae_events__event_badge";
 
 
 let export_obj = {