diff --git a/packages/mobile/metro.config.js b/packages/mobile/metro.config.js
index b9f424561..4f8f48d42 100644
--- a/packages/mobile/metro.config.js
+++ b/packages/mobile/metro.config.js
@@ -29,9 +29,6 @@ module.exports = (async () => {
       '../filepicker',
       '../services',
       '../files',
-      '../models',
-      '../responses',
-      '../common',
       '../utils',
       '../sncrypto-common',
       '../snjs',
diff --git a/packages/mobile/src/Lib/ApplicationGroup.ts b/packages/mobile/src/Lib/ApplicationGroup.ts
index ed36de259..cde237bd1 100644
--- a/packages/mobile/src/Lib/ApplicationGroup.ts
+++ b/packages/mobile/src/Lib/ApplicationGroup.ts
@@ -1,5 +1,4 @@
-import { InternalEventBus } from '@standardnotes/services'
-import { ApplicationDescriptor, DeviceInterface, SNApplicationGroup } from '@standardnotes/snjs'
+import { ApplicationDescriptor, DeviceInterface, InternalEventBus, SNApplicationGroup } from '@standardnotes/snjs'
 import { MobileApplication } from './Application'
 import { ApplicationState } from './ApplicationState'
 import { BackupsService } from './BackupsService'
diff --git a/packages/mobile/src/Lib/ApplicationState.ts b/packages/mobile/src/Lib/ApplicationState.ts
index 50287bab5..dd10b59c9 100644
--- a/packages/mobile/src/Lib/ApplicationState.ts
+++ b/packages/mobile/src/Lib/ApplicationState.ts
@@ -1,4 +1,3 @@
-import { InternalEventBus } from '@standardnotes/services'
 import {
   ApplicationEvent,
   ApplicationService,
@@ -7,6 +6,7 @@ import {
   ChallengeReason,
   ChallengeValidation,
   ContentType,
+  InternalEventBus,
   isNullOrUndefined,
   NoteViewController,
   PayloadEmitSource,
diff --git a/packages/mobile/src/Lib/FilesService.ts b/packages/mobile/src/Lib/FilesService.ts
index 1e478f0b4..86b694f96 100644
--- a/packages/mobile/src/Lib/FilesService.ts
+++ b/packages/mobile/src/Lib/FilesService.ts
@@ -1,6 +1,12 @@
-import { ByteChunker, FileSelectionResponse, OnChunkCallback } from '@standardnotes/filepicker'
-import { ClientDisplayableError } from '@standardnotes/responses'
-import { ApplicationService, FileDownloadProgress, FileItem } from '@standardnotes/snjs'
+import { FileSelectionResponse } from '@standardnotes/filepicker'
+import {
+  ApplicationService,
+  ByteChunker,
+  ClientDisplayableError,
+  FileDownloadProgress,
+  FileItem,
+  OnChunkCallback,
+} from '@standardnotes/snjs'
 import { Buffer } from 'buffer'
 import { Base64 } from 'js-base64'
 import { PermissionsAndroid, Platform } from 'react-native'
diff --git a/packages/web/src/javascripts/Components/FileView/FileViewProps.tsx b/packages/web/src/javascripts/Components/FileView/FileViewProps.tsx
index 9becc9ab3..818f11d35 100644
--- a/packages/web/src/javascripts/Components/FileView/FileViewProps.tsx
+++ b/packages/web/src/javascripts/Components/FileView/FileViewProps.tsx
@@ -1,6 +1,6 @@
 import { WebApplication } from '@/Application/Application'
 import { ViewControllerManager } from '@/Controllers/ViewControllerManager'
-import { FileItem } from '@standardnotes/snjs/dist/@types'
+import { FileItem } from '@standardnotes/snjs'
 
 export type FileViewProps = {
   application: WebApplication
diff --git a/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalFooter.tsx b/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalFooter.tsx
index 1b4e1d567..47fb9e5ca 100644
--- a/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalFooter.tsx
+++ b/packages/web/src/javascripts/Components/RevisionHistoryModal/HistoryModalFooter.tsx
@@ -1,5 +1,5 @@
 import { NoteHistoryController } from '@/Controllers/NoteHistory/NoteHistoryController'
-import { RevisionListEntry } from '@standardnotes/snjs/dist/@types'
+import { RevisionListEntry } from '@standardnotes/snjs'
 import { observer } from 'mobx-react-lite'
 import { useCallback, useState } from 'react'
 import Button from '@/Components/Button/Button'
diff --git a/packages/web/src/javascripts/Components/RevisionHistoryModal/RemoteHistoryList.tsx b/packages/web/src/javascripts/Components/RevisionHistoryModal/RemoteHistoryList.tsx
index 73544ca3f..0d84e84db 100644
--- a/packages/web/src/javascripts/Components/RevisionHistoryModal/RemoteHistoryList.tsx
+++ b/packages/web/src/javascripts/Components/RevisionHistoryModal/RemoteHistoryList.tsx
@@ -4,7 +4,7 @@ import Icon from '@/Components/Icon/Icon'
 import { useListKeyboardNavigation } from '@/Hooks/useListKeyboardNavigation'
 import HistoryListItem from './HistoryListItem'
 import { previewHistoryEntryTitle } from './utils'
-import { FeaturesClientInterface, RevisionListEntry } from '@standardnotes/snjs/dist/@types'
+import { FeaturesClientInterface, RevisionListEntry } from '@standardnotes/snjs'
 import { NoteHistoryController } from '@/Controllers/NoteHistory/NoteHistoryController'
 import Spinner from '@/Components/Spinner/Spinner'
 import { PremiumFeatureIconClass, PremiumFeatureIconName } from '../Icon/PremiumFeatureIcon'