diff --git a/src/components/dialogs/WorldDialog/WorldDialog.vue b/src/components/dialogs/WorldDialog/WorldDialog.vue
index 8f9a4b64..8ef89dbe 100644
--- a/src/components/dialogs/WorldDialog/WorldDialog.vue
+++ b/src/components/dialogs/WorldDialog/WorldDialog.vue
@@ -842,7 +842,7 @@
     } from '../../../shared/utils/imageUpload';
     import { favoriteRequest, miscRequest, userRequest, worldRequest } from '../../../api';
     import { Badge } from '../../ui/badge';
-    import { database } from '../../../service/database.js';
+    import { database } from '../../../service/database';
     import { formatJsonVars } from '../../../shared/utils/base/ui';
 
     import ImageCropDialog from '../ImageCropDialog.vue';
diff --git a/src/service/database.js b/src/service/database/index.js
similarity index 90%
rename from src/service/database.js
rename to src/service/database/index.js
index 0a01311d..3be56979 100644
--- a/src/service/database.js
+++ b/src/service/database/index.js
@@ -1,20 +1,20 @@
-import { avatarFavorites } from './database/avatarFavorites.js';
-import { avatarTags } from './database/avatarTags.js';
-import { feed } from './database/feed.js';
-import { friendFavorites } from './database/friendFavorites.js';
-import { friendLogCurrent } from './database/friendLogCurrent.js';
-import { friendLogHistory } from './database/friendLogHistory.js';
-import { gameLog } from './database/gameLog.js';
-import { memos } from './database/memos.js';
-import { moderation } from './database/moderation.js';
-import { mutualGraph } from './database/mutualGraph.js';
-import { notifications } from './database/notifications.js';
-import { tableAlter } from './database/tableAlter.js';
-import { tableFixes } from './database/tableFixes.js';
-import { tableSize } from './database/tableSize.js';
-import { worldFavorites } from './database/worldFavorites.js';
+import { avatarFavorites } from './avatarFavorites.js';
+import { avatarTags } from './avatarTags.js';
+import { feed } from './feed.js';
+import { friendFavorites } from './friendFavorites.js';
+import { friendLogCurrent } from './friendLogCurrent.js';
+import { friendLogHistory } from './friendLogHistory.js';
+import { gameLog } from './gameLog.js';
+import { memos } from './memos.js';
+import { moderation } from './moderation.js';
+import { mutualGraph } from './mutualGraph.js';
+import { notifications } from './notifications.js';
+import { tableAlter } from './tableAlter.js';
+import { tableFixes } from './tableFixes.js';
+import { tableSize } from './tableSize.js';
+import { worldFavorites } from './worldFavorites.js';
 
-import sqliteService from './sqlite.js';
+import sqliteService from '../sqlite.js';
 
 const dbVars = {
     userId: '',
diff --git a/src/service/gamelog.js b/src/service/gameLog.js
similarity index 100%
rename from src/service/gamelog.js
rename to src/service/gameLog.js
diff --git a/src/shared/__tests__/notificationCategory.test.js b/src/shared/__tests__/notificationCategory.test.js
index 325fdc5e..0023304c 100644
--- a/src/shared/__tests__/notificationCategory.test.js
+++ b/src/shared/__tests__/notificationCategory.test.js
@@ -3,7 +3,7 @@ import {
     GROUP_EXACT_TYPES,
     getNotificationCategory,
     getNotificationTs
-} from '../notificationCategory';
+} from '../utils/notificationCategory';
 
 describe('getNotificationCategory', () => {
     test('returns "other" for falsy type', () => {
diff --git a/src/shared/__tests__/notificationMessage.test.js b/src/shared/__tests__/notificationMessage.test.js
index ddb65777..f8abbaee 100644
--- a/src/shared/__tests__/notificationMessage.test.js
+++ b/src/shared/__tests__/notificationMessage.test.js
@@ -2,7 +2,7 @@ import {
     getNotificationMessage,
     getUserIdFromNoty,
     toNotificationText
-} from '../notificationMessage';
+} from '../utils/notificationMessage';
 
 // Mock displayLocation to return a predictable string
 vi.mock('../utils', () => ({
diff --git a/src/shared/__tests__/resolveRef.test.js b/src/shared/__tests__/resolveRef.test.js
index d7d1cefd..bc393d76 100644
--- a/src/shared/__tests__/resolveRef.test.js
+++ b/src/shared/__tests__/resolveRef.test.js
@@ -1,4 +1,4 @@
-import { resolveRef } from '../resolveRef';
+import { resolveRef } from '../utils/resolveRef';
 
 describe('resolveRef', () => {
     const emptyDefault = { id: '', name: '' };
diff --git a/src/shared/utils/memos.js b/src/shared/utils/memos.js
index fe265752..83d8141c 100644
--- a/src/shared/utils/memos.js
+++ b/src/shared/utils/memos.js
@@ -1,5 +1,5 @@
 import { useFriendStore, useUserStore } from '../../stores';
-import { database } from '../../service/database.js';
+import { database } from '../../service/database';
 
 /**
  * @returns {Promise<void>}
diff --git a/src/shared/notificationCategory.js b/src/shared/utils/notificationCategory.js
similarity index 100%
rename from src/shared/notificationCategory.js
rename to src/shared/utils/notificationCategory.js
diff --git a/src/shared/notificationMessage.js b/src/shared/utils/notificationMessage.js
similarity index 99%
rename from src/shared/notificationMessage.js
rename to src/shared/utils/notificationMessage.js
index 59271c4e..978b3ab0 100644
--- a/src/shared/notificationMessage.js
+++ b/src/shared/utils/notificationMessage.js
@@ -1,4 +1,4 @@
-import { displayLocation } from './utils';
+import { displayLocation } from './locationParser';
 
 /**
  * Extracts the notification title and body from a notification object.
diff --git a/src/shared/resolveRef.js b/src/shared/utils/resolveRef.js
similarity index 100%
rename from src/shared/resolveRef.js
rename to src/shared/utils/resolveRef.js
diff --git a/src/stores/gameLog/index.js b/src/stores/gameLog/index.js
index 65135392..d185e5d5 100644
--- a/src/stores/gameLog/index.js
+++ b/src/stores/gameLog/index.js
@@ -37,7 +37,7 @@ import { userRequest } from '../../api';
 import { watchState } from '../../service/watchState';
 
 import configRepository from '../../service/config';
-import gameLogService from '../../service/gamelog.js';
+import gameLogService from '../../service/gameLog.js';
 
 import * as workerTimers from 'worker-timers';
 
diff --git a/src/stores/group.js b/src/stores/group.js
index fe1d99c3..27858f1b 100644
--- a/src/stores/group.js
+++ b/src/stores/group.js
@@ -14,7 +14,7 @@ import {
     hasGroupPermission,
     replaceBioSymbols
 } from '../shared/utils';
-import { database } from '../service/database.js';
+import { database } from '../service/database';
 import { groupDialogFilterOptions } from '../shared/constants/';
 import { useGameStore } from './game';
 import { useInstanceStore } from './instance';
diff --git a/src/stores/instance.js b/src/stores/instance.js
index d2cd925e..2ee6177a 100644
--- a/src/stores/instance.js
+++ b/src/stores/instance.js
@@ -30,7 +30,7 @@ import {
     instanceContentSettings
 } from '../shared/constants';
 import { database } from '../service/database';
-import { resolveRef } from '../shared/resolveRef';
+import { resolveRef } from '../shared/utils/resolveRef';
 import { useAppearanceSettingsStore } from './settings/appearance';
 import { useFriendStore } from './friend';
 import { useGroupStore } from './group';
diff --git a/src/stores/notification/index.js b/src/stores/notification/index.js
index 190b9b13..d0bbfd0c 100644
--- a/src/stores/notification/index.js
+++ b/src/stores/notification/index.js
@@ -27,12 +27,12 @@ import {
     getNotificationMessage,
     getUserIdFromNoty as getUserIdFromNotyBase,
     toNotificationText
-} from '../../shared/notificationMessage';
+} from '../../shared/utils/notificationMessage';
 import { database, dbVars } from '../../service/database';
 import {
     getNotificationCategory,
     getNotificationTs
-} from '../../shared/notificationCategory';
+} from '../../shared/utils/notificationCategory';
 import { AppDebug } from '../../service/appConfig';
 import { createOverlayDispatch } from './overlayDispatch';
 import { useAdvancedSettingsStore } from '../settings/advanced';
diff --git a/src/stores/notification/overlayDispatch.js b/src/stores/notification/overlayDispatch.js
index f607226a..643e850e 100644
--- a/src/stores/notification/overlayDispatch.js
+++ b/src/stores/notification/overlayDispatch.js
@@ -2,7 +2,7 @@ import { extractFileId, extractFileVersion } from '../../shared/utils';
 import {
     getNotificationMessage,
     toNotificationText
-} from '../../shared/notificationMessage';
+} from '../../shared/utils/notificationMessage';
 
 /**
  * Creates the overlay dispatch functions for the Notification store.