From 44924a502beaca6db601d903ad66e21e5daf1da4 Mon Sep 17 00:00:00 2001
From: Andrew Bierman <abbierman101@gmail.com>
Date: Fri, 1 May 2026 17:53:05 -0600
Subject: [PATCH 1/9] chore: scaffold @packrat/domain package

Adds packages/domain with package.json, tsconfig, and barrel index files
for packs, catalog, trips, and pack-templates sub-packages. Registers
@packrat/domain/* paths in the root tsconfig.
---
 packages/domain/package.json                   | 18 ++++++++++++++++++
 packages/domain/src/catalog/index.ts           | 10 ++++++++++
 .../domain/src}/catalog/types.ts               |  0
 .../src/catalog/utils}/normalizeDescription.ts |  0
 packages/domain/src/index.ts                   |  4 ++++
 packages/domain/src/pack-templates/index.ts    |  8 ++++++++
 .../domain/src}/pack-templates/types.ts        |  0
 packages/domain/src/packs/index.ts             | 15 +++++++++++++++
 .../domain/src}/packs/input.ts                 |  0
 .../domain/src}/packs/types.ts                 |  0
 .../src}/packs/utils/computePackWeights.ts     |  0
 .../src}/packs/utils/convertFromGrams.ts       |  0
 .../domain/src}/packs/utils/convertToGrams.ts  |  0
 packages/domain/src/trips/index.ts             |  1 +
 .../domain/src}/trips/types.ts                 |  0
 packages/domain/tsconfig.json                  | 10 ++++++++++
 tsconfig.json                                  |  2 ++
 17 files changed, 68 insertions(+)
 create mode 100644 packages/domain/package.json
 create mode 100644 packages/domain/src/catalog/index.ts
 rename {apps/expo/features => packages/domain/src}/catalog/types.ts (100%)
 rename {apps/expo/features/catalog/lib => packages/domain/src/catalog/utils}/normalizeDescription.ts (100%)
 create mode 100644 packages/domain/src/index.ts
 create mode 100644 packages/domain/src/pack-templates/index.ts
 rename {apps/expo/features => packages/domain/src}/pack-templates/types.ts (100%)
 create mode 100644 packages/domain/src/packs/index.ts
 rename {apps/expo/features => packages/domain/src}/packs/input.ts (100%)
 rename {apps/expo/features => packages/domain/src}/packs/types.ts (100%)
 rename {apps/expo/features => packages/domain/src}/packs/utils/computePackWeights.ts (100%)
 rename {apps/expo/features => packages/domain/src}/packs/utils/convertFromGrams.ts (100%)
 rename {apps/expo/features => packages/domain/src}/packs/utils/convertToGrams.ts (100%)
 create mode 100644 packages/domain/src/trips/index.ts
 rename {apps/expo/features => packages/domain/src}/trips/types.ts (100%)
 create mode 100644 packages/domain/tsconfig.json

diff --git a/packages/domain/package.json b/packages/domain/package.json
new file mode 100644
index 0000000000..c0571ab944
--- /dev/null
+++ b/packages/domain/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "@packrat/domain",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts",
+    "./catalog": "./src/catalog/index.ts",
+    "./pack-templates": "./src/pack-templates/index.ts",
+    "./packs": "./src/packs/index.ts",
+    "./trips": "./src/trips/index.ts"
+  },
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
+  "dependencies": {
+    "@packrat/api": "workspace:*"
+  }
+}
diff --git a/packages/domain/src/catalog/index.ts b/packages/domain/src/catalog/index.ts
new file mode 100644
index 0000000000..6a02bd2ff8
--- /dev/null
+++ b/packages/domain/src/catalog/index.ts
@@ -0,0 +1,10 @@
+export type {
+  CatalogItem,
+  CatalogItemInput,
+  CatalogItemLink,
+  CatalogItemReview,
+  CatalogItemWithPackItemFields,
+  CatalogItemWithQuantity,
+  PaginatedCatalogItemsResponse,
+} from './types';
+export { normalizeDescription } from './utils/normalizeDescription';
diff --git a/apps/expo/features/catalog/types.ts b/packages/domain/src/catalog/types.ts
similarity index 100%
rename from apps/expo/features/catalog/types.ts
rename to packages/domain/src/catalog/types.ts
diff --git a/apps/expo/features/catalog/lib/normalizeDescription.ts b/packages/domain/src/catalog/utils/normalizeDescription.ts
similarity index 100%
rename from apps/expo/features/catalog/lib/normalizeDescription.ts
rename to packages/domain/src/catalog/utils/normalizeDescription.ts
diff --git a/packages/domain/src/index.ts b/packages/domain/src/index.ts
new file mode 100644
index 0000000000..8145601b36
--- /dev/null
+++ b/packages/domain/src/index.ts
@@ -0,0 +1,4 @@
+export * from './catalog/index';
+export * from './pack-templates/index';
+export * from './packs/index';
+export * from './trips/index';
diff --git a/packages/domain/src/pack-templates/index.ts b/packages/domain/src/pack-templates/index.ts
new file mode 100644
index 0000000000..e229e374c3
--- /dev/null
+++ b/packages/domain/src/pack-templates/index.ts
@@ -0,0 +1,8 @@
+export type {
+  PackTemplate,
+  PackTemplateInput,
+  PackTemplateInStore,
+  PackTemplateItem,
+  PackTemplateItemInput,
+  WeightUnit,
+} from './types';
diff --git a/apps/expo/features/pack-templates/types.ts b/packages/domain/src/pack-templates/types.ts
similarity index 100%
rename from apps/expo/features/pack-templates/types.ts
rename to packages/domain/src/pack-templates/types.ts
diff --git a/packages/domain/src/packs/index.ts b/packages/domain/src/packs/index.ts
new file mode 100644
index 0000000000..38c9c34e27
--- /dev/null
+++ b/packages/domain/src/packs/index.ts
@@ -0,0 +1,15 @@
+export type {
+  Pack,
+  PackCategory,
+  PackInput,
+  PackInStore,
+  PackItem,
+  PackItemCategory,
+  PackItemInput,
+  PackWeightHistoryEntry,
+  Weight,
+  WeightUnit,
+} from './types';
+export { computePackWeights } from './utils/computePackWeights';
+export { convertFromGrams } from './utils/convertFromGrams';
+export { convertToGrams } from './utils/convertToGrams';
diff --git a/apps/expo/features/packs/input.ts b/packages/domain/src/packs/input.ts
similarity index 100%
rename from apps/expo/features/packs/input.ts
rename to packages/domain/src/packs/input.ts
diff --git a/apps/expo/features/packs/types.ts b/packages/domain/src/packs/types.ts
similarity index 100%
rename from apps/expo/features/packs/types.ts
rename to packages/domain/src/packs/types.ts
diff --git a/apps/expo/features/packs/utils/computePackWeights.ts b/packages/domain/src/packs/utils/computePackWeights.ts
similarity index 100%
rename from apps/expo/features/packs/utils/computePackWeights.ts
rename to packages/domain/src/packs/utils/computePackWeights.ts
diff --git a/apps/expo/features/packs/utils/convertFromGrams.ts b/packages/domain/src/packs/utils/convertFromGrams.ts
similarity index 100%
rename from apps/expo/features/packs/utils/convertFromGrams.ts
rename to packages/domain/src/packs/utils/convertFromGrams.ts
diff --git a/apps/expo/features/packs/utils/convertToGrams.ts b/packages/domain/src/packs/utils/convertToGrams.ts
similarity index 100%
rename from apps/expo/features/packs/utils/convertToGrams.ts
rename to packages/domain/src/packs/utils/convertToGrams.ts
diff --git a/packages/domain/src/trips/index.ts b/packages/domain/src/trips/index.ts
new file mode 100644
index 0000000000..03473f3154
--- /dev/null
+++ b/packages/domain/src/trips/index.ts
@@ -0,0 +1 @@
+export type { Trip, TripInput, TripInStore, TripStatus } from './types';
diff --git a/apps/expo/features/trips/types.ts b/packages/domain/src/trips/types.ts
similarity index 100%
rename from apps/expo/features/trips/types.ts
rename to packages/domain/src/trips/types.ts
diff --git a/packages/domain/tsconfig.json b/packages/domain/tsconfig.json
new file mode 100644
index 0000000000..8d7bbc94df
--- /dev/null
+++ b/packages/domain/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "verbatimModuleSyntax": true,
+    "skipLibCheck": true,
+    "noEmit": true
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["node_modules", "dist"]
+}
diff --git a/tsconfig.json b/tsconfig.json
index 90b5240c22..85af917f4b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -36,6 +36,8 @@
       "@packrat/analytics/*": ["./packages/analytics/src/*"],
       "@packrat/cli": ["./packages/cli/src"],
       "@packrat/cli/*": ["./packages/cli/src/*"],
+      "@packrat/domain": ["./packages/domain/src/index.ts"],
+      "@packrat/domain/*": ["./packages/domain/src/*"],
       "@packrat/web-ui": ["./packages/web-ui/src"],
       "@packrat/web-ui/*": ["./packages/web-ui/src/*"],
       "nativewindui/*": ["./apps/expo/components/ui/*"]

From 91fdab06509f1b78f652383c6ade0c8307eead80 Mon Sep 17 00:00:00 2001
From: Andrew Bierman <abbierman101@gmail.com>
Date: Fri, 1 May 2026 17:53:31 -0600
Subject: [PATCH 2/9] refactor: wire expo app to @packrat/domain via re-export
 stubs

- Fix imports in moved domain files to use @packrat/api/types instead of
  expo-app/* aliases
- Add thin re-export stubs in expo features so all existing imports are
  unaffected (zero churn to callers)
- Add @packrat/domain workspace dependency to expo package.json
---
 .../features/catalog/lib/normalizeDescription.ts     |  1 +
 apps/expo/features/catalog/types.ts                  |  9 +++++++++
 apps/expo/features/pack-templates/types.ts           |  8 ++++++++
 apps/expo/features/packs/input.ts                    |  1 +
 apps/expo/features/packs/types.ts                    | 12 ++++++++++++
 apps/expo/features/packs/utils/computePackWeights.ts |  1 +
 apps/expo/features/packs/utils/convertFromGrams.ts   |  1 +
 apps/expo/features/packs/utils/convertToGrams.ts     |  1 +
 apps/expo/features/trips/types.ts                    |  1 +
 apps/expo/package.json                               |  1 +
 packages/domain/src/catalog/types.ts                 |  2 +-
 packages/domain/src/pack-templates/types.ts          |  4 +++-
 packages/domain/src/packs/input.ts                   |  2 +-
 packages/domain/src/packs/types.ts                   |  6 +++---
 packages/domain/src/trips/types.ts                   |  2 +-
 15 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 apps/expo/features/catalog/lib/normalizeDescription.ts
 create mode 100644 apps/expo/features/catalog/types.ts
 create mode 100644 apps/expo/features/pack-templates/types.ts
 create mode 100644 apps/expo/features/packs/input.ts
 create mode 100644 apps/expo/features/packs/types.ts
 create mode 100644 apps/expo/features/packs/utils/computePackWeights.ts
 create mode 100644 apps/expo/features/packs/utils/convertFromGrams.ts
 create mode 100644 apps/expo/features/packs/utils/convertToGrams.ts
 create mode 100644 apps/expo/features/trips/types.ts

diff --git a/apps/expo/features/catalog/lib/normalizeDescription.ts b/apps/expo/features/catalog/lib/normalizeDescription.ts
new file mode 100644
index 0000000000..cedcd351b2
--- /dev/null
+++ b/apps/expo/features/catalog/lib/normalizeDescription.ts
@@ -0,0 +1 @@
+export { normalizeDescription } from '@packrat/domain/catalog';
diff --git a/apps/expo/features/catalog/types.ts b/apps/expo/features/catalog/types.ts
new file mode 100644
index 0000000000..d6fc34b9fd
--- /dev/null
+++ b/apps/expo/features/catalog/types.ts
@@ -0,0 +1,9 @@
+export type {
+  CatalogItem,
+  CatalogItemInput,
+  CatalogItemLink,
+  CatalogItemReview,
+  CatalogItemWithPackItemFields,
+  CatalogItemWithQuantity,
+  PaginatedCatalogItemsResponse,
+} from '@packrat/domain/catalog';
diff --git a/apps/expo/features/pack-templates/types.ts b/apps/expo/features/pack-templates/types.ts
new file mode 100644
index 0000000000..700ae97678
--- /dev/null
+++ b/apps/expo/features/pack-templates/types.ts
@@ -0,0 +1,8 @@
+export type {
+  PackTemplate,
+  PackTemplateInput,
+  PackTemplateInStore,
+  PackTemplateItem,
+  PackTemplateItemInput,
+  WeightUnit,
+} from '@packrat/domain/pack-templates';
diff --git a/apps/expo/features/packs/input.ts b/apps/expo/features/packs/input.ts
new file mode 100644
index 0000000000..8d011a9f33
--- /dev/null
+++ b/apps/expo/features/packs/input.ts
@@ -0,0 +1 @@
+export type { PackItemInput } from '@packrat/domain/packs';
diff --git a/apps/expo/features/packs/types.ts b/apps/expo/features/packs/types.ts
new file mode 100644
index 0000000000..d2dc308315
--- /dev/null
+++ b/apps/expo/features/packs/types.ts
@@ -0,0 +1,12 @@
+export type {
+  Pack,
+  PackCategory,
+  PackInput,
+  PackInStore,
+  PackItem,
+  PackItemCategory,
+  PackItemInput,
+  PackWeightHistoryEntry,
+  Weight,
+  WeightUnit,
+} from '@packrat/domain/packs';
diff --git a/apps/expo/features/packs/utils/computePackWeights.ts b/apps/expo/features/packs/utils/computePackWeights.ts
new file mode 100644
index 0000000000..b5a4ceba43
--- /dev/null
+++ b/apps/expo/features/packs/utils/computePackWeights.ts
@@ -0,0 +1 @@
+export { computePackWeights } from '@packrat/domain/packs';
diff --git a/apps/expo/features/packs/utils/convertFromGrams.ts b/apps/expo/features/packs/utils/convertFromGrams.ts
new file mode 100644
index 0000000000..9b4596b520
--- /dev/null
+++ b/apps/expo/features/packs/utils/convertFromGrams.ts
@@ -0,0 +1 @@
+export { convertFromGrams } from '@packrat/domain/packs';
diff --git a/apps/expo/features/packs/utils/convertToGrams.ts b/apps/expo/features/packs/utils/convertToGrams.ts
new file mode 100644
index 0000000000..47702a08b2
--- /dev/null
+++ b/apps/expo/features/packs/utils/convertToGrams.ts
@@ -0,0 +1 @@
+export { convertToGrams } from '@packrat/domain/packs';
diff --git a/apps/expo/features/trips/types.ts b/apps/expo/features/trips/types.ts
new file mode 100644
index 0000000000..057a1059cb
--- /dev/null
+++ b/apps/expo/features/trips/types.ts
@@ -0,0 +1 @@
+export type { Trip, TripInput, TripInStore, TripStatus } from '@packrat/domain/trips';
diff --git a/apps/expo/package.json b/apps/expo/package.json
index cbf86a55d9..a607967343 100644
--- a/apps/expo/package.json
+++ b/apps/expo/package.json
@@ -52,6 +52,7 @@
     "@legendapp/state": "^3.0.0-beta.30",
     "@packrat/api-client": "workspace:*",
     "@packrat/config": "workspace:*",
+    "@packrat/domain": "workspace:*",
     "@packrat/env": "workspace:*",
     "@packrat/guards": "workspace:*",
     "@react-native-ai/apple": "~0.10.0",
diff --git a/packages/domain/src/catalog/types.ts b/packages/domain/src/catalog/types.ts
index 6c86cb7679..581c111235 100644
--- a/packages/domain/src/catalog/types.ts
+++ b/packages/domain/src/catalog/types.ts
@@ -1,4 +1,4 @@
-import type { WeightUnit } from 'expo-app/types';
+import type { WeightUnit } from '@packrat/api/types';
 import type { PackItemInput } from '../packs/input';
 
 export interface CatalogItemLink {
diff --git a/packages/domain/src/pack-templates/types.ts b/packages/domain/src/pack-templates/types.ts
index 6e7f7bf707..45934ded65 100644
--- a/packages/domain/src/pack-templates/types.ts
+++ b/packages/domain/src/pack-templates/types.ts
@@ -1,4 +1,6 @@
-export type WeightUnit = 'g' | 'kg' | 'oz' | 'lb';
+import type { WeightUnit } from '@packrat/api/types';
+
+export type { WeightUnit };
 
 export interface PackWeightHistoryEntry {
   id: string;
diff --git a/packages/domain/src/packs/input.ts b/packages/domain/src/packs/input.ts
index 8d9a4895e0..ac6329784f 100644
--- a/packages/domain/src/packs/input.ts
+++ b/packages/domain/src/packs/input.ts
@@ -1,4 +1,4 @@
-import type { WeightUnit } from 'expo-app/types';
+import type { WeightUnit } from '@packrat/api/types';
 
 export interface PackItemInput {
   name: string;
diff --git a/packages/domain/src/packs/types.ts b/packages/domain/src/packs/types.ts
index 9b6f433895..93e659317a 100644
--- a/packages/domain/src/packs/types.ts
+++ b/packages/domain/src/packs/types.ts
@@ -1,6 +1,6 @@
-import type { CatalogItem } from 'expo-app/features/catalog/types';
-import type { PackTemplateItem } from 'expo-app/features/pack-templates/types';
-import type { PackCategory, WeightUnit } from 'expo-app/types';
+import type { PackCategory, WeightUnit } from '@packrat/api/types';
+import type { CatalogItem } from '../catalog/types';
+import type { PackTemplateItem } from '../pack-templates/types';
 
 export type { PackCategory, WeightUnit };
 
diff --git a/packages/domain/src/trips/types.ts b/packages/domain/src/trips/types.ts
index 2d59bb5b50..31256b37df 100644
--- a/packages/domain/src/trips/types.ts
+++ b/packages/domain/src/trips/types.ts
@@ -1,4 +1,4 @@
-import type { Pack } from 'expo-app/features/packs/types';
+import type { Pack } from '../packs/types';
 
 export type TripStatus = 'planned' | 'ongoing' | 'completed' | 'cancelled';
 

From e36e19287cb02f06c8117202421acf3c6ab2bbcf Mon Sep 17 00:00:00 2001
From: Andrew Bierman <abbierman101@gmail.com>
Date: Fri, 1 May 2026 18:02:47 -0600
Subject: [PATCH 3/9] =?UTF-8?q?refactor:=20rename=20@packrat/domain=20?=
 =?UTF-8?q?=E2=86=92=20@packrat/app?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Renames packages/domain → packages/app and updates all references.
The shared package will hold full FSD feature slices (types, hooks,
utils, and .web.tsx UI variants) — not just domain logic — so 'app'
is the more accurate name. Expo and web apps become thin routing
shells on top of packages/app.
---
 .../catalog/lib/normalizeDescription.ts       |  2 +-
 apps/expo/features/catalog/types.ts           |  2 +-
 apps/expo/features/pack-templates/types.ts    |  2 +-
 apps/expo/features/packs/input.ts             |  2 +-
 apps/expo/features/packs/types.ts             |  2 +-
 .../packs/utils/computePackWeights.ts         |  2 +-
 .../features/packs/utils/convertFromGrams.ts  |  2 +-
 .../features/packs/utils/convertToGrams.ts    |  2 +-
 apps/expo/features/trips/types.ts             |  2 +-
 apps/expo/package.json                        |  2 +-
 compound-engineering.local.md                 | 10 +++
 ...hared-app-package-extraction-brainstorm.md | 69 +++++++++++++++++++
 packages/{domain => app}/package.json         |  2 +-
 packages/{domain => app}/src/catalog/index.ts |  0
 packages/{domain => app}/src/catalog/types.ts |  0
 .../src/catalog/utils/normalizeDescription.ts |  0
 packages/{domain => app}/src/index.ts         |  0
 .../src/pack-templates/index.ts               |  0
 .../src/pack-templates/types.ts               |  0
 packages/{domain => app}/src/packs/index.ts   |  0
 packages/{domain => app}/src/packs/input.ts   |  0
 packages/{domain => app}/src/packs/types.ts   |  0
 .../src/packs/utils/computePackWeights.ts     |  0
 .../src/packs/utils/convertFromGrams.ts       |  0
 .../src/packs/utils/convertToGrams.ts         |  0
 packages/{domain => app}/src/trips/index.ts   |  0
 packages/{domain => app}/src/trips/types.ts   |  0
 packages/{domain => app}/tsconfig.json        |  0
 todos/001-pending-p1-toggle-api-mismatch.md   | 59 ++++++++++++++++
 ...2-pending-p1-missing-react-type-imports.md | 45 ++++++++++++
 ...nding-p1-securetext-multiline-plaintext.md | 48 +++++++++++++
 ...04-pending-p2-context-menu-methods-type.md | 43 ++++++++++++
 ...pending-p2-duplicate-error-message-prop.md | 35 ++++++++++
 ...006-pending-p2-context-submenu-mutation.md | 45 ++++++++++++
 .../007-pending-p2-web-ui-depdendency-type.md | 35 ++++++++++
 ...008-pending-p2-submit-editing-not-wired.md | 44 ++++++++++++
 ...09-pending-p2-unsafe-rest-spread-button.md | 43 ++++++++++++
 ...ng-p2-icon-map-nouncheckedindexedaccess.md | 41 +++++++++++
 todos/011-pending-p3-cn-utility-duplicated.md | 46 +++++++++++++
 ...pending-p3-theme-toggle-circular-import.md | 37 ++++++++++
 todos/013-pending-p3-alert-methods-type.md    | 40 +++++++++++
 ...pending-p3-create-item-generic-identity.md | 45 ++++++++++++
 todos/015-pending-p3-lucide-barrel-imports.md | 44 ++++++++++++
 .../016-pending-p3-picker-child-type-guard.md | 52 ++++++++++++++
 tsconfig.json                                 |  4 +-
 45 files changed, 794 insertions(+), 13 deletions(-)
 create mode 100644 compound-engineering.local.md
 create mode 100644 docs/brainstorms/2026-05-01-shared-app-package-extraction-brainstorm.md
 rename packages/{domain => app}/package.json (93%)
 rename packages/{domain => app}/src/catalog/index.ts (100%)
 rename packages/{domain => app}/src/catalog/types.ts (100%)
 rename packages/{domain => app}/src/catalog/utils/normalizeDescription.ts (100%)
 rename packages/{domain => app}/src/index.ts (100%)
 rename packages/{domain => app}/src/pack-templates/index.ts (100%)
 rename packages/{domain => app}/src/pack-templates/types.ts (100%)
 rename packages/{domain => app}/src/packs/index.ts (100%)
 rename packages/{domain => app}/src/packs/input.ts (100%)
 rename packages/{domain => app}/src/packs/types.ts (100%)
 rename packages/{domain => app}/src/packs/utils/computePackWeights.ts (100%)
 rename packages/{domain => app}/src/packs/utils/convertFromGrams.ts (100%)
 rename packages/{domain => app}/src/packs/utils/convertToGrams.ts (100%)
 rename packages/{domain => app}/src/trips/index.ts (100%)
 rename packages/{domain => app}/src/trips/types.ts (100%)
 rename packages/{domain => app}/tsconfig.json (100%)
 create mode 100644 todos/001-pending-p1-toggle-api-mismatch.md
 create mode 100644 todos/002-pending-p1-missing-react-type-imports.md
 create mode 100644 todos/003-pending-p1-securetext-multiline-plaintext.md
 create mode 100644 todos/004-pending-p2-context-menu-methods-type.md
 create mode 100644 todos/005-pending-p2-duplicate-error-message-prop.md
 create mode 100644 todos/006-pending-p2-context-submenu-mutation.md
 create mode 100644 todos/007-pending-p2-web-ui-depdendency-type.md
 create mode 100644 todos/008-pending-p2-submit-editing-not-wired.md
 create mode 100644 todos/009-pending-p2-unsafe-rest-spread-button.md
 create mode 100644 todos/010-pending-p2-icon-map-nouncheckedindexedaccess.md
 create mode 100644 todos/011-pending-p3-cn-utility-duplicated.md
 create mode 100644 todos/012-pending-p3-theme-toggle-circular-import.md
 create mode 100644 todos/013-pending-p3-alert-methods-type.md
 create mode 100644 todos/014-pending-p3-create-item-generic-identity.md
 create mode 100644 todos/015-pending-p3-lucide-barrel-imports.md
 create mode 100644 todos/016-pending-p3-picker-child-type-guard.md

diff --git a/apps/expo/features/catalog/lib/normalizeDescription.ts b/apps/expo/features/catalog/lib/normalizeDescription.ts
index cedcd351b2..38944cfb94 100644
--- a/apps/expo/features/catalog/lib/normalizeDescription.ts
+++ b/apps/expo/features/catalog/lib/normalizeDescription.ts
@@ -1 +1 @@
-export { normalizeDescription } from '@packrat/domain/catalog';
+export { normalizeDescription } from '@packrat/app/catalog';
diff --git a/apps/expo/features/catalog/types.ts b/apps/expo/features/catalog/types.ts
index d6fc34b9fd..53430d9132 100644
--- a/apps/expo/features/catalog/types.ts
+++ b/apps/expo/features/catalog/types.ts
@@ -6,4 +6,4 @@ export type {
   CatalogItemWithPackItemFields,
   CatalogItemWithQuantity,
   PaginatedCatalogItemsResponse,
-} from '@packrat/domain/catalog';
+} from '@packrat/app/catalog';
diff --git a/apps/expo/features/pack-templates/types.ts b/apps/expo/features/pack-templates/types.ts
index 700ae97678..654d23baa5 100644
--- a/apps/expo/features/pack-templates/types.ts
+++ b/apps/expo/features/pack-templates/types.ts
@@ -5,4 +5,4 @@ export type {
   PackTemplateItem,
   PackTemplateItemInput,
   WeightUnit,
-} from '@packrat/domain/pack-templates';
+} from '@packrat/app/pack-templates';
diff --git a/apps/expo/features/packs/input.ts b/apps/expo/features/packs/input.ts
index 8d011a9f33..0b58053a5c 100644
--- a/apps/expo/features/packs/input.ts
+++ b/apps/expo/features/packs/input.ts
@@ -1 +1 @@
-export type { PackItemInput } from '@packrat/domain/packs';
+export type { PackItemInput } from '@packrat/app/packs';
diff --git a/apps/expo/features/packs/types.ts b/apps/expo/features/packs/types.ts
index d2dc308315..a60a4c3efd 100644
--- a/apps/expo/features/packs/types.ts
+++ b/apps/expo/features/packs/types.ts
@@ -9,4 +9,4 @@ export type {
   PackWeightHistoryEntry,
   Weight,
   WeightUnit,
-} from '@packrat/domain/packs';
+} from '@packrat/app/packs';
diff --git a/apps/expo/features/packs/utils/computePackWeights.ts b/apps/expo/features/packs/utils/computePackWeights.ts
index b5a4ceba43..75c1a4da35 100644
--- a/apps/expo/features/packs/utils/computePackWeights.ts
+++ b/apps/expo/features/packs/utils/computePackWeights.ts
@@ -1 +1 @@
-export { computePackWeights } from '@packrat/domain/packs';
+export { computePackWeights } from '@packrat/app/packs';
diff --git a/apps/expo/features/packs/utils/convertFromGrams.ts b/apps/expo/features/packs/utils/convertFromGrams.ts
index 9b4596b520..93b9b48eed 100644
--- a/apps/expo/features/packs/utils/convertFromGrams.ts
+++ b/apps/expo/features/packs/utils/convertFromGrams.ts
@@ -1 +1 @@
-export { convertFromGrams } from '@packrat/domain/packs';
+export { convertFromGrams } from '@packrat/app/packs';
diff --git a/apps/expo/features/packs/utils/convertToGrams.ts b/apps/expo/features/packs/utils/convertToGrams.ts
index 47702a08b2..2eb5f4722b 100644
--- a/apps/expo/features/packs/utils/convertToGrams.ts
+++ b/apps/expo/features/packs/utils/convertToGrams.ts
@@ -1 +1 @@
-export { convertToGrams } from '@packrat/domain/packs';
+export { convertToGrams } from '@packrat/app/packs';
diff --git a/apps/expo/features/trips/types.ts b/apps/expo/features/trips/types.ts
index 057a1059cb..973263f643 100644
--- a/apps/expo/features/trips/types.ts
+++ b/apps/expo/features/trips/types.ts
@@ -1 +1 @@
-export type { Trip, TripInput, TripInStore, TripStatus } from '@packrat/domain/trips';
+export type { Trip, TripInput, TripInStore, TripStatus } from '@packrat/app/trips';
diff --git a/apps/expo/package.json b/apps/expo/package.json
index a607967343..cd67a162c6 100644
--- a/apps/expo/package.json
+++ b/apps/expo/package.json
@@ -51,8 +51,8 @@
     "@gorhom/bottom-sheet": "^5.1.2",
     "@legendapp/state": "^3.0.0-beta.30",
     "@packrat/api-client": "workspace:*",
+    "@packrat/app": "workspace:*",
     "@packrat/config": "workspace:*",
-    "@packrat/domain": "workspace:*",
     "@packrat/env": "workspace:*",
     "@packrat/guards": "workspace:*",
     "@react-native-ai/apple": "~0.10.0",
diff --git a/compound-engineering.local.md b/compound-engineering.local.md
new file mode 100644
index 0000000000..a9a62e0b25
--- /dev/null
+++ b/compound-engineering.local.md
@@ -0,0 +1,10 @@
+---
+review_agents:
+  - kieran-typescript-reviewer
+  - architecture-strategist
+  - performance-oracle
+  - security-sentinel
+  - code-simplicity-reviewer
+---
+
+This is a React Native / Expo monorepo (Bun workspaces) with a web layer powered by Metro `.web.tsx` platform shims that map `@packrat-ai/nativewindui` to `@packrat/web-ui` (shadcn/Radix UI components). TypeScript strict mode. Biome for linting/formatting. The primary concern is correctness of the shim layer and ensuring no regressions to the native mobile builds.
diff --git a/docs/brainstorms/2026-05-01-shared-app-package-extraction-brainstorm.md b/docs/brainstorms/2026-05-01-shared-app-package-extraction-brainstorm.md
new file mode 100644
index 0000000000..8987a04142
--- /dev/null
+++ b/docs/brainstorms/2026-05-01-shared-app-package-extraction-brainstorm.md
@@ -0,0 +1,69 @@
+---
+date: 2026-05-01
+topic: shared-app-package-extraction
+---
+
+# Shared Logic Extraction — How Much Can Move to a `packages/domain` Package?
+
+## What We're Building
+
+A shared `packages/domain` package (or `packages/app`) containing platform-agnostic business logic: types, domain utils, data-fetching hooks, and Jotai store definitions — usable by both the Expo app today and a future Next.js web app without changes to either consumer.
+
+## Why This Approach
+
+The monorepo already proves the pattern works: `@packrat/api-client` is fully platform-agnostic because it injects auth adapters from the consumer layer rather than importing them directly. The same injection pattern can unlock 35–40% of feature code in `apps/expo/features/` for sharing. Screens and components (the irreducibly platform-specific 40%) stay in each app. Logic moves to shared packages.
+
+## Current State (from audit)
+
+**Already shared:** `api-client`, `guards`, `env`, `config` — well-architected boundaries.
+
+**`apps/expo/features/` breakdown (307 files):**
+
+| Category | Files | Shareable? |
+|---|---|---|
+| Screens (`screens/*.tsx`) | 39 | No — expo-router, RN layout primitives |
+| Components (`components/*.tsx`) | 84 | No — View, Text, TouchableOpacity |
+| Hooks (`hooks/*.ts`) | 98 | ~30% clean now, ~70% light surgery |
+| Stores/Atoms | 18 | Medium — logic clean, persistence RN |
+| Utils + Types | ~68 | ~60% clean, ~40% RN/Expo |
+
+**Rough extractable: 35–40% of feature code.**
+
+## Key Decisions
+
+**1. The injection pattern is the unlock.**
+`@packrat/api-client` already does this for auth. Apply the same to:
+- **Navigation**: hooks pass callbacks (`onSuccess: () => router.push(...)`) rather than importing `expo-router` directly
+- **Storage**: Jotai atom persistence layer injected at app startup, not inside the atom definition
+- **Image picking**: `useImagePicker` wraps `expo-image-picker`; extract the mutation logic, inject the picker as a callback
+
+**2. Easy wins (zero refactor, move tomorrow):**
+- `packs/utils/convertToGrams.ts`, `convertFromGrams.ts`, `computePackWeights.ts` — unit math with tests
+- `catalog/lib/normalizeDescription.ts` — string formatter
+- All domain types: `packs/types.ts`, `trips/types.ts`, `catalog/types.ts`
+- ~29 hooks that grep clean (no `react-native`/`expo` imports): `useAllPacks`, `useRecentPacks`, `useUserPackItems`, `useCategoriesCount`, etc.
+
+**3. Medium effort (~30 min per hook/store):**
+- `useCreatePack`, `useUpdatePack` etc.: query logic is clean; navigation side-effects are the only entanglement. Lift navigation out as an `onSuccess` callback parameter.
+- Jotai stores: atom *definitions* are platform-agnostic; only `persistPlugin` + `kvStorage` are Expo-specific. Split: `domain` exports the atom shape, Expo app wraps with persistence.
+- `authAtoms.ts`: imports `kvStorage` (MMKV). Same pattern — inject the storage adapter.
+
+**4. Screens and components do NOT move.** They are irreducibly platform-specific by definition. This is fine — the value is in sharing the logic layer, not the view layer.
+
+**5. JSX/logic split assessment:**
+The split already mostly exists structurally (`.ts` hooks vs `.tsx` screens). The entanglement is in **platform side-effects used inside otherwise pure hooks** — specifically `expo-router` for navigation callbacks and `expo-*` for device APIs. These can be lifted out via the injection pattern without restructuring anything major.
+
+## What This Enables
+
+A future Next.js app can `import { useAllPacks, computePackWeights } from '@packrat/domain'` and get all the data-fetching and business logic for free. It builds its own screens and components on top. No shared JSX, no shared navigation — just shared models and queries.
+
+## Open Questions
+
+- **Package name**: `packages/domain`, `packages/app`, or `packages/core`? Domain is most accurate.
+- **Migration strategy**: move all at once vs feature-by-feature? Feature-by-feature (start with `packs`) reduces risk.
+- **Jotai on Next.js**: Jotai works fine in Next.js App Router with a Provider. Not a blocker.
+- **tRPC/eden client on Next.js**: `@packrat/api-client` already platform-agnostic. Needs HTTP transport config, not a code change.
+
+## Next Steps
+
+→ `/ce:plan` to create `packages/domain` with the packs feature as the first migration target.
diff --git a/packages/domain/package.json b/packages/app/package.json
similarity index 93%
rename from packages/domain/package.json
rename to packages/app/package.json
index c0571ab944..94950fd70b 100644
--- a/packages/domain/package.json
+++ b/packages/app/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@packrat/domain",
+  "name": "@packrat/app",
   "version": "0.1.0",
   "private": true,
   "type": "module",
diff --git a/packages/domain/src/catalog/index.ts b/packages/app/src/catalog/index.ts
similarity index 100%
rename from packages/domain/src/catalog/index.ts
rename to packages/app/src/catalog/index.ts
diff --git a/packages/domain/src/catalog/types.ts b/packages/app/src/catalog/types.ts
similarity index 100%
rename from packages/domain/src/catalog/types.ts
rename to packages/app/src/catalog/types.ts
diff --git a/packages/domain/src/catalog/utils/normalizeDescription.ts b/packages/app/src/catalog/utils/normalizeDescription.ts
similarity index 100%
rename from packages/domain/src/catalog/utils/normalizeDescription.ts
rename to packages/app/src/catalog/utils/normalizeDescription.ts
diff --git a/packages/domain/src/index.ts b/packages/app/src/index.ts
similarity index 100%
rename from packages/domain/src/index.ts
rename to packages/app/src/index.ts
diff --git a/packages/domain/src/pack-templates/index.ts b/packages/app/src/pack-templates/index.ts
similarity index 100%
rename from packages/domain/src/pack-templates/index.ts
rename to packages/app/src/pack-templates/index.ts
diff --git a/packages/domain/src/pack-templates/types.ts b/packages/app/src/pack-templates/types.ts
similarity index 100%
rename from packages/domain/src/pack-templates/types.ts
rename to packages/app/src/pack-templates/types.ts
diff --git a/packages/domain/src/packs/index.ts b/packages/app/src/packs/index.ts
similarity index 100%
rename from packages/domain/src/packs/index.ts
rename to packages/app/src/packs/index.ts
diff --git a/packages/domain/src/packs/input.ts b/packages/app/src/packs/input.ts
similarity index 100%
rename from packages/domain/src/packs/input.ts
rename to packages/app/src/packs/input.ts
diff --git a/packages/domain/src/packs/types.ts b/packages/app/src/packs/types.ts
similarity index 100%
rename from packages/domain/src/packs/types.ts
rename to packages/app/src/packs/types.ts
diff --git a/packages/domain/src/packs/utils/computePackWeights.ts b/packages/app/src/packs/utils/computePackWeights.ts
similarity index 100%
rename from packages/domain/src/packs/utils/computePackWeights.ts
rename to packages/app/src/packs/utils/computePackWeights.ts
diff --git a/packages/domain/src/packs/utils/convertFromGrams.ts b/packages/app/src/packs/utils/convertFromGrams.ts
similarity index 100%
rename from packages/domain/src/packs/utils/convertFromGrams.ts
rename to packages/app/src/packs/utils/convertFromGrams.ts
diff --git a/packages/domain/src/packs/utils/convertToGrams.ts b/packages/app/src/packs/utils/convertToGrams.ts
similarity index 100%
rename from packages/domain/src/packs/utils/convertToGrams.ts
rename to packages/app/src/packs/utils/convertToGrams.ts
diff --git a/packages/domain/src/trips/index.ts b/packages/app/src/trips/index.ts
similarity index 100%
rename from packages/domain/src/trips/index.ts
rename to packages/app/src/trips/index.ts
diff --git a/packages/domain/src/trips/types.ts b/packages/app/src/trips/types.ts
similarity index 100%
rename from packages/domain/src/trips/types.ts
rename to packages/app/src/trips/types.ts
diff --git a/packages/domain/tsconfig.json b/packages/app/tsconfig.json
similarity index 100%
rename from packages/domain/tsconfig.json
rename to packages/app/tsconfig.json
diff --git a/todos/001-pending-p1-toggle-api-mismatch.md b/todos/001-pending-p1-toggle-api-mismatch.md
new file mode 100644
index 0000000000..7f748bfefd
--- /dev/null
+++ b/todos/001-pending-p1-toggle-api-mismatch.md
@@ -0,0 +1,59 @@
+---
+status: pending
+priority: p1
+issue_id: "001"
+tags: [code-review, architecture, runtime-bug, web-shims]
+dependencies: []
+---
+
+# Toggle API Mismatch — Silent Runtime Bug
+
+## Problem Statement
+
+`index.web.tsx` exports `Switch as Toggle` directly from `@packrat/web-ui`. The shadcn `Switch` uses `checked` + `onCheckedChange`, but nativewindui's `Toggle` (wrapping RN's `Switch`) uses `value` + `onValueChange`. Screen code passes `value`/`onValueChange` (e.g. `weather-alert-preferences.tsx` lines 96–116). On web, the Radix Switch receives unknown props — the toggle renders visually but never responds to interaction.
+
+**Why it matters:** Toggle UI appears functional but is completely broken. Users cannot change toggle state on web. No error is thrown.
+
+## Findings
+
+- Architecture reviewer confirmed screen code at `apps/expo/app/(app)/weather-alert-preferences.tsx:96–116` passes `value`/`onValueChange`
+- `@packrat/web-ui` `Switch` component uses `checked`/`onCheckedChange` (Radix UI)
+- Direct re-export `Switch as Toggle` provides no prop bridging
+
+## Proposed Solutions
+
+### Option A: Wrapper component in index.web.tsx (Recommended)
+```tsx
+export function Toggle({ value, onValueChange, checked, onCheckedChange, disabled, ...rest }) {
+  return (
+    <Switch
+      checked={value ?? checked}
+      onCheckedChange={onValueChange ?? onCheckedChange}
+      disabled={disabled}
+      {...rest}
+    />
+  );
+}
+```
+**Pros:** Handles both native and shadcn props, drop-in fix.
+**Cons:** Must keep in sync if Toggle native API evolves.
+**Effort:** Small. **Risk:** Low.
+
+### Option B: Dedicated `toggle.web.tsx` shim file
+Same logic but in its own file, imported by the barrel.
+**Pros:** Consistent with other shim files.
+**Cons:** One more file.
+**Effort:** Small. **Risk:** Low.
+
+## Acceptance Criteria
+- [ ] Toggle renders correctly on web
+- [ ] Toggling state updates correctly (onValueChange fires)
+- [ ] `bun check-types` still passes
+- [ ] Biome passes
+
+## Work Log
+- 2026-05-01: Found during ce:review (architecture-strategist agent)
+
+## Resources
+- `packages/ui/nativewindui/index.web.tsx` — current direct re-export
+- `apps/expo/app/(app)/weather-alert-preferences.tsx:96–116` — confirmed call site
diff --git a/todos/002-pending-p1-missing-react-type-imports.md b/todos/002-pending-p1-missing-react-type-imports.md
new file mode 100644
index 0000000000..dc730fe305
--- /dev/null
+++ b/todos/002-pending-p1-missing-react-type-imports.md
@@ -0,0 +1,45 @@
+---
+status: pending
+priority: p1
+issue_id: "002"
+tags: [code-review, typescript, web-shims]
+dependencies: []
+---
+
+# Missing `import type * as React` in Three Shim Files
+
+## Problem Statement
+
+`text-field.web.tsx`, `search-input.web.tsx`, and `icon.web.tsx` use `React.` namespace for type references (`React.ChangeEventHandler`, `React.ReactNode`, `React.CSSProperties`, `React.Ref`, `React.ChangeEvent`) but none import the `React` namespace. The new JSX transform handles JSX without a React import, but it does not inject the namespace for explicit type references. TypeScript will error on these under `strict: true`.
+
+## Findings
+
+From TypeScript reviewer:
+- `text-field.web.tsx`: uses `React.ChangeEventHandler`, `React.ReactNode`, `React.CSSProperties`, `React.Ref`
+- `search-input.web.tsx`: uses `React.ChangeEventHandler`, `React.ReactNode`
+- `icon.web.tsx`: uses `React.CSSProperties`
+- All three import named exports from `react` (forwardRef, useId, useEffect) but not the namespace
+
+## Proposed Solutions
+
+### Option A: Add `import type * as React from 'react'` (Recommended)
+Add to each of the three files. The `type` modifier keeps it type-only with zero bundle impact.
+**Effort:** Small. **Risk:** None.
+
+### Option B: Replace namespace usage with direct type imports
+e.g., `import type { CSSProperties } from 'react'` and replace `React.CSSProperties` → `CSSProperties`
+**Pros:** More explicit, no namespace needed.
+**Cons:** More lines to change.
+**Effort:** Small. **Risk:** None.
+
+## Acceptance Criteria
+- [ ] `bun check-types` passes with no React namespace errors
+- [ ] Biome passes (import should be `import type`)
+
+## Work Log
+- 2026-05-01: Found during ce:review (kieran-typescript-reviewer)
+
+## Resources
+- `packages/ui/nativewindui/text-field.web.tsx`
+- `packages/ui/nativewindui/search-input.web.tsx`
+- `packages/ui/nativewindui/icon.web.tsx`
diff --git a/todos/003-pending-p1-securetext-multiline-plaintext.md b/todos/003-pending-p1-securetext-multiline-plaintext.md
new file mode 100644
index 0000000000..244aca5c42
--- /dev/null
+++ b/todos/003-pending-p1-securetext-multiline-plaintext.md
@@ -0,0 +1,48 @@
+---
+status: pending
+priority: p1
+issue_id: "003"
+tags: [code-review, security, web-shims]
+dependencies: []
+---
+
+# secureTextEntry + multiline Silently Renders Passwords as Plaintext
+
+## Problem Statement
+
+In `text-field.web.tsx`, when `multiline={true}` a `<textarea>` is rendered. The `secureTextEntry` prop (→ `type="password"`) is only applied to the `<input>` branch. A `<textarea>` has no `type="password"` equivalent. If any call site passes both `multiline={true}` and `secureTextEntry={true}`, the password renders in plaintext — no masking, browsers may offer to save/autocomplete it as a text field, and the value is visible in the DOM.
+
+In React Native, `secureTextEntry` on a multiline TextInput is documented as unsupported. The web shim should be equally explicit.
+
+## Findings
+
+- Security reviewer (M2 finding) confirmed this combination is silently ignored
+- `text-field.web.tsx:104–117`: multiline branch renders `<textarea>`, ignores `secureTextEntry`
+- No current call sites pass both (so not currently exploitable), but it's a footgun for future code
+
+## Proposed Solutions
+
+### Option A: Dev warning + force non-multiline (Recommended)
+```tsx
+if (secureTextEntry && multiline) {
+  if (__DEV__) console.warn('TextField: secureTextEntry is not supported with multiline on web. Rendering as single-line input.');
+  // Fall through to input branch
+}
+```
+**Pros:** Matches RN documented behavior. Warns developers immediately.
+**Effort:** Small. **Risk:** None.
+
+### Option B: Runtime assertion
+Throw in dev mode if both are set.
+**Cons:** More disruptive.
+
+## Acceptance Criteria
+- [ ] Passing both `multiline` and `secureTextEntry` does not render a plaintext password field
+- [ ] A DEV-mode warning appears when both props are combined
+- [ ] Single-line password inputs still work correctly
+
+## Work Log
+- 2026-05-01: Found during ce:review (security-sentinel agent)
+
+## Resources
+- `packages/ui/nativewindui/text-field.web.tsx:104–117`
diff --git a/todos/004-pending-p2-context-menu-methods-type.md b/todos/004-pending-p2-context-menu-methods-type.md
new file mode 100644
index 0000000000..6139941cf7
--- /dev/null
+++ b/todos/004-pending-p2-context-menu-methods-type.md
@@ -0,0 +1,43 @@
+---
+status: pending
+priority: p2
+issue_id: "004"
+tags: [code-review, typescript, architecture, web-shims]
+dependencies: []
+---
+
+# ContextMenuMethods Type Not Exported from Web Barrel
+
+## Problem Statement
+
+`apps/expo/app/(app)/messages/chat.tsx` imports `type { ContextMenuMethods }` from `@packrat/ui/nativewindui`. This type is not exported from `index.web.tsx`. The root tsconfig excludes `*.web.tsx` from native compilation, so this gap is invisible during `bun check-types` — it will surface when a web-targeted tsc run is added to CI.
+
+## Findings
+
+- Architecture reviewer confirmed the import exists in `chat.tsx`
+- `ContextMenuMethods` is a View-derived native type with no web equivalent
+- The tsconfig exclusion approach creates this specific blind spot
+
+## Proposed Solutions
+
+### Option A: Stub type export (Recommended)
+Add to `index.web.tsx`:
+```tsx
+export type ContextMenuMethods = Record<string, never>;
+```
+**Effort:** Tiny. **Risk:** None.
+
+### Option B: Add web tsconfig that checks .web.tsx files
+Add `packages/ui/tsconfig.web.json` with `react-jsx` and `browser` conditions to catch these gaps in CI.
+**Effort:** Medium. **Risk:** Low.
+
+## Acceptance Criteria
+- [ ] `type { ContextMenuMethods }` import from `@packrat/ui/nativewindui` resolves on web
+- [ ] No runtime value is exported (type only)
+
+## Work Log
+- 2026-05-01: Found during ce:review (architecture-strategist agent)
+
+## Resources
+- `packages/ui/nativewindui/index.web.tsx`
+- `apps/expo/app/(app)/messages/chat.tsx`
diff --git a/todos/005-pending-p2-duplicate-error-message-prop.md b/todos/005-pending-p2-duplicate-error-message-prop.md
new file mode 100644
index 0000000000..15d724e267
--- /dev/null
+++ b/todos/005-pending-p2-duplicate-error-message-prop.md
@@ -0,0 +1,35 @@
+---
+status: pending
+priority: p2
+issue_id: "005"
+tags: [code-review, typescript, quality, web-shims]
+dependencies: []
+---
+
+# Duplicate errorMessage Property in TextFieldProps
+
+## Problem Statement
+
+`TextFieldProps` in `text-field.web.tsx` declares `errorMessage?: string` twice — at lines 17 and 41. TypeScript may silently deduplicate or error depending on version. More importantly, it signals careless editing of the prop bridge and erodes confidence in type surface completeness.
+
+## Findings
+
+- TypeScript reviewer, simplicity reviewer, and security reviewer all flagged this independently
+- Flagged at lines 17 and 41 in `text-field.web.tsx`
+- Using `interface` TypeScript will error on duplicate; using `type` last-wins silently
+
+## Proposed Solutions
+
+### Option A: Remove the duplicate declaration (Recommended)
+Delete one of the two `errorMessage?: string` lines.
+**Effort:** Trivial. **Risk:** None.
+
+## Acceptance Criteria
+- [ ] `errorMessage` appears exactly once in `TextFieldProps`
+- [ ] `bun check-types` passes
+
+## Work Log
+- 2026-05-01: Found during ce:review (3 agents)
+
+## Resources
+- `packages/ui/nativewindui/text-field.web.tsx:17` and `:41`
diff --git a/todos/006-pending-p2-context-submenu-mutation.md b/todos/006-pending-p2-context-submenu-mutation.md
new file mode 100644
index 0000000000..959e6efdfc
--- /dev/null
+++ b/todos/006-pending-p2-context-submenu-mutation.md
@@ -0,0 +1,45 @@
+---
+status: pending
+priority: p2
+issue_id: "006"
+tags: [code-review, security, quality, web-shims]
+dependencies: []
+---
+
+# createContextSubMenu / createDropdownSubMenu Mutate Passed Objects
+
+## Problem Statement
+
+In `index.web.tsx`:
+```ts
+export const createContextSubMenu = (subMenu: object, items: unknown[]) =>
+  Object.assign(subMenu, { items });
+```
+`Object.assign` mutates `subMenu` in place. If the same object is reused across calls (or caller retains reference expecting immutability), shared state is corrupted. Also opens a theoretical prototype pollution vector if an object with `__proto__` is passed.
+
+## Findings
+
+- Security reviewer (L3 finding) flagged mutation + prototype risk
+- Architecture reviewer noted same pattern
+- Call sites in `conversations.tsx` and `chat.tsx` pass local object literals today (low immediate risk)
+
+## Proposed Solutions
+
+### Option A: Return a new spread object (Recommended)
+```ts
+export const createContextSubMenu = (subMenu: object, items: unknown[]) =>
+  ({ ...subMenu, items });
+export const createDropdownSubMenu = (subMenu: object, items: unknown[]) =>
+  ({ ...subMenu, items });
+```
+**Effort:** Trivial. **Risk:** None (same external API, immutable return).
+
+## Acceptance Criteria
+- [ ] Both functions return new objects (no mutation)
+- [ ] Existing call sites unaffected
+
+## Work Log
+- 2026-05-01: Found during ce:review (security-sentinel agent)
+
+## Resources
+- `packages/ui/nativewindui/index.web.tsx` — createContextSubMenu and createDropdownSubMenu
diff --git a/todos/007-pending-p2-web-ui-depdendency-type.md b/todos/007-pending-p2-web-ui-depdendency-type.md
new file mode 100644
index 0000000000..9f0cfe3589
--- /dev/null
+++ b/todos/007-pending-p2-web-ui-depdendency-type.md
@@ -0,0 +1,35 @@
+---
+status: pending
+priority: p2
+issue_id: "007"
+tags: [code-review, architecture, web-shims]
+dependencies: []
+---
+
+# @packrat/web-ui Listed as devDependency Instead of dependency
+
+## Problem Statement
+
+`packages/ui/package.json` declares `@packrat/web-ui` under `devDependencies`. However, `index.web.tsx` statically imports from it at runtime (when Metro bundles for web). In Bun workspaces this works due to hoisting, but it's architecturally incorrect. If the package were ever published or consumed by a workspace that doesn't hoist, this would fail.
+
+## Findings
+
+- Architecture reviewer flagged this as significant
+- Confirmed in `packages/ui/package.json`
+- `bun.lock` shows it correctly in devDependencies today
+
+## Proposed Solutions
+
+### Option A: Move to dependencies (Recommended)
+Change `"devDependencies": { "@packrat/web-ui": "workspace:*" }` to `"dependencies": { "@packrat/web-ui": "workspace:*" }`.
+**Effort:** Trivial. **Risk:** None.
+
+## Acceptance Criteria
+- [ ] `@packrat/web-ui` listed under `dependencies` in `packages/ui/package.json`
+- [ ] `bun install` still succeeds
+
+## Work Log
+- 2026-05-01: Found during ce:review (architecture-strategist agent)
+
+## Resources
+- `packages/ui/package.json`
diff --git a/todos/008-pending-p2-submit-editing-not-wired.md b/todos/008-pending-p2-submit-editing-not-wired.md
new file mode 100644
index 0000000000..96f638fd3c
--- /dev/null
+++ b/todos/008-pending-p2-submit-editing-not-wired.md
@@ -0,0 +1,44 @@
+---
+status: pending
+priority: p2
+issue_id: "008"
+tags: [code-review, quality, web-shims, ux]
+dependencies: []
+---
+
+# onSubmitEditing Not Wired in SearchInput Web Shim
+
+## Problem Statement
+
+`SearchInput` accepts `onSubmitEditing?: () => void` in its props type but the web shim never wires it to the `<input>` element. Users pressing Enter in a search box on web get no response. This is a functional regression from native behavior.
+
+## Findings
+
+- Agent-native reviewer flagged this as the only functional gap in the shim layer
+- `search-input.web.tsx` has `onSubmitEditing` in type but not in the JSX
+- Affects web users; agents are unaffected (they call tools directly)
+
+## Proposed Solutions
+
+### Option A: Add onKeyDown Enter handler (Recommended)
+```tsx
+onKeyDown={(e: React.KeyboardEvent<HTMLInputElement>) => {
+  if (e.key === 'Enter') onSubmitEditing?.();
+}}
+```
+**Effort:** Small. **Risk:** None.
+
+### Option B: Wire to a wrapping `<form>` with onSubmit
+Wrap in `<form onSubmit={...}>` for proper browser form semantics.
+**Pros:** Better accessibility (browser handles Enter natively).
+**Effort:** Small. **Risk:** Low.
+
+## Acceptance Criteria
+- [ ] Pressing Enter in SearchInput on web calls `onSubmitEditing`
+- [ ] Existing keyboard behavior unchanged
+
+## Work Log
+- 2026-05-01: Found during ce:review (agent-native-reviewer agent)
+
+## Resources
+- `packages/ui/nativewindui/search-input.web.tsx`
diff --git a/todos/009-pending-p2-unsafe-rest-spread-button.md b/todos/009-pending-p2-unsafe-rest-spread-button.md
new file mode 100644
index 0000000000..d5ac7895d5
--- /dev/null
+++ b/todos/009-pending-p2-unsafe-rest-spread-button.md
@@ -0,0 +1,43 @@
+---
+status: pending
+priority: p2
+issue_id: "009"
+tags: [code-review, typescript, quality, web-shims]
+dependencies: []
+---
+
+# Unsafe rest Spread Cast in button.web.tsx
+
+## Problem Statement
+
+```ts
+{...(rest as Partial<ShadcnButtonProps>)}
+```
+`ButtonProps` does not extend `ShadcnButtonProps`. The cast is unsound — it lets any leftover prop flow to the DOM `<button>` without type verification. Native-only props not listed in `ButtonProps` would be spread onto a DOM element, generating React unknown prop warnings.
+
+## Findings
+
+- TypeScript reviewer (High severity) and simplicity reviewer both flagged this
+- `androidRootClassName` is explicitly destructured and discarded — but any other native prop not listed will flow through
+- The cast `Partial<ShadcnButtonProps>` is not a valid assertion of what `rest` actually contains
+
+## Proposed Solutions
+
+### Option A: Remove the rest spread entirely (Recommended for PoC)
+The existing named props cover all real use cases. Removing `...rest` eliminates the risk.
+**Effort:** Trivial. **Risk:** None for current call sites.
+
+### Option B: Properly type the component
+Define `ButtonProps` as extending `Omit<ShadcnButtonProps, 'variant' | 'size' | 'onClick'>` and let TypeScript validate the intersection.
+**Effort:** Medium. **Risk:** Low.
+
+## Acceptance Criteria
+- [ ] No unsound type cast on button props
+- [ ] No unknown DOM prop warnings in browser console
+- [ ] `bun check-types` passes
+
+## Work Log
+- 2026-05-01: Found during ce:review (kieran-typescript-reviewer)
+
+## Resources
+- `packages/ui/nativewindui/button.web.tsx`
diff --git a/todos/010-pending-p2-icon-map-nouncheckedindexedaccess.md b/todos/010-pending-p2-icon-map-nouncheckedindexedaccess.md
new file mode 100644
index 0000000000..cccb8cb1c3
--- /dev/null
+++ b/todos/010-pending-p2-icon-map-nouncheckedindexedaccess.md
@@ -0,0 +1,41 @@
+---
+status: pending
+priority: p2
+issue_id: "010"
+tags: [code-review, typescript, web-shims]
+dependencies: []
+---
+
+# ICON_MAP[name] Conflicts with noUncheckedIndexedAccess
+
+## Problem Statement
+
+```ts
+const LucideComponent: LucideIcon = ICON_MAP[name] ?? Circle;
+```
+With `noUncheckedIndexedAccess: true` (inherited via expo tsconfig), `ICON_MAP[name]` resolves to `LucideIcon | undefined`. The `?? Circle` fallback handles runtime, but the explicit type annotation `LucideIcon` forces assignment of `LucideIcon | undefined` to `LucideIcon` — TypeScript rejects this.
+
+## Findings
+
+- TypeScript reviewer (High severity) flagged this
+- Root tsconfig has `noUncheckedIndexedAccess: true`
+- `.web.tsx` files are excluded from root tsconfig but included by expo tsconfig which extends root
+
+## Proposed Solutions
+
+### Option A: Remove the explicit type annotation (Recommended)
+```ts
+const LucideComponent = ICON_MAP[name] ?? Circle;
+```
+TypeScript infers `LucideIcon | undefined`, then the `?? Circle` fallback narrows it to `LucideIcon`. Type-safe, no annotation needed.
+**Effort:** Trivial. **Risk:** None.
+
+## Acceptance Criteria
+- [ ] `bun check-types` passes with no error on `icon.web.tsx`
+- [ ] Fallback to `Circle` for unknown names still works
+
+## Work Log
+- 2026-05-01: Found during ce:review (kieran-typescript-reviewer)
+
+## Resources
+- `packages/ui/nativewindui/icon.web.tsx`
diff --git a/todos/011-pending-p3-cn-utility-duplicated.md b/todos/011-pending-p3-cn-utility-duplicated.md
new file mode 100644
index 0000000000..afbbc3b99d
--- /dev/null
+++ b/todos/011-pending-p3-cn-utility-duplicated.md
@@ -0,0 +1,46 @@
+---
+status: pending
+priority: p3
+issue_id: "011"
+tags: [code-review, quality, architecture, web-shims]
+dependencies: []
+---
+
+# cn Utility Duplicated Across 8+ Shim Files
+
+## Problem Statement
+
+Every shim file that needs CSS class merging inlines the same `cn` function:
+```ts
+import { type ClassValue, clsx } from 'clsx';
+import { twMerge } from 'tailwind-merge';
+function cn(...inputs: ClassValue[]) { return twMerge(clsx(inputs)); }
+```
+`index.web.tsx` already exports `cn` publicly. The other files don't import from the barrel (would create a circular dep). A shared `cn.web.ts` in the same directory would solve this cleanly.
+
+## Findings
+
+- TypeScript reviewer (Medium), architecture reviewer (Significant), simplicity reviewer all flagged
+- Affected files: activity-indicator, segmented-control, list, search-input, text-field, text, large-title-header, stepper
+- `theme-toggle.web.tsx` already imports from `./index.web` — pattern is partly established
+
+## Proposed Solutions
+
+### Option A: Extract to cn.web.ts (Recommended)
+Create `packages/ui/nativewindui/cn.web.ts` with the cn export, import from it in all shim files and in index.web.tsx.
+**Effort:** Small. **Risk:** None.
+
+### Option B: Import from @packrat/web-ui
+If `@packrat/web-ui` exports `cn`, import from there.
+**Effort:** Tiny. **Risk:** Adds coupling to web-ui for a utility.
+
+## Acceptance Criteria
+- [ ] `cn` defined in exactly one place within the shim directory
+- [ ] All shim files import from that shared location
+- [ ] No circular dependency introduced
+
+## Work Log
+- 2026-05-01: Found during ce:review (3 agents)
+
+## Resources
+- `packages/ui/nativewindui/*.web.tsx`
diff --git a/todos/012-pending-p3-theme-toggle-circular-import.md b/todos/012-pending-p3-theme-toggle-circular-import.md
new file mode 100644
index 0000000000..4ff69d78ff
--- /dev/null
+++ b/todos/012-pending-p3-theme-toggle-circular-import.md
@@ -0,0 +1,37 @@
+---
+status: pending
+priority: p3
+issue_id: "012"
+tags: [code-review, architecture, web-shims]
+dependencies: ["011"]
+---
+
+# Circular Import: theme-toggle.web.tsx → index.web.tsx
+
+## Problem Statement
+
+`theme-toggle.web.tsx` imports `useColorScheme` from `./index.web`. Since `index.web.tsx` re-exports `ThemeToggle` from `./theme-toggle.web`, there is a circular module dependency. Metro handles this at runtime via lazy loading, but TypeScript's language service can get confused, and initialization ordering bugs are possible if the cycle grows.
+
+## Findings
+
+- TypeScript reviewer (Medium) and architecture reviewer (Moderate) both flagged this
+- The cycle: `index.web.tsx` → `theme-toggle.web.tsx` → `index.web.tsx`
+- Metro CommonJS lazy loading makes this work today, but it's a structural smell
+
+## Proposed Solutions
+
+### Option A: Extract useColorScheme to use-color-scheme.web.ts (Recommended)
+Move `useColorScheme`, `STUB_COLORS`, and `DARK_STUB_COLORS` to `packages/ui/nativewindui/use-color-scheme.web.ts`. Both `index.web.tsx` and `theme-toggle.web.tsx` import from there. Cycle broken.
+**Effort:** Small. **Risk:** Low.
+
+## Acceptance Criteria
+- [ ] No circular import between theme-toggle and index barrel
+- [ ] ThemeToggle still works correctly
+- [ ] `useColorScheme` still exported from index.web.tsx
+
+## Work Log
+- 2026-05-01: Found during ce:review
+
+## Resources
+- `packages/ui/nativewindui/theme-toggle.web.tsx`
+- `packages/ui/nativewindui/index.web.tsx`
diff --git a/todos/013-pending-p3-alert-methods-type.md b/todos/013-pending-p3-alert-methods-type.md
new file mode 100644
index 0000000000..16e7f2d8a8
--- /dev/null
+++ b/todos/013-pending-p3-alert-methods-type.md
@@ -0,0 +1,40 @@
+---
+status: pending
+priority: p3
+issue_id: "013"
+tags: [code-review, typescript, quality, web-shims]
+dependencies: []
+---
+
+# AlertMethods Exported as Runtime Value Instead of Type
+
+## Problem Statement
+
+```ts
+export const AlertMethods = {};
+```
+Screen code does `import { Alert, type AlertMethods }`. On native `AlertMethods` is a type. Exporting it as a runtime value pollutes the module's runtime surface and gives type `{}` which is nearly unconstrained.
+
+## Findings
+
+- Architecture reviewer (Significant) and TypeScript reviewer (Low) both flagged this
+- Should be `export type AlertMethods = Record<string, never>`
+
+## Proposed Solutions
+
+### Option A: Change to type export (Recommended)
+```ts
+export type AlertMethods = Record<string, never>;
+```
+And remove `export const AlertMethods = {};`.
+**Effort:** Trivial. **Risk:** None.
+
+## Acceptance Criteria
+- [ ] `AlertMethods` is a type-only export
+- [ ] No runtime value exported for AlertMethods
+
+## Work Log
+- 2026-05-01: Found during ce:review
+
+## Resources
+- `packages/ui/nativewindui/index.web.tsx`
diff --git a/todos/014-pending-p3-create-item-generic-identity.md b/todos/014-pending-p3-create-item-generic-identity.md
new file mode 100644
index 0000000000..3bae418481
--- /dev/null
+++ b/todos/014-pending-p3-create-item-generic-identity.md
@@ -0,0 +1,45 @@
+---
+status: pending
+priority: p3
+issue_id: "014"
+tags: [code-review, typescript, quality, web-shims]
+dependencies: []
+---
+
+# createContextItem / createDropdownItem Should Be Generic Identity Functions
+
+## Problem Statement
+
+```ts
+export const createContextItem = (item: unknown) => item;
+export const createDropdownItem = (item: unknown) => item;
+```
+The return type is `unknown`. Call sites build arrays of these items and pass them to menu components. With `unknown` return type, the array type is `unknown[]`, which TypeScript will reject when passed to typed component props.
+
+## Findings
+
+- TypeScript reviewer flagged this (Low)
+- Call sites in `chat.tsx` and `conversations.tsx` pass shaped objects
+
+## Proposed Solutions
+
+### Option A: Generic identity function (Recommended)
+```ts
+export const createContextItem = <T,>(item: T): T => item;
+export const createDropdownItem = <T,>(item: T): T => item;
+export const createContextSubMenu = <T extends object>(subMenu: T, items: unknown[]): T & { items: unknown[] } =>
+  ({ ...subMenu, items });
+export const createDropdownSubMenu = <T extends object>(subMenu: T, items: unknown[]): T & { items: unknown[] } =>
+  ({ ...subMenu, items });
+```
+**Effort:** Trivial. **Risk:** None.
+
+## Acceptance Criteria
+- [ ] `createContextItem` preserves the type of its argument
+- [ ] No `unknown[]` array types at call sites
+
+## Work Log
+- 2026-05-01: Found during ce:review (kieran-typescript-reviewer)
+
+## Resources
+- `packages/ui/nativewindui/index.web.tsx`
diff --git a/todos/015-pending-p3-lucide-barrel-imports.md b/todos/015-pending-p3-lucide-barrel-imports.md
new file mode 100644
index 0000000000..27c8fbb420
--- /dev/null
+++ b/todos/015-pending-p3-lucide-barrel-imports.md
@@ -0,0 +1,44 @@
+---
+status: pending
+priority: p3
+issue_id: "015"
+tags: [code-review, performance, web-shims, bundle-size]
+dependencies: []
+---
+
+# 60 Lucide Imports May Pull Full 224KB Barrel
+
+## Problem Statement
+
+`icon.web.tsx` imports ~60 named icons from `lucide-react` root barrel. Metro does not perform named-export tree-shaking within a module — it traces the module graph. If Metro resolves `lucide-react` to the ESM barrel (224 KB, 1,947 icons), every chunk that uses `Icon` carries 97% wasted icon payload.
+
+## Findings
+
+- Performance reviewer (P0) flagged this as the single largest potential bundle regression
+- Lucide v1.x ships per-icon `.mjs` subpath exports (~180 bytes each)
+- Whether Metro tree-shakes depends on how `lucide-react` package exports are configured
+
+## Proposed Solutions
+
+### Option A: Switch to per-icon subpath imports (Recommended)
+```ts
+import { Circle } from 'lucide-react/icons/circle';
+import { Search } from 'lucide-react/icons/search';
+```
+**Pros:** Only referenced icons in bundle.
+**Cons:** More verbose import block.
+**Effort:** Small. **Risk:** Low.
+
+### Option B: Audit current bundle output first
+Run `METRO_BUNDLE_ANALYZE=1` or check bundle size before/after. If lucide-react ships proper `sideEffects: false` and Metro is using its ESM exports correctly, barrel may already be shaken.
+**Effort:** Small. **Risk:** None.
+
+## Acceptance Criteria
+- [ ] Bundle size verified before/after
+- [ ] If barrel is full-size: switch to per-icon imports
+
+## Work Log
+- 2026-05-01: Found during ce:review (performance-oracle agent)
+
+## Resources
+- `packages/ui/nativewindui/icon.web.tsx`
diff --git a/todos/016-pending-p3-picker-child-type-guard.md b/todos/016-pending-p3-picker-child-type-guard.md
new file mode 100644
index 0000000000..82c5513317
--- /dev/null
+++ b/todos/016-pending-p3-picker-child-type-guard.md
@@ -0,0 +1,52 @@
+---
+status: pending
+priority: p3
+issue_id: "016"
+tags: [code-review, security, quality, web-shims]
+dependencies: []
+---
+
+# Picker collectItems Needs child.type === PickerItem Guard
+
+## Problem Statement
+
+`collectItems` in `picker.web.tsx` checks only that `child.props.label` is a string before casting `child.props as PickerItemProps`. Any non-PickerItem component that happens to have a `label` string prop will be silently promoted into the select list. The existing `apps/expo/lib/Picker.web.tsx` already uses the correct pattern: `React.isValidElement<ItemProps>(child) && child.type === PickerItem`.
+
+Also: `value` is not validated — a child with `label` but no `value` produces `value={String(undefined)}` = `"undefined"` as a SelectItem key/value.
+
+## Findings
+
+- Security reviewer (M1), simplicity reviewer, and TypeScript reviewer all flagged
+- The existing web-ui Picker shim at `apps/expo/lib/Picker.web.tsx` already has the correct pattern
+
+## Proposed Solutions
+
+### Option A: Add React.isValidElement + type check (Recommended)
+```ts
+function collectItems(children: React.ReactNode): PickerItemProps[] {
+  const items: PickerItemProps[] = [];
+  React.Children.forEach(children, (child) => {
+    if (React.isValidElement<PickerItemProps>(child) && child.type === PickerItem) {
+      items.push(child.props);
+    }
+  });
+  return items;
+}
+```
+**Effort:** Small. **Risk:** None.
+
+### Option B: Accept items array prop
+See todo 011 discussion. Eliminates traversal entirely.
+**Effort:** Medium. **Risk:** Requires caller changes.
+
+## Acceptance Criteria
+- [ ] Only actual `<PickerItem>` children are collected
+- [ ] Non-PickerItem elements with `label` props are ignored
+- [ ] `value` fallback handled (empty string or skip)
+
+## Work Log
+- 2026-05-01: Found during ce:review
+
+## Resources
+- `packages/ui/nativewindui/picker.web.tsx`
+- `apps/expo/lib/Picker.web.tsx` — reference implementation
diff --git a/tsconfig.json b/tsconfig.json
index 85af917f4b..34067b3dd9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -36,8 +36,8 @@
       "@packrat/analytics/*": ["./packages/analytics/src/*"],
       "@packrat/cli": ["./packages/cli/src"],
       "@packrat/cli/*": ["./packages/cli/src/*"],
-      "@packrat/domain": ["./packages/domain/src/index.ts"],
-      "@packrat/domain/*": ["./packages/domain/src/*"],
+      "@packrat/app": ["./packages/app/src/index.ts"],
+      "@packrat/app/*": ["./packages/app/src/*"],
       "@packrat/web-ui": ["./packages/web-ui/src"],
       "@packrat/web-ui/*": ["./packages/web-ui/src/*"],
       "nativewindui/*": ["./apps/expo/components/ui/*"]

From feb7ec3db4a5e8dc3b06d74a0a3c370304bef6fc Mon Sep 17 00:00:00 2001
From: Andrew Bierman <abbierman101@gmail.com>
Date: Fri, 1 May 2026 18:06:41 -0600
Subject: [PATCH 4/9] refactor: move all remaining clean feature types to
 @packrat/app
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Moves 7 feature type files (ai-packs, ai, feed, guides, profile,
trail-conditions, wildlife) to packages/app/src with index barrels
and sub-path exports. Adds re-export stubs in expo so existing
imports are unaffected. Adds `ai` catalog dep to packages/app.

Skipped: weather/types.ts (refs MaterialIconName from expo-app),
auth atoms/store (kvStorage — needs injection pattern PR).
---
 apps/expo/features/ai-packs/types.ts         |  4 +-
 apps/expo/features/ai/types.ts               | 41 +------------
 apps/expo/features/feed/types.ts             | 60 +++-----------------
 apps/expo/features/guides/types.ts           | 27 +--------
 apps/expo/features/profile/types.ts          | 12 +---
 apps/expo/features/trail-conditions/types.ts | 36 +++---------
 apps/expo/features/wildlife/types.ts         | 53 ++---------------
 packages/app/package.json                    | 12 +++-
 packages/app/src/ai-packs/index.ts           |  1 +
 packages/app/src/ai-packs/types.ts           |  3 +
 packages/app/src/ai/index.ts                 |  1 +
 packages/app/src/ai/types.ts                 | 40 +++++++++++++
 packages/app/src/feed/index.ts               |  8 +++
 packages/app/src/feed/types.ts               | 52 +++++++++++++++++
 packages/app/src/guides/index.ts             |  1 +
 packages/app/src/guides/types.ts             | 26 +++++++++
 packages/app/src/index.ts                    |  8 +++
 packages/app/src/profile/index.ts            |  1 +
 packages/app/src/profile/types.ts            | 11 ++++
 packages/app/src/trail-conditions/index.ts   |  8 +++
 packages/app/src/trail-conditions/types.ts   | 30 ++++++++++
 packages/app/src/wildlife/index.ts           |  6 ++
 packages/app/src/wildlife/types.ts           | 47 +++++++++++++++
 23 files changed, 278 insertions(+), 210 deletions(-)
 create mode 100644 packages/app/src/ai-packs/index.ts
 create mode 100644 packages/app/src/ai-packs/types.ts
 create mode 100644 packages/app/src/ai/index.ts
 create mode 100644 packages/app/src/ai/types.ts
 create mode 100644 packages/app/src/feed/index.ts
 create mode 100644 packages/app/src/feed/types.ts
 create mode 100644 packages/app/src/guides/index.ts
 create mode 100644 packages/app/src/guides/types.ts
 create mode 100644 packages/app/src/profile/index.ts
 create mode 100644 packages/app/src/profile/types.ts
 create mode 100644 packages/app/src/trail-conditions/index.ts
 create mode 100644 packages/app/src/trail-conditions/types.ts
 create mode 100644 packages/app/src/wildlife/index.ts
 create mode 100644 packages/app/src/wildlife/types.ts

diff --git a/apps/expo/features/ai-packs/types.ts b/apps/expo/features/ai-packs/types.ts
index 22fcaeb3f5..86cee2f231 100644
--- a/apps/expo/features/ai-packs/types.ts
+++ b/apps/expo/features/ai-packs/types.ts
@@ -1,3 +1 @@
-export interface GenerationRequest {
-  count: number;
-}
+export type { GenerationRequest } from '@packrat/app/ai-packs';
diff --git a/apps/expo/features/ai/types.ts b/apps/expo/features/ai/types.ts
index 741ed16209..97eabd8e6e 100644
--- a/apps/expo/features/ai/types.ts
+++ b/apps/expo/features/ai/types.ts
@@ -1,40 +1 @@
-import type { DeepPartial } from 'ai';
-
-export type ToolOutput<Data> =
-  | ({
-      success: true;
-    } & Data)
-  | {
-      success: false;
-      error: string;
-    };
-
-export type ToolInvocation<TInput, TOutput> = {
-  toolCallId: string;
-  providerExecuted?: boolean;
-} & (
-  | {
-      state: 'input-streaming';
-      input: DeepPartial<TInput> | undefined;
-      output?: never;
-      errorText?: never;
-    }
-  | {
-      state: 'input-available';
-      input: TInput;
-      output?: never;
-      errorText?: never;
-    }
-  | {
-      state: 'output-available';
-      input: TInput;
-      output: TOutput;
-      errorText?: never;
-    }
-  | {
-      state: 'output-error';
-      input: TInput;
-      output?: never;
-      errorText: string;
-    }
-);
+export type { ToolInvocation, ToolOutput } from '@packrat/app/ai';
diff --git a/apps/expo/features/feed/types.ts b/apps/expo/features/feed/types.ts
index a1cb5cbff6..08d76a2760 100644
--- a/apps/expo/features/feed/types.ts
+++ b/apps/expo/features/feed/types.ts
@@ -1,52 +1,8 @@
-export interface PostAuthor {
-  id: number;
-  firstName: string | null;
-  lastName: string | null;
-}
-
-export interface Post {
-  id: number;
-  userId: number;
-  caption: string | null;
-  images: string[];
-  createdAt: string;
-  updatedAt: string;
-  author?: PostAuthor;
-  likeCount: number;
-  commentCount: number;
-  likedByMe: boolean;
-}
-
-export interface FeedResponse {
-  items: Post[];
-  page: number;
-  limit: number;
-  total: number;
-  totalPages: number;
-}
-
-export interface Comment {
-  id: number;
-  postId: number;
-  userId: number;
-  content: string;
-  parentCommentId: number | null;
-  createdAt: string;
-  updatedAt: string;
-  author?: PostAuthor;
-  likeCount: number;
-  likedByMe: boolean;
-}
-
-export interface CommentsResponse {
-  items: Comment[];
-  page: number;
-  limit: number;
-  total: number;
-  totalPages: number;
-}
-
-export interface LikeToggleResponse {
-  liked: boolean;
-  likeCount: number;
-}
+export type {
+  Comment,
+  CommentsResponse,
+  FeedResponse,
+  LikeToggleResponse,
+  Post,
+  PostAuthor,
+} from '@packrat/app/feed';
diff --git a/apps/expo/features/guides/types.ts b/apps/expo/features/guides/types.ts
index 7bf619f216..1b9fac7bed 100644
--- a/apps/expo/features/guides/types.ts
+++ b/apps/expo/features/guides/types.ts
@@ -1,26 +1 @@
-export interface Guide {
-  id: string;
-  key: string;
-  title: string;
-  category: string;
-  categories?: string[];
-  description: string;
-  content?: string;
-  author?: string;
-  readingTime?: string;
-  difficulty?: string;
-  createdAt: string;
-  updatedAt: string;
-}
-
-export interface GuidesListResponse {
-  items: Guide[];
-  totalCount: number;
-  page: number;
-  limit: number;
-  totalPages: number;
-}
-
-export interface GuidesSearchResponse extends GuidesListResponse {
-  query: string;
-}
+export type { Guide, GuidesListResponse, GuidesSearchResponse } from '@packrat/app/guides';
diff --git a/apps/expo/features/profile/types.ts b/apps/expo/features/profile/types.ts
index f487d58a38..025216030f 100644
--- a/apps/expo/features/profile/types.ts
+++ b/apps/expo/features/profile/types.ts
@@ -1,11 +1 @@
-import type { WeightUnit } from '../packs/types';
-
-export interface User {
-  id: number;
-  email: string;
-  firstName: string;
-  lastName: string;
-  avatarUrl?: string | null;
-  role: 'USER' | 'ADMIN';
-  preferredWeightUnit: WeightUnit;
-}
+export type { User } from '@packrat/app/profile';
diff --git a/apps/expo/features/trail-conditions/types.ts b/apps/expo/features/trail-conditions/types.ts
index 5e94586702..3a16f80ccb 100644
--- a/apps/expo/features/trail-conditions/types.ts
+++ b/apps/expo/features/trail-conditions/types.ts
@@ -1,30 +1,8 @@
-export type TrailSurface = 'paved' | 'gravel' | 'dirt' | 'rocky' | 'snow' | 'mud';
-export type OverallCondition = 'excellent' | 'good' | 'fair' | 'poor';
-export type WaterCrossingDifficulty = 'easy' | 'moderate' | 'difficult';
-
-export interface TrailConditionReport {
-  id: string;
-  trailName: string;
-  trailRegion?: string | null;
-  surface: TrailSurface;
-  overallCondition: OverallCondition;
-  hazards: string[];
-  waterCrossings: number;
-  waterCrossingDifficulty?: WaterCrossingDifficulty | null;
-  notes?: string | null;
-  photos: string[];
-  userId?: number;
-  tripId?: string | null;
-  deleted: boolean;
-  createdAt?: string;
-  updatedAt?: string;
-  localCreatedAt?: string;
-  localUpdatedAt?: string;
-}
-
-export type TrailConditionReportInStore = Omit<TrailConditionReport, 'userId'>;
-
-export type TrailConditionReportInput = Omit<
+export type {
+  OverallCondition,
   TrailConditionReport,
-  'id' | 'userId' | 'deleted' | 'createdAt' | 'updatedAt' | 'localCreatedAt' | 'localUpdatedAt'
->;
+  TrailConditionReportInput,
+  TrailConditionReportInStore,
+  TrailSurface,
+  WaterCrossingDifficulty,
+} from '@packrat/app/trail-conditions';
diff --git a/apps/expo/features/wildlife/types.ts b/apps/expo/features/wildlife/types.ts
index fde8728031..8d2e312586 100644
--- a/apps/expo/features/wildlife/types.ts
+++ b/apps/expo/features/wildlife/types.ts
@@ -1,47 +1,6 @@
-export type SpeciesCategory =
-  | 'mammal'
-  | 'bird'
-  | 'reptile'
-  | 'amphibian'
-  | 'insect'
-  | 'plant'
-  | 'flower'
-  | 'tree'
-  | 'mushroom'
-  | 'fish'
-  | 'other';
-
-export interface SpeciesEntry {
-  id: string;
-  commonName: string;
-  scientificName: string;
-  category: SpeciesCategory;
-  description: string;
-  habitat: string[];
-  regions: string[];
-  dangerLevel: 'safe' | 'caution' | 'dangerous';
-  characteristics: string[];
-  conservationStatus?: string;
-  interestingFacts?: string[];
-  imageDescription?: string;
-}
-
-export interface IdentificationResult {
-  species: SpeciesEntry;
-  /** Normalized confidence score in the range [0, 1]. */
-  confidence: number;
-  source: 'online' | 'offline';
-}
-
-export interface WildlifeIdentification {
-  id: string;
-  imageUri: string;
-  timestamp: number;
-  results: IdentificationResult[];
-  notes?: string;
-  location?: {
-    latitude: number;
-    longitude: number;
-    name?: string;
-  };
-}
+export type {
+  IdentificationResult,
+  SpeciesCategory,
+  SpeciesEntry,
+  WildlifeIdentification,
+} from '@packrat/app/wildlife';
diff --git a/packages/app/package.json b/packages/app/package.json
index 94950fd70b..7f9b8ae65c 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -5,14 +5,22 @@
   "type": "module",
   "exports": {
     ".": "./src/index.ts",
+    "./ai": "./src/ai/index.ts",
+    "./ai-packs": "./src/ai-packs/index.ts",
     "./catalog": "./src/catalog/index.ts",
+    "./feed": "./src/feed/index.ts",
+    "./guides": "./src/guides/index.ts",
     "./pack-templates": "./src/pack-templates/index.ts",
     "./packs": "./src/packs/index.ts",
-    "./trips": "./src/trips/index.ts"
+    "./profile": "./src/profile/index.ts",
+    "./trail-conditions": "./src/trail-conditions/index.ts",
+    "./trips": "./src/trips/index.ts",
+    "./wildlife": "./src/wildlife/index.ts"
   },
   "main": "./src/index.ts",
   "types": "./src/index.ts",
   "dependencies": {
-    "@packrat/api": "workspace:*"
+    "@packrat/api": "workspace:*",
+    "ai": "catalog:"
   }
 }
diff --git a/packages/app/src/ai-packs/index.ts b/packages/app/src/ai-packs/index.ts
new file mode 100644
index 0000000000..b8e16be7cc
--- /dev/null
+++ b/packages/app/src/ai-packs/index.ts
@@ -0,0 +1 @@
+export type { GenerationRequest } from './types';
diff --git a/packages/app/src/ai-packs/types.ts b/packages/app/src/ai-packs/types.ts
new file mode 100644
index 0000000000..22fcaeb3f5
--- /dev/null
+++ b/packages/app/src/ai-packs/types.ts
@@ -0,0 +1,3 @@
+export interface GenerationRequest {
+  count: number;
+}
diff --git a/packages/app/src/ai/index.ts b/packages/app/src/ai/index.ts
new file mode 100644
index 0000000000..5e6b4a3731
--- /dev/null
+++ b/packages/app/src/ai/index.ts
@@ -0,0 +1 @@
+export type { ToolInvocation, ToolOutput } from './types';
diff --git a/packages/app/src/ai/types.ts b/packages/app/src/ai/types.ts
new file mode 100644
index 0000000000..741ed16209
--- /dev/null
+++ b/packages/app/src/ai/types.ts
@@ -0,0 +1,40 @@
+import type { DeepPartial } from 'ai';
+
+export type ToolOutput<Data> =
+  | ({
+      success: true;
+    } & Data)
+  | {
+      success: false;
+      error: string;
+    };
+
+export type ToolInvocation<TInput, TOutput> = {
+  toolCallId: string;
+  providerExecuted?: boolean;
+} & (
+  | {
+      state: 'input-streaming';
+      input: DeepPartial<TInput> | undefined;
+      output?: never;
+      errorText?: never;
+    }
+  | {
+      state: 'input-available';
+      input: TInput;
+      output?: never;
+      errorText?: never;
+    }
+  | {
+      state: 'output-available';
+      input: TInput;
+      output: TOutput;
+      errorText?: never;
+    }
+  | {
+      state: 'output-error';
+      input: TInput;
+      output?: never;
+      errorText: string;
+    }
+);
diff --git a/packages/app/src/feed/index.ts b/packages/app/src/feed/index.ts
new file mode 100644
index 0000000000..ce93f81b87
--- /dev/null
+++ b/packages/app/src/feed/index.ts
@@ -0,0 +1,8 @@
+export type {
+  Comment,
+  CommentsResponse,
+  FeedResponse,
+  LikeToggleResponse,
+  Post,
+  PostAuthor,
+} from './types';
diff --git a/packages/app/src/feed/types.ts b/packages/app/src/feed/types.ts
new file mode 100644
index 0000000000..a1cb5cbff6
--- /dev/null
+++ b/packages/app/src/feed/types.ts
@@ -0,0 +1,52 @@
+export interface PostAuthor {
+  id: number;
+  firstName: string | null;
+  lastName: string | null;
+}
+
+export interface Post {
+  id: number;
+  userId: number;
+  caption: string | null;
+  images: string[];
+  createdAt: string;
+  updatedAt: string;
+  author?: PostAuthor;
+  likeCount: number;
+  commentCount: number;
+  likedByMe: boolean;
+}
+
+export interface FeedResponse {
+  items: Post[];
+  page: number;
+  limit: number;
+  total: number;
+  totalPages: number;
+}
+
+export interface Comment {
+  id: number;
+  postId: number;
+  userId: number;
+  content: string;
+  parentCommentId: number | null;
+  createdAt: string;
+  updatedAt: string;
+  author?: PostAuthor;
+  likeCount: number;
+  likedByMe: boolean;
+}
+
+export interface CommentsResponse {
+  items: Comment[];
+  page: number;
+  limit: number;
+  total: number;
+  totalPages: number;
+}
+
+export interface LikeToggleResponse {
+  liked: boolean;
+  likeCount: number;
+}
diff --git a/packages/app/src/guides/index.ts b/packages/app/src/guides/index.ts
new file mode 100644
index 0000000000..aa4b0f3b22
--- /dev/null
+++ b/packages/app/src/guides/index.ts
@@ -0,0 +1 @@
+export type { Guide, GuidesListResponse, GuidesSearchResponse } from './types';
diff --git a/packages/app/src/guides/types.ts b/packages/app/src/guides/types.ts
new file mode 100644
index 0000000000..7bf619f216
--- /dev/null
+++ b/packages/app/src/guides/types.ts
@@ -0,0 +1,26 @@
+export interface Guide {
+  id: string;
+  key: string;
+  title: string;
+  category: string;
+  categories?: string[];
+  description: string;
+  content?: string;
+  author?: string;
+  readingTime?: string;
+  difficulty?: string;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface GuidesListResponse {
+  items: Guide[];
+  totalCount: number;
+  page: number;
+  limit: number;
+  totalPages: number;
+}
+
+export interface GuidesSearchResponse extends GuidesListResponse {
+  query: string;
+}
diff --git a/packages/app/src/index.ts b/packages/app/src/index.ts
index 8145601b36..58f0f60f7c 100644
--- a/packages/app/src/index.ts
+++ b/packages/app/src/index.ts
@@ -1,4 +1,12 @@
+export * from './ai/index';
+export * from './ai-packs/index';
 export * from './catalog/index';
+export * from './feed/index';
+export * from './guides/index';
 export * from './pack-templates/index';
 export * from './packs/index';
+export * from './profile/index';
+export * from './trail-conditions/index';
 export * from './trips/index';
+export * from './wildlife/index';
+export * from './wildlife/index';
diff --git a/packages/app/src/profile/index.ts b/packages/app/src/profile/index.ts
new file mode 100644
index 0000000000..1524bfb596
--- /dev/null
+++ b/packages/app/src/profile/index.ts
@@ -0,0 +1 @@
+export type { User } from './types';
diff --git a/packages/app/src/profile/types.ts b/packages/app/src/profile/types.ts
new file mode 100644
index 0000000000..f487d58a38
--- /dev/null
+++ b/packages/app/src/profile/types.ts
@@ -0,0 +1,11 @@
+import type { WeightUnit } from '../packs/types';
+
+export interface User {
+  id: number;
+  email: string;
+  firstName: string;
+  lastName: string;
+  avatarUrl?: string | null;
+  role: 'USER' | 'ADMIN';
+  preferredWeightUnit: WeightUnit;
+}
diff --git a/packages/app/src/trail-conditions/index.ts b/packages/app/src/trail-conditions/index.ts
new file mode 100644
index 0000000000..9717724410
--- /dev/null
+++ b/packages/app/src/trail-conditions/index.ts
@@ -0,0 +1,8 @@
+export type {
+  OverallCondition,
+  TrailConditionReport,
+  TrailConditionReportInput,
+  TrailConditionReportInStore,
+  TrailSurface,
+  WaterCrossingDifficulty,
+} from './types';
diff --git a/packages/app/src/trail-conditions/types.ts b/packages/app/src/trail-conditions/types.ts
new file mode 100644
index 0000000000..5e94586702
--- /dev/null
+++ b/packages/app/src/trail-conditions/types.ts
@@ -0,0 +1,30 @@
+export type TrailSurface = 'paved' | 'gravel' | 'dirt' | 'rocky' | 'snow' | 'mud';
+export type OverallCondition = 'excellent' | 'good' | 'fair' | 'poor';
+export type WaterCrossingDifficulty = 'easy' | 'moderate' | 'difficult';
+
+export interface TrailConditionReport {
+  id: string;
+  trailName: string;
+  trailRegion?: string | null;
+  surface: TrailSurface;
+  overallCondition: OverallCondition;
+  hazards: string[];
+  waterCrossings: number;
+  waterCrossingDifficulty?: WaterCrossingDifficulty | null;
+  notes?: string | null;
+  photos: string[];
+  userId?: number;
+  tripId?: string | null;
+  deleted: boolean;
+  createdAt?: string;
+  updatedAt?: string;
+  localCreatedAt?: string;
+  localUpdatedAt?: string;
+}
+
+export type TrailConditionReportInStore = Omit<TrailConditionReport, 'userId'>;
+
+export type TrailConditionReportInput = Omit<
+  TrailConditionReport,
+  'id' | 'userId' | 'deleted' | 'createdAt' | 'updatedAt' | 'localCreatedAt' | 'localUpdatedAt'
+>;
diff --git a/packages/app/src/wildlife/index.ts b/packages/app/src/wildlife/index.ts
new file mode 100644
index 0000000000..01846dea27
--- /dev/null
+++ b/packages/app/src/wildlife/index.ts
@@ -0,0 +1,6 @@
+export type {
+  IdentificationResult,
+  SpeciesCategory,
+  SpeciesEntry,
+  WildlifeIdentification,
+} from './types';
diff --git a/packages/app/src/wildlife/types.ts b/packages/app/src/wildlife/types.ts
new file mode 100644
index 0000000000..fde8728031
--- /dev/null
+++ b/packages/app/src/wildlife/types.ts
@@ -0,0 +1,47 @@
+export type SpeciesCategory =
+  | 'mammal'
+  | 'bird'
+  | 'reptile'
+  | 'amphibian'
+  | 'insect'
+  | 'plant'
+  | 'flower'
+  | 'tree'
+  | 'mushroom'
+  | 'fish'
+  | 'other';
+
+export interface SpeciesEntry {
+  id: string;
+  commonName: string;
+  scientificName: string;
+  category: SpeciesCategory;
+  description: string;
+  habitat: string[];
+  regions: string[];
+  dangerLevel: 'safe' | 'caution' | 'dangerous';
+  characteristics: string[];
+  conservationStatus?: string;
+  interestingFacts?: string[];
+  imageDescription?: string;
+}
+
+export interface IdentificationResult {
+  species: SpeciesEntry;
+  /** Normalized confidence score in the range [0, 1]. */
+  confidence: number;
+  source: 'online' | 'offline';
+}
+
+export interface WildlifeIdentification {
+  id: string;
+  imageUri: string;
+  timestamp: number;
+  results: IdentificationResult[];
+  notes?: string;
+  location?: {
+    latitude: number;
+    longitude: number;
+    name?: string;
+  };
+}

From 9d7e3c8963fc6c53114605f50144fa2e637b25fa Mon Sep 17 00:00:00 2001
From: Andrew Bierman <abbierman101@gmail.com>
Date: Fri, 1 May 2026 18:17:38 -0600
Subject: [PATCH 5/9] feat(app): migrate types/utils/lib to @packrat/app
 package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move all cleanly extractable code from apps/expo/features to packages/app
following FSD organization. Callers import directly via @packrat/app/{feature}
sub-path exports — no re-export stubs.

Moved:
- packs, catalog, trips, pack-templates, ai, ai-packs, feed, guides,
  profile, trail-conditions, wildlife — types, utils, lib, data files

packages/app gets self-referential tsconfig paths so internal files
can import siblings via @packrat/app/packs instead of deep ../.. traversal.
---
 apps/expo/app/(app)/gear-inventory.tsx        |  2 +-
 apps/expo/app/(app)/settings/index.tsx        |  2 +-
 apps/expo/app/(app)/trail-conditions.tsx      |  2 +-
 .../atoms/recentlyUsedCatalogItemsAtom.ts     |  2 +-
 .../ai-packs/hooks/useGeneratedPacks.ts       |  2 +-
 apps/expo/features/ai-packs/types.ts          |  1 -
 .../features/ai/components/AIModeSheet.tsx    |  2 +-
 .../components/CatalogItemsGenerativeUI.tsx   |  4 ++--
 .../ai/components/GuidesRAGGenerativeUI.tsx   |  2 +-
 .../ai/components/PackDetailsGenerativeUI.tsx |  4 ++--
 .../PackItemDetailsGenerativeUI.tsx           |  4 ++--
 .../ai/components/WeatherGenerativeUI.tsx     |  2 +-
 .../ai/components/WebSearchGenerativeUI.tsx   |  2 +-
 .../features/ai/hooks/useReportedContent.ts   |  2 +-
 .../expo/features/ai/lib/localModelManager.ts |  3 +--
 apps/expo/features/ai/types.ts                |  1 -
 .../features/auth/hooks/useAuthActions.ts     |  2 +-
 apps/expo/features/auth/store/user.ts         |  2 +-
 .../components/CatalogBrowserModal.tsx        |  2 +-
 .../catalog/components/CatalogItemCard.tsx    |  4 ++--
 .../components/CatalogItemSelectCard.tsx      |  2 +-
 .../features/catalog/components/ItemLinks.tsx |  2 +-
 .../catalog/components/ItemReviews.tsx        |  2 +-
 .../hooks/useRecentlyUsedCatalogItems.ts      |  2 +-
 .../features/catalog/hooks/useSimilarItems.ts |  2 +-
 .../catalog/lib/normalizeDescription.ts       |  1 -
 .../screens/AddCatalogItemDetailsScreen.tsx   |  2 +-
 .../screens/CatalogItemDetailScreen.tsx       |  2 +-
 .../catalog/screens/CatalogItemsScreen.tsx    |  2 +-
 apps/expo/features/catalog/types.ts           |  9 ---------
 .../features/feed/components/CommentItem.tsx  |  2 +-
 .../features/feed/components/PostCard.tsx     |  2 +-
 apps/expo/features/feed/index.ts              |  2 +-
 .../expo/features/feed/screens/FeedScreen.tsx |  2 +-
 .../feed/screens/PostDetailScreen.tsx         |  2 +-
 apps/expo/features/feed/types.ts              |  8 --------
 .../feed/utils/__tests__/feedUtils.test.ts    |  2 +-
 apps/expo/features/feed/utils/index.ts        |  2 +-
 .../features/guides/components/GuideCard.tsx  |  2 +-
 .../guides/screens/GuidesListScreen.tsx       |  2 +-
 apps/expo/features/guides/types.ts            |  1 -
 .../components/AddPackTemplateItemActions.tsx |  2 +-
 .../components/FeaturedPacksSection.tsx       |  2 +-
 .../components/PackTemplateCard.tsx           |  2 +-
 .../components/PackTemplateForm.tsx           |  2 +-
 .../components/PackTemplateItemCard.tsx       |  2 +-
 .../components/PackTemplateItemImage.tsx      |  2 +-
 .../hooks/useBulkAddCatalogItems.ts           |  2 +-
 .../hooks/useCreatePackFromTemplate.ts        |  2 +-
 .../hooks/useCreatePackTemplate.ts            |  2 +-
 .../hooks/useCreatePackTemplateItem.ts        |  2 +-
 .../useGenerateTemplateFromOnlineContent.ts   |  2 +-
 .../hooks/usePackTemplateSummary.ts           |  2 +-
 .../hooks/usePackTemplatesDetails.ts          |  2 +-
 .../hooks/useUpdatePackTemplateItem.ts        |  2 +-
 .../hooks/useUpdatePacktemplate.ts            |  2 +-
 apps/expo/features/pack-templates/index.ts    |  2 +-
 .../screens/CreatePackTemplateItemForm.tsx    |  2 +-
 .../screens/ItemsScanScreen.tsx               |  2 +-
 .../screens/PackTemplateDetailScreen.tsx      |  2 +-
 .../screens/PackTemplateListScreen.tsx        |  4 ++--
 .../pack-templates/store/packTemplateItems.ts |  2 +-
 .../pack-templates/store/packTemplates.ts     |  2 +-
 apps/expo/features/pack-templates/types.ts    |  8 --------
 .../computePacktemplateWeight.test.ts         | 20 +++----------------
 .../packs/components/ActivityPicker.tsx       |  2 +-
 .../packs/components/AddPackItemActions.tsx   |  2 +-
 .../packs/components/GapAnalysisModal.tsx     |  2 +-
 .../components/GapItemCatalogSuggestions.tsx  |  2 +-
 .../packs/components/GapSuggestion.tsx        |  2 +-
 .../components/HorizontalCatalogItemCard.tsx  |  2 +-
 .../features/packs/components/PackCard.tsx    |  2 +-
 .../features/packs/components/PackForm.tsx    |  2 +-
 .../packs/components/PackItemCard.tsx         |  2 +-
 .../packs/components/PackItemImage.tsx        |  2 +-
 .../packs/components/SearchResults.tsx        |  2 +-
 .../features/packs/hooks/useAddCatalogItem.ts |  4 ++--
 .../packs/hooks/useBulkAddCatalogItems.ts     |  2 +-
 .../features/packs/hooks/useCreatePack.ts     |  2 +-
 .../packs/hooks/useCreatePackFromPack.ts      |  2 +-
 .../features/packs/hooks/useCreatePackItem.ts |  2 +-
 .../packs/hooks/useCreatePackWithItems.ts     |  2 +-
 .../features/packs/hooks/useDetailedPacks.ts  |  2 +-
 .../features/packs/hooks/useDuplicatePack.ts  |  2 +-
 .../features/packs/hooks/useImageDetection.ts |  2 +-
 .../packs/hooks/usePackDetailsFromStore.ts    |  3 +--
 .../packs/hooks/usePackItemDetailsFromApi.ts  |  2 +-
 .../packs/hooks/usePackWeightHistory.ts       |  2 +-
 .../features/packs/hooks/useRecentPacks.ts    |  2 +-
 .../packs/hooks/useSeasonSuggestions.ts       |  2 +-
 .../features/packs/hooks/useUpdatePack.ts     |  2 +-
 .../features/packs/hooks/useUpdatePackItem.ts |  2 +-
 apps/expo/features/packs/index.ts             |  2 +-
 apps/expo/features/packs/input.ts             |  1 -
 .../packs/screens/CreatePackItemForm.tsx      |  2 +-
 .../packs/screens/ItemsScanScreen.tsx         |  2 +-
 .../packs/screens/PackDetailScreen.tsx        |  2 +-
 .../features/packs/screens/PackListScreen.tsx |  2 +-
 apps/expo/features/packs/store/packItems.ts   |  2 +-
 .../features/packs/store/packWeightHistory.ts |  2 +-
 apps/expo/features/packs/store/packs.ts       |  2 +-
 apps/expo/features/packs/types.ts             | 12 -----------
 .../__tests__/computePackWeights.test.ts      |  4 ++--
 .../utils/__tests__/convertFromGrams.test.ts  |  2 +-
 .../utils/__tests__/convertToGrams.test.ts    |  2 +-
 .../features/packs/utils/computeCategories.ts |  5 ++---
 .../packs/utils/computePackWeights.ts         |  1 -
 .../features/packs/utils/convertFromGrams.ts  |  1 -
 .../features/packs/utils/convertToGrams.ts    |  1 -
 apps/expo/features/packs/utils/index.ts       |  6 +++---
 apps/expo/features/profile/types.ts           |  1 -
 .../components/ConditionBadge.tsx             |  2 +-
 .../components/SubmitConditionReportForm.tsx  |  6 +++++-
 .../components/TrailConditionReportCard.tsx   |  6 +++++-
 .../hooks/useSubmitTrailConditionReport.ts    |  5 ++++-
 .../hooks/useTrailConditionReports.ts         |  2 +-
 apps/expo/features/trail-conditions/index.ts  |  2 +-
 .../store/trailConditionReports.ts            |  2 +-
 apps/expo/features/trail-conditions/types.ts  |  8 --------
 .../features/trips/components/TripCard.tsx    |  2 +-
 .../features/trips/components/TripForm.tsx    |  2 +-
 .../features/trips/hooks/useCreateTrip.ts     |  2 +-
 .../features/trips/hooks/useUpdateTrip.ts     |  2 +-
 apps/expo/features/trips/index.ts             |  2 +-
 .../trips/screens/TripDetailScreen.tsx        |  2 +-
 .../features/trips/screens/TripListScreen.tsx |  2 +-
 apps/expo/features/trips/store/trips.ts       |  2 +-
 apps/expo/features/trips/types.ts             |  1 -
 .../features/wildlife/atoms/wildlifeAtoms.ts  |  2 +-
 .../wildlife/components/SpeciesCard.tsx       |  2 +-
 .../wildlife/hooks/useWildlifeHistory.ts      |  2 +-
 .../hooks/useWildlifeIdentification.ts        |  4 ++--
 apps/expo/features/wildlife/index.ts          |  2 +-
 .../wildlife/screens/IdentificationScreen.tsx |  2 +-
 .../wildlife/screens/SpeciesDetailScreen.tsx  |  2 +-
 .../wildlife/screens/WildlifeScreen.tsx       |  2 +-
 apps/expo/features/wildlife/types.ts          |  6 ------
 apps/expo/lib/utils/itemCalculations.ts       |  6 +++---
 packages/app/src/ai/index.ts                  |  1 +
 .../app/src}/ai/lib/constants.ts              |  0
 packages/app/src/pack-templates/index.ts      |  1 +
 .../utils/computePacktemplateWeight.ts        |  2 +-
 .../app/src}/wildlife/data/speciesDatabase.ts |  0
 packages/app/src/wildlife/index.ts            | 12 +++++++++++
 .../src}/wildlife/lib/offlineIdentifier.ts    |  0
 packages/app/tsconfig.json                    |  6 +++++-
 146 files changed, 168 insertions(+), 217 deletions(-)
 delete mode 100644 apps/expo/features/ai-packs/types.ts
 delete mode 100644 apps/expo/features/ai/types.ts
 delete mode 100644 apps/expo/features/catalog/lib/normalizeDescription.ts
 delete mode 100644 apps/expo/features/catalog/types.ts
 delete mode 100644 apps/expo/features/feed/types.ts
 delete mode 100644 apps/expo/features/guides/types.ts
 delete mode 100644 apps/expo/features/pack-templates/types.ts
 delete mode 100644 apps/expo/features/packs/input.ts
 delete mode 100644 apps/expo/features/packs/types.ts
 delete mode 100644 apps/expo/features/packs/utils/computePackWeights.ts
 delete mode 100644 apps/expo/features/packs/utils/convertFromGrams.ts
 delete mode 100644 apps/expo/features/packs/utils/convertToGrams.ts
 delete mode 100644 apps/expo/features/profile/types.ts
 delete mode 100644 apps/expo/features/trail-conditions/types.ts
 delete mode 100644 apps/expo/features/trips/types.ts
 delete mode 100644 apps/expo/features/wildlife/types.ts
 rename {apps/expo/features => packages/app/src}/ai/lib/constants.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/utils/computePacktemplateWeight.ts (92%)
 rename {apps/expo/features => packages/app/src}/wildlife/data/speciesDatabase.ts (100%)
 rename {apps/expo/features => packages/app/src}/wildlife/lib/offlineIdentifier.ts (100%)

diff --git a/apps/expo/app/(app)/gear-inventory.tsx b/apps/expo/app/(app)/gear-inventory.tsx
index f2fa21b2ed..dcb3d526a7 100644
--- a/apps/expo/app/(app)/gear-inventory.tsx
+++ b/apps/expo/app/(app)/gear-inventory.tsx
@@ -1,8 +1,8 @@
+import type { PackItem } from '@packrat/app/packs';
 import { assertDefined } from '@packrat/guards';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
 import { PackItemCard } from 'expo-app/features/packs/components/PackItemCard';
 import { useUserPackItems } from 'expo-app/features/packs/hooks/useUserPackItems';
-import type { PackItem } from 'expo-app/features/packs/types';
 import { cn } from 'expo-app/lib/cn';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useState } from 'react';
diff --git a/apps/expo/app/(app)/settings/index.tsx b/apps/expo/app/(app)/settings/index.tsx
index 0ec2f40c8f..6190cef236 100644
--- a/apps/expo/app/(app)/settings/index.tsx
+++ b/apps/expo/app/(app)/settings/index.tsx
@@ -1,3 +1,4 @@
+import { LLAMA_MODEL_SIZE } from '@packrat/app/ai';
 import { ActivityIndicator, Text } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
 import { appAlert } from 'expo-app/app/_layout';
@@ -7,7 +8,6 @@ import {
   localModelProgressAtom,
   localModelStatusAtom,
 } from 'expo-app/features/ai/atoms/aiModeAtoms';
-import { LLAMA_MODEL_SIZE } from 'expo-app/features/ai/lib/constants';
 import {
   cancelLocalModelDownload,
   deleteLocalModel,
diff --git a/apps/expo/app/(app)/trail-conditions.tsx b/apps/expo/app/(app)/trail-conditions.tsx
index 984a7cf2f3..2fb5fa10a7 100644
--- a/apps/expo/app/(app)/trail-conditions.tsx
+++ b/apps/expo/app/(app)/trail-conditions.tsx
@@ -1,9 +1,9 @@
+import type { TrailConditionReport, TrailSurface } from '@packrat/app/trail-conditions';
 import { ActivityIndicator, LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
 import { featureFlags } from 'expo-app/config';
 import { SubmitConditionReportForm } from 'expo-app/features/trail-conditions/components/SubmitConditionReportForm';
 import { TrailConditionReportCard } from 'expo-app/features/trail-conditions/components/TrailConditionReportCard';
 import { useTrailConditionReports } from 'expo-app/features/trail-conditions/hooks/useTrailConditionReports';
-import type { TrailConditionReport, TrailSurface } from 'expo-app/features/trail-conditions/types';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useMemo, useState } from 'react';
 import { FlatList, Modal, Pressable, ScrollView, View } from 'react-native';
diff --git a/apps/expo/atoms/recentlyUsedCatalogItemsAtom.ts b/apps/expo/atoms/recentlyUsedCatalogItemsAtom.ts
index 701ccea101..f2ca69800b 100644
--- a/apps/expo/atoms/recentlyUsedCatalogItemsAtom.ts
+++ b/apps/expo/atoms/recentlyUsedCatalogItemsAtom.ts
@@ -1,4 +1,4 @@
-import type { CatalogItem } from 'expo-app/features/catalog/types';
+import type { CatalogItem } from '@packrat/app/catalog';
 import { atomWithAsyncStorage } from './atomWithAsyncStorage';
 
 const MAX_RECENTLY_USED = 10;
diff --git a/apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts b/apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts
index 2e6c304fac..5b7cdd66ef 100644
--- a/apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts
+++ b/apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts
@@ -1,10 +1,10 @@
 import { use$ } from '@legendapp/state/react';
+import type { GenerationRequest } from '@packrat/app/ai-packs';
 import { useMutation } from '@tanstack/react-query';
 import type { Pack } from 'expo-app/features/packs';
 import { packsStore } from 'expo-app/features/packs/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { obs } from 'expo-app/lib/store';
-import type { GenerationRequest } from '../types';
 
 const generatePacks = async (request: GenerationRequest): Promise<Pack[]> => {
   const { data, error } = await apiClient.packs['generate-packs'].post(request);
diff --git a/apps/expo/features/ai-packs/types.ts b/apps/expo/features/ai-packs/types.ts
deleted file mode 100644
index 86cee2f231..0000000000
--- a/apps/expo/features/ai-packs/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { GenerationRequest } from '@packrat/app/ai-packs';
diff --git a/apps/expo/features/ai/components/AIModeSheet.tsx b/apps/expo/features/ai/components/AIModeSheet.tsx
index 44cf9ce611..ba61c58a6a 100644
--- a/apps/expo/features/ai/components/AIModeSheet.tsx
+++ b/apps/expo/features/ai/components/AIModeSheet.tsx
@@ -1,5 +1,6 @@
 import type { BottomSheetModal } from '@gorhom/bottom-sheet';
 import { BottomSheetView } from '@gorhom/bottom-sheet';
+import { LLAMA_MODEL_SIZE } from '@packrat/app/ai';
 import { isFunction } from '@packrat/guards';
 import { Sheet, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
@@ -16,7 +17,6 @@ import {
   localModelProgressAtom,
   localModelStatusAtom,
 } from '../atoms/aiModeAtoms';
-import { LLAMA_MODEL_SIZE } from '../lib/constants';
 import {
   cancelLocalModelDownload,
   downloadLocalModel,
diff --git a/apps/expo/features/ai/components/CatalogItemsGenerativeUI.tsx b/apps/expo/features/ai/components/CatalogItemsGenerativeUI.tsx
index 7fa2daad4d..31849cb652 100644
--- a/apps/expo/features/ai/components/CatalogItemsGenerativeUI.tsx
+++ b/apps/expo/features/ai/components/CatalogItemsGenerativeUI.tsx
@@ -1,10 +1,10 @@
+import type { ToolInvocation } from '@packrat/app/ai';
+import type { CatalogItem } from '@packrat/app/catalog';
 import { Text } from '@packrat/ui/nativewindui';
 import { CatalogItemCard } from 'expo-app/features/catalog/components';
-import type { CatalogItem } from 'expo-app/features/catalog/types';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { Dimensions, ScrollView, View } from 'react-native';
-import type { ToolInvocation } from '../types';
 import { ToolCard } from './ToolCard';
 
 type CatalogItemsToolOutput =
diff --git a/apps/expo/features/ai/components/GuidesRAGGenerativeUI.tsx b/apps/expo/features/ai/components/GuidesRAGGenerativeUI.tsx
index a8d2f0858f..089aa1ce4f 100644
--- a/apps/expo/features/ai/components/GuidesRAGGenerativeUI.tsx
+++ b/apps/expo/features/ai/components/GuidesRAGGenerativeUI.tsx
@@ -1,3 +1,4 @@
+import type { ToolInvocation } from '@packrat/app/ai';
 import { Icon } from 'expo-app/components/Icon';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
@@ -12,7 +13,6 @@ import {
   TouchableOpacity,
   View,
 } from 'react-native';
-import type { ToolInvocation } from '../types';
 import { ToolCard } from './ToolCard';
 
 interface GuideSearchResult {
diff --git a/apps/expo/features/ai/components/PackDetailsGenerativeUI.tsx b/apps/expo/features/ai/components/PackDetailsGenerativeUI.tsx
index 32a89cd47f..d0ef2908c9 100644
--- a/apps/expo/features/ai/components/PackDetailsGenerativeUI.tsx
+++ b/apps/expo/features/ai/components/PackDetailsGenerativeUI.tsx
@@ -1,7 +1,7 @@
+import type { ToolInvocation } from '@packrat/app/ai';
+import type { Pack } from '@packrat/app/packs';
 import { PackCard } from 'expo-app/features/packs/components/PackCard';
-import type { Pack } from 'expo-app/features/packs/types';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import type { ToolInvocation } from '../types';
 import { ToolCard } from './ToolCard';
 
 type PackDetailsToolOutput =
diff --git a/apps/expo/features/ai/components/PackItemDetailsGenerativeUI.tsx b/apps/expo/features/ai/components/PackItemDetailsGenerativeUI.tsx
index eb73ac483e..21ad17e003 100644
--- a/apps/expo/features/ai/components/PackItemDetailsGenerativeUI.tsx
+++ b/apps/expo/features/ai/components/PackItemDetailsGenerativeUI.tsx
@@ -1,7 +1,7 @@
+import type { ToolInvocation } from '@packrat/app/ai';
+import type { PackItem } from '@packrat/app/packs';
 import { PackItemCard } from 'expo-app/features/packs/components/PackItemCard';
-import type { PackItem } from 'expo-app/features/packs/types';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import type { ToolInvocation } from '../types';
 import { ToolCard } from './ToolCard';
 
 type PackItemToolInput = {
diff --git a/apps/expo/features/ai/components/WeatherGenerativeUI.tsx b/apps/expo/features/ai/components/WeatherGenerativeUI.tsx
index 28d010c0c5..6e0adab4f6 100644
--- a/apps/expo/features/ai/components/WeatherGenerativeUI.tsx
+++ b/apps/expo/features/ai/components/WeatherGenerativeUI.tsx
@@ -1,9 +1,9 @@
+import type { ToolInvocation } from '@packrat/app/ai';
 import { Text, useColorScheme } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { getWeatherIconByCondition } from 'expo-app/features/weather/lib/weatherIcons';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { View } from 'react-native';
-import type { ToolInvocation } from '../types';
 import { ToolCard } from './ToolCard';
 
 type WeatherToolOutput =
diff --git a/apps/expo/features/ai/components/WebSearchGenerativeUI.tsx b/apps/expo/features/ai/components/WebSearchGenerativeUI.tsx
index 91e0883022..2d4d6bc74c 100644
--- a/apps/expo/features/ai/components/WebSearchGenerativeUI.tsx
+++ b/apps/expo/features/ai/components/WebSearchGenerativeUI.tsx
@@ -2,13 +2,13 @@ import EvilIcons from '@expo/vector-icons/EvilIcons';
 import Fontisto from '@expo/vector-icons/Fontisto';
 import Ionicons from '@expo/vector-icons/Ionicons';
 import { BottomSheetScrollView } from '@gorhom/bottom-sheet';
+import type { ToolInvocation } from '@packrat/app/ai';
 import { Card, CardContent, Sheet, Text, useSheetRef } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Linking, Pressable, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
-import type { ToolInvocation } from '../types';
 import { ToolCard } from './ToolCard';
 
 type WebSearchToolInput = {
diff --git a/apps/expo/features/ai/hooks/useReportedContent.ts b/apps/expo/features/ai/hooks/useReportedContent.ts
index 204ea674a4..cafa618ac3 100644
--- a/apps/expo/features/ai/hooks/useReportedContent.ts
+++ b/apps/expo/features/ai/hooks/useReportedContent.ts
@@ -1,6 +1,6 @@
+import type { User } from '@packrat/app/profile';
 import { useQuery } from '@tanstack/react-query';
 import { useUser } from 'expo-app/features/auth/hooks/useUser';
-import type { User } from 'expo-app/features/profile/types';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 
diff --git a/apps/expo/features/ai/lib/localModelManager.ts b/apps/expo/features/ai/lib/localModelManager.ts
index a72ca60236..e0318a7b87 100644
--- a/apps/expo/features/ai/lib/localModelManager.ts
+++ b/apps/expo/features/ai/lib/localModelManager.ts
@@ -8,6 +8,7 @@
  * from any component, even while the bottom sheet is closed.
  */
 
+import { LLAMA_MODEL_ID, LLAMA_MODEL_SIZE_BYTES } from '@packrat/app/ai';
 import { isString } from '@packrat/guards';
 import { type LlamaLanguageModel, llama } from '@react-native-ai/llama';
 import { store } from 'expo-app/atoms/store';
@@ -19,8 +20,6 @@ import {
   localModelProgressAtom,
   localModelStatusAtom,
 } from '../atoms/aiModeAtoms';
-
-import { LLAMA_MODEL_ID, LLAMA_MODEL_SIZE_BYTES } from './constants';
 import { createLocalTools } from './tools';
 
 const LLAMA_MODEL_FILENAME = 'SmolLM3-Q4_K_M.gguf';
diff --git a/apps/expo/features/ai/types.ts b/apps/expo/features/ai/types.ts
deleted file mode 100644
index 97eabd8e6e..0000000000
--- a/apps/expo/features/ai/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { ToolInvocation, ToolOutput } from '@packrat/app/ai';
diff --git a/apps/expo/features/auth/hooks/useAuthActions.ts b/apps/expo/features/auth/hooks/useAuthActions.ts
index 289605f5c0..98030b51c1 100644
--- a/apps/expo/features/auth/hooks/useAuthActions.ts
+++ b/apps/expo/features/auth/hooks/useAuthActions.ts
@@ -1,3 +1,4 @@
+import type { User } from '@packrat/app/profile';
 import { isObject } from '@packrat/guards';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import {
@@ -6,7 +7,6 @@ import {
   statusCodes,
 } from '@react-native-google-signin/google-signin';
 import { isAuthed, userStore } from 'expo-app/features/auth/store';
-import type { User } from 'expo-app/features/profile/types';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { t } from 'expo-app/lib/i18n';
 import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
diff --git a/apps/expo/features/auth/store/user.ts b/apps/expo/features/auth/store/user.ts
index 7991b3f0b3..96c9d44be0 100644
--- a/apps/expo/features/auth/store/user.ts
+++ b/apps/expo/features/auth/store/user.ts
@@ -1,7 +1,7 @@
 import { observable, syncState } from '@legendapp/state';
 import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
-import type { User } from 'expo-app/features/profile/types';
+import type { User } from '@packrat/app/profile';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
 
 export const userStore = observable<User | null>(null);
diff --git a/apps/expo/features/catalog/components/CatalogBrowserModal.tsx b/apps/expo/features/catalog/components/CatalogBrowserModal.tsx
index 38a40684fe..d7d29a2586 100644
--- a/apps/expo/features/catalog/components/CatalogBrowserModal.tsx
+++ b/apps/expo/features/catalog/components/CatalogBrowserModal.tsx
@@ -1,3 +1,4 @@
+import type { CatalogItem } from '@packrat/app/catalog';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { searchValueAtom } from 'expo-app/atoms/itemListAtoms';
 import { CategoriesFilter } from 'expo-app/components/CategoriesFilter';
@@ -24,7 +25,6 @@ import { useCatalogItemsCategories } from '../hooks/useCatalogItemsCategories';
 import { usePopularCatalogItems } from '../hooks/usePopularCatalogItems';
 import { useRecentlyUsedCatalogItems } from '../hooks/useRecentlyUsedCatalogItems';
 import { useVectorSearch } from '../hooks/useVectorSearch';
-import type { CatalogItem } from '../types';
 
 type CatalogBrowserModalProps = {
   visible: boolean;
diff --git a/apps/expo/features/catalog/components/CatalogItemCard.tsx b/apps/expo/features/catalog/components/CatalogItemCard.tsx
index b56a45cee4..e969b826fa 100644
--- a/apps/expo/features/catalog/components/CatalogItemCard.tsx
+++ b/apps/expo/features/catalog/components/CatalogItemCard.tsx
@@ -1,3 +1,5 @@
+import type { CatalogItem } from '@packrat/app/catalog';
+import { normalizeDescription } from '@packrat/app/catalog';
 import {
   Card,
   CardContent,
@@ -11,8 +13,6 @@ import { Icon } from 'expo-app/components/Icon';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { TouchableWithoutFeedback, View } from 'react-native';
-import { normalizeDescription } from '../lib/normalizeDescription';
-import type { CatalogItem } from '../types';
 import { CatalogItemImage } from './CatalogItemImage';
 
 type CatalogItemCardProps = {
diff --git a/apps/expo/features/catalog/components/CatalogItemSelectCard.tsx b/apps/expo/features/catalog/components/CatalogItemSelectCard.tsx
index 9c15459cfb..53717b6991 100644
--- a/apps/expo/features/catalog/components/CatalogItemSelectCard.tsx
+++ b/apps/expo/features/catalog/components/CatalogItemSelectCard.tsx
@@ -1,3 +1,4 @@
+import type { CatalogItem } from '@packrat/app/catalog';
 import {
   Card,
   CardContent,
@@ -11,7 +12,6 @@ import { Icon } from 'expo-app/components/Icon';
 import { cn } from 'expo-app/lib/cn';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { TouchableWithoutFeedback, View } from 'react-native';
-import type { CatalogItem } from '../types';
 import { CatalogItemImage } from './CatalogItemImage';
 
 type CatalogItemSelectCardProps = {
diff --git a/apps/expo/features/catalog/components/ItemLinks.tsx b/apps/expo/features/catalog/components/ItemLinks.tsx
index 8172e2426d..5c148ecd0c 100644
--- a/apps/expo/features/catalog/components/ItemLinks.tsx
+++ b/apps/expo/features/catalog/components/ItemLinks.tsx
@@ -1,6 +1,6 @@
+import type { CatalogItem } from '@packrat/app/catalog';
 import { Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import type { CatalogItem } from 'expo-app/features/catalog/types';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Linking, TouchableOpacity, View } from 'react-native';
diff --git a/apps/expo/features/catalog/components/ItemReviews.tsx b/apps/expo/features/catalog/components/ItemReviews.tsx
index 37e023f35d..a4378f2f22 100644
--- a/apps/expo/features/catalog/components/ItemReviews.tsx
+++ b/apps/expo/features/catalog/components/ItemReviews.tsx
@@ -1,12 +1,12 @@
 'use client';
 
+import type { CatalogItem } from '@packrat/app/catalog';
 import { Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useState } from 'react';
 import { Image, TouchableOpacity, View } from 'react-native';
-import type { CatalogItem } from '../types';
 
 type ItemReviewsProps = {
   reviews: CatalogItem['reviews'];
diff --git a/apps/expo/features/catalog/hooks/useRecentlyUsedCatalogItems.ts b/apps/expo/features/catalog/hooks/useRecentlyUsedCatalogItems.ts
index f5db02667c..27ff1e056c 100644
--- a/apps/expo/features/catalog/hooks/useRecentlyUsedCatalogItems.ts
+++ b/apps/expo/features/catalog/hooks/useRecentlyUsedCatalogItems.ts
@@ -1,10 +1,10 @@
+import type { CatalogItem } from '@packrat/app/catalog';
 import {
   buildUpdatedRecentlyUsed,
   recentlyUsedCatalogItemsAtom,
 } from 'expo-app/atoms/recentlyUsedCatalogItemsAtom';
 import { useAtom } from 'jotai';
 import { useCallback } from 'react';
-import type { CatalogItem } from '../types';
 
 export function useRecentlyUsedCatalogItems() {
   const [recentItems, setRecentItems] = useAtom(recentlyUsedCatalogItemsAtom);
diff --git a/apps/expo/features/catalog/hooks/useSimilarItems.ts b/apps/expo/features/catalog/hooks/useSimilarItems.ts
index 430fe66173..6b306d876c 100644
--- a/apps/expo/features/catalog/hooks/useSimilarItems.ts
+++ b/apps/expo/features/catalog/hooks/useSimilarItems.ts
@@ -1,7 +1,7 @@
+import type { CatalogItem } from '@packrat/app/catalog';
 import { useQuery } from '@tanstack/react-query';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
-import type { CatalogItem } from '../types';
 
 export interface SimilarItem extends Omit<CatalogItem, 'embedding'> {
   similarity: number;
diff --git a/apps/expo/features/catalog/lib/normalizeDescription.ts b/apps/expo/features/catalog/lib/normalizeDescription.ts
deleted file mode 100644
index 38944cfb94..0000000000
--- a/apps/expo/features/catalog/lib/normalizeDescription.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { normalizeDescription } from '@packrat/app/catalog';
diff --git a/apps/expo/features/catalog/screens/AddCatalogItemDetailsScreen.tsx b/apps/expo/features/catalog/screens/AddCatalogItemDetailsScreen.tsx
index 80aec8997c..57f8497501 100644
--- a/apps/expo/features/catalog/screens/AddCatalogItemDetailsScreen.tsx
+++ b/apps/expo/features/catalog/screens/AddCatalogItemDetailsScreen.tsx
@@ -1,4 +1,5 @@
 import { WeightUnitSchema } from '@packrat/api/types';
+import type { CatalogItem } from '@packrat/app/catalog';
 import { assertDefined, fromZod } from '@packrat/guards';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { useQueryClient } from '@tanstack/react-query';
@@ -24,7 +25,6 @@ import {
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { useCatalogItemDetails } from '../hooks';
 import { cacheCatalogItemImage } from '../lib/cacheCatalogItemImage';
-import type { CatalogItem } from '../types';
 
 export function AddCatalogItemDetailsScreen() {
   const router = useRouter();
diff --git a/apps/expo/features/catalog/screens/CatalogItemDetailScreen.tsx b/apps/expo/features/catalog/screens/CatalogItemDetailScreen.tsx
index 94a693bbc8..c580b58e78 100644
--- a/apps/expo/features/catalog/screens/CatalogItemDetailScreen.tsx
+++ b/apps/expo/features/catalog/screens/CatalogItemDetailScreen.tsx
@@ -1,4 +1,5 @@
 import { Ionicons } from '@expo/vector-icons';
+import { normalizeDescription } from '@packrat/app/catalog';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { Chip } from 'expo-app/components/initial/Chip';
@@ -18,7 +19,6 @@ import { Linking, Text as RNText, ScrollView, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { CatalogItemImage } from '../components/CatalogItemImage';
 import { useCatalogItemDetails } from '../hooks';
-import { normalizeDescription } from '../lib/normalizeDescription';
 
 export function CatalogItemDetailScreen() {
   const router = useRouter();
diff --git a/apps/expo/features/catalog/screens/CatalogItemsScreen.tsx b/apps/expo/features/catalog/screens/CatalogItemsScreen.tsx
index 2cd1451a64..bc4c64b4ff 100644
--- a/apps/expo/features/catalog/screens/CatalogItemsScreen.tsx
+++ b/apps/expo/features/catalog/screens/CatalogItemsScreen.tsx
@@ -1,3 +1,4 @@
+import type { CatalogItem } from '@packrat/app/catalog';
 import { LargeTitleHeader, type LargeTitleSearchBarMethods, Text } from '@packrat/ui/nativewindui';
 import { searchValueAtom } from 'expo-app/atoms/itemListAtoms';
 import { AndroidTabBarInsetFix } from 'expo-app/components/AndroidTabBarInsetFix';
@@ -27,7 +28,6 @@ import { CatalogItemCard } from '../components/CatalogItemCard';
 import { useCatalogItemsInfinite } from '../hooks';
 import { useCatalogItemsCategories } from '../hooks/useCatalogItemsCategories';
 import { useVectorSearch } from '../hooks/useVectorSearch';
-import type { CatalogItem } from '../types';
 
 function CatalogItemsScreen() {
   const router = useRouter();
diff --git a/apps/expo/features/catalog/types.ts b/apps/expo/features/catalog/types.ts
deleted file mode 100644
index 53430d9132..0000000000
--- a/apps/expo/features/catalog/types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export type {
-  CatalogItem,
-  CatalogItemInput,
-  CatalogItemLink,
-  CatalogItemReview,
-  CatalogItemWithPackItemFields,
-  CatalogItemWithQuantity,
-  PaginatedCatalogItemsResponse,
-} from '@packrat/app/catalog';
diff --git a/apps/expo/features/feed/components/CommentItem.tsx b/apps/expo/features/feed/components/CommentItem.tsx
index 44aab46fa7..a4294c5668 100644
--- a/apps/expo/features/feed/components/CommentItem.tsx
+++ b/apps/expo/features/feed/components/CommentItem.tsx
@@ -1,8 +1,8 @@
+import type { Comment } from '@packrat/app/feed';
 import { Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { TouchableOpacity, View } from 'react-native';
-import type { Comment } from '../types';
 import { formatAuthorName, formatRelativeDate } from '../utils';
 
 interface CommentItemProps {
diff --git a/apps/expo/features/feed/components/PostCard.tsx b/apps/expo/features/feed/components/PostCard.tsx
index 66dc234f8f..b1382fe99c 100644
--- a/apps/expo/features/feed/components/PostCard.tsx
+++ b/apps/expo/features/feed/components/PostCard.tsx
@@ -1,3 +1,4 @@
+import type { Post } from '@packrat/app/feed';
 import { Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
@@ -12,7 +13,6 @@ import {
   TouchableOpacity,
   View,
 } from 'react-native';
-import type { Post } from '../types';
 import { buildPostImageUrl, formatAuthorName, formatRelativeDate } from '../utils';
 
 const SCREEN_WIDTH = Dimensions.get('window').width;
diff --git a/apps/expo/features/feed/index.ts b/apps/expo/features/feed/index.ts
index 6c529ab1e4..ec4808e944 100644
--- a/apps/expo/features/feed/index.ts
+++ b/apps/expo/features/feed/index.ts
@@ -1,5 +1,5 @@
+export * from '@packrat/app/feed';
 export * from './components';
 export * from './hooks';
 export * from './screens';
-export * from './types';
 export * from './utils';
diff --git a/apps/expo/features/feed/screens/FeedScreen.tsx b/apps/expo/features/feed/screens/FeedScreen.tsx
index 43067d4019..6f1b67eff5 100644
--- a/apps/expo/features/feed/screens/FeedScreen.tsx
+++ b/apps/expo/features/feed/screens/FeedScreen.tsx
@@ -1,3 +1,4 @@
+import type { Post } from '@packrat/app/feed';
 import { ActivityIndicator, Button, LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { userStore } from 'expo-app/features/auth/store';
@@ -8,7 +9,6 @@ import { useCallback } from 'react';
 import { FlatList, RefreshControl, View } from 'react-native';
 import { PostCard } from '../components/PostCard';
 import { useDeletePost, useFeed, useTogglePostLike } from '../hooks';
-import type { Post } from '../types';
 
 export const FeedScreen = () => {
   const { t } = useTranslation();
diff --git a/apps/expo/features/feed/screens/PostDetailScreen.tsx b/apps/expo/features/feed/screens/PostDetailScreen.tsx
index 890aa55f62..3c4f40dce0 100644
--- a/apps/expo/features/feed/screens/PostDetailScreen.tsx
+++ b/apps/expo/features/feed/screens/PostDetailScreen.tsx
@@ -1,3 +1,4 @@
+import type { Comment, Post } from '@packrat/app/feed';
 import { ActivityIndicator, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { TextInput } from 'expo-app/components/TextInput';
@@ -24,7 +25,6 @@ import {
   useToggleCommentLike,
   useTogglePostLike,
 } from '../hooks';
-import type { Comment, Post } from '../types';
 import { buildPostImageUrl } from '../utils';
 
 interface PostDetailScreenProps {
diff --git a/apps/expo/features/feed/types.ts b/apps/expo/features/feed/types.ts
deleted file mode 100644
index 08d76a2760..0000000000
--- a/apps/expo/features/feed/types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export type {
-  Comment,
-  CommentsResponse,
-  FeedResponse,
-  LikeToggleResponse,
-  Post,
-  PostAuthor,
-} from '@packrat/app/feed';
diff --git a/apps/expo/features/feed/utils/__tests__/feedUtils.test.ts b/apps/expo/features/feed/utils/__tests__/feedUtils.test.ts
index bcc717f084..d59194232c 100644
--- a/apps/expo/features/feed/utils/__tests__/feedUtils.test.ts
+++ b/apps/expo/features/feed/utils/__tests__/feedUtils.test.ts
@@ -14,7 +14,7 @@ vi.mock('expo-app/lib/utils/getRelativeTime', () => ({
   getRelativeTime: (input: string | Date) => `relative(${String(input)})`,
 }));
 
-import type { Comment, Post } from '../../types';
+import type { Comment, Post } from '@packrat/app/feed';
 import { buildPostImageUrl, formatAuthorName, formatRelativeDate } from '../index';
 
 const basePost: Post = {
diff --git a/apps/expo/features/feed/utils/index.ts b/apps/expo/features/feed/utils/index.ts
index fdfca54b8c..4e431c1ab3 100644
--- a/apps/expo/features/feed/utils/index.ts
+++ b/apps/expo/features/feed/utils/index.ts
@@ -1,6 +1,6 @@
+import type { Comment, Post } from '@packrat/app/feed';
 import { clientEnvs } from '@packrat/env/expo-client';
 import { getRelativeTime } from 'expo-app/lib/utils/getRelativeTime';
-import type { Comment, Post } from '../types';
 
 export function buildPostImageUrl(imageKey: string): string {
   return `${clientEnvs.EXPO_PUBLIC_R2_PUBLIC_URL}/${imageKey}`;
diff --git a/apps/expo/features/guides/components/GuideCard.tsx b/apps/expo/features/guides/components/GuideCard.tsx
index 48b695be1e..9c77001689 100644
--- a/apps/expo/features/guides/components/GuideCard.tsx
+++ b/apps/expo/features/guides/components/GuideCard.tsx
@@ -1,7 +1,7 @@
+import type { Guide } from '@packrat/app/guides';
 import { Card, CardContent, CardTitle, Text } from '@packrat/ui/nativewindui';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { TouchableOpacity, View } from 'react-native';
-import type { Guide } from '../types';
 
 interface GuideCardProps {
   guide: Guide;
diff --git a/apps/expo/features/guides/screens/GuidesListScreen.tsx b/apps/expo/features/guides/screens/GuidesListScreen.tsx
index 171a247400..7ec4ce8764 100644
--- a/apps/expo/features/guides/screens/GuidesListScreen.tsx
+++ b/apps/expo/features/guides/screens/GuidesListScreen.tsx
@@ -1,3 +1,4 @@
+import type { Guide } from '@packrat/app/guides';
 import { LargeTitleHeader, type LargeTitleSearchBarMethods, Text } from '@packrat/ui/nativewindui';
 import { CategoriesFilter } from 'expo-app/components/CategoriesFilter';
 import { LargeTitleHeaderOverlapFixIOS } from 'expo-app/components/LargeTitleHeaderOverlapFixIOS';
@@ -10,7 +11,6 @@ import { useCallback, useRef, useState } from 'react';
 import { ActivityIndicator, FlatList, RefreshControl, View } from 'react-native';
 import { GuideCard } from '../components/GuideCard';
 import { useGuideCategories, useGuides, useSearchGuides } from '../hooks';
-import type { Guide } from '../types';
 
 export const GuidesListScreen = () => {
   const router = useRouter();
diff --git a/apps/expo/features/guides/types.ts b/apps/expo/features/guides/types.ts
deleted file mode 100644
index 1b9fac7bed..0000000000
--- a/apps/expo/features/guides/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { Guide, GuidesListResponse, GuidesSearchResponse } from '@packrat/app/guides';
diff --git a/apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx b/apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx
index e056c88c17..5ddda279b2 100644
--- a/apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx
+++ b/apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx
@@ -1,6 +1,7 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import type { BottomSheetModal } from '@gorhom/bottom-sheet';
 import { BottomSheetView } from '@gorhom/bottom-sheet';
+import type { CatalogItem } from '@packrat/app/catalog';
 import { isFunction, nullToUndefined } from '@packrat/guards';
 import { Sheet, Text, useColorScheme } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
@@ -9,7 +10,6 @@ import { Icon } from 'expo-app/components/Icon';
 import { isAuthed } from 'expo-app/features/auth/store';
 import { CatalogBrowserModal } from 'expo-app/features/catalog/components';
 import { useRecentlyUsedCatalogItems } from 'expo-app/features/catalog/hooks/useRecentlyUsedCatalogItems';
-import type { CatalogItem } from 'expo-app/features/catalog/types';
 import { useImagePicker } from 'expo-app/features/packs';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router } from 'expo-router';
diff --git a/apps/expo/features/pack-templates/components/FeaturedPacksSection.tsx b/apps/expo/features/pack-templates/components/FeaturedPacksSection.tsx
index 81355a0ef1..856dfdcb40 100644
--- a/apps/expo/features/pack-templates/components/FeaturedPacksSection.tsx
+++ b/apps/expo/features/pack-templates/components/FeaturedPacksSection.tsx
@@ -1,3 +1,4 @@
+import type { PackTemplate, PackTemplateInStore } from '@packrat/app/pack-templates';
 import { Text } from '@packrat/ui/nativewindui';
 import { WeightBadge } from 'expo-app/components/initial/WeightBadge';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
@@ -7,7 +8,6 @@ import { useMemo } from 'react';
 import { Image, Pressable, ScrollView, View } from 'react-native';
 import { usePackTemplates } from '../hooks';
 import { usePackTemplateSummaries } from '../hooks/usePackTemplateSummary';
-import type { PackTemplate, PackTemplateInStore } from '../types';
 
 type FeaturedPackCardProps = {
   template: PackTemplateInStore;
diff --git a/apps/expo/features/pack-templates/components/PackTemplateCard.tsx b/apps/expo/features/pack-templates/components/PackTemplateCard.tsx
index 1c59445b2e..029afb5274 100644
--- a/apps/expo/features/pack-templates/components/PackTemplateCard.tsx
+++ b/apps/expo/features/pack-templates/components/PackTemplateCard.tsx
@@ -1,4 +1,5 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import type { PackTemplate } from '@packrat/app/pack-templates';
 import { isArray } from '@packrat/guards';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { appAlert } from 'expo-app/app/_layout';
@@ -11,7 +12,6 @@ import { Image, Pressable, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { useDeletePackTemplate, usePackTemplateDetails } from '../hooks';
 import { useWritePermissionCheck } from '../hooks/useWritePermissionCheck';
-import type { PackTemplate } from '../types';
 import { AppTemplateBadge } from './AppTemplateBadge';
 
 type PackTemplateCard = {
diff --git a/apps/expo/features/pack-templates/components/PackTemplateForm.tsx b/apps/expo/features/pack-templates/components/PackTemplateForm.tsx
index a52eb54cb3..0c74e395d9 100644
--- a/apps/expo/features/pack-templates/components/PackTemplateForm.tsx
+++ b/apps/expo/features/pack-templates/components/PackTemplateForm.tsx
@@ -1,4 +1,5 @@
 import { PackCategorySchema } from '@packrat/api/types';
+import type { PackTemplate } from '@packrat/app/pack-templates';
 import { fromZod } from '@packrat/guards';
 import {
   Button,
@@ -27,7 +28,6 @@ import {
 import { z } from 'zod';
 import { useCreatePackTemplate } from '../hooks/useCreatePackTemplate';
 import { useUpdatePackTemplate } from '../hooks/useUpdatePacktemplate';
-import type { PackTemplate } from '../types';
 
 export const PackTemplateForm = ({ template }: { template?: PackTemplate }) => {
   const router = useRouter();
diff --git a/apps/expo/features/pack-templates/components/PackTemplateItemCard.tsx b/apps/expo/features/pack-templates/components/PackTemplateItemCard.tsx
index e039899494..e6a4ead02f 100644
--- a/apps/expo/features/pack-templates/components/PackTemplateItemCard.tsx
+++ b/apps/expo/features/pack-templates/components/PackTemplateItemCard.tsx
@@ -1,4 +1,5 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import type { PackTemplateItem } from '@packrat/app/pack-templates';
 import { Text } from '@packrat/ui/nativewindui';
 import { appAlert } from 'expo-app/app/_layout';
 import { Icon } from 'expo-app/components/Icon';
@@ -10,7 +11,6 @@ import { useRouter } from 'expo-router';
 import { Pressable, TouchableWithoutFeedback, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { useDeletePackTemplateItem } from '../hooks';
-import type { PackTemplateItem } from '../types';
 import { PackTemplateItemImage } from './PackTemplateItemImage';
 
 type PackTemplateItemCardProps = {
diff --git a/apps/expo/features/pack-templates/components/PackTemplateItemImage.tsx b/apps/expo/features/pack-templates/components/PackTemplateItemImage.tsx
index 38d07369ba..68e7281b03 100644
--- a/apps/expo/features/pack-templates/components/PackTemplateItemImage.tsx
+++ b/apps/expo/features/pack-templates/components/PackTemplateItemImage.tsx
@@ -1,10 +1,10 @@
+import type { PackTemplateItem } from '@packrat/app/pack-templates';
 import { useColorScheme } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { CatalogItemImage } from 'expo-app/features/catalog/components/CatalogItemImage';
 import { CachedImage } from 'expo-app/features/packs/components/CachedImage';
 import { buildImageUrl } from 'expo-app/lib/utils/buildImageUrl';
 import { type ImageProps, View } from 'react-native';
-import type { PackTemplateItem } from '../types';
 
 interface PackTemplateItemImageProps extends Omit<ImageProps, 'source'> {
   item: PackTemplateItem;
diff --git a/apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts b/apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts
index ffb1e49686..136d5ee641 100644
--- a/apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts
+++ b/apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts
@@ -1,7 +1,7 @@
 import { WeightUnitSchema } from '@packrat/api/types';
+import type { CatalogItemWithPackItemFields } from '@packrat/app/catalog';
 import { fromZod } from '@packrat/guards';
 import { cacheCatalogItemImage } from 'expo-app/features/catalog/lib/cacheCatalogItemImage';
-import type { CatalogItemWithPackItemFields } from 'expo-app/features/catalog/types';
 import { useState } from 'react';
 import { useCreatePackTemplateItem } from './useCreatePackTemplateItem';
 
diff --git a/apps/expo/features/pack-templates/hooks/useCreatePackFromTemplate.ts b/apps/expo/features/pack-templates/hooks/useCreatePackFromTemplate.ts
index 7b246a336c..c162fe59e4 100644
--- a/apps/expo/features/pack-templates/hooks/useCreatePackFromTemplate.ts
+++ b/apps/expo/features/pack-templates/hooks/useCreatePackFromTemplate.ts
@@ -1,8 +1,8 @@
 // hooks/useCreatePackFromTemplate.ts
 
+import type { PackInput } from '@packrat/app/packs';
 import { getTemplateItems } from 'expo-app/features/pack-templates/store';
 import { useCreatePack, useCreatePackItem } from 'expo-app/features/packs';
-import type { PackInput } from 'expo-app/features/packs/types';
 import { useCallback } from 'react';
 
 export function useCreatePackFromTemplate() {
diff --git a/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts b/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts
index ea9fbc9155..b5aa4a31bb 100644
--- a/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts
+++ b/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts
@@ -1,8 +1,8 @@
+import type { PackTemplateInput, PackTemplateInStore } from '@packrat/app/pack-templates';
 import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 import { packTemplatesStore } from '../store/packTemplates';
-import type { PackTemplateInput, PackTemplateInStore } from '../types';
 
 export function useCreatePackTemplate() {
   const createPackTemplate = useCallback((input: PackTemplateInput) => {
diff --git a/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts b/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts
index 8e4dd5e963..c95204a587 100644
--- a/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts
+++ b/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts
@@ -1,11 +1,11 @@
 // useCreatePackTemplateItem.ts
 
+import type { PackTemplateItem, PackTemplateItemInput } from '@packrat/app/pack-templates';
 import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 import { packTemplateItemsStore } from '../store/packTemplateItems';
 import { packTemplatesStore } from '../store/packTemplates';
-import type { PackTemplateItem, PackTemplateItemInput } from '../types';
 
 export function useCreatePackTemplateItem() {
   const createPackTemplateItem = useCallback(
diff --git a/apps/expo/features/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts b/apps/expo/features/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts
index 4276262235..86bce87721 100644
--- a/apps/expo/features/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts
+++ b/apps/expo/features/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts
@@ -1,3 +1,4 @@
+import type { PackTemplateInStore, PackTemplateItem } from '@packrat/app/pack-templates';
 import { isObject } from '@packrat/guards';
 import { useMutation } from '@tanstack/react-query';
 import { apiClient } from 'expo-app/lib/api/packrat';
@@ -5,7 +6,6 @@ import { obs } from 'expo-app/lib/store';
 import { isWeightUnit } from 'expo-app/lib/utils/itemCalculations';
 import { packTemplateItemsStore } from '../store/packTemplateItems';
 import { packTemplatesStore } from '../store/packTemplates';
-import type { PackTemplateInStore, PackTemplateItem } from '../types';
 
 export interface GenerateFromOnlineContentInput {
   contentUrl: string;
diff --git a/apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts b/apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts
index 56a92edf6a..be8f2e700b 100644
--- a/apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts
+++ b/apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts
@@ -1,7 +1,7 @@
 import { use$ } from '@legendapp/state/react';
+import type { WeightUnit } from '@packrat/app/pack-templates';
 import { convertFromGrams, convertToGrams } from 'expo-app/features/packs/utils';
 import { packTemplateItemsStore } from '../store/packTemplateItems';
-import type { WeightUnit } from '../types';
 
 export type PackTemplateSummary = {
   itemCount: number;
diff --git a/apps/expo/features/pack-templates/hooks/usePackTemplatesDetails.ts b/apps/expo/features/pack-templates/hooks/usePackTemplatesDetails.ts
index df62273388..21f71c2a04 100644
--- a/apps/expo/features/pack-templates/hooks/usePackTemplatesDetails.ts
+++ b/apps/expo/features/pack-templates/hooks/usePackTemplatesDetails.ts
@@ -1,8 +1,8 @@
 import { use$ } from '@legendapp/state/react';
+import { computePackTemplateWeights } from '@packrat/app/pack-templates';
 import { obs } from 'expo-app/lib/store';
 import { getTemplateItems } from '../store/packTemplateItems';
 import { packTemplatesStore } from '../store/packTemplates';
-import { computePackTemplateWeights } from '../utils/computePacktemplateWeight';
 
 // Hook to get a single pack template
 export function usePackTemplateDetails(id: string) {
diff --git a/apps/expo/features/pack-templates/hooks/useUpdatePackTemplateItem.ts b/apps/expo/features/pack-templates/hooks/useUpdatePackTemplateItem.ts
index 993ad63919..8d97e1b519 100644
--- a/apps/expo/features/pack-templates/hooks/useUpdatePackTemplateItem.ts
+++ b/apps/expo/features/pack-templates/hooks/useUpdatePackTemplateItem.ts
@@ -1,9 +1,9 @@
 // useUpdatePackTemplateItem.ts
 
+import type { PackTemplateItem } from '@packrat/app/pack-templates';
 import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
 import { packTemplateItemsStore, packTemplatesStore } from '../store';
-import type { PackTemplateItem } from '../types';
 
 export function useUpdatePackTemplateItem() {
   const updatePackTemplateItem = useCallback((item: PackTemplateItem) => {
diff --git a/apps/expo/features/pack-templates/hooks/useUpdatePacktemplate.ts b/apps/expo/features/pack-templates/hooks/useUpdatePacktemplate.ts
index 7ac5376c59..74c89312ed 100644
--- a/apps/expo/features/pack-templates/hooks/useUpdatePacktemplate.ts
+++ b/apps/expo/features/pack-templates/hooks/useUpdatePacktemplate.ts
@@ -1,7 +1,7 @@
+import type { PackTemplate } from '@packrat/app/pack-templates';
 import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
 import { packTemplatesStore } from '../store/packTemplates';
-import type { PackTemplate } from '../types';
 
 export function useUpdatePackTemplate() {
   const update = useCallback((template: PackTemplate) => {
diff --git a/apps/expo/features/pack-templates/index.ts b/apps/expo/features/pack-templates/index.ts
index a9a0a249f5..fe818d9a06 100644
--- a/apps/expo/features/pack-templates/index.ts
+++ b/apps/expo/features/pack-templates/index.ts
@@ -1,2 +1,2 @@
+export * from '@packrat/app/pack-templates';
 export * from './hooks';
-export * from './types';
diff --git a/apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx b/apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx
index 615d0d2e98..76ead292c0 100644
--- a/apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx
+++ b/apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx
@@ -1,6 +1,7 @@
 // CreatePackTemplateItemForm.tsx
 
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import type { PackTemplateItem } from '@packrat/app/pack-templates';
 import { safeIndexOf } from '@packrat/guards';
 import { Form, FormItem, FormSection, SegmentedControl, TextField } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
@@ -18,7 +19,6 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { z } from 'zod';
 import { useCreatePackTemplateItem } from '../hooks/useCreatePackTemplateItem';
 import { useUpdatePackTemplateItem } from '../hooks/useUpdatePackTemplateItem';
-import type { PackTemplateItem } from '../types';
 
 const itemFormSchema = z.object({
   name: z.string().min(1, 'Item name is required'),
diff --git a/apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx b/apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx
index 2ea880be38..6030b5c3ec 100644
--- a/apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx
+++ b/apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx
@@ -1,4 +1,5 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import type { CatalogItem, CatalogItemWithPackItemFields } from '@packrat/app/catalog';
 import { assertNonNull } from '@packrat/guards';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
@@ -14,7 +15,6 @@ import { Stack, useLocalSearchParams, useRouter } from 'expo-router';
 import { useCallback, useEffect, useState } from 'react';
 import { Image, ScrollView, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
-import type { CatalogItem, CatalogItemWithPackItemFields } from '../../catalog/types';
 import { useBulkAddCatalogItems } from '../hooks';
 
 export function ItemsScanScreen() {
diff --git a/apps/expo/features/pack-templates/screens/PackTemplateDetailScreen.tsx b/apps/expo/features/pack-templates/screens/PackTemplateDetailScreen.tsx
index 4dc0b0c52f..cc721f99ea 100644
--- a/apps/expo/features/pack-templates/screens/PackTemplateDetailScreen.tsx
+++ b/apps/expo/features/pack-templates/screens/PackTemplateDetailScreen.tsx
@@ -1,3 +1,4 @@
+import type { PackTemplateItem } from '@packrat/app/pack-templates';
 import { Button, Text, useSheetRef } from '@packrat/ui/nativewindui';
 import { Chip } from 'expo-app/components/initial/Chip';
 import { WeightBadge } from 'expo-app/components/initial/WeightBadge';
@@ -12,7 +13,6 @@ import AddPackTemplateItemActions from '../components/AddPackTemplateItemActions
 import { AppTemplateBadge } from '../components/AppTemplateBadge';
 import { PackTemplateItemCard } from '../components/PackTemplateItemCard';
 import { usePackTemplateDetails } from '../hooks';
-import type { PackTemplateItem } from '../types';
 
 export function PackTemplateDetailScreen() {
   const router = useRouter();
diff --git a/apps/expo/features/pack-templates/screens/PackTemplateListScreen.tsx b/apps/expo/features/pack-templates/screens/PackTemplateListScreen.tsx
index 46d55919b6..7945639e74 100644
--- a/apps/expo/features/pack-templates/screens/PackTemplateListScreen.tsx
+++ b/apps/expo/features/pack-templates/screens/PackTemplateListScreen.tsx
@@ -1,11 +1,12 @@
 import type { BottomSheetModal } from '@gorhom/bottom-sheet';
+import type { PackTemplate } from '@packrat/app/pack-templates';
+import type { PackCategory } from '@packrat/app/packs';
 import type { LargeTitleSearchBarMethods } from '@packrat/ui/nativewindui';
 import { LargeTitleHeader, SegmentedControl } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { LargeTitleHeaderSearchContentContainer } from 'expo-app/components/LargeTitleHeaderSearchContentContainer';
 import { useAuth } from 'expo-app/features/auth/hooks/useAuth';
 import { useUser } from 'expo-app/features/auth/hooks/useUser';
-import type { PackCategory } from 'expo-app/features/packs/types';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
@@ -26,7 +27,6 @@ import { PackTemplateCard } from '../components/PackTemplateCard';
 import TemplateCreationOptions from '../components/TemplateCreationOptions';
 import { usePackTemplates } from '../hooks';
 import { activeTemplateFilterAtom, templateSearchValueAtom } from '../packTemplateListAtoms';
-import type { PackTemplate } from '../types';
 
 type FilterOption = {
   label: string;
diff --git a/apps/expo/features/pack-templates/store/packTemplateItems.ts b/apps/expo/features/pack-templates/store/packTemplateItems.ts
index f942a5e6f4..79d6f82199 100644
--- a/apps/expo/features/pack-templates/store/packTemplateItems.ts
+++ b/apps/expo/features/pack-templates/store/packTemplateItems.ts
@@ -5,10 +5,10 @@ import {
   PackTemplateItemSchema,
   PackTemplateWithItemsSchema,
 } from '@packrat/api/schemas/packTemplates';
+import type { PackTemplateItem } from '@packrat/app/pack-templates';
 import { isAuthed } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
-import type { PackTemplateItem } from '../types';
 
 const listAllPackTemplateItems = async (): Promise<PackTemplateItem[]> => {
   const { data, error } = await apiClient['pack-templates'].get();
diff --git a/apps/expo/features/pack-templates/store/packTemplates.ts b/apps/expo/features/pack-templates/store/packTemplates.ts
index 8e6afbf641..8159ee63cf 100644
--- a/apps/expo/features/pack-templates/store/packTemplates.ts
+++ b/apps/expo/features/pack-templates/store/packTemplates.ts
@@ -5,10 +5,10 @@ import {
   PackTemplateSchema,
   PackTemplateWithItemsSchema,
 } from '@packrat/api/schemas/packTemplates';
+import type { PackTemplate, PackTemplateInStore } from '@packrat/app/pack-templates';
 import { isAuthed } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
-import type { PackTemplate, PackTemplateInStore } from '../types';
 
 const listPackTemplates = async (): Promise<PackTemplateInStore[] | null> => {
   const { data, error } = await apiClient['pack-templates'].get();
diff --git a/apps/expo/features/pack-templates/types.ts b/apps/expo/features/pack-templates/types.ts
deleted file mode 100644
index 654d23baa5..0000000000
--- a/apps/expo/features/pack-templates/types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export type {
-  PackTemplate,
-  PackTemplateInput,
-  PackTemplateInStore,
-  PackTemplateItem,
-  PackTemplateItemInput,
-  WeightUnit,
-} from '@packrat/app/pack-templates';
diff --git a/apps/expo/features/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts b/apps/expo/features/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts
index c9f4f72480..1ed032413e 100644
--- a/apps/expo/features/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts
+++ b/apps/expo/features/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts
@@ -1,20 +1,6 @@
-import { describe, expect, it, vi } from 'vitest';
-import type { PackTemplate, PackTemplateItem } from '../../types';
-
-// The SUT imports convertFromGrams/convertToGrams from the packs/utils barrel,
-// which also re-exports uploadImage (expo-file-system) and computeCategories
-// (expo-app/features/auth/store). Replace the barrel with the real pure
-// conversion helpers so the test stays in a Node environment.
-vi.mock('expo-app/features/packs/utils', async () => {
-  const fromGrams = await import('expo-app/features/packs/utils/convertFromGrams');
-  const toGrams = await import('expo-app/features/packs/utils/convertToGrams');
-  return {
-    convertFromGrams: fromGrams.convertFromGrams,
-    convertToGrams: toGrams.convertToGrams,
-  };
-});
-
-import { computePackTemplateWeights } from '../computePacktemplateWeight';
+import type { PackTemplate, PackTemplateItem } from '@packrat/app/pack-templates';
+import { computePackTemplateWeights } from '@packrat/app/pack-templates';
+import { describe, expect, it } from 'vitest';
 
 type TemplateInput = Omit<PackTemplate, 'baseWeight' | 'totalWeight'>;
 
diff --git a/apps/expo/features/packs/components/ActivityPicker.tsx b/apps/expo/features/packs/components/ActivityPicker.tsx
index 622b2874b3..39e8afcc84 100644
--- a/apps/expo/features/packs/components/ActivityPicker.tsx
+++ b/apps/expo/features/packs/components/ActivityPicker.tsx
@@ -1,10 +1,10 @@
+import type { PackCategory } from '@packrat/app/packs';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { cn } from 'expo-app/lib/cn';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useState } from 'react';
 import { Modal, Pressable, ScrollView, TouchableOpacity, View } from 'react-native';
-import type { PackCategory } from '../types';
 
 type ActivityPickerProps = {
   open: boolean;
diff --git a/apps/expo/features/packs/components/AddPackItemActions.tsx b/apps/expo/features/packs/components/AddPackItemActions.tsx
index c3039eb99d..63e251acf6 100644
--- a/apps/expo/features/packs/components/AddPackItemActions.tsx
+++ b/apps/expo/features/packs/components/AddPackItemActions.tsx
@@ -1,13 +1,13 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import type { BottomSheetModal } from '@gorhom/bottom-sheet';
 import { BottomSheetView } from '@gorhom/bottom-sheet';
+import type { CatalogItem } from '@packrat/app/catalog';
 import { isFunction, nullToUndefined } from '@packrat/guards';
 import { Sheet, Text, useColorScheme } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { isAuthed } from 'expo-app/features/auth/store';
 import { CatalogBrowserModal } from 'expo-app/features/catalog/components';
 import { useRecentlyUsedCatalogItems } from 'expo-app/features/catalog/hooks/useRecentlyUsedCatalogItems';
-import type { CatalogItem } from 'expo-app/features/catalog/types';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { testIds } from 'expo-app/lib/testIds';
 import { router } from 'expo-router';
diff --git a/apps/expo/features/packs/components/GapAnalysisModal.tsx b/apps/expo/features/packs/components/GapAnalysisModal.tsx
index 5509b8de36..4a4939f6b3 100644
--- a/apps/expo/features/packs/components/GapAnalysisModal.tsx
+++ b/apps/expo/features/packs/components/GapAnalysisModal.tsx
@@ -1,10 +1,10 @@
+import type { Pack, PackCategory } from '@packrat/app/packs';
 import { ActivityIndicator, Button, cn, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Modal, ScrollView, TouchableOpacity, View } from 'react-native';
 import type { GapAnalysisResponse } from '../hooks/usePackGapAnalysis';
-import type { Pack, PackCategory } from '../types';
 import { GapSuggestion } from './GapSuggestion';
 
 interface GapAnalysisModalProps {
diff --git a/apps/expo/features/packs/components/GapItemCatalogSuggestions.tsx b/apps/expo/features/packs/components/GapItemCatalogSuggestions.tsx
index 8f629b8b28..270b121662 100644
--- a/apps/expo/features/packs/components/GapItemCatalogSuggestions.tsx
+++ b/apps/expo/features/packs/components/GapItemCatalogSuggestions.tsx
@@ -1,7 +1,7 @@
+import type { CatalogItem } from '@packrat/app/catalog';
 import { assertDefined } from '@packrat/guards';
 import { ActivityIndicator, Button, cn, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import type { CatalogItem } from 'expo-app/features/catalog/types';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useState } from 'react';
 import { Modal, ScrollView, TouchableOpacity, View } from 'react-native';
diff --git a/apps/expo/features/packs/components/GapSuggestion.tsx b/apps/expo/features/packs/components/GapSuggestion.tsx
index 21dd623988..a689e32294 100644
--- a/apps/expo/features/packs/components/GapSuggestion.tsx
+++ b/apps/expo/features/packs/components/GapSuggestion.tsx
@@ -1,7 +1,7 @@
+import type { CatalogItem } from '@packrat/app/catalog';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { useVectorSearch } from 'expo-app/features/catalog/hooks/useVectorSearch';
-import type { CatalogItem } from 'expo-app/features/catalog/types';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useState } from 'react';
 import { View } from 'react-native';
diff --git a/apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx b/apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx
index 247f26e154..397fe7b794 100644
--- a/apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx
+++ b/apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx
@@ -1,7 +1,7 @@
+import type { CatalogItem } from '@packrat/app/catalog';
 import { Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { CatalogItemImage } from 'expo-app/features/catalog/components/CatalogItemImage';
-import type { CatalogItem } from 'expo-app/features/catalog/types';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { TouchableWithoutFeedback, View } from 'react-native';
 
diff --git a/apps/expo/features/packs/components/PackCard.tsx b/apps/expo/features/packs/components/PackCard.tsx
index 449b1954e7..c73961b7b1 100644
--- a/apps/expo/features/packs/components/PackCard.tsx
+++ b/apps/expo/features/packs/components/PackCard.tsx
@@ -1,4 +1,5 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import type { Pack, PackInStore } from '@packrat/app/packs';
 import { isArray } from '@packrat/guards';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
@@ -9,7 +10,6 @@ import { ActivityIndicator, Alert, Image, Pressable, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { useDeletePack, useDuplicatePack, usePackDetailsFromStore } from '../hooks';
 import { usePackOwnershipCheck } from '../hooks/usePackOwnershipCheck';
-import type { Pack, PackInStore } from '../types';
 
 type PackCardProps = {
   pack: Pack | PackInStore;
diff --git a/apps/expo/features/packs/components/PackForm.tsx b/apps/expo/features/packs/components/PackForm.tsx
index baea33172e..57f65baee0 100644
--- a/apps/expo/features/packs/components/PackForm.tsx
+++ b/apps/expo/features/packs/components/PackForm.tsx
@@ -1,4 +1,5 @@
 import { PackCategorySchema } from '@packrat/api/types';
+import type { Pack } from '@packrat/app/packs';
 import { fromZod } from '@packrat/guards';
 import {
   Button,
@@ -31,7 +32,6 @@ import {
 } from 'react-native';
 import { z } from 'zod';
 import { useCreatePack, useUpdatePack } from '../hooks';
-import type { Pack } from '../types';
 
 // Define Zod schema
 const packFormSchema = z.object({
diff --git a/apps/expo/features/packs/components/PackItemCard.tsx b/apps/expo/features/packs/components/PackItemCard.tsx
index 529e45e1bd..78f1300138 100644
--- a/apps/expo/features/packs/components/PackItemCard.tsx
+++ b/apps/expo/features/packs/components/PackItemCard.tsx
@@ -1,4 +1,5 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import type { PackItem } from '@packrat/app/packs';
 import { assertDefined } from '@packrat/guards';
 import { Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
@@ -13,7 +14,6 @@ import {
   usePackItemDetailsFromStore,
   usePackItemOwnershipCheck,
 } from '../hooks';
-import type { PackItem } from '../types';
 import { PackItemImage } from './PackItemImage';
 
 type Base = {
diff --git a/apps/expo/features/packs/components/PackItemImage.tsx b/apps/expo/features/packs/components/PackItemImage.tsx
index 4396f09783..94912b7126 100644
--- a/apps/expo/features/packs/components/PackItemImage.tsx
+++ b/apps/expo/features/packs/components/PackItemImage.tsx
@@ -1,3 +1,4 @@
+import type { PackItem } from '@packrat/app/packs';
 import { isRemoteUrl } from '@packrat/guards';
 import { useColorScheme } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
@@ -5,7 +6,6 @@ import { CatalogItemImage } from 'expo-app/features/catalog/components/CatalogIt
 import { buildImageUrl } from 'expo-app/lib/utils/buildImageUrl';
 import { Image, type ImageProps, View } from 'react-native';
 import { usePackItemOwnershipCheck } from '../hooks';
-import type { PackItem } from '../types';
 import { CachedImage } from './CachedImage';
 
 interface PackItemImageProps extends Omit<ImageProps, 'source'> {
diff --git a/apps/expo/features/packs/components/SearchResults.tsx b/apps/expo/features/packs/components/SearchResults.tsx
index 7ce0f63039..7167886340 100644
--- a/apps/expo/features/packs/components/SearchResults.tsx
+++ b/apps/expo/features/packs/components/SearchResults.tsx
@@ -1,6 +1,6 @@
+import type { Pack } from '@packrat/app/packs';
 import { Icon } from 'expo-app/components/Icon';
 import { FlatList, Pressable, Text, View } from 'react-native';
-import type { Pack } from '../types';
 
 type SearchResultsProps = {
   results: Omit<Pack, 'items' | 'baseWeight' | 'totalWeight'>[];
diff --git a/apps/expo/features/packs/hooks/useAddCatalogItem.ts b/apps/expo/features/packs/hooks/useAddCatalogItem.ts
index d5a27dfbf4..8bc8ce36dd 100644
--- a/apps/expo/features/packs/hooks/useAddCatalogItem.ts
+++ b/apps/expo/features/packs/hooks/useAddCatalogItem.ts
@@ -1,10 +1,10 @@
 import { WeightUnitSchema } from '@packrat/api/types';
+import type { CatalogItem } from '@packrat/app/catalog';
+import type { PackItem } from '@packrat/app/packs';
 import { fromZod } from '@packrat/guards';
 import * as Burnt from 'burnt';
 import { cacheCatalogItemImage } from 'expo-app/features/catalog/lib/cacheCatalogItemImage';
-import type { CatalogItem } from 'expo-app/features/catalog/types';
 import { useState } from 'react';
-import type { PackItem } from '../types';
 import { useCreatePackItem } from './useCreatePackItem';
 
 export function useAddCatalogItem() {
diff --git a/apps/expo/features/packs/hooks/useBulkAddCatalogItems.ts b/apps/expo/features/packs/hooks/useBulkAddCatalogItems.ts
index 24a36cd18d..bb57357810 100644
--- a/apps/expo/features/packs/hooks/useBulkAddCatalogItems.ts
+++ b/apps/expo/features/packs/hooks/useBulkAddCatalogItems.ts
@@ -1,8 +1,8 @@
 import { WeightUnitSchema } from '@packrat/api/types';
+import type { CatalogItemWithPackItemFields } from '@packrat/app/catalog';
 import { fromZod } from '@packrat/guards';
 import { useState } from 'react';
 import { cacheCatalogItemImage } from '../../catalog/lib/cacheCatalogItemImage';
-import type { CatalogItemWithPackItemFields } from '../../catalog/types';
 import { useCreatePackItem } from './useCreatePackItem';
 
 export function useBulkAddCatalogItems() {
diff --git a/apps/expo/features/packs/hooks/useCreatePack.ts b/apps/expo/features/packs/hooks/useCreatePack.ts
index 38c4a7d918..8124345a63 100644
--- a/apps/expo/features/packs/hooks/useCreatePack.ts
+++ b/apps/expo/features/packs/hooks/useCreatePack.ts
@@ -1,8 +1,8 @@
+import type { PackInput, PackInStore } from '@packrat/app/packs';
 import { packsStore } from 'expo-app/features/packs/store';
 import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
-import type { PackInput, PackInStore } from '../types';
 
 // Hook to create a pack
 export function useCreatePack() {
diff --git a/apps/expo/features/packs/hooks/useCreatePackFromPack.ts b/apps/expo/features/packs/hooks/useCreatePackFromPack.ts
index 287c8dee5b..326a05d0d5 100644
--- a/apps/expo/features/packs/hooks/useCreatePackFromPack.ts
+++ b/apps/expo/features/packs/hooks/useCreatePackFromPack.ts
@@ -1,6 +1,6 @@
+import type { Pack, PackInput, PackInStore } from '@packrat/app/packs';
 import { packItemsStore, packsStore } from 'expo-app/features/packs/store';
 import { recordPackWeight } from 'expo-app/features/packs/store/packWeightHistory';
-import type { Pack, PackInput, PackInStore } from 'expo-app/features/packs/types';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 
diff --git a/apps/expo/features/packs/hooks/useCreatePackItem.ts b/apps/expo/features/packs/hooks/useCreatePackItem.ts
index a9d677971b..504e299d1b 100644
--- a/apps/expo/features/packs/hooks/useCreatePackItem.ts
+++ b/apps/expo/features/packs/hooks/useCreatePackItem.ts
@@ -1,9 +1,9 @@
+import type { PackItem, PackItemInput } from '@packrat/app/packs';
 import { packItemsStore, packsStore } from 'expo-app/features/packs/store';
 import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 import { recordPackWeight } from '../store/packWeightHistory';
-import type { PackItem, PackItemInput } from '../types';
 
 export function useCreatePackItem() {
   const createPackItem = useCallback(
diff --git a/apps/expo/features/packs/hooks/useCreatePackWithItems.ts b/apps/expo/features/packs/hooks/useCreatePackWithItems.ts
index 6ddcc44167..f2fef37805 100644
--- a/apps/expo/features/packs/hooks/useCreatePackWithItems.ts
+++ b/apps/expo/features/packs/hooks/useCreatePackWithItems.ts
@@ -1,5 +1,5 @@
+import type { PackInput, PackItemInput } from '@packrat/app/packs';
 import { useCallback } from 'react';
-import type { PackInput, PackItemInput } from '../types';
 import { useCreatePack } from './useCreatePack';
 import { useCreatePackItem } from './useCreatePackItem';
 
diff --git a/apps/expo/features/packs/hooks/useDetailedPacks.ts b/apps/expo/features/packs/hooks/useDetailedPacks.ts
index f8ad24344d..8060e36370 100644
--- a/apps/expo/features/packs/hooks/useDetailedPacks.ts
+++ b/apps/expo/features/packs/hooks/useDetailedPacks.ts
@@ -1,6 +1,6 @@
 import { use$ } from '@legendapp/state/react';
+import type { Pack } from '@packrat/app/packs';
 import { getPackItems, packsStore } from 'expo-app/features/packs/store';
-import type { Pack } from '../types';
 import { computePackWeights } from '../utils';
 
 export function useDetailedPacks(): Pack[] {
diff --git a/apps/expo/features/packs/hooks/useDuplicatePack.ts b/apps/expo/features/packs/hooks/useDuplicatePack.ts
index 7570426363..312025057b 100644
--- a/apps/expo/features/packs/hooks/useDuplicatePack.ts
+++ b/apps/expo/features/packs/hooks/useDuplicatePack.ts
@@ -1,7 +1,7 @@
+import type { Pack, PackInput } from '@packrat/app/packs';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { useCallback } from 'react';
-import type { Pack, PackInput } from '../types';
 import { useCreatePackFromPack } from './useCreatePackFromPack';
 
 export function useDuplicatePack() {
diff --git a/apps/expo/features/packs/hooks/useImageDetection.ts b/apps/expo/features/packs/hooks/useImageDetection.ts
index 89b0b48ec7..97e1b30a6c 100644
--- a/apps/expo/features/packs/hooks/useImageDetection.ts
+++ b/apps/expo/features/packs/hooks/useImageDetection.ts
@@ -1,5 +1,5 @@
+import type { CatalogItem } from '@packrat/app/catalog';
 import { useMutation } from '@tanstack/react-query';
-import type { CatalogItem } from 'expo-app/features/catalog/types';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { uploadImage } from '../utils';
 import type { SelectedImage } from './useImagePicker';
diff --git a/apps/expo/features/packs/hooks/usePackDetailsFromStore.ts b/apps/expo/features/packs/hooks/usePackDetailsFromStore.ts
index 9bdb7bc106..7b734b3fc5 100644
--- a/apps/expo/features/packs/hooks/usePackDetailsFromStore.ts
+++ b/apps/expo/features/packs/hooks/usePackDetailsFromStore.ts
@@ -1,8 +1,7 @@
 import { use$ } from '@legendapp/state/react';
-
+import { computePackWeights } from '@packrat/app/packs';
 import { getPackItems, packsStore } from 'expo-app/features/packs/store';
 import { obs } from 'expo-app/lib/store';
-import { computePackWeights } from '../utils/computePackWeights';
 
 /**
  * Retrieves pack from store.
diff --git a/apps/expo/features/packs/hooks/usePackItemDetailsFromApi.ts b/apps/expo/features/packs/hooks/usePackItemDetailsFromApi.ts
index 8229888c23..b21e065d31 100644
--- a/apps/expo/features/packs/hooks/usePackItemDetailsFromApi.ts
+++ b/apps/expo/features/packs/hooks/usePackItemDetailsFromApi.ts
@@ -1,8 +1,8 @@
 import { PackItemSchema } from '@packrat/api/schemas/packs';
+import type { PackItem } from '@packrat/app/packs';
 import { useQuery } from '@tanstack/react-query';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
-import type { PackItem } from '../types';
 
 export async function fetchPackItemById(id: string) {
   const { data, error } = await apiClient.packs.items({ itemId: id }).get();
diff --git a/apps/expo/features/packs/hooks/usePackWeightHistory.ts b/apps/expo/features/packs/hooks/usePackWeightHistory.ts
index cf73028208..cd0af67b74 100644
--- a/apps/expo/features/packs/hooks/usePackWeightHistory.ts
+++ b/apps/expo/features/packs/hooks/usePackWeightHistory.ts
@@ -1,7 +1,7 @@
 import { use$ } from '@legendapp/state/react';
+import type { PackWeightHistoryEntry } from '@packrat/app/packs';
 import { assertDefined } from '@packrat/guards';
 import { packWeigthHistoryStore } from '../store/packWeightHistory';
-import type { PackWeightHistoryEntry } from '../types';
 
 export type PackMonthlyAverage = {
   month: string;
diff --git a/apps/expo/features/packs/hooks/useRecentPacks.ts b/apps/expo/features/packs/hooks/useRecentPacks.ts
index c6e3818f34..8ff6393078 100644
--- a/apps/expo/features/packs/hooks/useRecentPacks.ts
+++ b/apps/expo/features/packs/hooks/useRecentPacks.ts
@@ -1,6 +1,6 @@
 import { use$ } from '@legendapp/state/react';
+import { computePackWeights } from '@packrat/app/packs';
 import { getPackItems } from '../store';
-import { computePackWeights } from '../utils/computePackWeights';
 import { usePacks } from './usePacks';
 
 export function useRecentPacks() {
diff --git a/apps/expo/features/packs/hooks/useSeasonSuggestions.ts b/apps/expo/features/packs/hooks/useSeasonSuggestions.ts
index 4aa43cbf17..10c0df0810 100644
--- a/apps/expo/features/packs/hooks/useSeasonSuggestions.ts
+++ b/apps/expo/features/packs/hooks/useSeasonSuggestions.ts
@@ -1,6 +1,6 @@
+import type { PackInput, PackItemInput } from '@packrat/app/packs';
 import { useMutation } from '@tanstack/react-query';
 import { apiClient } from 'expo-app/lib/api/packrat';
-import type { PackInput, PackItemInput } from '../types';
 
 export interface SeasonSuggestionsRequest {
   location: string;
diff --git a/apps/expo/features/packs/hooks/useUpdatePack.ts b/apps/expo/features/packs/hooks/useUpdatePack.ts
index 638504bc70..3e4a15c252 100644
--- a/apps/expo/features/packs/hooks/useUpdatePack.ts
+++ b/apps/expo/features/packs/hooks/useUpdatePack.ts
@@ -1,7 +1,7 @@
+import type { Pack } from '@packrat/app/packs';
 import { packsStore } from 'expo-app/features/packs/store';
 import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
-import type { Pack } from '../types';
 
 export function useUpdatePack() {
   const updatePack = useCallback((pack: Pack) => {
diff --git a/apps/expo/features/packs/hooks/useUpdatePackItem.ts b/apps/expo/features/packs/hooks/useUpdatePackItem.ts
index e5ba312cc3..eca053a742 100644
--- a/apps/expo/features/packs/hooks/useUpdatePackItem.ts
+++ b/apps/expo/features/packs/hooks/useUpdatePackItem.ts
@@ -1,7 +1,7 @@
+import type { PackItem } from '@packrat/app/packs';
 import { packItemsStore, packsStore } from 'expo-app/features/packs/store';
 import { useCallback } from 'react';
 import { recordPackWeight } from '../store/packWeightHistory';
-import type { PackItem } from '../types';
 
 export function useUpdatePackItem() {
   const updatePackItem = useCallback((item: PackItem) => {
diff --git a/apps/expo/features/packs/index.ts b/apps/expo/features/packs/index.ts
index a9a0a249f5..c4b0798c02 100644
--- a/apps/expo/features/packs/index.ts
+++ b/apps/expo/features/packs/index.ts
@@ -1,2 +1,2 @@
+export * from '@packrat/app/packs';
 export * from './hooks';
-export * from './types';
diff --git a/apps/expo/features/packs/input.ts b/apps/expo/features/packs/input.ts
deleted file mode 100644
index 0b58053a5c..0000000000
--- a/apps/expo/features/packs/input.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { PackItemInput } from '@packrat/app/packs';
diff --git a/apps/expo/features/packs/screens/CreatePackItemForm.tsx b/apps/expo/features/packs/screens/CreatePackItemForm.tsx
index 9f0dff53d7..b814f76ee1 100644
--- a/apps/expo/features/packs/screens/CreatePackItemForm.tsx
+++ b/apps/expo/features/packs/screens/CreatePackItemForm.tsx
@@ -1,4 +1,5 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import type { PackItem } from '@packrat/app/packs';
 import { safeIndexOf } from '@packrat/guards';
 import { Form, FormItem, FormSection, SegmentedControl, TextField } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
@@ -16,7 +17,6 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { z } from 'zod';
 import { useCreatePackItem, useUpdatePackItem } from '../hooks';
 import { useImagePicker } from '../hooks/useImagePicker';
-import type { PackItem } from '../types';
 
 // Define Zod schema
 const itemFormSchema = z.object({
diff --git a/apps/expo/features/packs/screens/ItemsScanScreen.tsx b/apps/expo/features/packs/screens/ItemsScanScreen.tsx
index 4f6093118f..a8dbc08b49 100644
--- a/apps/expo/features/packs/screens/ItemsScanScreen.tsx
+++ b/apps/expo/features/packs/screens/ItemsScanScreen.tsx
@@ -1,4 +1,5 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import type { CatalogItem, CatalogItemWithPackItemFields } from '@packrat/app/catalog';
 import { assertNonNull } from '@packrat/guards';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
@@ -12,7 +13,6 @@ import { Stack, useLocalSearchParams, useRouter } from 'expo-router';
 import { useCallback, useEffect, useState } from 'react';
 import { Image, ScrollView, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
-import type { CatalogItem, CatalogItemWithPackItemFields } from '../../catalog/types';
 import { HorizontalCatalogItemCard } from '../components/HorizontalCatalogItemCard';
 import { useBulkAddCatalogItems } from '../hooks';
 import { useImageDetection } from '../hooks/useImageDetection';
diff --git a/apps/expo/features/packs/screens/PackDetailScreen.tsx b/apps/expo/features/packs/screens/PackDetailScreen.tsx
index 78d45b6e1d..ff614a2867 100644
--- a/apps/expo/features/packs/screens/PackDetailScreen.tsx
+++ b/apps/expo/features/packs/screens/PackDetailScreen.tsx
@@ -1,4 +1,5 @@
 import { BottomSheetView } from '@gorhom/bottom-sheet';
+import type { Pack, PackCategory, PackItem } from '@packrat/app/packs';
 import { isDefined } from '@packrat/guards';
 import { ActivityIndicator, Button, Sheet, Text, useSheetRef } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
@@ -26,7 +27,6 @@ import AddPackItemActions from '../components/AddPackItemActions';
 import { usePackDetailsFromApi, usePackDetailsFromStore, usePackGapAnalysis } from '../hooks';
 import { usePackOwnershipCheck } from '../hooks/usePackOwnershipCheck';
 import { packingModeStore } from '../store/packingMode';
-import type { Pack, PackCategory, PackItem } from '../types';
 
 export function PackDetailScreen() {
   const { t } = useTranslation();
diff --git a/apps/expo/features/packs/screens/PackListScreen.tsx b/apps/expo/features/packs/screens/PackListScreen.tsx
index 9c31d519a4..fb8ee1fd2c 100644
--- a/apps/expo/features/packs/screens/PackListScreen.tsx
+++ b/apps/expo/features/packs/screens/PackListScreen.tsx
@@ -1,3 +1,4 @@
+import type { Pack, PackCategory, PackInStore } from '@packrat/app/packs';
 import type { LargeTitleSearchBarMethods } from '@packrat/ui/nativewindui';
 import {
   ActivityIndicator,
@@ -33,7 +34,6 @@ import {
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { useAllPacks } from '../hooks/useAllPacks';
 import { usePacks } from '../hooks/usePacks';
-import type { Pack, PackCategory, PackInStore } from '../types';
 
 type FilterOption = {
   label: string;
diff --git a/apps/expo/features/packs/store/packItems.ts b/apps/expo/features/packs/store/packItems.ts
index e8339a567f..35ff673d53 100644
--- a/apps/expo/features/packs/store/packItems.ts
+++ b/apps/expo/features/packs/store/packItems.ts
@@ -2,12 +2,12 @@ import { observable, syncState } from '@legendapp/state';
 import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { PackItemSchema, PackWithWeightsSchema } from '@packrat/api/schemas/packs';
+import type { PackItem } from '@packrat/app/packs';
 import { isRemoteUrl } from '@packrat/guards';
 import { isAuthed } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
 import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
-import type { PackItem } from '../types';
 import { uploadImage } from '../utils';
 
 const listAllPackItems = async (): Promise<PackItem[] | null> => {
diff --git a/apps/expo/features/packs/store/packWeightHistory.ts b/apps/expo/features/packs/store/packWeightHistory.ts
index 75dc2f32a1..d1941f3c50 100644
--- a/apps/expo/features/packs/store/packWeightHistory.ts
+++ b/apps/expo/features/packs/store/packWeightHistory.ts
@@ -2,12 +2,12 @@ import { observable, syncState } from '@legendapp/state';
 import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { PackWeightHistoryResponseSchema } from '@packrat/api/schemas/packs';
+import type { PackWeightHistoryEntry } from '@packrat/app/packs';
 import { isAuthed } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
 import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
-import type { PackWeightHistoryEntry } from '../types';
 import { computePackWeights } from '../utils';
 import { packItemsStore } from './packItems';
 import { packsStore } from './packs';
diff --git a/apps/expo/features/packs/store/packs.ts b/apps/expo/features/packs/store/packs.ts
index 4f1917a0e3..d276c24408 100644
--- a/apps/expo/features/packs/store/packs.ts
+++ b/apps/expo/features/packs/store/packs.ts
@@ -2,10 +2,10 @@ import { observable, syncState } from '@legendapp/state';
 import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { PackWithWeightsSchema } from '@packrat/api/schemas/packs';
+import type { PackInStore } from '@packrat/app/packs';
 import { isAuthed } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
-import type { PackInStore } from '../types';
 
 let _refreshPacksList: (() => void) | undefined;
 export const refreshPacksList = () => _refreshPacksList?.();
diff --git a/apps/expo/features/packs/types.ts b/apps/expo/features/packs/types.ts
deleted file mode 100644
index a60a4c3efd..0000000000
--- a/apps/expo/features/packs/types.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export type {
-  Pack,
-  PackCategory,
-  PackInput,
-  PackInStore,
-  PackItem,
-  PackItemCategory,
-  PackItemInput,
-  PackWeightHistoryEntry,
-  Weight,
-  WeightUnit,
-} from '@packrat/app/packs';
diff --git a/apps/expo/features/packs/utils/__tests__/computePackWeights.test.ts b/apps/expo/features/packs/utils/__tests__/computePackWeights.test.ts
index 80b1608278..e3a6b4f199 100644
--- a/apps/expo/features/packs/utils/__tests__/computePackWeights.test.ts
+++ b/apps/expo/features/packs/utils/__tests__/computePackWeights.test.ts
@@ -1,6 +1,6 @@
+import type { Pack, PackItem } from '@packrat/app/packs';
+import { computePackWeights } from '@packrat/app/packs';
 import { describe, expect, it } from 'vitest';
-import type { Pack, PackItem } from '../../types';
-import { computePackWeights } from '../computePackWeights';
 
 describe('computePackWeights', () => {
   describe('basic weight calculations', () => {
diff --git a/apps/expo/features/packs/utils/__tests__/convertFromGrams.test.ts b/apps/expo/features/packs/utils/__tests__/convertFromGrams.test.ts
index 1af77352eb..fb9f608643 100644
--- a/apps/expo/features/packs/utils/__tests__/convertFromGrams.test.ts
+++ b/apps/expo/features/packs/utils/__tests__/convertFromGrams.test.ts
@@ -1,5 +1,5 @@
+import { convertFromGrams } from '@packrat/app/packs';
 import { describe, expect, it } from 'vitest';
-import { convertFromGrams } from '../convertFromGrams';
 
 describe('convertFromGrams', () => {
   // -------------------------------------------------------------------------
diff --git a/apps/expo/features/packs/utils/__tests__/convertToGrams.test.ts b/apps/expo/features/packs/utils/__tests__/convertToGrams.test.ts
index e8903526b6..8eb01a5ff0 100644
--- a/apps/expo/features/packs/utils/__tests__/convertToGrams.test.ts
+++ b/apps/expo/features/packs/utils/__tests__/convertToGrams.test.ts
@@ -1,5 +1,5 @@
+import { convertToGrams } from '@packrat/app/packs';
 import { describe, expect, it } from 'vitest';
-import { convertToGrams } from '../convertToGrams';
 
 describe('convertToGrams', () => {
   // -------------------------------------------------------------------------
diff --git a/apps/expo/features/packs/utils/computeCategories.ts b/apps/expo/features/packs/utils/computeCategories.ts
index 9646f31335..7a7fe1164c 100644
--- a/apps/expo/features/packs/utils/computeCategories.ts
+++ b/apps/expo/features/packs/utils/computeCategories.ts
@@ -1,8 +1,7 @@
+import type { Pack } from '@packrat/app/packs';
+import { convertFromGrams, convertToGrams } from '@packrat/app/packs';
 import { assertDefined } from '@packrat/guards';
 import { userStore } from 'expo-app/features/auth/store';
-import type { Pack } from '../types';
-import { convertFromGrams } from './convertFromGrams';
-import { convertToGrams } from './convertToGrams';
 
 export type CategorySummary = {
   name: string;
diff --git a/apps/expo/features/packs/utils/computePackWeights.ts b/apps/expo/features/packs/utils/computePackWeights.ts
deleted file mode 100644
index 75c1a4da35..0000000000
--- a/apps/expo/features/packs/utils/computePackWeights.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { computePackWeights } from '@packrat/app/packs';
diff --git a/apps/expo/features/packs/utils/convertFromGrams.ts b/apps/expo/features/packs/utils/convertFromGrams.ts
deleted file mode 100644
index 93b9b48eed..0000000000
--- a/apps/expo/features/packs/utils/convertFromGrams.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { convertFromGrams } from '@packrat/app/packs';
diff --git a/apps/expo/features/packs/utils/convertToGrams.ts b/apps/expo/features/packs/utils/convertToGrams.ts
deleted file mode 100644
index 2eb5f4722b..0000000000
--- a/apps/expo/features/packs/utils/convertToGrams.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { convertToGrams } from '@packrat/app/packs';
diff --git a/apps/expo/features/packs/utils/index.ts b/apps/expo/features/packs/utils/index.ts
index f3e71bfe10..5d90e234e2 100644
--- a/apps/expo/features/packs/utils/index.ts
+++ b/apps/expo/features/packs/utils/index.ts
@@ -1,5 +1,5 @@
+export * from '@packrat/app/packs';
+export * from '@packrat/app/packs';
+export * from '@packrat/app/packs';
 export * from './computeCategories';
-export * from './computePackWeights';
-export * from './convertFromGrams';
-export * from './convertToGrams';
 export * from './uploadImage';
diff --git a/apps/expo/features/profile/types.ts b/apps/expo/features/profile/types.ts
deleted file mode 100644
index 025216030f..0000000000
--- a/apps/expo/features/profile/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { User } from '@packrat/app/profile';
diff --git a/apps/expo/features/trail-conditions/components/ConditionBadge.tsx b/apps/expo/features/trail-conditions/components/ConditionBadge.tsx
index 63a2621cb7..1a9364133b 100644
--- a/apps/expo/features/trail-conditions/components/ConditionBadge.tsx
+++ b/apps/expo/features/trail-conditions/components/ConditionBadge.tsx
@@ -1,7 +1,7 @@
+import type { OverallCondition } from '@packrat/app/trail-conditions';
 import { Text } from '@packrat/ui/nativewindui';
 import { cn } from 'expo-app/lib/cn';
 import { View } from 'react-native';
-import type { OverallCondition } from '../types';
 
 interface ConditionBadgeProps {
   condition: OverallCondition | string;
diff --git a/apps/expo/features/trail-conditions/components/SubmitConditionReportForm.tsx b/apps/expo/features/trail-conditions/components/SubmitConditionReportForm.tsx
index 6ee4f06fe7..e6a11d4e85 100644
--- a/apps/expo/features/trail-conditions/components/SubmitConditionReportForm.tsx
+++ b/apps/expo/features/trail-conditions/components/SubmitConditionReportForm.tsx
@@ -1,10 +1,14 @@
+import type {
+  OverallCondition,
+  TrailSurface,
+  WaterCrossingDifficulty,
+} from '@packrat/app/trail-conditions';
 import { Text } from '@packrat/ui/nativewindui';
 import { TextInput } from 'expo-app/components/TextInput';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useState } from 'react';
 import { Alert, KeyboardAvoidingView, Platform, Pressable, ScrollView, View } from 'react-native';
 import { useSubmitTrailConditionReport } from '../hooks/useSubmitTrailConditionReport';
-import type { OverallCondition, TrailSurface, WaterCrossingDifficulty } from '../types';
 
 const SURFACE_OPTIONS: TrailSurface[] = ['paved', 'gravel', 'dirt', 'rocky', 'snow', 'mud'];
 const CONDITION_OPTIONS: OverallCondition[] = ['excellent', 'good', 'fair', 'poor'];
diff --git a/apps/expo/features/trail-conditions/components/TrailConditionReportCard.tsx b/apps/expo/features/trail-conditions/components/TrailConditionReportCard.tsx
index 0bb13c7d60..c76e356568 100644
--- a/apps/expo/features/trail-conditions/components/TrailConditionReportCard.tsx
+++ b/apps/expo/features/trail-conditions/components/TrailConditionReportCard.tsx
@@ -1,7 +1,11 @@
+import type {
+  TrailConditionReport,
+  TrailSurface,
+  WaterCrossingDifficulty,
+} from '@packrat/app/trail-conditions';
 import { Text } from '@packrat/ui/nativewindui';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { View } from 'react-native';
-import type { TrailConditionReport, TrailSurface, WaterCrossingDifficulty } from '../types';
 import { ConditionBadge } from './ConditionBadge';
 
 interface TrailConditionReportCardProps {
diff --git a/apps/expo/features/trail-conditions/hooks/useSubmitTrailConditionReport.ts b/apps/expo/features/trail-conditions/hooks/useSubmitTrailConditionReport.ts
index bcb16fa563..48430b0a4b 100644
--- a/apps/expo/features/trail-conditions/hooks/useSubmitTrailConditionReport.ts
+++ b/apps/expo/features/trail-conditions/hooks/useSubmitTrailConditionReport.ts
@@ -1,10 +1,13 @@
+import type {
+  TrailConditionReportInput,
+  TrailConditionReportInStore,
+} from '@packrat/app/trail-conditions';
 import { nanoid } from 'nanoid';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import {
   trailConditionReportsStore,
   trailConditionReportsSyncState,
 } from '../store/trailConditionReports';
-import type { TrailConditionReportInput, TrailConditionReportInStore } from '../types';
 
 interface SubmitOptions {
   onSuccess?: (id: string) => void;
diff --git a/apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts b/apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts
index f0887a9dad..8f97dec132 100644
--- a/apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts
+++ b/apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts
@@ -1,4 +1,5 @@
 import { useSelector } from '@legendapp/state/react';
+import type { TrailConditionReport } from '@packrat/app/trail-conditions';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { useQuery } from '@tanstack/react-query';
 import { userStore } from 'expo-app/features/auth/store/user';
@@ -6,7 +7,6 @@ import { apiClient } from 'expo-app/lib/api/packrat';
 import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 import { useEffect, useRef, useState } from 'react';
 import { trailConditionReportsStore } from '../store/trailConditionReports';
-import type { TrailConditionReport } from '../types';
 
 const CACHE_KEY_PREFIX = 'trail_condition_reports_cache';
 
diff --git a/apps/expo/features/trail-conditions/index.ts b/apps/expo/features/trail-conditions/index.ts
index 2103701b18..8721fe0b5b 100644
--- a/apps/expo/features/trail-conditions/index.ts
+++ b/apps/expo/features/trail-conditions/index.ts
@@ -1,3 +1,3 @@
+export * from '@packrat/app/trail-conditions';
 export * from './components';
 export * from './hooks';
-export * from './types';
diff --git a/apps/expo/features/trail-conditions/store/trailConditionReports.ts b/apps/expo/features/trail-conditions/store/trailConditionReports.ts
index 0ddc8d5115..d8737f5734 100644
--- a/apps/expo/features/trail-conditions/store/trailConditionReports.ts
+++ b/apps/expo/features/trail-conditions/store/trailConditionReports.ts
@@ -2,10 +2,10 @@ import { observable, syncState } from '@legendapp/state';
 import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { TrailConditionReportSchema } from '@packrat/api/schemas/trailConditions';
+import type { TrailConditionReportInStore } from '@packrat/app/trail-conditions';
 import { isAuthed } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
-import type { TrailConditionReportInStore } from '../types';
 
 const listMyReports = async (_params: unknown, { lastSync }: { lastSync?: number } = {}) => {
   const { data, error } = await apiClient['trail-conditions'].mine.get({
diff --git a/apps/expo/features/trail-conditions/types.ts b/apps/expo/features/trail-conditions/types.ts
deleted file mode 100644
index 3a16f80ccb..0000000000
--- a/apps/expo/features/trail-conditions/types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export type {
-  OverallCondition,
-  TrailConditionReport,
-  TrailConditionReportInput,
-  TrailConditionReportInStore,
-  TrailSurface,
-  WaterCrossingDifficulty,
-} from '@packrat/app/trail-conditions';
diff --git a/apps/expo/features/trips/components/TripCard.tsx b/apps/expo/features/trips/components/TripCard.tsx
index 7a7d6225df..507f34866a 100644
--- a/apps/expo/features/trips/components/TripCard.tsx
+++ b/apps/expo/features/trips/components/TripCard.tsx
@@ -1,4 +1,5 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import type { Trip } from '@packrat/app/trips';
 import { Alert, type AlertMethods, Button } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
@@ -9,7 +10,6 @@ import { useRef } from 'react';
 import { Pressable, Text, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { useDeleteTrip } from '../hooks/useDeleteTrip';
-import type { Trip } from '../types';
 
 interface TripCardProps {
   trip: Trip;
diff --git a/apps/expo/features/trips/components/TripForm.tsx b/apps/expo/features/trips/components/TripForm.tsx
index cd71757cd3..4c38fc5a76 100644
--- a/apps/expo/features/trips/components/TripForm.tsx
+++ b/apps/expo/features/trips/components/TripForm.tsx
@@ -1,3 +1,4 @@
+import type { Trip } from '@packrat/app/trips';
 import { assertDefined, isString } from '@packrat/guards';
 import { Form, FormItem, FormSection, TextField } from '@packrat/ui/nativewindui';
 import DateTimePicker from '@react-native-community/datetimepicker';
@@ -17,7 +18,6 @@ import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context'
 import { z } from 'zod';
 import { useCreateTrip, useUpdateTrip } from '../hooks';
 import { tripLocationStore, useTripLocation } from '../store/tripLocationStore';
-import type { Trip } from '../types';
 
 const tripFormSchema = z
   .object({
diff --git a/apps/expo/features/trips/hooks/useCreateTrip.ts b/apps/expo/features/trips/hooks/useCreateTrip.ts
index 30cf45edbd..8220e533c6 100644
--- a/apps/expo/features/trips/hooks/useCreateTrip.ts
+++ b/apps/expo/features/trips/hooks/useCreateTrip.ts
@@ -1,8 +1,8 @@
+import type { TripInput, TripInStore } from '@packrat/app/trips';
 import { tripsStore } from 'expo-app/features/trips/store/trips';
 import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
-import type { TripInput, TripInStore } from '../types';
 
 // Hook to create a trip
 export function useCreateTrip() {
diff --git a/apps/expo/features/trips/hooks/useUpdateTrip.ts b/apps/expo/features/trips/hooks/useUpdateTrip.ts
index 47c8d8b3e8..38e881b2c9 100644
--- a/apps/expo/features/trips/hooks/useUpdateTrip.ts
+++ b/apps/expo/features/trips/hooks/useUpdateTrip.ts
@@ -1,7 +1,7 @@
+import type { Trip } from '@packrat/app/trips';
 import { tripsStore } from 'expo-app/features/trips/store/trips';
 import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
-import type { Trip } from '../types';
 
 export function useUpdateTrip() {
   const updateTrip = useCallback((trip: Trip) => {
diff --git a/apps/expo/features/trips/index.ts b/apps/expo/features/trips/index.ts
index a9a0a249f5..e1772d4b05 100644
--- a/apps/expo/features/trips/index.ts
+++ b/apps/expo/features/trips/index.ts
@@ -1,2 +1,2 @@
+export * from '@packrat/app/trips';
 export * from './hooks';
-export * from './types';
diff --git a/apps/expo/features/trips/screens/TripDetailScreen.tsx b/apps/expo/features/trips/screens/TripDetailScreen.tsx
index 8bc6a0f39b..fa1b21d5b7 100644
--- a/apps/expo/features/trips/screens/TripDetailScreen.tsx
+++ b/apps/expo/features/trips/screens/TripDetailScreen.tsx
@@ -1,3 +1,4 @@
+import type { Trip } from '@packrat/app/trips';
 import { assertDefined } from '@packrat/guards';
 import { ActivityIndicator, Button, Card, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
@@ -13,7 +14,6 @@ import MapView, { Marker } from 'react-native-maps';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { useDetailedPacks } from '../../packs/hooks/useDetailedPacks';
 import { useTripDetailsFromStore } from '../hooks/useTripDetailsFromStore';
-import type { Trip } from '../types';
 
 export function TripDetailScreen() {
   const router = useRouter();
diff --git a/apps/expo/features/trips/screens/TripListScreen.tsx b/apps/expo/features/trips/screens/TripListScreen.tsx
index ea2efee01d..c1986065bb 100644
--- a/apps/expo/features/trips/screens/TripListScreen.tsx
+++ b/apps/expo/features/trips/screens/TripListScreen.tsx
@@ -1,3 +1,4 @@
+import type { Trip } from '@packrat/app/trips';
 import { LargeTitleHeader, type LargeTitleSearchBarMethods } from '@packrat/ui/nativewindui';
 import { AndroidTabBarInsetFix } from 'expo-app/components/AndroidTabBarInsetFix';
 import { Icon } from 'expo-app/components/Icon';
@@ -12,7 +13,6 @@ import { FlatList, Pressable, ScrollView, Text, TouchableOpacity, View } from 'r
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { TripCard } from '../components/TripCard';
 import { useTrips } from '../hooks';
-import type { Trip } from '../types';
 
 function TrailConditionsBanner() {
   const { colors } = useColorScheme();
diff --git a/apps/expo/features/trips/store/trips.ts b/apps/expo/features/trips/store/trips.ts
index 17262b42b6..1c16c1e637 100644
--- a/apps/expo/features/trips/store/trips.ts
+++ b/apps/expo/features/trips/store/trips.ts
@@ -2,10 +2,10 @@ import { observable, syncState } from '@legendapp/state';
 import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { TripSchema } from '@packrat/api/schemas/trips';
+import type { TripInStore } from '@packrat/app/trips';
 import { isAuthed } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
-import type { TripInStore } from '../types';
 
 let _refreshTripsList: (() => void) | undefined;
 export const refreshTripsList = () => _refreshTripsList?.();
diff --git a/apps/expo/features/trips/types.ts b/apps/expo/features/trips/types.ts
deleted file mode 100644
index 973263f643..0000000000
--- a/apps/expo/features/trips/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { Trip, TripInput, TripInStore, TripStatus } from '@packrat/app/trips';
diff --git a/apps/expo/features/wildlife/atoms/wildlifeAtoms.ts b/apps/expo/features/wildlife/atoms/wildlifeAtoms.ts
index 7c53db4725..4d5421a91c 100644
--- a/apps/expo/features/wildlife/atoms/wildlifeAtoms.ts
+++ b/apps/expo/features/wildlife/atoms/wildlifeAtoms.ts
@@ -1,6 +1,6 @@
+import type { WildlifeIdentification } from '@packrat/app/wildlife';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { atomWithStorage, createJSONStorage, loadable } from 'jotai/utils';
-import type { WildlifeIdentification } from '../types';
 
 // createJSONStorage handles JSON.parse/stringify internally; pass AsyncStorage directly.
 const wildlifeStorage = createJSONStorage<WildlifeIdentification[]>(() => AsyncStorage);
diff --git a/apps/expo/features/wildlife/components/SpeciesCard.tsx b/apps/expo/features/wildlife/components/SpeciesCard.tsx
index f186438533..58b11e99e6 100644
--- a/apps/expo/features/wildlife/components/SpeciesCard.tsx
+++ b/apps/expo/features/wildlife/components/SpeciesCard.tsx
@@ -1,7 +1,7 @@
+import type { IdentificationResult } from '@packrat/app/wildlife';
 import { Text } from '@packrat/ui/nativewindui';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Pressable, View } from 'react-native';
-import type { IdentificationResult } from '../types';
 
 interface SpeciesCardProps {
   result: IdentificationResult;
diff --git a/apps/expo/features/wildlife/hooks/useWildlifeHistory.ts b/apps/expo/features/wildlife/hooks/useWildlifeHistory.ts
index 5f076e8a3a..9f9695d5b2 100644
--- a/apps/expo/features/wildlife/hooks/useWildlifeHistory.ts
+++ b/apps/expo/features/wildlife/hooks/useWildlifeHistory.ts
@@ -1,9 +1,9 @@
+import type { IdentificationResult, WildlifeIdentification } from '@packrat/app/wildlife';
 import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
 import { useAtom } from 'jotai';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 import { baseWildlifeHistoryAtom, wildlifeHistoryAtom } from '../atoms/wildlifeAtoms';
-import type { IdentificationResult, WildlifeIdentification } from '../types';
 
 export function useWildlifeHistory() {
   const [historyState] = useAtom(wildlifeHistoryAtom);
diff --git a/apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts b/apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts
index 0dc6794346..10b056ce15 100644
--- a/apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts
+++ b/apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts
@@ -1,11 +1,11 @@
+import type { IdentificationResult } from '@packrat/app/wildlife';
+import { identifyFromDescription } from '@packrat/app/wildlife';
 import { isObject, zodGuard } from '@packrat/guards';
 import { useMutation } from '@tanstack/react-query';
 import type { SelectedImage } from 'expo-app/features/packs/hooks/useImagePicker';
 import { uploadImage } from 'expo-app/features/packs/utils';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { z } from 'zod';
-import { identifyFromDescription } from '../lib/offlineIdentifier';
-import type { IdentificationResult } from '../types';
 
 const isIdentifyResponse = zodGuard(z.object({ results: z.array(z.unknown()) }));
 
diff --git a/apps/expo/features/wildlife/index.ts b/apps/expo/features/wildlife/index.ts
index 3c129c6b10..7512bbfba8 100644
--- a/apps/expo/features/wildlife/index.ts
+++ b/apps/expo/features/wildlife/index.ts
@@ -1,4 +1,4 @@
+export * from '@packrat/app/wildlife';
 export * from './components';
 export * from './hooks';
 export * from './screens';
-export * from './types';
diff --git a/apps/expo/features/wildlife/screens/IdentificationScreen.tsx b/apps/expo/features/wildlife/screens/IdentificationScreen.tsx
index d7359b7229..aef1066073 100644
--- a/apps/expo/features/wildlife/screens/IdentificationScreen.tsx
+++ b/apps/expo/features/wildlife/screens/IdentificationScreen.tsx
@@ -1,4 +1,5 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import type { IdentificationResult } from '@packrat/app/wildlife';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import { appAlert } from 'expo-app/app/_layout';
 import { Icon } from 'expo-app/components/Icon';
@@ -12,7 +13,6 @@ import { Image, ScrollView, View } from 'react-native';
 import { SpeciesCard } from '../components/SpeciesCard';
 import { useWildlifeHistory } from '../hooks/useWildlifeHistory';
 import { useWildlifeIdentification } from '../hooks/useWildlifeIdentification';
-import type { IdentificationResult } from '../types';
 
 export function IdentificationScreen() {
   const { t } = useTranslation();
diff --git a/apps/expo/features/wildlife/screens/SpeciesDetailScreen.tsx b/apps/expo/features/wildlife/screens/SpeciesDetailScreen.tsx
index ae48b9b740..c0037a4af1 100644
--- a/apps/expo/features/wildlife/screens/SpeciesDetailScreen.tsx
+++ b/apps/expo/features/wildlife/screens/SpeciesDetailScreen.tsx
@@ -1,10 +1,10 @@
+import { getSpeciesById } from '@packrat/app/wildlife';
 import { Text } from '@packrat/ui/nativewindui';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Stack, useLocalSearchParams } from 'expo-router';
 import { useAtom } from 'jotai';
 import { ActivityIndicator, ScrollView, View } from 'react-native';
 import { wildlifeHistoryAtom } from '../atoms/wildlifeAtoms';
-import { getSpeciesById } from '../data/speciesDatabase';
 
 const DANGER_BADGE = {
   safe: 'bg-green-100 dark:bg-green-900/30',
diff --git a/apps/expo/features/wildlife/screens/WildlifeScreen.tsx b/apps/expo/features/wildlife/screens/WildlifeScreen.tsx
index c48d234e17..c4f9c1d7a7 100644
--- a/apps/expo/features/wildlife/screens/WildlifeScreen.tsx
+++ b/apps/expo/features/wildlife/screens/WildlifeScreen.tsx
@@ -1,3 +1,4 @@
+import type { WildlifeIdentification } from '@packrat/app/wildlife';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
@@ -5,7 +6,6 @@ import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { ActivityIndicator, FlatList, Pressable, SafeAreaView, View } from 'react-native';
 import { useWildlifeHistory } from '../hooks/useWildlifeHistory';
-import type { WildlifeIdentification } from '../types';
 
 function HistoryItem({ item, onPress }: { item: WildlifeIdentification; onPress: () => void }) {
   const { colors } = useColorScheme();
diff --git a/apps/expo/features/wildlife/types.ts b/apps/expo/features/wildlife/types.ts
deleted file mode 100644
index 8d2e312586..0000000000
--- a/apps/expo/features/wildlife/types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export type {
-  IdentificationResult,
-  SpeciesCategory,
-  SpeciesEntry,
-  WildlifeIdentification,
-} from '@packrat/app/wildlife';
diff --git a/apps/expo/lib/utils/itemCalculations.ts b/apps/expo/lib/utils/itemCalculations.ts
index db18761832..0c2df40943 100644
--- a/apps/expo/lib/utils/itemCalculations.ts
+++ b/apps/expo/lib/utils/itemCalculations.ts
@@ -1,8 +1,8 @@
-import { makeEnumGuard } from '@packrat/guards';
-import type { CatalogItem } from 'expo-app/features/catalog/types';
+import type { CatalogItem } from '@packrat/app/catalog';
 // Leaf import (not the barrel) — barrel re-exports hooks, one of which
 // imports back into this file, which would be a circular dependency.
-import type { PackTemplateItem } from 'expo-app/features/pack-templates/types';
+import type { PackTemplateItem } from '@packrat/app/pack-templates';
+import { makeEnumGuard } from '@packrat/guards';
 import type { PackItem, WeightUnit } from 'expo-app/features/packs';
 
 type Item = CatalogItem | PackItem | PackTemplateItem;
diff --git a/packages/app/src/ai/index.ts b/packages/app/src/ai/index.ts
index 5e6b4a3731..64fb24813d 100644
--- a/packages/app/src/ai/index.ts
+++ b/packages/app/src/ai/index.ts
@@ -1 +1,2 @@
+export { LLAMA_MODEL_ID, LLAMA_MODEL_SIZE, LLAMA_MODEL_SIZE_BYTES } from './lib/constants';
 export type { ToolInvocation, ToolOutput } from './types';
diff --git a/apps/expo/features/ai/lib/constants.ts b/packages/app/src/ai/lib/constants.ts
similarity index 100%
rename from apps/expo/features/ai/lib/constants.ts
rename to packages/app/src/ai/lib/constants.ts
diff --git a/packages/app/src/pack-templates/index.ts b/packages/app/src/pack-templates/index.ts
index e229e374c3..f11efe79cd 100644
--- a/packages/app/src/pack-templates/index.ts
+++ b/packages/app/src/pack-templates/index.ts
@@ -6,3 +6,4 @@ export type {
   PackTemplateItemInput,
   WeightUnit,
 } from './types';
+export { computePackTemplateWeights } from './utils/computePacktemplateWeight';
diff --git a/apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts b/packages/app/src/pack-templates/utils/computePacktemplateWeight.ts
similarity index 92%
rename from apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts
rename to packages/app/src/pack-templates/utils/computePacktemplateWeight.ts
index 4661a60e71..88e3e09b16 100644
--- a/apps/expo/features/pack-templates/utils/computePacktemplateWeight.ts
+++ b/packages/app/src/pack-templates/utils/computePacktemplateWeight.ts
@@ -1,4 +1,4 @@
-import { convertFromGrams, convertToGrams } from 'expo-app/features/packs/utils';
+import { convertFromGrams, convertToGrams } from '@packrat/app/packs';
 import type { PackTemplate, WeightUnit } from '../types';
 
 export const computePackTemplateWeights = (
diff --git a/apps/expo/features/wildlife/data/speciesDatabase.ts b/packages/app/src/wildlife/data/speciesDatabase.ts
similarity index 100%
rename from apps/expo/features/wildlife/data/speciesDatabase.ts
rename to packages/app/src/wildlife/data/speciesDatabase.ts
diff --git a/packages/app/src/wildlife/index.ts b/packages/app/src/wildlife/index.ts
index 01846dea27..0f29f40333 100644
--- a/packages/app/src/wildlife/index.ts
+++ b/packages/app/src/wildlife/index.ts
@@ -1,3 +1,15 @@
+export {
+  getSpeciesByCategory,
+  getSpeciesById,
+  SPECIES_DATABASE,
+  searchSpecies,
+} from './data/speciesDatabase';
+export {
+  getAllSpeciesResults,
+  getCandidatesByCategory,
+  getDangerousSpecies,
+  identifyFromDescription,
+} from './lib/offlineIdentifier';
 export type {
   IdentificationResult,
   SpeciesCategory,
diff --git a/apps/expo/features/wildlife/lib/offlineIdentifier.ts b/packages/app/src/wildlife/lib/offlineIdentifier.ts
similarity index 100%
rename from apps/expo/features/wildlife/lib/offlineIdentifier.ts
rename to packages/app/src/wildlife/lib/offlineIdentifier.ts
diff --git a/packages/app/tsconfig.json b/packages/app/tsconfig.json
index 8d7bbc94df..7ea02c30f5 100644
--- a/packages/app/tsconfig.json
+++ b/packages/app/tsconfig.json
@@ -3,7 +3,11 @@
   "compilerOptions": {
     "verbatimModuleSyntax": true,
     "skipLibCheck": true,
-    "noEmit": true
+    "noEmit": true,
+    "paths": {
+      "@packrat/app": ["./src/index.ts"],
+      "@packrat/app/*": ["./src/*/index.ts"]
+    }
   },
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules", "dist"]

From be6890e1061e0dab610aef4a4d7e477624ab43b1 Mon Sep 17 00:00:00 2001
From: Andrew Bierman <abbierman101@gmail.com>
Date: Fri, 1 May 2026 18:43:43 -0600
Subject: [PATCH 6/9] feat(app): move all expo features to @packrat/app (hooks,
 stores, atoms, components, screens)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Completes the mass migration of apps/expo/features/ to packages/app/src/.
Every feature slice now lives in the shared package — expo becomes a thin
routing shell.

Moved:
- hooks, stores, atoms (all features)
- components, screens (all features)
- lib dirs (ai, catalog, weather)
- offline-ai feature (new slice)
- weather feature (new slice with types, atoms, hooks, components, screens)

Import strategy:
- Deep paths for cross-feature hook/component imports (@packrat/app/{feature}/hooks/X)
- Type barrel (@packrat/app/{feature}) for type-only imports
- expo-app/* internal refs are transitional (lib/, components/ not yet moved)

packages/app tsconfig updated to allow deep path resolution.
---
 apps/expo/app/(app)/(tabs)/(home)/index.tsx   | 40 ++++-----
 apps/expo/app/(app)/(tabs)/catalog/index.tsx  |  2 +-
 apps/expo/app/(app)/(tabs)/feed/index.tsx     |  2 +-
 apps/expo/app/(app)/(tabs)/packs/index.tsx    |  2 +-
 apps/expo/app/(app)/(tabs)/profile/index.tsx  | 14 +--
 apps/expo/app/(app)/(tabs)/profile/name.tsx   |  4 +-
 apps/expo/app/(app)/(tabs)/trips/index.tsx    |  2 +-
 apps/expo/app/(app)/_layout.tsx               | 18 ++--
 apps/expo/app/(app)/admin/ai-packs.tsx        |  2 +-
 apps/expo/app/(app)/ai-chat.tsx               | 30 +++----
 apps/expo/app/(app)/catalog/[id].tsx          |  2 +-
 .../app/(app)/catalog/add-to-pack/details.tsx |  2 +-
 .../app/(app)/catalog/add-to-pack/index.tsx   |  2 +-
 apps/expo/app/(app)/current-pack/[id].tsx     |  6 +-
 apps/expo/app/(app)/feed/[id].tsx             |  4 +-
 apps/expo/app/(app)/feed/create.tsx           |  2 +-
 apps/expo/app/(app)/gear-inventory.tsx        |  4 +-
 apps/expo/app/(app)/guides/[id].tsx           |  2 +-
 apps/expo/app/(app)/guides/index.tsx          |  2 +-
 apps/expo/app/(app)/item/[id]/edit.tsx        |  2 +-
 apps/expo/app/(app)/item/[id]/index.tsx       |  2 +-
 apps/expo/app/(app)/item/new.tsx              |  2 +-
 apps/expo/app/(app)/pack-categories/[id].tsx  |  6 +-
 apps/expo/app/(app)/pack-stats/[id].tsx       |  8 +-
 .../app/(app)/pack-templates/[id]/edit.tsx    |  2 +-
 .../app/(app)/pack-templates/[id]/index.tsx   |  2 +-
 apps/expo/app/(app)/pack-templates/index.tsx  |  2 +-
 .../app/(app)/pack-templates/items-scan.tsx   |  2 +-
 apps/expo/app/(app)/pack-templates/new.tsx    |  2 +-
 apps/expo/app/(app)/pack/[id]/edit.tsx        |  2 +-
 apps/expo/app/(app)/pack/[id]/index.tsx       |  2 +-
 apps/expo/app/(app)/pack/items-scan.tsx       |  2 +-
 apps/expo/app/(app)/pack/new.tsx              |  2 +-
 apps/expo/app/(app)/recent-packs.tsx          |  4 +-
 apps/expo/app/(app)/reported-ai-content.tsx   |  2 +-
 apps/expo/app/(app)/season-suggestions.tsx    | 14 +--
 apps/expo/app/(app)/settings/index.tsx        | 16 ++--
 .../expo/app/(app)/templateItem/[id]/edit.tsx |  2 +-
 .../app/(app)/templateItem/[id]/index.tsx     |  2 +-
 apps/expo/app/(app)/templateItem/new.tsx      |  2 +-
 apps/expo/app/(app)/trail-conditions.tsx      |  6 +-
 apps/expo/app/(app)/trip/[id]/edit.tsx        |  2 +-
 apps/expo/app/(app)/trip/[id]/index.tsx       |  2 +-
 apps/expo/app/(app)/trip/location-search.tsx  |  2 +-
 apps/expo/app/(app)/trip/new.tsx              |  2 +-
 apps/expo/app/(app)/upcoming-trips.tsx        |  4 +-
 apps/expo/app/(app)/weather-alerts.tsx        |  2 +-
 apps/expo/app/(app)/weather/[id].tsx          |  2 +-
 apps/expo/app/(app)/weather/geo.tsx           |  2 +-
 apps/expo/app/(app)/weather/index.tsx         |  2 +-
 apps/expo/app/(app)/weather/preview.tsx       |  2 +-
 apps/expo/app/(app)/weather/search.tsx        |  2 +-
 apps/expo/app/(app)/weight-analysis/[id].tsx  |  4 +-
 apps/expo/app/(app)/wildlife/[id].tsx         |  2 +-
 apps/expo/app/(app)/wildlife/identify.tsx     |  2 +-
 apps/expo/app/(app)/wildlife/index.tsx        |  2 +-
 apps/expo/app/_layout.tsx                     |  2 +-
 .../app/auth/(create-account)/credentials.tsx |  2 +-
 .../expo/app/auth/(login)/forgot-password.tsx |  4 +-
 apps/expo/app/auth/(login)/index.tsx          |  4 +-
 apps/expo/app/auth/(login)/reset-password.tsx |  2 +-
 apps/expo/app/auth/index.tsx                  |  8 +-
 apps/expo/app/auth/one-time-password.tsx      |  2 +-
 apps/expo/components/ai-chatHeader.tsx        |  2 +-
 apps/expo/features/auth/README.md             | 87 -------------------
 apps/expo/features/feed/index.ts              |  5 --
 apps/expo/features/pack-templates/index.ts    |  2 -
 apps/expo/features/packs/index.ts             |  2 -
 apps/expo/features/trail-conditions/index.ts  |  3 -
 apps/expo/features/trips/index.ts             |  2 -
 apps/expo/features/wildlife/index.ts          |  4 -
 apps/expo/lib/api/packrat.ts                  |  8 +-
 apps/expo/lib/hasUnsyncedChanges.ts           | 10 +--
 .../lib/hooks/useAuthenticatedQueryToolkit.ts |  2 +-
 apps/expo/lib/utils/buildImageUrl.ts          |  4 +-
 apps/expo/lib/utils/itemCalculations.ts       |  2 +-
 apps/expo/screens/ProfileScreen.tsx           |  8 +-
 apps/expo/utils/__tests__/storage.test.ts     |  2 +-
 apps/expo/utils/storage.ts                    |  2 +-
 biome.json                                    |  2 +-
 .../src}/ai-packs/components/AIPacksTile.tsx  |  2 +-
 .../src}/ai-packs/hooks/useGeneratedPacks.ts  |  4 +-
 .../src}/ai-packs/screens/AIPacksScreen.tsx   |  2 +-
 .../app/src}/ai/atoms/aiModeAtoms.ts          |  0
 .../app/src}/ai/atoms/chatStorageAtoms.ts     |  0
 .../app/src}/ai/components/AIChatTile.tsx     |  0
 .../app/src}/ai/components/AIModeSelector.tsx |  0
 .../app/src}/ai/components/AIModeSheet.tsx    |  2 +-
 .../components/CatalogItemsGenerativeUI.tsx   |  2 +-
 .../app/src}/ai/components/ChatBubble.tsx     |  0
 .../ai/components/CircularDownloadButton.tsx  |  0
 .../app/src}/ai/components/ErrorState.tsx     |  0
 .../ai/components/GuidesRAGGenerativeUI.tsx   |  0
 .../src}/ai/components/LocationContext.tsx    |  2 +-
 .../ai/components/PackDetailsGenerativeUI.tsx |  2 +-
 .../PackItemDetailsGenerativeUI.tsx           |  2 +-
 .../app/src}/ai/components/ReportModal.tsx    |  0
 .../ai/components/ReportedContentTile.tsx     |  2 +-
 .../app/src}/ai/components/ToolCard.tsx       |  0
 .../ai/components/ToolInvocationRenderer.tsx  |  0
 .../ai/components/WeatherGenerativeUI.tsx     |  2 +-
 .../ai/components/WebSearchGenerativeUI.tsx   |  0
 .../app/src}/ai/hooks/useReportContent.ts     |  0
 .../app/src}/ai/hooks/useReportedContent.ts   |  2 +-
 .../src}/ai/hooks/useUpdateReportStatus.ts    |  0
 .../app/src}/ai/lib/CustomChatTransport.ts    |  0
 .../app/src}/ai/lib/localModelManager.ts      |  0
 .../app/src}/ai/lib/reportReasons.ts          |  0
 .../app/src}/ai/lib/tools.ts                  |  6 +-
 .../src}/ai/screens/ReportedContentScreen.tsx |  0
 .../app/src}/auth/atoms/authAtoms.ts          |  0
 .../auth/components/DeleteAccountButton.tsx   |  2 +-
 .../app/src}/auth/hocs/index.ts               |  0
 .../app/src}/auth/hocs/withAuthWall.tsx       |  0
 .../app/src}/auth/hooks/useAuth.ts            |  0
 .../app/src}/auth/hooks/useAuthActions.ts     |  2 +-
 .../app/src}/auth/hooks/useAuthInit.ts        |  0
 .../app/src}/auth/hooks/useAuthState.ts       |  0
 .../app/src}/auth/hooks/useUser.ts            |  0
 .../app/src}/auth/store/index.ts              |  0
 .../app/src}/auth/store/user.ts               |  0
 .../components/CatalogBrowserModal.tsx        |  2 +-
 .../components/CatalogCategoriesFilter.tsx    |  0
 .../catalog/components/CatalogItemCard.tsx    |  0
 .../catalog/components/CatalogItemImage.tsx   |  0
 .../components/CatalogItemSelectCard.tsx      |  0
 .../components/CatalogItemsAuthWall.tsx       |  0
 .../app/src}/catalog/components/ItemLinks.tsx |  0
 .../src}/catalog/components/ItemReviews.tsx   |  0
 .../src}/catalog/components/SimilarItems.tsx  |  2 +-
 .../app/src}/catalog/components/index.ts      |  0
 .../app/src}/catalog/hooks/index.ts           |  0
 .../catalog/hooks/useCatalogItemDetails.ts    |  0
 .../app/src}/catalog/hooks/useCatalogItems.ts |  0
 .../hooks/useCatalogItemsCategories.ts        |  0
 .../catalog/hooks/usePopularCatalogItems.ts   |  0
 .../hooks/useRecentlyUsedCatalogItems.ts      |  0
 .../app/src}/catalog/hooks/useSimilarItems.ts |  0
 .../app/src}/catalog/hooks/useVectorSearch.ts |  0
 .../src}/catalog/lib/cacheCatalogItemImage.ts |  0
 .../screens/AddCatalogItemDetailsScreen.tsx   |  3 +-
 .../screens/CatalogItemDetailScreen.tsx       |  6 +-
 .../catalog/screens/CatalogItemsScreen.tsx    |  2 +-
 .../catalog/screens/PackSelectionScreen.tsx   |  2 +-
 .../app/src}/feed/components/CommentItem.tsx  |  0
 .../app/src}/feed/components/FeedTile.tsx     |  0
 .../app/src}/feed/components/PostCard.tsx     |  0
 .../app/src}/feed/components/index.ts         |  0
 .../app/src}/feed/hooks/index.ts              |  0
 .../app/src}/feed/hooks/useAddComment.ts      |  0
 .../app/src}/feed/hooks/useCreatePost.ts      |  0
 .../app/src}/feed/hooks/useDeleteComment.ts   |  0
 .../app/src}/feed/hooks/useDeletePost.ts      |  0
 .../app/src}/feed/hooks/useFeed.ts            |  0
 .../app/src}/feed/hooks/usePostComments.ts    |  0
 .../src}/feed/hooks/useToggleCommentLike.ts   |  0
 .../app/src}/feed/hooks/useTogglePostLike.ts  |  0
 .../src}/feed/screens/CreatePostScreen.tsx    |  2 +-
 .../app/src}/feed/screens/FeedScreen.tsx      |  2 +-
 .../src}/feed/screens/PostDetailScreen.tsx    |  0
 .../app/src}/feed/screens/index.ts            |  0
 .../feed/utils/__tests__/feedUtils.test.ts    |  0
 .../app/src}/feed/utils/index.ts              |  0
 .../app/src}/guides/components/GuideCard.tsx  |  0
 .../app/src}/guides/components/GuidesTile.tsx |  0
 .../app/src}/guides/components/index.ts       |  0
 .../app/src}/guides/hooks/index.ts            |  0
 .../src}/guides/hooks/useGuideCategories.ts   |  0
 .../app/src}/guides/hooks/useGuideDetails.ts  |  0
 .../app/src}/guides/hooks/useGuides.ts        |  0
 .../app/src}/guides/hooks/useSearchGuides.ts  |  0
 .../src}/guides/screens/GuideDetailScreen.tsx |  0
 .../src}/guides/screens/GuidesListScreen.tsx  |  0
 .../app/src}/guides/screens/index.ts          |  0
 .../offline-ai/__tests__/offline-ai.test.ts   |  0
 .../offline-ai/lib/MockLLMProvider.ts         |  0
 .../components/AddPackTemplateItemActions.tsx |  8 +-
 .../components/AppTemplateBadge.tsx           |  0
 .../components/FeaturedPacksSection.tsx       |  0
 .../components/OnlineContentImportModal.tsx   |  0
 .../components/PackTemplateCard.tsx           |  0
 .../components/PackTemplateForm.tsx           |  2 +-
 .../components/PackTemplateItemCard.tsx       |  2 +-
 .../components/PackTemplateItemImage.tsx      |  4 +-
 .../components/PackTemplatesTile.tsx          |  0
 .../components/TemplateCreationOptions.tsx    |  4 +-
 .../app/src}/pack-templates/hooks/index.ts    |  0
 .../hooks/useBulkAddCatalogItems.ts           |  2 +-
 .../hooks/useCreatePackFromTemplate.ts        |  5 +-
 .../hooks/useCreatePackTemplate.ts            |  0
 .../hooks/useCreatePackTemplateItem.ts        |  0
 .../hooks/useDeletePackTemplate.ts            |  0
 .../hooks/useDeletePackTemplateItem.ts        |  0
 .../useGenerateTemplateFromOnlineContent.ts   |  0
 .../hooks/usePackTemplateItem.ts              |  0
 .../hooks/usePackTemplateSummary.ts           |  2 +-
 .../pack-templates/hooks/usePackTemplates.ts  |  0
 .../hooks/usePackTemplatesDetails.ts          |  0
 .../hooks/useUpdatePackTemplateItem.ts        |  0
 .../hooks/useUpdatePacktemplate.ts            |  0
 .../hooks/useWritePermissionCheck.ts          |  2 +-
 .../pack-templates/packTemplateListAtoms.ts   |  0
 .../screens/CreatePackTemplateItemForm.tsx    |  2 +-
 .../screens/CreatePackTemplateScreen.tsx      |  0
 .../screens/EditPackTemplateItemScreen.tsx    |  0
 .../screens/EditPackTemplateScreen.tsx        |  0
 .../screens/ItemsScanScreen.tsx               |  6 +-
 .../screens/PackTemplateDetailScreen.tsx      |  2 +-
 .../screens/PackTemplateItemDetailScreen.tsx  |  2 +-
 .../screens/PackTemplateListScreen.tsx        |  4 +-
 .../app/src}/pack-templates/store/index.ts    |  0
 .../pack-templates/store/packTemplateItems.ts |  2 +-
 .../pack-templates/store/packTemplates.ts     |  2 +-
 .../computePacktemplateWeight.test.ts         |  0
 .../utils/getPackTemplateDetailOptions.tsx    |  0
 .../getPackTemplateItemDetailOptions.tsx      |  0
 .../src}/packs/components/ActivityPicker.tsx  |  0
 .../packs/components/AddPackItemActions.tsx   |  6 +-
 .../app/src}/packs/components/CachedImage.tsx |  0
 .../src}/packs/components/CurrentPackTile.tsx |  0
 .../packs/components/GapAnalysisModal.tsx     |  0
 .../components/GapItemCatalogSuggestions.tsx  |  0
 .../src}/packs/components/GapSuggestion.tsx   |  2 +-
 .../packs/components/GearInventoryTile.tsx    |  0
 .../components/HorizontalCatalogItemCard.tsx  |  2 +-
 .../app/src}/packs/components/PackCard.tsx    |  0
 .../packs/components/PackCategoriesTile.tsx   |  0
 .../app/src}/packs/components/PackForm.tsx    |  6 +-
 .../src}/packs/components/PackItemCard.tsx    |  0
 .../src}/packs/components/PackItemImage.tsx   |  2 +-
 .../src}/packs/components/PackStatsTile.tsx   |  0
 .../src}/packs/components/RecentPacksTile.tsx |  0
 .../src}/packs/components/SearchResults.tsx   |  0
 .../components/SeasonSuggestionsTile.tsx      |  0
 .../src}/packs/components/SharedPacksTile.tsx |  0
 .../packs/components/ShoppingListTile.tsx     |  0
 .../components/SimilarItemsForPackItem.tsx    |  4 +-
 .../app/src}/packs/components/SyncBanner.tsx  |  0
 .../packs/components/TemplateItemsSection.tsx |  0
 .../packs/components/WeightAnalysisTile.tsx   |  0
 .../app/src}/packs/hooks/index.ts             |  0
 .../app/src}/packs/hooks/useAddCatalogItem.ts |  2 +-
 .../app/src}/packs/hooks/useAllPacks.ts       |  0
 .../packs/hooks/useBulkAddCatalogItems.ts     |  0
 .../src}/packs/hooks/useCategoriesCount.ts    |  0
 .../app/src}/packs/hooks/useCreatePack.ts     |  2 +-
 .../src}/packs/hooks/useCreatePackFromPack.ts |  4 +-
 .../app/src}/packs/hooks/useCreatePackItem.ts |  2 +-
 .../packs/hooks/useCreatePackWithItems.ts     |  0
 .../app/src}/packs/hooks/useCurrentPack.ts    |  0
 .../app/src}/packs/hooks/useDeletePack.ts     |  2 +-
 .../app/src}/packs/hooks/useDeletePackItem.ts |  2 +-
 .../app/src}/packs/hooks/useDetailedPacks.ts  |  2 +-
 .../app/src}/packs/hooks/useDuplicatePack.ts  |  0
 .../packs/hooks/useHasMinimumInventory.ts     |  0
 .../app/src}/packs/hooks/useImageDetection.ts |  0
 .../app/src}/packs/hooks/useImagePicker.ts    |  0
 .../src}/packs/hooks/usePackDetailsFromApi.ts |  0
 .../packs/hooks/usePackDetailsFromStore.ts    |  2 +-
 .../src}/packs/hooks/usePackGapAnalysis.ts    |  0
 .../packs/hooks/usePackItemDetailsFromApi.ts  |  0
 .../hooks/usePackItemDetailsFromStore.ts      |  2 +-
 .../packs/hooks/usePackItemOwnershipCheck.ts  |  0
 .../src}/packs/hooks/usePackOwnershipCheck.ts |  0
 .../src}/packs/hooks/usePackWeightAnalysis.ts |  2 +-
 .../src}/packs/hooks/usePackWeightHistory.ts  |  0
 .../app/src}/packs/hooks/usePacks.ts          |  2 +-
 .../app/src}/packs/hooks/useRecentPacks.ts    |  0
 .../src}/packs/hooks/useSeasonSuggestions.ts  |  0
 .../app/src}/packs/hooks/useUpdatePack.ts     |  2 +-
 .../app/src}/packs/hooks/useUpdatePackItem.ts |  2 +-
 .../app/src}/packs/hooks/useUserPackItems.ts  |  0
 .../app/src}/packs/packListAtoms.ts           |  0
 .../src}/packs/screens/CreatePackItemForm.tsx |  0
 .../src}/packs/screens/CreatePackScreen.tsx   |  0
 .../src}/packs/screens/EditPackItemScreen.tsx |  2 +-
 .../app/src}/packs/screens/EditPackScreen.tsx |  4 +-
 .../src}/packs/screens/ItemsScanScreen.tsx    |  2 +-
 .../src}/packs/screens/PackDetailScreen.tsx   | 12 +--
 .../packs/screens/PackItemDetailScreen.tsx    |  2 +-
 .../app/src}/packs/screens/PackListScreen.tsx | 10 +--
 .../app/src}/packs/store/index.ts             |  0
 .../app/src}/packs/store/packItems.ts         |  2 +-
 .../app/src}/packs/store/packWeightHistory.ts |  2 +-
 .../app/src}/packs/store/packingMode.ts       |  0
 .../app/src}/packs/store/packs.ts             |  2 +-
 .../__tests__/computePackWeights.test.ts      |  0
 .../utils/__tests__/convertFromGrams.test.ts  |  0
 .../utils/__tests__/convertToGrams.test.ts    |  0
 .../app/src}/packs/utils/computeCategories.ts |  2 +-
 .../src}/packs/utils/getPackDetailOptions.tsx |  0
 .../packs/utils/getPackItemDetailOptions.tsx  |  0
 .../app/src}/packs/utils/index.ts             |  0
 .../app/src}/packs/utils/uploadImage.ts       |  2 +-
 .../profile/components/ProfileAuthWall.tsx    |  0
 .../app/src}/profile/components/index.ts      |  0
 .../src}/profile/hooks/useUpdateProfile.ts    |  2 +-
 .../components/ConditionBadge.tsx             |  0
 .../components/SubmitConditionReportForm.tsx  |  0
 .../components/TrailConditionReportCard.tsx   |  0
 .../src}/trail-conditions/components/index.ts |  0
 .../app/src}/trail-conditions/hooks/index.ts  |  0
 .../hooks/useSubmitTrailConditionReport.ts    |  0
 .../hooks/useTrailConditionReports.ts         |  2 +-
 .../store/trailConditionReports.ts            |  2 +-
 .../trips/components/TrailConditionsTile.tsx  |  0
 .../app/src}/trips/components/TripCard.tsx    |  0
 .../app/src}/trips/components/TripForm.tsx    |  2 +-
 .../trips/components/UpcomingTripsTile.tsx    |  2 +-
 .../app/src}/trips/hooks/index.ts             |  0
 .../app/src}/trips/hooks/useAllTrips.ts       |  0
 .../app/src}/trips/hooks/useCreateTrip.ts     |  2 +-
 .../app/src}/trips/hooks/useDeleteTrip.ts     |  2 +-
 .../trips/hooks/useTripDetailsFromStore.ts    |  2 +-
 .../app/src}/trips/hooks/useTrips.ts          |  0
 .../app/src}/trips/hooks/useUpdateTrip.ts     |  2 +-
 .../src}/trips/screens/CreateTripScreen.tsx   |  0
 .../app/src}/trips/screens/EditTripScreen.tsx |  2 +-
 .../src}/trips/screens/TripDetailScreen.tsx   |  2 +-
 .../app/src}/trips/screens/TripListScreen.tsx |  0
 .../screens/TripWeatherDetailsScreen.tsx      |  6 +-
 .../app/src}/trips/store/tripLocationStore.ts |  0
 .../app/src}/trips/store/trips.ts             |  2 +-
 .../app/src}/trips/tripListAtoms.tsx          |  0
 .../src}/trips/utils/getTripDetailOptions.tsx |  0
 .../app/src}/weather/atoms/locationsAtoms.ts  |  0
 .../src}/weather/components/LocationCard.tsx  |  0
 .../weather/components/LocationPicker.tsx     |  0
 .../weather/components/WeatherAlertsTile.tsx  |  0
 .../weather/components/WeatherAuthWall.tsx    |  0
 .../weather/components/WeatherForecast.tsx    |  0
 .../src}/weather/components/WeatherIcon.tsx   |  0
 .../src}/weather/components/WeatherTile.tsx   |  0
 .../app/src}/weather/components/index.ts      |  0
 .../app/src}/weather/hooks/index.ts           |  0
 .../src}/weather/hooks/useActiveLocation.ts   |  0
 .../src}/weather/hooks/useLocationRefresh.ts  |  2 +-
 .../src}/weather/hooks/useLocationSearch.ts   |  2 +-
 .../app/src}/weather/hooks/useLocations.ts    |  0
 .../app/src}/weather/hooks/useWeatherAlert.ts |  2 +-
 .../app/src}/weather/lib/weatherIcons.ts      |  0
 .../app/src}/weather/lib/weatherService.ts    |  0
 .../weather/screens/LocationDetailScreen.tsx  |  2 +-
 .../weather/screens/LocationPreviewScreen.tsx |  6 +-
 .../weather/screens/LocationSearchScreen.tsx  |  0
 .../src}/weather/screens/LocationsScreen.tsx  |  2 +-
 .../app/src}/weather/screens/index.ts         |  0
 .../app/src}/weather/types.ts                 |  0
 .../app/src}/wildlife/atoms/wildlifeAtoms.ts  |  0
 .../src}/wildlife/components/SpeciesCard.tsx  |  0
 .../src}/wildlife/components/WildlifeTile.tsx |  0
 .../app/src}/wildlife/components/index.ts     |  0
 .../app/src}/wildlife/hooks/index.ts          |  0
 .../src}/wildlife/hooks/useWildlifeHistory.ts |  0
 .../hooks/useWildlifeIdentification.ts        |  4 +-
 .../wildlife/screens/IdentificationScreen.tsx |  2 +-
 .../wildlife/screens/SpeciesDetailScreen.tsx  |  0
 .../src}/wildlife/screens/WildlifeScreen.tsx  |  0
 .../app/src}/wildlife/screens/index.ts        |  0
 packages/app/tsconfig.json                    |  4 +-
 360 files changed, 288 insertions(+), 399 deletions(-)
 delete mode 100644 apps/expo/features/auth/README.md
 delete mode 100644 apps/expo/features/feed/index.ts
 delete mode 100644 apps/expo/features/pack-templates/index.ts
 delete mode 100644 apps/expo/features/packs/index.ts
 delete mode 100644 apps/expo/features/trail-conditions/index.ts
 delete mode 100644 apps/expo/features/trips/index.ts
 delete mode 100644 apps/expo/features/wildlife/index.ts
 rename {apps/expo/features => packages/app/src}/ai-packs/components/AIPacksTile.tsx (95%)
 rename {apps/expo/features => packages/app/src}/ai-packs/hooks/useGeneratedPacks.ts (89%)
 rename {apps/expo/features => packages/app/src}/ai-packs/screens/AIPacksScreen.tsx (98%)
 rename {apps/expo/features => packages/app/src}/ai/atoms/aiModeAtoms.ts (100%)
 rename {apps/expo/features => packages/app/src}/ai/atoms/chatStorageAtoms.ts (100%)
 rename {apps/expo/features => packages/app/src}/ai/components/AIChatTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/ai/components/AIModeSelector.tsx (100%)
 rename {apps/expo/features => packages/app/src}/ai/components/AIModeSheet.tsx (98%)
 rename {apps/expo/features => packages/app/src}/ai/components/CatalogItemsGenerativeUI.tsx (97%)
 rename {apps/expo/features => packages/app/src}/ai/components/ChatBubble.tsx (100%)
 rename {apps/expo/features => packages/app/src}/ai/components/CircularDownloadButton.tsx (100%)
 rename {apps/expo/features => packages/app/src}/ai/components/ErrorState.tsx (100%)
 rename {apps/expo/features => packages/app/src}/ai/components/GuidesRAGGenerativeUI.tsx (100%)
 rename {apps/expo/features => packages/app/src}/ai/components/LocationContext.tsx (96%)
 rename {apps/expo/features => packages/app/src}/ai/components/PackDetailsGenerativeUI.tsx (94%)
 rename {apps/expo/features => packages/app/src}/ai/components/PackItemDetailsGenerativeUI.tsx (94%)
 rename {apps/expo/features => packages/app/src}/ai/components/ReportModal.tsx (100%)
 rename {apps/expo/features => packages/app/src}/ai/components/ReportedContentTile.tsx (96%)
 rename {apps/expo/features => packages/app/src}/ai/components/ToolCard.tsx (100%)
 rename {apps/expo/features => packages/app/src}/ai/components/ToolInvocationRenderer.tsx (100%)
 rename {apps/expo/features => packages/app/src}/ai/components/WeatherGenerativeUI.tsx (98%)
 rename {apps/expo/features => packages/app/src}/ai/components/WebSearchGenerativeUI.tsx (100%)
 rename {apps/expo/features => packages/app/src}/ai/hooks/useReportContent.ts (100%)
 rename {apps/expo/features => packages/app/src}/ai/hooks/useReportedContent.ts (96%)
 rename {apps/expo/features => packages/app/src}/ai/hooks/useUpdateReportStatus.ts (100%)
 rename {apps/expo/features => packages/app/src}/ai/lib/CustomChatTransport.ts (100%)
 rename {apps/expo/features => packages/app/src}/ai/lib/localModelManager.ts (100%)
 rename {apps/expo/features => packages/app/src}/ai/lib/reportReasons.ts (100%)
 rename {apps/expo/features => packages/app/src}/ai/lib/tools.ts (97%)
 rename {apps/expo/features => packages/app/src}/ai/screens/ReportedContentScreen.tsx (100%)
 rename {apps/expo/features => packages/app/src}/auth/atoms/authAtoms.ts (100%)
 rename {apps/expo/features => packages/app/src}/auth/components/DeleteAccountButton.tsx (97%)
 rename {apps/expo/features => packages/app/src}/auth/hocs/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/auth/hocs/withAuthWall.tsx (100%)
 rename {apps/expo/features => packages/app/src}/auth/hooks/useAuth.ts (100%)
 rename {apps/expo/features => packages/app/src}/auth/hooks/useAuthActions.ts (99%)
 rename {apps/expo/features => packages/app/src}/auth/hooks/useAuthInit.ts (100%)
 rename {apps/expo/features => packages/app/src}/auth/hooks/useAuthState.ts (100%)
 rename {apps/expo/features => packages/app/src}/auth/hooks/useUser.ts (100%)
 rename {apps/expo/features => packages/app/src}/auth/store/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/auth/store/user.ts (100%)
 rename {apps/expo/features => packages/app/src}/catalog/components/CatalogBrowserModal.tsx (99%)
 rename {apps/expo/features => packages/app/src}/catalog/components/CatalogCategoriesFilter.tsx (100%)
 rename {apps/expo/features => packages/app/src}/catalog/components/CatalogItemCard.tsx (100%)
 rename {apps/expo/features => packages/app/src}/catalog/components/CatalogItemImage.tsx (100%)
 rename {apps/expo/features => packages/app/src}/catalog/components/CatalogItemSelectCard.tsx (100%)
 rename {apps/expo/features => packages/app/src}/catalog/components/CatalogItemsAuthWall.tsx (100%)
 rename {apps/expo/features => packages/app/src}/catalog/components/ItemLinks.tsx (100%)
 rename {apps/expo/features => packages/app/src}/catalog/components/ItemReviews.tsx (100%)
 rename {apps/expo/features => packages/app/src}/catalog/components/SimilarItems.tsx (97%)
 rename {apps/expo/features => packages/app/src}/catalog/components/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/catalog/hooks/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/catalog/hooks/useCatalogItemDetails.ts (100%)
 rename {apps/expo/features => packages/app/src}/catalog/hooks/useCatalogItems.ts (100%)
 rename {apps/expo/features => packages/app/src}/catalog/hooks/useCatalogItemsCategories.ts (100%)
 rename {apps/expo/features => packages/app/src}/catalog/hooks/usePopularCatalogItems.ts (100%)
 rename {apps/expo/features => packages/app/src}/catalog/hooks/useRecentlyUsedCatalogItems.ts (100%)
 rename {apps/expo/features => packages/app/src}/catalog/hooks/useSimilarItems.ts (100%)
 rename {apps/expo/features => packages/app/src}/catalog/hooks/useVectorSearch.ts (100%)
 rename {apps/expo/features => packages/app/src}/catalog/lib/cacheCatalogItemImage.ts (100%)
 rename {apps/expo/features => packages/app/src}/catalog/screens/AddCatalogItemDetailsScreen.tsx (98%)
 rename {apps/expo/features => packages/app/src}/catalog/screens/CatalogItemDetailScreen.tsx (97%)
 rename {apps/expo/features => packages/app/src}/catalog/screens/CatalogItemsScreen.tsx (99%)
 rename {apps/expo/features => packages/app/src}/catalog/screens/PackSelectionScreen.tsx (98%)
 rename {apps/expo/features => packages/app/src}/feed/components/CommentItem.tsx (100%)
 rename {apps/expo/features => packages/app/src}/feed/components/FeedTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/feed/components/PostCard.tsx (100%)
 rename {apps/expo/features => packages/app/src}/feed/components/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/feed/hooks/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/feed/hooks/useAddComment.ts (100%)
 rename {apps/expo/features => packages/app/src}/feed/hooks/useCreatePost.ts (100%)
 rename {apps/expo/features => packages/app/src}/feed/hooks/useDeleteComment.ts (100%)
 rename {apps/expo/features => packages/app/src}/feed/hooks/useDeletePost.ts (100%)
 rename {apps/expo/features => packages/app/src}/feed/hooks/useFeed.ts (100%)
 rename {apps/expo/features => packages/app/src}/feed/hooks/usePostComments.ts (100%)
 rename {apps/expo/features => packages/app/src}/feed/hooks/useToggleCommentLike.ts (100%)
 rename {apps/expo/features => packages/app/src}/feed/hooks/useTogglePostLike.ts (100%)
 rename {apps/expo/features => packages/app/src}/feed/screens/CreatePostScreen.tsx (98%)
 rename {apps/expo/features => packages/app/src}/feed/screens/FeedScreen.tsx (98%)
 rename {apps/expo/features => packages/app/src}/feed/screens/PostDetailScreen.tsx (100%)
 rename {apps/expo/features => packages/app/src}/feed/screens/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/feed/utils/__tests__/feedUtils.test.ts (100%)
 rename {apps/expo/features => packages/app/src}/feed/utils/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/guides/components/GuideCard.tsx (100%)
 rename {apps/expo/features => packages/app/src}/guides/components/GuidesTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/guides/components/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/guides/hooks/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/guides/hooks/useGuideCategories.ts (100%)
 rename {apps/expo/features => packages/app/src}/guides/hooks/useGuideDetails.ts (100%)
 rename {apps/expo/features => packages/app/src}/guides/hooks/useGuides.ts (100%)
 rename {apps/expo/features => packages/app/src}/guides/hooks/useSearchGuides.ts (100%)
 rename {apps/expo/features => packages/app/src}/guides/screens/GuideDetailScreen.tsx (100%)
 rename {apps/expo/features => packages/app/src}/guides/screens/GuidesListScreen.tsx (100%)
 rename {apps/expo/features => packages/app/src}/guides/screens/index.ts (100%)
 rename {apps/expo/features => packages/app/src/offline-ai}/offline-ai/__tests__/offline-ai.test.ts (100%)
 rename {apps/expo/features => packages/app/src/offline-ai}/offline-ai/lib/MockLLMProvider.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/components/AddPackTemplateItemActions.tsx (95%)
 rename {apps/expo/features => packages/app/src}/pack-templates/components/AppTemplateBadge.tsx (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/components/FeaturedPacksSection.tsx (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/components/OnlineContentImportModal.tsx (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/components/PackTemplateCard.tsx (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/components/PackTemplateForm.tsx (99%)
 rename {apps/expo/features => packages/app/src}/pack-templates/components/PackTemplateItemCard.tsx (98%)
 rename {apps/expo/features => packages/app/src}/pack-templates/components/PackTemplateItemImage.tsx (85%)
 rename {apps/expo/features => packages/app/src}/pack-templates/components/PackTemplatesTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/components/TemplateCreationOptions.tsx (97%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/useBulkAddCatalogItems.ts (95%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/useCreatePackFromTemplate.ts (75%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/useCreatePackTemplate.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/useCreatePackTemplateItem.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/useDeletePackTemplate.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/useDeletePackTemplateItem.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/usePackTemplateItem.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/usePackTemplateSummary.ts (97%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/usePackTemplates.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/usePackTemplatesDetails.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/useUpdatePackTemplateItem.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/useUpdatePacktemplate.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/hooks/useWritePermissionCheck.ts (82%)
 rename {apps/expo/features => packages/app/src}/pack-templates/packTemplateListAtoms.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/screens/CreatePackTemplateItemForm.tsx (99%)
 rename {apps/expo/features => packages/app/src}/pack-templates/screens/CreatePackTemplateScreen.tsx (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/screens/EditPackTemplateItemScreen.tsx (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/screens/EditPackTemplateScreen.tsx (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/screens/ItemsScanScreen.tsx (97%)
 rename {apps/expo/features => packages/app/src}/pack-templates/screens/PackTemplateDetailScreen.tsx (99%)
 rename {apps/expo/features => packages/app/src}/pack-templates/screens/PackTemplateItemDetailScreen.tsx (98%)
 rename {apps/expo/features => packages/app/src}/pack-templates/screens/PackTemplateListScreen.tsx (98%)
 rename {apps/expo/features => packages/app/src}/pack-templates/store/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/store/packTemplateItems.ts (98%)
 rename {apps/expo/features => packages/app/src}/pack-templates/store/packTemplates.ts (98%)
 rename {apps/expo/features => packages/app/src}/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/utils/getPackTemplateDetailOptions.tsx (100%)
 rename {apps/expo/features => packages/app/src}/pack-templates/utils/getPackTemplateItemDetailOptions.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/ActivityPicker.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/AddPackItemActions.tsx (96%)
 rename {apps/expo/features => packages/app/src}/packs/components/CachedImage.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/CurrentPackTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/GapAnalysisModal.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/GapItemCatalogSuggestions.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/GapSuggestion.tsx (98%)
 rename {apps/expo/features => packages/app/src}/packs/components/GearInventoryTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/HorizontalCatalogItemCard.tsx (97%)
 rename {apps/expo/features => packages/app/src}/packs/components/PackCard.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/PackCategoriesTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/PackForm.tsx (97%)
 rename {apps/expo/features => packages/app/src}/packs/components/PackItemCard.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/PackItemImage.tsx (93%)
 rename {apps/expo/features => packages/app/src}/packs/components/PackStatsTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/RecentPacksTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/SearchResults.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/SeasonSuggestionsTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/SharedPacksTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/ShoppingListTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/SimilarItemsForPackItem.tsx (95%)
 rename {apps/expo/features => packages/app/src}/packs/components/SyncBanner.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/TemplateItemsSection.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/components/WeightAnalysisTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useAddCatalogItem.ts (94%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useAllPacks.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useBulkAddCatalogItems.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useCategoriesCount.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useCreatePack.ts (91%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useCreatePackFromPack.ts (91%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useCreatePackItem.ts (93%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useCreatePackWithItems.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useCurrentPack.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useDeletePack.ts (81%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useDeletePackItem.ts (84%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useDetailedPacks.ts (88%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useDuplicatePack.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useHasMinimumInventory.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useImageDetection.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useImagePicker.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/usePackDetailsFromApi.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/usePackDetailsFromStore.ts (90%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/usePackGapAnalysis.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/usePackItemDetailsFromApi.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/usePackItemDetailsFromStore.ts (86%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/usePackItemOwnershipCheck.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/usePackOwnershipCheck.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/usePackWeightAnalysis.ts (95%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/usePackWeightHistory.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/usePacks.ts (83%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useRecentPacks.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useSeasonSuggestions.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useUpdatePack.ts (85%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useUpdatePackItem.ts (89%)
 rename {apps/expo/features => packages/app/src}/packs/hooks/useUserPackItems.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/packListAtoms.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/screens/CreatePackItemForm.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/screens/CreatePackScreen.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/screens/EditPackItemScreen.tsx (90%)
 rename {apps/expo/features => packages/app/src}/packs/screens/EditPackScreen.tsx (70%)
 rename {apps/expo/features => packages/app/src}/packs/screens/ItemsScanScreen.tsx (99%)
 rename {apps/expo/features => packages/app/src}/packs/screens/PackDetailScreen.tsx (98%)
 rename {apps/expo/features => packages/app/src}/packs/screens/PackItemDetailScreen.tsx (99%)
 rename {apps/expo/features => packages/app/src}/packs/screens/PackListScreen.tsx (96%)
 rename {apps/expo/features => packages/app/src}/packs/store/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/store/packItems.ts (98%)
 rename {apps/expo/features => packages/app/src}/packs/store/packWeightHistory.ts (98%)
 rename {apps/expo/features => packages/app/src}/packs/store/packingMode.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/store/packs.ts (98%)
 rename {apps/expo/features => packages/app/src}/packs/utils/__tests__/computePackWeights.test.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/utils/__tests__/convertFromGrams.test.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/utils/__tests__/convertToGrams.test.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/utils/computeCategories.ts (96%)
 rename {apps/expo/features => packages/app/src}/packs/utils/getPackDetailOptions.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/utils/getPackItemDetailOptions.tsx (100%)
 rename {apps/expo/features => packages/app/src}/packs/utils/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/packs/utils/uploadImage.ts (95%)
 rename {apps/expo/features => packages/app/src}/profile/components/ProfileAuthWall.tsx (100%)
 rename {apps/expo/features => packages/app/src}/profile/components/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/profile/hooks/useUpdateProfile.ts (95%)
 rename {apps/expo/features => packages/app/src}/trail-conditions/components/ConditionBadge.tsx (100%)
 rename {apps/expo/features => packages/app/src}/trail-conditions/components/SubmitConditionReportForm.tsx (100%)
 rename {apps/expo/features => packages/app/src}/trail-conditions/components/TrailConditionReportCard.tsx (100%)
 rename {apps/expo/features => packages/app/src}/trail-conditions/components/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/trail-conditions/hooks/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/trail-conditions/hooks/useSubmitTrailConditionReport.ts (100%)
 rename {apps/expo/features => packages/app/src}/trail-conditions/hooks/useTrailConditionReports.ts (98%)
 rename {apps/expo/features => packages/app/src}/trail-conditions/store/trailConditionReports.ts (98%)
 rename {apps/expo/features => packages/app/src}/trips/components/TrailConditionsTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/trips/components/TripCard.tsx (100%)
 rename {apps/expo/features => packages/app/src}/trips/components/TripForm.tsx (99%)
 rename {apps/expo/features => packages/app/src}/trips/components/UpcomingTripsTile.tsx (98%)
 rename {apps/expo/features => packages/app/src}/trips/hooks/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/trips/hooks/useAllTrips.ts (100%)
 rename {apps/expo/features => packages/app/src}/trips/hooks/useCreateTrip.ts (90%)
 rename {apps/expo/features => packages/app/src}/trips/hooks/useDeleteTrip.ts (83%)
 rename {apps/expo/features => packages/app/src}/trips/hooks/useTripDetailsFromStore.ts (87%)
 rename {apps/expo/features => packages/app/src}/trips/hooks/useTrips.ts (100%)
 rename {apps/expo/features => packages/app/src}/trips/hooks/useUpdateTrip.ts (84%)
 rename {apps/expo/features => packages/app/src}/trips/screens/CreateTripScreen.tsx (100%)
 rename {apps/expo/features => packages/app/src}/trips/screens/EditTripScreen.tsx (94%)
 rename {apps/expo/features => packages/app/src}/trips/screens/TripDetailScreen.tsx (98%)
 rename {apps/expo/features => packages/app/src}/trips/screens/TripListScreen.tsx (100%)
 rename {apps/expo/features => packages/app/src}/trips/screens/TripWeatherDetailsScreen.tsx (97%)
 rename {apps/expo/features => packages/app/src}/trips/store/tripLocationStore.ts (100%)
 rename {apps/expo/features => packages/app/src}/trips/store/trips.ts (98%)
 rename {apps/expo/features => packages/app/src}/trips/tripListAtoms.tsx (100%)
 rename {apps/expo/features => packages/app/src}/trips/utils/getTripDetailOptions.tsx (100%)
 rename {apps/expo/features => packages/app/src}/weather/atoms/locationsAtoms.ts (100%)
 rename {apps/expo/features => packages/app/src}/weather/components/LocationCard.tsx (100%)
 rename {apps/expo/features => packages/app/src}/weather/components/LocationPicker.tsx (100%)
 rename {apps/expo/features => packages/app/src}/weather/components/WeatherAlertsTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/weather/components/WeatherAuthWall.tsx (100%)
 rename {apps/expo/features => packages/app/src}/weather/components/WeatherForecast.tsx (100%)
 rename {apps/expo/features => packages/app/src}/weather/components/WeatherIcon.tsx (100%)
 rename {apps/expo/features => packages/app/src}/weather/components/WeatherTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/weather/components/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/weather/hooks/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/weather/hooks/useActiveLocation.ts (100%)
 rename {apps/expo/features => packages/app/src}/weather/hooks/useLocationRefresh.ts (95%)
 rename {apps/expo/features => packages/app/src}/weather/hooks/useLocationSearch.ts (97%)
 rename {apps/expo/features => packages/app/src}/weather/hooks/useLocations.ts (100%)
 rename {apps/expo/features => packages/app/src}/weather/hooks/useWeatherAlert.ts (98%)
 rename {apps/expo/features => packages/app/src}/weather/lib/weatherIcons.ts (100%)
 rename {apps/expo/features => packages/app/src}/weather/lib/weatherService.ts (100%)
 rename {apps/expo/features => packages/app/src}/weather/screens/LocationDetailScreen.tsx (99%)
 rename {apps/expo/features => packages/app/src}/weather/screens/LocationPreviewScreen.tsx (99%)
 rename {apps/expo/features => packages/app/src}/weather/screens/LocationSearchScreen.tsx (100%)
 rename {apps/expo/features => packages/app/src}/weather/screens/LocationsScreen.tsx (99%)
 rename {apps/expo/features => packages/app/src}/weather/screens/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/weather/types.ts (100%)
 rename {apps/expo/features => packages/app/src}/wildlife/atoms/wildlifeAtoms.ts (100%)
 rename {apps/expo/features => packages/app/src}/wildlife/components/SpeciesCard.tsx (100%)
 rename {apps/expo/features => packages/app/src}/wildlife/components/WildlifeTile.tsx (100%)
 rename {apps/expo/features => packages/app/src}/wildlife/components/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/wildlife/hooks/index.ts (100%)
 rename {apps/expo/features => packages/app/src}/wildlife/hooks/useWildlifeHistory.ts (100%)
 rename {apps/expo/features => packages/app/src}/wildlife/hooks/useWildlifeIdentification.ts (95%)
 rename {apps/expo/features => packages/app/src}/wildlife/screens/IdentificationScreen.tsx (99%)
 rename {apps/expo/features => packages/app/src}/wildlife/screens/SpeciesDetailScreen.tsx (100%)
 rename {apps/expo/features => packages/app/src}/wildlife/screens/WildlifeScreen.tsx (100%)
 rename {apps/expo/features => packages/app/src}/wildlife/screens/index.ts (100%)

diff --git a/apps/expo/app/(app)/(tabs)/(home)/index.tsx b/apps/expo/app/(app)/(tabs)/(home)/index.tsx
index 95c487933c..c031bcdd5e 100644
--- a/apps/expo/app/(app)/(tabs)/(home)/index.tsx
+++ b/apps/expo/app/(app)/(tabs)/(home)/index.tsx
@@ -1,5 +1,25 @@
 'use client';
 
+import { AIChatTile } from '@packrat/app/ai/components/AIChatTile';
+import { ReportedContentTile } from '@packrat/app/ai/components/ReportedContentTile';
+import { AIPacksTile } from '@packrat/app/ai-packs/components/AIPacksTile';
+import { FeedTile } from '@packrat/app/feed/components/FeedTile';
+import { GuidesTile } from '@packrat/app/guides/components/GuidesTile';
+import { PackTemplatesTile } from '@packrat/app/pack-templates/components/PackTemplatesTile';
+import { CurrentPackTile } from '@packrat/app/packs/components/CurrentPackTile';
+import { GearInventoryTile } from '@packrat/app/packs/components/GearInventoryTile';
+import { PackCategoriesTile } from '@packrat/app/packs/components/PackCategoriesTile';
+import { PackStatsTile } from '@packrat/app/packs/components/PackStatsTile';
+import { RecentPacksTile } from '@packrat/app/packs/components/RecentPacksTile';
+import { SeasonSuggestionsTile } from '@packrat/app/packs/components/SeasonSuggestionsTile';
+import { SharedPacksTile } from '@packrat/app/packs/components/SharedPacksTile';
+import { ShoppingListTile } from '@packrat/app/packs/components/ShoppingListTile';
+import { WeightAnalysisTile } from '@packrat/app/packs/components/WeightAnalysisTile';
+import { TrailConditionsTile } from '@packrat/app/trips/components/TrailConditionsTile';
+import { UpcomingTripsTile } from '@packrat/app/trips/components/UpcomingTripsTile';
+import { WeatherAlertsTile } from '@packrat/app/weather/components/WeatherAlertsTile';
+import { WeatherTile } from '@packrat/app/weather/components/WeatherTile';
+import { WildlifeTile } from '@packrat/app/wildlife/components/WildlifeTile';
 import { arrayIncludes, assertIsString, objectKeys } from '@packrat/guards';
 import type { LargeTitleSearchBarMethods, ListDataItem } from '@packrat/ui/nativewindui';
 import {
@@ -12,26 +32,6 @@ import { AndroidTabBarInsetFix } from 'expo-app/components/AndroidTabBarInsetFix
 import { Icon } from 'expo-app/components/Icon';
 import { LargeTitleHeaderSearchContentContainer } from 'expo-app/components/LargeTitleHeaderSearchContentContainer';
 import { appConfig, featureFlags } from 'expo-app/config';
-import { AIChatTile } from 'expo-app/features/ai/components/AIChatTile';
-import { ReportedContentTile } from 'expo-app/features/ai/components/ReportedContentTile';
-import { AIPacksTile } from 'expo-app/features/ai-packs/components/AIPacksTile';
-import { FeedTile } from 'expo-app/features/feed/components/FeedTile';
-import { GuidesTile } from 'expo-app/features/guides/components/GuidesTile';
-import { PackTemplatesTile } from 'expo-app/features/pack-templates/components/PackTemplatesTile';
-import { CurrentPackTile } from 'expo-app/features/packs/components/CurrentPackTile';
-import { GearInventoryTile } from 'expo-app/features/packs/components/GearInventoryTile';
-import { PackCategoriesTile } from 'expo-app/features/packs/components/PackCategoriesTile';
-import { PackStatsTile } from 'expo-app/features/packs/components/PackStatsTile';
-import { RecentPacksTile } from 'expo-app/features/packs/components/RecentPacksTile';
-import { SeasonSuggestionsTile } from 'expo-app/features/packs/components/SeasonSuggestionsTile';
-import { SharedPacksTile } from 'expo-app/features/packs/components/SharedPacksTile';
-import { ShoppingListTile } from 'expo-app/features/packs/components/ShoppingListTile';
-import { WeightAnalysisTile } from 'expo-app/features/packs/components/WeightAnalysisTile';
-import { TrailConditionsTile } from 'expo-app/features/trips/components/TrailConditionsTile';
-import { UpcomingTripsTile } from 'expo-app/features/trips/components/UpcomingTripsTile';
-import { WeatherAlertsTile } from 'expo-app/features/weather/components/WeatherAlertsTile';
-import { WeatherTile } from 'expo-app/features/weather/components/WeatherTile';
-import { WildlifeTile } from 'expo-app/features/wildlife/components/WildlifeTile';
 import { cn } from 'expo-app/lib/cn';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
diff --git a/apps/expo/app/(app)/(tabs)/catalog/index.tsx b/apps/expo/app/(app)/(tabs)/catalog/index.tsx
index deae5bbc28..57a563058f 100644
--- a/apps/expo/app/(app)/(tabs)/catalog/index.tsx
+++ b/apps/expo/app/(app)/(tabs)/catalog/index.tsx
@@ -1,4 +1,4 @@
-import CatalogItemsScreen from 'expo-app/features/catalog/screens/CatalogItemsScreen';
+import CatalogItemsScreen from '@packrat/app/catalog/screens/CatalogItemsScreen';
 
 export default function CatalogItemsPage() {
   return <CatalogItemsScreen />;
diff --git a/apps/expo/app/(app)/(tabs)/feed/index.tsx b/apps/expo/app/(app)/(tabs)/feed/index.tsx
index b85975166d..8bfd772ba1 100644
--- a/apps/expo/app/(app)/(tabs)/feed/index.tsx
+++ b/apps/expo/app/(app)/(tabs)/feed/index.tsx
@@ -1,4 +1,4 @@
-import { FeedScreen } from 'expo-app/features/feed';
+import { FeedScreen } from '@packrat/app/feed/screens/FeedScreen';
 
 export default function FeedRoute() {
   return <FeedScreen />;
diff --git a/apps/expo/app/(app)/(tabs)/packs/index.tsx b/apps/expo/app/(app)/(tabs)/packs/index.tsx
index 44b77b50d2..d3b87ce208 100644
--- a/apps/expo/app/(app)/(tabs)/packs/index.tsx
+++ b/apps/expo/app/(app)/(tabs)/packs/index.tsx
@@ -1,4 +1,4 @@
-import { PackListScreen } from 'expo-app/features/packs/screens/PackListScreen';
+import { PackListScreen } from '@packrat/app/packs/screens/PackListScreen';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { StatusBar } from 'expo-status-bar';
 import { Platform } from 'react-native';
diff --git a/apps/expo/app/(app)/(tabs)/profile/index.tsx b/apps/expo/app/(app)/(tabs)/profile/index.tsx
index a38571090a..84bbe1206c 100644
--- a/apps/expo/app/(app)/(tabs)/profile/index.tsx
+++ b/apps/expo/app/(app)/(tabs)/profile/index.tsx
@@ -1,3 +1,10 @@
+import { withAuthWall } from '@packrat/app/auth/hocs';
+import { useAuth } from '@packrat/app/auth/hooks/useAuth';
+import { useUser } from '@packrat/app/auth/hooks/useUser';
+import { useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
+import { uploadImage } from '@packrat/app/packs/utils/uploadImage';
+import { ProfileAuthWall } from '@packrat/app/profile/components';
+import { useUpdateProfile } from '@packrat/app/profile/hooks/useUpdateProfile';
 import { clientEnvs } from '@packrat/env/expo-client';
 import { isString } from '@packrat/guards';
 import {
@@ -15,13 +22,6 @@ import {
 } from '@packrat/ui/nativewindui';
 import { AndroidTabBarInsetFix } from 'expo-app/components/AndroidTabBarInsetFix';
 import { Icon } from 'expo-app/components/Icon';
-import { withAuthWall } from 'expo-app/features/auth/hocs';
-import { useAuth } from 'expo-app/features/auth/hooks/useAuth';
-import { useUser } from 'expo-app/features/auth/hooks/useUser';
-import { useImagePicker } from 'expo-app/features/packs/hooks/useImagePicker';
-import { uploadImage } from 'expo-app/features/packs/utils/uploadImage';
-import { ProfileAuthWall } from 'expo-app/features/profile/components';
-import { useUpdateProfile } from 'expo-app/features/profile/hooks/useUpdateProfile';
 import { cn } from 'expo-app/lib/cn';
 import { hasUnsyncedChanges } from 'expo-app/lib/hasUnsyncedChanges';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
diff --git a/apps/expo/app/(app)/(tabs)/profile/name.tsx b/apps/expo/app/(app)/(tabs)/profile/name.tsx
index 083cf1495a..98e30d8b13 100644
--- a/apps/expo/app/(app)/(tabs)/profile/name.tsx
+++ b/apps/expo/app/(app)/(tabs)/profile/name.tsx
@@ -1,6 +1,6 @@
+import { useUser } from '@packrat/app/auth/hooks/useUser';
+import { useUpdateProfile } from '@packrat/app/profile/hooks/useUpdateProfile';
 import { Button, Form, FormItem, FormSection, Text, TextField } from '@packrat/ui/nativewindui';
-import { useUser } from 'expo-app/features/auth/hooks/useUser';
-import { useUpdateProfile } from 'expo-app/features/profile/hooks/useUpdateProfile';
 import { cn } from 'expo-app/lib/cn';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { testIds } from 'expo-app/lib/testIds';
diff --git a/apps/expo/app/(app)/(tabs)/trips/index.tsx b/apps/expo/app/(app)/(tabs)/trips/index.tsx
index 2cf2fc0227..2e33529481 100644
--- a/apps/expo/app/(app)/(tabs)/trips/index.tsx
+++ b/apps/expo/app/(app)/(tabs)/trips/index.tsx
@@ -1,5 +1,5 @@
+import { TripsListScreen } from '@packrat/app/trips/screens/TripListScreen';
 import { featureFlags } from 'expo-app/config';
-import { TripsListScreen } from 'expo-app/features/trips/screens/TripListScreen';
 import { Redirect } from 'expo-router';
 import { StatusBar } from 'expo-status-bar';
 
diff --git a/apps/expo/app/(app)/_layout.tsx b/apps/expo/app/(app)/_layout.tsx
index 4213baab5f..7616b17881 100644
--- a/apps/expo/app/(app)/_layout.tsx
+++ b/apps/expo/app/(app)/_layout.tsx
@@ -1,15 +1,15 @@
 import { use$ } from '@legendapp/state/react';
+import { isLoadingAtom, needsReauthAtom } from '@packrat/app/auth/atoms/authAtoms';
+import { useAuthInit } from '@packrat/app/auth/hooks/useAuthInit';
+import { isAuthed } from '@packrat/app/auth/store';
+import { getPackTemplateDetailOptions } from '@packrat/app/pack-templates/utils/getPackTemplateDetailOptions';
+import { getPackTemplateItemDetailOptions } from '@packrat/app/pack-templates/utils/getPackTemplateItemDetailOptions';
+import SyncBanner from '@packrat/app/packs/components/SyncBanner';
+import { getPackDetailOptions } from '@packrat/app/packs/utils/getPackDetailOptions';
+import { getPackItemDetailOptions } from '@packrat/app/packs/utils/getPackItemDetailOptions';
+import { getTripDetailOptions } from '@packrat/app/trips/utils/getTripDetailOptions';
 import { ActivityIndicator } from '@packrat/ui/nativewindui';
 import { ThemeToggle } from 'expo-app/components/ThemeToggle';
-import { isLoadingAtom, needsReauthAtom } from 'expo-app/features/auth/atoms/authAtoms';
-import { useAuthInit } from 'expo-app/features/auth/hooks/useAuthInit';
-import { isAuthed } from 'expo-app/features/auth/store';
-import { getPackTemplateDetailOptions } from 'expo-app/features/pack-templates/utils/getPackTemplateDetailOptions';
-import { getPackTemplateItemDetailOptions } from 'expo-app/features/pack-templates/utils/getPackTemplateItemDetailOptions';
-import SyncBanner from 'expo-app/features/packs/components/SyncBanner';
-import { getPackDetailOptions } from 'expo-app/features/packs/utils/getPackDetailOptions';
-import { getPackItemDetailOptions } from 'expo-app/features/packs/utils/getPackItemDetailOptions';
-import { getTripDetailOptions } from 'expo-app/features/trips/utils/getTripDetailOptions';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import type { TranslationFunction } from 'expo-app/lib/i18n/types';
 import { testIds } from 'expo-app/lib/testIds';
diff --git a/apps/expo/app/(app)/admin/ai-packs.tsx b/apps/expo/app/(app)/admin/ai-packs.tsx
index 95c501d116..baea24010a 100644
--- a/apps/expo/app/(app)/admin/ai-packs.tsx
+++ b/apps/expo/app/(app)/admin/ai-packs.tsx
@@ -1,4 +1,4 @@
-import { AIPacksScreen } from 'expo-app/features/ai-packs/screens/AIPacksScreen';
+import { AIPacksScreen } from '@packrat/app/ai-packs/screens/AIPacksScreen';
 
 export default function AIPacks() {
   return <AIPacksScreen />;
diff --git a/apps/expo/app/(app)/ai-chat.tsx b/apps/expo/app/(app)/ai-chat.tsx
index 0088688673..35ec4d76b4 100644
--- a/apps/expo/app/(app)/ai-chat.tsx
+++ b/apps/expo/app/(app)/ai-chat.tsx
@@ -1,4 +1,19 @@
 import { type UIMessage, useChat } from '@ai-sdk/react';
+import { aiModeAtom, localModelStatusAtom } from '@packrat/app/ai/atoms/aiModeAtoms';
+import {
+  clearChatMessages,
+  loadChatMessages,
+  saveChatMessages,
+} from '@packrat/app/ai/atoms/chatStorageAtoms';
+import { ChatBubble } from '@packrat/app/ai/components/ChatBubble';
+import { ErrorState } from '@packrat/app/ai/components/ErrorState';
+import { LocationContext } from '@packrat/app/ai/components/LocationContext';
+import { CustomChatTransport } from '@packrat/app/ai/lib/CustomChatTransport';
+import { getLocalModel, initLocalModel } from '@packrat/app/ai/lib/localModelManager';
+import { createLocalTools } from '@packrat/app/ai/lib/tools';
+import { tokenAtom } from '@packrat/app/auth/atoms/authAtoms';
+import { useActiveLocation } from '@packrat/app/weather/hooks';
+import type { WeatherLocation } from '@packrat/app/weather/types';
 import { clientEnvs } from '@packrat/env/expo-client';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import { DefaultChatTransport, type TextUIPart } from 'ai';
@@ -8,21 +23,6 @@ import { AiChatHeader } from 'expo-app/components/ai-chatHeader';
 import { Icon } from 'expo-app/components/Icon';
 import { TextInput } from 'expo-app/components/TextInput';
 import { featureFlags } from 'expo-app/config';
-import { aiModeAtom, localModelStatusAtom } from 'expo-app/features/ai/atoms/aiModeAtoms';
-import {
-  clearChatMessages,
-  loadChatMessages,
-  saveChatMessages,
-} from 'expo-app/features/ai/atoms/chatStorageAtoms';
-import { ChatBubble } from 'expo-app/features/ai/components/ChatBubble';
-import { ErrorState } from 'expo-app/features/ai/components/ErrorState';
-import { LocationContext } from 'expo-app/features/ai/components/LocationContext';
-import { CustomChatTransport } from 'expo-app/features/ai/lib/CustomChatTransport';
-import { getLocalModel, initLocalModel } from 'expo-app/features/ai/lib/localModelManager';
-import { createLocalTools } from 'expo-app/features/ai/lib/tools';
-import { tokenAtom } from 'expo-app/features/auth/atoms/authAtoms';
-import { useActiveLocation } from 'expo-app/features/weather/hooks';
-import type { WeatherLocation } from 'expo-app/features/weather/types';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { getContextualGreeting, getContextualSuggestions } from 'expo-app/utils/chatContextHelpers';
diff --git a/apps/expo/app/(app)/catalog/[id].tsx b/apps/expo/app/(app)/catalog/[id].tsx
index a9b7e076eb..4a54619997 100644
--- a/apps/expo/app/(app)/catalog/[id].tsx
+++ b/apps/expo/app/(app)/catalog/[id].tsx
@@ -1,4 +1,4 @@
-import { CatalogItemDetailScreen } from 'expo-app/features/catalog/screens/CatalogItemDetailScreen';
+import { CatalogItemDetailScreen } from '@packrat/app/catalog/screens/CatalogItemDetailScreen';
 
 export default function CatalogItemDetailPage() {
   return <CatalogItemDetailScreen />;
diff --git a/apps/expo/app/(app)/catalog/add-to-pack/details.tsx b/apps/expo/app/(app)/catalog/add-to-pack/details.tsx
index bb5ca85870..e9b1af809b 100644
--- a/apps/expo/app/(app)/catalog/add-to-pack/details.tsx
+++ b/apps/expo/app/(app)/catalog/add-to-pack/details.tsx
@@ -1,4 +1,4 @@
-import { AddCatalogItemDetailsScreen } from 'expo-app/features/catalog/screens/AddCatalogItemDetailsScreen';
+import { AddCatalogItemDetailsScreen } from '@packrat/app/catalog/screens/AddCatalogItemDetailsScreen';
 
 export default function AddCatalogItemDetailsPage() {
   return <AddCatalogItemDetailsScreen />;
diff --git a/apps/expo/app/(app)/catalog/add-to-pack/index.tsx b/apps/expo/app/(app)/catalog/add-to-pack/index.tsx
index 3328c1f4a0..476c5d367d 100644
--- a/apps/expo/app/(app)/catalog/add-to-pack/index.tsx
+++ b/apps/expo/app/(app)/catalog/add-to-pack/index.tsx
@@ -1,4 +1,4 @@
-import { PackSelectionScreen } from 'expo-app/features/catalog/screens/PackSelectionScreen';
+import { PackSelectionScreen } from '@packrat/app/catalog/screens/PackSelectionScreen';
 
 export default function PackSelectionPage() {
   return <PackSelectionScreen />;
diff --git a/apps/expo/app/(app)/current-pack/[id].tsx b/apps/expo/app/(app)/current-pack/[id].tsx
index 2a37709625..47ccc12214 100644
--- a/apps/expo/app/(app)/current-pack/[id].tsx
+++ b/apps/expo/app/(app)/current-pack/[id].tsx
@@ -1,3 +1,6 @@
+import { userStore } from '@packrat/app/auth/store';
+import { usePackDetailsFromStore } from '@packrat/app/packs/hooks/usePackDetailsFromStore';
+import { type CategorySummary, computeCategorySummaries } from '@packrat/app/packs/utils';
 import {
   Avatar,
   AvatarFallback,
@@ -5,9 +8,6 @@ import {
   LargeTitleHeader,
   Text,
 } from '@packrat/ui/nativewindui';
-import { userStore } from 'expo-app/features/auth/store';
-import { usePackDetailsFromStore } from 'expo-app/features/packs/hooks/usePackDetailsFromStore';
-import { type CategorySummary, computeCategorySummaries } from 'expo-app/features/packs/utils';
 import { cn } from 'expo-app/lib/cn';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
diff --git a/apps/expo/app/(app)/feed/[id].tsx b/apps/expo/app/(app)/feed/[id].tsx
index c928127dc5..9cc6b663ba 100644
--- a/apps/expo/app/(app)/feed/[id].tsx
+++ b/apps/expo/app/(app)/feed/[id].tsx
@@ -1,7 +1,7 @@
+import { userStore } from '@packrat/app/auth/store';
+import { PostDetailScreen } from '@packrat/app/feed/screens/PostDetailScreen';
 import { Text } from '@packrat/ui/nativewindui';
 import { useQuery } from '@tanstack/react-query';
-import { userStore } from 'expo-app/features/auth/store';
-import { PostDetailScreen } from 'expo-app/features/feed';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { useLocalSearchParams } from 'expo-router';
 import { ActivityIndicator, View } from 'react-native';
diff --git a/apps/expo/app/(app)/feed/create.tsx b/apps/expo/app/(app)/feed/create.tsx
index 41603d7f8e..61c2b36b45 100644
--- a/apps/expo/app/(app)/feed/create.tsx
+++ b/apps/expo/app/(app)/feed/create.tsx
@@ -1,4 +1,4 @@
-import { CreatePostScreen } from 'expo-app/features/feed';
+import { CreatePostScreen } from '@packrat/app/feed/screens/CreatePostScreen';
 import { useRouter } from 'expo-router';
 
 export default function CreatePostRoute() {
diff --git a/apps/expo/app/(app)/gear-inventory.tsx b/apps/expo/app/(app)/gear-inventory.tsx
index dcb3d526a7..891ed15dc6 100644
--- a/apps/expo/app/(app)/gear-inventory.tsx
+++ b/apps/expo/app/(app)/gear-inventory.tsx
@@ -1,8 +1,8 @@
 import type { PackItem } from '@packrat/app/packs';
+import { PackItemCard } from '@packrat/app/packs/components/PackItemCard';
+import { useUserPackItems } from '@packrat/app/packs/hooks/useUserPackItems';
 import { assertDefined } from '@packrat/guards';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { PackItemCard } from 'expo-app/features/packs/components/PackItemCard';
-import { useUserPackItems } from 'expo-app/features/packs/hooks/useUserPackItems';
 import { cn } from 'expo-app/lib/cn';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useState } from 'react';
diff --git a/apps/expo/app/(app)/guides/[id].tsx b/apps/expo/app/(app)/guides/[id].tsx
index 2e70061f1b..6ff79bb1ae 100644
--- a/apps/expo/app/(app)/guides/[id].tsx
+++ b/apps/expo/app/(app)/guides/[id].tsx
@@ -1,4 +1,4 @@
-import { GuideDetailScreen } from 'expo-app/features/guides/screens/GuideDetailScreen';
+import { GuideDetailScreen } from '@packrat/app/guides/screens/GuideDetailScreen';
 
 export default function GuideDetailRoute() {
   return <GuideDetailScreen />;
diff --git a/apps/expo/app/(app)/guides/index.tsx b/apps/expo/app/(app)/guides/index.tsx
index 389aab8e3c..eb4d9d4377 100644
--- a/apps/expo/app/(app)/guides/index.tsx
+++ b/apps/expo/app/(app)/guides/index.tsx
@@ -1,4 +1,4 @@
-import { GuidesListScreen } from 'expo-app/features/guides/screens/GuidesListScreen';
+import { GuidesListScreen } from '@packrat/app/guides/screens/GuidesListScreen';
 
 export default function GuidesRoute() {
   return <GuidesListScreen />;
diff --git a/apps/expo/app/(app)/item/[id]/edit.tsx b/apps/expo/app/(app)/item/[id]/edit.tsx
index b5078c1e11..cb51f6d620 100644
--- a/apps/expo/app/(app)/item/[id]/edit.tsx
+++ b/apps/expo/app/(app)/item/[id]/edit.tsx
@@ -1,4 +1,4 @@
-import { EditPackItemScreen } from 'expo-app/features/packs/screens/EditPackItemScreen';
+import { EditPackItemScreen } from '@packrat/app/packs/screens/EditPackItemScreen';
 
 export default function EditItemRoute() {
   return <EditPackItemScreen />;
diff --git a/apps/expo/app/(app)/item/[id]/index.tsx b/apps/expo/app/(app)/item/[id]/index.tsx
index 01f795356e..e0a660f587 100644
--- a/apps/expo/app/(app)/item/[id]/index.tsx
+++ b/apps/expo/app/(app)/item/[id]/index.tsx
@@ -1,4 +1,4 @@
-import { ItemDetailScreen } from 'expo-app/features/packs/screens/PackItemDetailScreen';
+import { ItemDetailScreen } from '@packrat/app/packs/screens/PackItemDetailScreen';
 
 export default function ItemDetailRoute() {
   return <ItemDetailScreen />;
diff --git a/apps/expo/app/(app)/item/new.tsx b/apps/expo/app/(app)/item/new.tsx
index 4c22028ae2..6c97daf4e8 100644
--- a/apps/expo/app/(app)/item/new.tsx
+++ b/apps/expo/app/(app)/item/new.tsx
@@ -1,4 +1,4 @@
-import { CreatePackItemForm } from 'expo-app/features/packs/screens/CreatePackItemForm';
+import { CreatePackItemForm } from '@packrat/app/packs/screens/CreatePackItemForm';
 import { useLocalSearchParams } from 'expo-router';
 
 export default function NewItemScreen() {
diff --git a/apps/expo/app/(app)/pack-categories/[id].tsx b/apps/expo/app/(app)/pack-categories/[id].tsx
index 4f8f97b771..3ab98c74ed 100644
--- a/apps/expo/app/(app)/pack-categories/[id].tsx
+++ b/apps/expo/app/(app)/pack-categories/[id].tsx
@@ -1,8 +1,8 @@
+import { userStore } from '@packrat/app/auth/store';
+import { usePackDetailsFromStore } from '@packrat/app/packs/hooks/usePackDetailsFromStore';
+import { computeCategorySummaries } from '@packrat/app/packs/utils';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
 import { Icon, type MaterialIconName } from 'expo-app/components/Icon';
-import { userStore } from 'expo-app/features/auth/store';
-import { usePackDetailsFromStore } from 'expo-app/features/packs/hooks/usePackDetailsFromStore';
-import { computeCategorySummaries } from 'expo-app/features/packs/utils';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useLocalSearchParams } from 'expo-router';
diff --git a/apps/expo/app/(app)/pack-stats/[id].tsx b/apps/expo/app/(app)/pack-stats/[id].tsx
index 3277f6d134..13feb1fd3c 100644
--- a/apps/expo/app/(app)/pack-stats/[id].tsx
+++ b/apps/expo/app/(app)/pack-stats/[id].tsx
@@ -1,9 +1,9 @@
+import { userStore } from '@packrat/app/auth/store';
+import { usePackDetailsFromStore } from '@packrat/app/packs/hooks/usePackDetailsFromStore';
+import { usePackWeightHistory } from '@packrat/app/packs/hooks/usePackWeightHistory';
+import { computeCategorySummaries } from '@packrat/app/packs/utils';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
 import { featureFlags } from 'expo-app/config';
-import { userStore } from 'expo-app/features/auth/store';
-import { usePackDetailsFromStore } from 'expo-app/features/packs/hooks/usePackDetailsFromStore';
-import { usePackWeightHistory } from 'expo-app/features/packs/hooks/usePackWeightHistory';
-import { computeCategorySummaries } from 'expo-app/features/packs/utils';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useLocalSearchParams } from 'expo-router';
 import { ScrollView, View } from 'react-native';
diff --git a/apps/expo/app/(app)/pack-templates/[id]/edit.tsx b/apps/expo/app/(app)/pack-templates/[id]/edit.tsx
index ef63bd7d42..8b6b9b6c3c 100644
--- a/apps/expo/app/(app)/pack-templates/[id]/edit.tsx
+++ b/apps/expo/app/(app)/pack-templates/[id]/edit.tsx
@@ -1,4 +1,4 @@
-import { EditPackTemplateScreen } from 'expo-app/features/pack-templates/screens/EditPackTemplateScreen';
+import { EditPackTemplateScreen } from '@packrat/app/pack-templates/screens/EditPackTemplateScreen';
 
 export default function EditPackTemplateScreenRoute() {
   return <EditPackTemplateScreen />;
diff --git a/apps/expo/app/(app)/pack-templates/[id]/index.tsx b/apps/expo/app/(app)/pack-templates/[id]/index.tsx
index bd92b8fa3f..800e75c8d9 100644
--- a/apps/expo/app/(app)/pack-templates/[id]/index.tsx
+++ b/apps/expo/app/(app)/pack-templates/[id]/index.tsx
@@ -1,4 +1,4 @@
-import { PackTemplateDetailScreen } from 'expo-app/features/pack-templates/screens/PackTemplateDetailScreen';
+import { PackTemplateDetailScreen } from '@packrat/app/pack-templates/screens/PackTemplateDetailScreen';
 
 export default function PackTemplateDetailScreenRoute() {
   return <PackTemplateDetailScreen />;
diff --git a/apps/expo/app/(app)/pack-templates/index.tsx b/apps/expo/app/(app)/pack-templates/index.tsx
index 002a312723..1a58946a2e 100644
--- a/apps/expo/app/(app)/pack-templates/index.tsx
+++ b/apps/expo/app/(app)/pack-templates/index.tsx
@@ -1,4 +1,4 @@
-import { PackTemplateListScreen } from 'expo-app/features/pack-templates/screens/PackTemplateListScreen';
+import { PackTemplateListScreen } from '@packrat/app/pack-templates/screens/PackTemplateListScreen';
 
 export default function () {
   return <PackTemplateListScreen />;
diff --git a/apps/expo/app/(app)/pack-templates/items-scan.tsx b/apps/expo/app/(app)/pack-templates/items-scan.tsx
index fd170df957..cce5ee86a9 100644
--- a/apps/expo/app/(app)/pack-templates/items-scan.tsx
+++ b/apps/expo/app/(app)/pack-templates/items-scan.tsx
@@ -1,4 +1,4 @@
-import { ItemsScanScreen } from 'expo-app/features/pack-templates/screens/ItemsScanScreen';
+import { ItemsScanScreen } from '@packrat/app/pack-templates/screens/ItemsScanScreen';
 
 export default function PackNewFromImageScreen() {
   return <ItemsScanScreen />;
diff --git a/apps/expo/app/(app)/pack-templates/new.tsx b/apps/expo/app/(app)/pack-templates/new.tsx
index b913fdc6d3..9221ed0dca 100644
--- a/apps/expo/app/(app)/pack-templates/new.tsx
+++ b/apps/expo/app/(app)/pack-templates/new.tsx
@@ -1,4 +1,4 @@
-import { CreateTemplatePackScreen } from 'expo-app/features/pack-templates/screens/CreatePackTemplateScreen';
+import { CreateTemplatePackScreen } from '@packrat/app/pack-templates/screens/CreatePackTemplateScreen';
 
 export default function PackNewScreen() {
   return <CreateTemplatePackScreen />;
diff --git a/apps/expo/app/(app)/pack/[id]/edit.tsx b/apps/expo/app/(app)/pack/[id]/edit.tsx
index d0bf6dd2b2..057024aac5 100644
--- a/apps/expo/app/(app)/pack/[id]/edit.tsx
+++ b/apps/expo/app/(app)/pack/[id]/edit.tsx
@@ -1,4 +1,4 @@
-import { EditPackScreen } from 'expo-app/features/packs/screens/EditPackScreen';
+import { EditPackScreen } from '@packrat/app/packs/screens/EditPackScreen';
 
 export default function EditPackScreenRoute() {
   return <EditPackScreen />;
diff --git a/apps/expo/app/(app)/pack/[id]/index.tsx b/apps/expo/app/(app)/pack/[id]/index.tsx
index 7bed2e5891..d7544a8086 100644
--- a/apps/expo/app/(app)/pack/[id]/index.tsx
+++ b/apps/expo/app/(app)/pack/[id]/index.tsx
@@ -1,4 +1,4 @@
-import { PackDetailScreen } from 'expo-app/features/packs/screens/PackDetailScreen';
+import { PackDetailScreen } from '@packrat/app/packs/screens/PackDetailScreen';
 
 export default function PackDetailScreenRoute() {
   return <PackDetailScreen />;
diff --git a/apps/expo/app/(app)/pack/items-scan.tsx b/apps/expo/app/(app)/pack/items-scan.tsx
index e6ee9cf760..55e41f14bd 100644
--- a/apps/expo/app/(app)/pack/items-scan.tsx
+++ b/apps/expo/app/(app)/pack/items-scan.tsx
@@ -1,4 +1,4 @@
-import { ItemsScanScreen } from 'expo-app/features/packs/screens/ItemsScanScreen';
+import { ItemsScanScreen } from '@packrat/app/packs/screens/ItemsScanScreen';
 
 export default function PackNewFromImageScreen() {
   return <ItemsScanScreen />;
diff --git a/apps/expo/app/(app)/pack/new.tsx b/apps/expo/app/(app)/pack/new.tsx
index 2ecd9df5c7..1c2b746c95 100644
--- a/apps/expo/app/(app)/pack/new.tsx
+++ b/apps/expo/app/(app)/pack/new.tsx
@@ -1,4 +1,4 @@
-import { CreatePackScreen } from 'expo-app/features/packs/screens/CreatePackScreen';
+import { CreatePackScreen } from '@packrat/app/packs/screens/CreatePackScreen';
 
 export default function PackNewScreen() {
   return <CreatePackScreen />;
diff --git a/apps/expo/app/(app)/recent-packs.tsx b/apps/expo/app/(app)/recent-packs.tsx
index 6ab73c53fb..df41f84b9b 100644
--- a/apps/expo/app/(app)/recent-packs.tsx
+++ b/apps/expo/app/(app)/recent-packs.tsx
@@ -1,7 +1,7 @@
+import type { Pack } from '@packrat/app/packs';
+import { useRecentPacks } from '@packrat/app/packs/hooks/useRecentPacks';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import type { Pack } from 'expo-app/features/packs';
-import { useRecentPacks } from 'expo-app/features/packs/hooks/useRecentPacks';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { getRelativeTime } from 'expo-app/lib/utils/getRelativeTime';
diff --git a/apps/expo/app/(app)/reported-ai-content.tsx b/apps/expo/app/(app)/reported-ai-content.tsx
index 4b8f114f59..b4f8f45802 100644
--- a/apps/expo/app/(app)/reported-ai-content.tsx
+++ b/apps/expo/app/(app)/reported-ai-content.tsx
@@ -1,3 +1,3 @@
-import ReportedContentScreen from 'expo-app/features/ai/screens/ReportedContentScreen';
+import ReportedContentScreen from '@packrat/app/ai/screens/ReportedContentScreen';
 
 export default ReportedContentScreen;
diff --git a/apps/expo/app/(app)/season-suggestions.tsx b/apps/expo/app/(app)/season-suggestions.tsx
index fda46f799e..5c4202900e 100644
--- a/apps/expo/app/(app)/season-suggestions.tsx
+++ b/apps/expo/app/(app)/season-suggestions.tsx
@@ -1,13 +1,13 @@
-import { assertDefined } from '@packrat/guards';
-import { Button, LargeTitleHeader, Text, useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useCreatePackWithItems } from 'expo-app/features/packs/hooks/useCreatePackWithItems';
+import { useCreatePackWithItems } from '@packrat/app/packs/hooks/useCreatePackWithItems';
 import {
   type PackSuggestion,
   useSeasonSuggestions,
-} from 'expo-app/features/packs/hooks/useSeasonSuggestions';
-import { LocationPicker } from 'expo-app/features/weather/components';
-import type { WeatherLocation } from 'expo-app/features/weather/types';
+} from '@packrat/app/packs/hooks/useSeasonSuggestions';
+import { LocationPicker } from '@packrat/app/weather/components';
+import type { WeatherLocation } from '@packrat/app/weather/types';
+import { assertDefined } from '@packrat/guards';
+import { Button, LargeTitleHeader, Text, useColorScheme } from '@packrat/ui/nativewindui';
+import { Icon } from 'expo-app/components/Icon';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { useState } from 'react';
diff --git a/apps/expo/app/(app)/settings/index.tsx b/apps/expo/app/(app)/settings/index.tsx
index 6190cef236..68100598d3 100644
--- a/apps/expo/app/(app)/settings/index.tsx
+++ b/apps/expo/app/(app)/settings/index.tsx
@@ -1,21 +1,21 @@
 import { LLAMA_MODEL_SIZE } from '@packrat/app/ai';
-import { ActivityIndicator, Text } from '@packrat/ui/nativewindui';
-import * as Burnt from 'burnt';
-import { appAlert } from 'expo-app/app/_layout';
-import { Icon, type MaterialIconName } from 'expo-app/components/Icon';
 import {
   localModelFileAvailableAtom,
   localModelProgressAtom,
   localModelStatusAtom,
-} from 'expo-app/features/ai/atoms/aiModeAtoms';
+} from '@packrat/app/ai/atoms/aiModeAtoms';
 import {
   cancelLocalModelDownload,
   deleteLocalModel,
   downloadLocalModel,
   isAppleIntelligenceAvailable,
-} from 'expo-app/features/ai/lib/localModelManager';
-import { DeleteAccountButton } from 'expo-app/features/auth/components/DeleteAccountButton';
-import { useAuth } from 'expo-app/features/auth/hooks/useAuth';
+} from '@packrat/app/ai/lib/localModelManager';
+import { DeleteAccountButton } from '@packrat/app/auth/components/DeleteAccountButton';
+import { useAuth } from '@packrat/app/auth/hooks/useAuth';
+import { ActivityIndicator, Text } from '@packrat/ui/nativewindui';
+import * as Burnt from 'burnt';
+import { appAlert } from 'expo-app/app/_layout';
+import { Icon, type MaterialIconName } from 'expo-app/components/Icon';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import Constants from 'expo-constants';
diff --git a/apps/expo/app/(app)/templateItem/[id]/edit.tsx b/apps/expo/app/(app)/templateItem/[id]/edit.tsx
index 49c9565822..cfbe64c94a 100644
--- a/apps/expo/app/(app)/templateItem/[id]/edit.tsx
+++ b/apps/expo/app/(app)/templateItem/[id]/edit.tsx
@@ -1,4 +1,4 @@
-import { EditPackTemplateItemScreen } from 'expo-app/features/pack-templates/screens/EditPackTemplateItemScreen';
+import { EditPackTemplateItemScreen } from '@packrat/app/pack-templates/screens/EditPackTemplateItemScreen';
 
 export default function EditTemplateItemRoute() {
   return <EditPackTemplateItemScreen />;
diff --git a/apps/expo/app/(app)/templateItem/[id]/index.tsx b/apps/expo/app/(app)/templateItem/[id]/index.tsx
index 0c07ac815c..0aac8b9e5a 100644
--- a/apps/expo/app/(app)/templateItem/[id]/index.tsx
+++ b/apps/expo/app/(app)/templateItem/[id]/index.tsx
@@ -1,4 +1,4 @@
-import { PackTemplateItemDetailScreen } from 'expo-app/features/pack-templates/screens/PackTemplateItemDetailScreen';
+import { PackTemplateItemDetailScreen } from '@packrat/app/pack-templates/screens/PackTemplateItemDetailScreen';
 
 export default function TemplateItemDetailRoute() {
   return <PackTemplateItemDetailScreen />;
diff --git a/apps/expo/app/(app)/templateItem/new.tsx b/apps/expo/app/(app)/templateItem/new.tsx
index b561f36cd6..cb64eb7bb0 100644
--- a/apps/expo/app/(app)/templateItem/new.tsx
+++ b/apps/expo/app/(app)/templateItem/new.tsx
@@ -1,4 +1,4 @@
-import { CreatePackTemplateItemForm } from 'expo-app/features/pack-templates/screens/CreatePackTemplateItemForm';
+import { CreatePackTemplateItemForm } from '@packrat/app/pack-templates/screens/CreatePackTemplateItemForm';
 import { useLocalSearchParams } from 'expo-router';
 
 export default function NewTemplateItemScreen() {
diff --git a/apps/expo/app/(app)/trail-conditions.tsx b/apps/expo/app/(app)/trail-conditions.tsx
index 2fb5fa10a7..3d6063c148 100644
--- a/apps/expo/app/(app)/trail-conditions.tsx
+++ b/apps/expo/app/(app)/trail-conditions.tsx
@@ -1,9 +1,9 @@
 import type { TrailConditionReport, TrailSurface } from '@packrat/app/trail-conditions';
+import { SubmitConditionReportForm } from '@packrat/app/trail-conditions/components/SubmitConditionReportForm';
+import { TrailConditionReportCard } from '@packrat/app/trail-conditions/components/TrailConditionReportCard';
+import { useTrailConditionReports } from '@packrat/app/trail-conditions/hooks/useTrailConditionReports';
 import { ActivityIndicator, LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
 import { featureFlags } from 'expo-app/config';
-import { SubmitConditionReportForm } from 'expo-app/features/trail-conditions/components/SubmitConditionReportForm';
-import { TrailConditionReportCard } from 'expo-app/features/trail-conditions/components/TrailConditionReportCard';
-import { useTrailConditionReports } from 'expo-app/features/trail-conditions/hooks/useTrailConditionReports';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useMemo, useState } from 'react';
 import { FlatList, Modal, Pressable, ScrollView, View } from 'react-native';
diff --git a/apps/expo/app/(app)/trip/[id]/edit.tsx b/apps/expo/app/(app)/trip/[id]/edit.tsx
index dba18c615a..1074ba730e 100644
--- a/apps/expo/app/(app)/trip/[id]/edit.tsx
+++ b/apps/expo/app/(app)/trip/[id]/edit.tsx
@@ -1,4 +1,4 @@
-import { EditTripScreen } from 'expo-app/features/trips/screens/EditTripScreen';
+import { EditTripScreen } from '@packrat/app/trips/screens/EditTripScreen';
 
 export default function EditTripScreenRoute() {
   return <EditTripScreen />;
diff --git a/apps/expo/app/(app)/trip/[id]/index.tsx b/apps/expo/app/(app)/trip/[id]/index.tsx
index a3b37861c7..bc7a2b6999 100644
--- a/apps/expo/app/(app)/trip/[id]/index.tsx
+++ b/apps/expo/app/(app)/trip/[id]/index.tsx
@@ -1,5 +1,5 @@
+import { TripDetailScreen } from '@packrat/app/trips/screens/TripDetailScreen';
 import { featureFlags } from 'expo-app/config';
-import { TripDetailScreen } from 'expo-app/features/trips/screens/TripDetailScreen';
 import { Redirect } from 'expo-router';
 
 export default function TripDetailScreenRoute() {
diff --git a/apps/expo/app/(app)/trip/location-search.tsx b/apps/expo/app/(app)/trip/location-search.tsx
index 6926aab0cd..110da77a67 100644
--- a/apps/expo/app/(app)/trip/location-search.tsx
+++ b/apps/expo/app/(app)/trip/location-search.tsx
@@ -1,3 +1,4 @@
+import { useTripLocation } from '@packrat/app/trips/store/tripLocationStore';
 import { clientEnvs } from '@packrat/env/expo-client';
 import { ActivityIndicator, Button } from '@packrat/ui/nativewindui';
 import { SearchInput } from 'expo-app/components/SearchInput';
@@ -8,7 +9,6 @@ import { useRef, useState } from 'react';
 import { Alert, Text, View } from 'react-native';
 import MapView, { Marker } from 'react-native-maps';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import { useTripLocation } from '../../../features/trips/store/tripLocationStore';
 
 const GOOGLE_MAPS_API_KEY =
   Constants.expoConfig?.extra?.googleMapsApiKey || clientEnvs.EXPO_PUBLIC_GOOGLE_MAPS_API_KEY;
diff --git a/apps/expo/app/(app)/trip/new.tsx b/apps/expo/app/(app)/trip/new.tsx
index 3c917107d2..86362a24c3 100644
--- a/apps/expo/app/(app)/trip/new.tsx
+++ b/apps/expo/app/(app)/trip/new.tsx
@@ -1,5 +1,5 @@
+import { CreateTripScreen } from '@packrat/app/trips/screens/CreateTripScreen';
 import { featureFlags } from 'expo-app/config';
-import { CreateTripScreen } from 'expo-app/features/trips/screens/CreateTripScreen';
 import { Redirect } from 'expo-router';
 
 export default function TripNewScreen() {
diff --git a/apps/expo/app/(app)/upcoming-trips.tsx b/apps/expo/app/(app)/upcoming-trips.tsx
index 158e218331..0871999788 100644
--- a/apps/expo/app/(app)/upcoming-trips.tsx
+++ b/apps/expo/app/(app)/upcoming-trips.tsx
@@ -1,14 +1,14 @@
+import { useDetailedPacks } from '@packrat/app/packs/hooks/useDetailedPacks';
+import { useTrips } from '@packrat/app/trips/hooks';
 import { List, ListItem, Text } from '@packrat/ui/nativewindui';
 import { format } from 'date-fns';
 import { featureFlags } from 'expo-app/config';
-import { useTrips } from 'expo-app/features/trips/hooks';
 import { cn } from 'expo-app/lib/cn';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import type { TranslationFunction } from 'expo-app/lib/i18n/types';
 import { Redirect } from 'expo-router';
 import { useEffect, useMemo, useState } from 'react';
 import { ScrollView, View } from 'react-native';
-import { useDetailedPacks } from '../../features/packs/hooks/useDetailedPacks';
 
 function formatDate(dateString?: string) {
   if (!dateString) return '—';
diff --git a/apps/expo/app/(app)/weather-alerts.tsx b/apps/expo/app/(app)/weather-alerts.tsx
index c02838c9a4..f2f40dfab3 100644
--- a/apps/expo/app/(app)/weather-alerts.tsx
+++ b/apps/expo/app/(app)/weather-alerts.tsx
@@ -1,6 +1,6 @@
 import { MaterialCommunityIcons } from '@expo/vector-icons';
+import { useWeatherAlerts } from '@packrat/app/weather/hooks/useWeatherAlert';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { useWeatherAlerts } from 'expo-app/features/weather/hooks/useWeatherAlert';
 import { cn } from 'expo-app/lib/cn';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
diff --git a/apps/expo/app/(app)/weather/[id].tsx b/apps/expo/app/(app)/weather/[id].tsx
index 20eb723864..6d6105dfb5 100644
--- a/apps/expo/app/(app)/weather/[id].tsx
+++ b/apps/expo/app/(app)/weather/[id].tsx
@@ -1,4 +1,4 @@
-import { LocationDetailScreen } from 'expo-app/features/weather/screens';
+import { LocationDetailScreen } from '@packrat/app/weather/screens';
 
 export default function LocationDetailIndexScreen() {
   return <LocationDetailScreen />;
diff --git a/apps/expo/app/(app)/weather/geo.tsx b/apps/expo/app/(app)/weather/geo.tsx
index 5c1ade3e60..2b6cad153f 100644
--- a/apps/expo/app/(app)/weather/geo.tsx
+++ b/apps/expo/app/(app)/weather/geo.tsx
@@ -1,4 +1,4 @@
-import TripWeatherDetailsScreen from 'expo-app/features/trips/screens/TripWeatherDetailsScreen';
+import TripWeatherDetailsScreen from '@packrat/app/trips/screens/TripWeatherDetailsScreen';
 
 export default function GeoWeatherDetailsScreen() {
   return <TripWeatherDetailsScreen />;
diff --git a/apps/expo/app/(app)/weather/index.tsx b/apps/expo/app/(app)/weather/index.tsx
index ee8c67f846..78ecac111b 100644
--- a/apps/expo/app/(app)/weather/index.tsx
+++ b/apps/expo/app/(app)/weather/index.tsx
@@ -1,4 +1,4 @@
-import { LocationsScreen } from 'expo-app/features/weather/screens';
+import { LocationsScreen } from '@packrat/app/weather/screens';
 
 export default function LocationsIndexScreen() {
   return <LocationsScreen />;
diff --git a/apps/expo/app/(app)/weather/preview.tsx b/apps/expo/app/(app)/weather/preview.tsx
index 2db5fdfb4a..94e4c8fbf6 100644
--- a/apps/expo/app/(app)/weather/preview.tsx
+++ b/apps/expo/app/(app)/weather/preview.tsx
@@ -1,4 +1,4 @@
-import { LocationPreviewScreen } from 'expo-app/features/weather/screens';
+import { LocationPreviewScreen } from '@packrat/app/weather/screens';
 
 export default function LocationPreviewIndexScreen() {
   return <LocationPreviewScreen />;
diff --git a/apps/expo/app/(app)/weather/search.tsx b/apps/expo/app/(app)/weather/search.tsx
index be625321fc..7b3e3b23d4 100644
--- a/apps/expo/app/(app)/weather/search.tsx
+++ b/apps/expo/app/(app)/weather/search.tsx
@@ -1,4 +1,4 @@
-import { LocationSearchScreen } from 'expo-app/features/weather/screens';
+import { LocationSearchScreen } from '@packrat/app/weather/screens';
 
 export default function LocationSearchIndexScreen() {
   return <LocationSearchScreen />;
diff --git a/apps/expo/app/(app)/weight-analysis/[id].tsx b/apps/expo/app/(app)/weight-analysis/[id].tsx
index 01978d9fd1..e71180f285 100644
--- a/apps/expo/app/(app)/weight-analysis/[id].tsx
+++ b/apps/expo/app/(app)/weight-analysis/[id].tsx
@@ -1,8 +1,8 @@
 'use client';
 
+import { userStore } from '@packrat/app/auth/store';
+import { usePackWeightAnalysis } from '@packrat/app/packs/hooks/usePackWeightAnalysis';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { userStore } from 'expo-app/features/auth/store';
-import { usePackWeightAnalysis } from 'expo-app/features/packs/hooks/usePackWeightAnalysis';
 import { cn } from 'expo-app/lib/cn';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useLocalSearchParams } from 'expo-router';
diff --git a/apps/expo/app/(app)/wildlife/[id].tsx b/apps/expo/app/(app)/wildlife/[id].tsx
index 2c90425f68..c2a909d612 100644
--- a/apps/expo/app/(app)/wildlife/[id].tsx
+++ b/apps/expo/app/(app)/wildlife/[id].tsx
@@ -1,5 +1,5 @@
+import { SpeciesDetailScreen } from '@packrat/app/wildlife/screens/SpeciesDetailScreen';
 import { featureFlags } from 'expo-app/config';
-import { SpeciesDetailScreen } from 'expo-app/features/wildlife/screens/SpeciesDetailScreen';
 import { Redirect } from 'expo-router';
 
 export default function SpeciesDetailRoute() {
diff --git a/apps/expo/app/(app)/wildlife/identify.tsx b/apps/expo/app/(app)/wildlife/identify.tsx
index 9de85cbf13..e03caa9c52 100644
--- a/apps/expo/app/(app)/wildlife/identify.tsx
+++ b/apps/expo/app/(app)/wildlife/identify.tsx
@@ -1,5 +1,5 @@
+import { IdentificationScreen } from '@packrat/app/wildlife/screens/IdentificationScreen';
 import { featureFlags } from 'expo-app/config';
-import { IdentificationScreen } from 'expo-app/features/wildlife/screens/IdentificationScreen';
 import { Redirect } from 'expo-router';
 
 export default function IdentifyRoute() {
diff --git a/apps/expo/app/(app)/wildlife/index.tsx b/apps/expo/app/(app)/wildlife/index.tsx
index 47b5afb522..bbfd6994ba 100644
--- a/apps/expo/app/(app)/wildlife/index.tsx
+++ b/apps/expo/app/(app)/wildlife/index.tsx
@@ -1,5 +1,5 @@
+import { WildlifeScreen } from '@packrat/app/wildlife/screens/WildlifeScreen';
 import { featureFlags } from 'expo-app/config';
-import { WildlifeScreen } from 'expo-app/features/wildlife/screens/WildlifeScreen';
 import { Redirect } from 'expo-router';
 
 export default function WildlifeRoute() {
diff --git a/apps/expo/app/_layout.tsx b/apps/expo/app/_layout.tsx
index 81dd6426d5..86a937eee2 100644
--- a/apps/expo/app/_layout.tsx
+++ b/apps/expo/app/_layout.tsx
@@ -6,10 +6,10 @@ import { Stack } from 'expo-router';
 import { StatusBar } from 'expo-status-bar';
 import '../global.css';
 
+import { userStore } from '@packrat/app/auth/store';
 import { clientEnvs } from '@packrat/env/expo-client';
 import { Alert, type AlertMethods } from '@packrat/ui/nativewindui';
 import * as Sentry from '@sentry/react-native';
-import { userStore } from 'expo-app/features/auth/store';
 import { useColorScheme, useInitialAndroidBarSync } from 'expo-app/lib/hooks/useColorScheme';
 import { Providers } from 'expo-app/providers';
 import { NAV_THEME } from 'expo-app/theme';
diff --git a/apps/expo/app/auth/(create-account)/credentials.tsx b/apps/expo/app/auth/(create-account)/credentials.tsx
index 0c8ca8ebef..0dc1081ddf 100644
--- a/apps/expo/app/auth/(create-account)/credentials.tsx
+++ b/apps/expo/app/auth/(create-account)/credentials.tsx
@@ -1,3 +1,4 @@
+import { useAuthActions } from '@packrat/app/auth/hooks/useAuthActions';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import {
   AlertAnchor,
@@ -11,7 +12,6 @@ import {
 } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
 import { Icon } from 'expo-app/components/Icon';
-import { useAuthActions } from 'expo-app/features/auth/hooks/useAuthActions';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import type { TranslationKeys } from 'expo-app/lib/i18n/types';
 import { router, useLocalSearchParams } from 'expo-router';
diff --git a/apps/expo/app/auth/(login)/forgot-password.tsx b/apps/expo/app/auth/(login)/forgot-password.tsx
index b0360ec93b..1fa8a15b44 100644
--- a/apps/expo/app/auth/(login)/forgot-password.tsx
+++ b/apps/expo/app/auth/(login)/forgot-password.tsx
@@ -1,3 +1,5 @@
+import { needsReauthAtom } from '@packrat/app/auth/atoms/authAtoms';
+import { useAuthActions } from '@packrat/app/auth/hooks/useAuthActions';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import {
   AlertAnchor,
@@ -9,8 +11,6 @@ import {
   TextField,
 } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
-import { needsReauthAtom } from 'expo-app/features/auth/atoms/authAtoms';
-import { useAuthActions } from 'expo-app/features/auth/hooks/useAuthActions';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router, Stack } from 'expo-router';
 import { useAtomValue } from 'jotai';
diff --git a/apps/expo/app/auth/(login)/index.tsx b/apps/expo/app/auth/(login)/index.tsx
index 8222e1f208..8c1a6ca839 100644
--- a/apps/expo/app/auth/(login)/index.tsx
+++ b/apps/expo/app/auth/(login)/index.tsx
@@ -1,7 +1,7 @@
+import { needsReauthAtom } from '@packrat/app/auth/atoms/authAtoms';
+import { useAuth } from '@packrat/app/auth/hooks/useAuth';
 import { Button, Form, FormItem, FormSection, Text, TextField } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
-import { needsReauthAtom } from 'expo-app/features/auth/atoms/authAtoms';
-import { useAuth } from 'expo-app/features/auth/hooks/useAuth';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { testIds } from 'expo-app/lib/testIds';
 import { Link, router, Stack, useLocalSearchParams } from 'expo-router';
diff --git a/apps/expo/app/auth/(login)/reset-password.tsx b/apps/expo/app/auth/(login)/reset-password.tsx
index dc553a4d91..7853e0600f 100644
--- a/apps/expo/app/auth/(login)/reset-password.tsx
+++ b/apps/expo/app/auth/(login)/reset-password.tsx
@@ -1,3 +1,4 @@
+import { useAuthActions } from '@packrat/app/auth/hooks/useAuthActions';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import {
   AlertAnchor,
@@ -11,7 +12,6 @@ import {
 } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
 import { Icon } from 'expo-app/components/Icon';
-import { useAuthActions } from 'expo-app/features/auth/hooks/useAuthActions';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import type { TranslationKeys } from 'expo-app/lib/i18n/types';
 import { router, Stack, useLocalSearchParams } from 'expo-router';
diff --git a/apps/expo/app/auth/index.tsx b/apps/expo/app/auth/index.tsx
index 1b8ba307d1..c0c8f032ed 100644
--- a/apps/expo/app/auth/index.tsx
+++ b/apps/expo/app/auth/index.tsx
@@ -1,13 +1,9 @@
+import { isLoadingAtom, needsReauthAtom, redirectToAtom } from '@packrat/app/auth/atoms/authAtoms';
+import { useAuth } from '@packrat/app/auth/hooks/useAuth';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { ActivityIndicator, AlertAnchor, Button, Text } from '@packrat/ui/nativewindui';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { featureFlags } from 'expo-app/config';
-import {
-  isLoadingAtom,
-  needsReauthAtom,
-  redirectToAtom,
-} from 'expo-app/features/auth/atoms/authAtoms';
-import { useAuth } from 'expo-app/features/auth/hooks/useAuth';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { testIds } from 'expo-app/lib/testIds';
 import { Link, router, useLocalSearchParams } from 'expo-router';
diff --git a/apps/expo/app/auth/one-time-password.tsx b/apps/expo/app/auth/one-time-password.tsx
index 7702a0cedc..d23a4ac46f 100644
--- a/apps/expo/app/auth/one-time-password.tsx
+++ b/apps/expo/app/auth/one-time-password.tsx
@@ -1,7 +1,7 @@
+import { useAuthActions } from '@packrat/app/auth/hooks/useAuthActions';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { ActivityIndicator, AlertAnchor, Button, Text, TextField } from '@packrat/ui/nativewindui';
 import { useHeaderHeight } from '@react-navigation/elements';
-import { useAuthActions } from 'expo-app/features/auth/hooks/useAuthActions';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useKeyboardHideBlur } from 'expo-app/lib/hooks/useKeyboardHideBlur';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
diff --git a/apps/expo/components/ai-chatHeader.tsx b/apps/expo/components/ai-chatHeader.tsx
index 56455b6e53..e42695c863 100644
--- a/apps/expo/components/ai-chatHeader.tsx
+++ b/apps/expo/components/ai-chatHeader.tsx
@@ -1,6 +1,6 @@
+import { AIModeSelector } from '@packrat/app/ai/components/AIModeSelector';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { AIModeSelector } from 'expo-app/features/ai/components/AIModeSelector';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { BlurView } from 'expo-blur';
diff --git a/apps/expo/features/auth/README.md b/apps/expo/features/auth/README.md
deleted file mode 100644
index de6eaebcc1..0000000000
--- a/apps/expo/features/auth/README.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# Authentication System
-
-This directory contains the authentication system for the PackRat mobile application.
-
-## Re-authentication Flow
-
-When a user's session expires (access token and refresh token both expire), the app automatically triggers a re-authentication flow with a non-blocking "Sync Paused" banner. This fits the local-first model where users can continue working offline while being notified they need to re-authenticate to sync changes.
-
-### How It Works
-
-1. **Token Expiration Detection**
-   - The axios interceptor in `lib/api/client.ts` intercepts all API requests
-   - When a 401 Unauthorized error occurs, it attempts to refresh the access token
-   - If refresh fails, it triggers re-authentication
-
-2. **Re-authentication State**
-   - `needsReauthAtom`: Boolean flag indicating re-authentication is required
-
-3. **User Experience**
-   - A non-blocking banner (`SyncBanner`) appears at the top of the screen
-   - Banner displays a message prompting user to sign in again
-   - User can continue working with local data while offline
-   - User can tap the banner to navigate to the auth screen
-   - After successful sign-in, user is redirected back to their previous location
-
-4. **State Management**
-   - Current path is automatically passed for post-authentication redirect
-   - After successful sign-in / logout, all re-auth state is cleared
-
-### Files
-
-- `components/SyncBanner.tsx`: Banner component displayed when session expires
-- `atoms/authAtoms.ts`: Jotai atoms for authentication state including re-auth flags
-- `hooks/useAuthActions.ts`: Actions for sign-in, sign-out, and state management
-- `lib/api/client.ts`: Axios interceptor handling token refresh and re-auth triggering
-- `lib/api/rpcTransport.ts`: Hono RPC fetch adapter mirroring the same refresh and re-auth behavior
-- `lib/api/rpcClient.ts`: Shared Expo RPC client entry point backed by `@packrat/api-client`
-
-## RPC Migration Status
-
-The app is currently in a coexistence period:
-
-- Legacy feature modules still use `lib/api/client.ts` and `axiosInstance`
-- New Hono RPC infrastructure lives in `lib/api/rpcTransport.ts` and `lib/api/rpcClient.ts`
-- The RPC transport is intended to preserve the same auth contract as axios:
-  bearer token attachment, refresh retry queueing, and `needsReauthAtom` on hard failure
-
-Until feature consumers are migrated, both transport layers may exist side-by-side. Changes to auth behavior should keep them aligned.
-
-### Example Flow
-
-```typescript
-// 1. User makes API request with expired token
-await axiosInstance.get('/api/user/profile');
-
-// 2. Server returns 401, interceptor tries to refresh
-// 3. Refresh token is also expired - 401
-// 4. Interceptor sets re-auth state
-await store.set(needsReauthAtom, true);
-
-// 5. SyncBanner appears at top of screen
-// 6. User can continue working offline OR tap banner to sign in
-// 7. User taps banner and completes sign-in
-await signIn(email, password);
-
-// 8. Re-auth state is cleared
-await setNeedsReauth(false);
-
-// 9. User is redirected to saved path
-redirect(redirectTo);
-```
-
-## Token Lifecycle
-
-- **Access Token**: Valid for 7 days, stored in `access_token` key
-- **Refresh Token**: Valid for 30 days, stored in `refresh_token` key
-- Both tokens are stored using `expo-sqlite/kv-store` for persistence
-- Tokens are automatically attached to requests via axios interceptor
-
-## Sign-In Methods
-
-The app supports multiple authentication methods:
-- Email/Password (`signIn`)
-- Google Sign-In (`signInWithGoogle`)
-- Apple Sign-In (`signInWithApple`)
-
-All methods reset re-authentication state upon successful authentication.
diff --git a/apps/expo/features/feed/index.ts b/apps/expo/features/feed/index.ts
deleted file mode 100644
index ec4808e944..0000000000
--- a/apps/expo/features/feed/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from '@packrat/app/feed';
-export * from './components';
-export * from './hooks';
-export * from './screens';
-export * from './utils';
diff --git a/apps/expo/features/pack-templates/index.ts b/apps/expo/features/pack-templates/index.ts
deleted file mode 100644
index fe818d9a06..0000000000
--- a/apps/expo/features/pack-templates/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '@packrat/app/pack-templates';
-export * from './hooks';
diff --git a/apps/expo/features/packs/index.ts b/apps/expo/features/packs/index.ts
deleted file mode 100644
index c4b0798c02..0000000000
--- a/apps/expo/features/packs/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '@packrat/app/packs';
-export * from './hooks';
diff --git a/apps/expo/features/trail-conditions/index.ts b/apps/expo/features/trail-conditions/index.ts
deleted file mode 100644
index 8721fe0b5b..0000000000
--- a/apps/expo/features/trail-conditions/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from '@packrat/app/trail-conditions';
-export * from './components';
-export * from './hooks';
diff --git a/apps/expo/features/trips/index.ts b/apps/expo/features/trips/index.ts
deleted file mode 100644
index e1772d4b05..0000000000
--- a/apps/expo/features/trips/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '@packrat/app/trips';
-export * from './hooks';
diff --git a/apps/expo/features/wildlife/index.ts b/apps/expo/features/wildlife/index.ts
deleted file mode 100644
index 7512bbfba8..0000000000
--- a/apps/expo/features/wildlife/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from '@packrat/app/wildlife';
-export * from './components';
-export * from './hooks';
-export * from './screens';
diff --git a/apps/expo/lib/api/packrat.ts b/apps/expo/lib/api/packrat.ts
index 88151d08cf..f6df7e3274 100644
--- a/apps/expo/lib/api/packrat.ts
+++ b/apps/expo/lib/api/packrat.ts
@@ -1,12 +1,8 @@
 import { createApiClient } from '@packrat/api-client';
+import { needsReauthAtom, refreshTokenAtom, tokenAtom } from '@packrat/app/auth/atoms/authAtoms';
+import { isAuthed } from '@packrat/app/auth/store';
 import { clientEnvs } from '@packrat/env/expo-client';
 import { store } from 'expo-app/atoms/store';
-import {
-  needsReauthAtom,
-  refreshTokenAtom,
-  tokenAtom,
-} from 'expo-app/features/auth/atoms/authAtoms';
-import { isAuthed } from 'expo-app/features/auth/store';
 import Storage from 'expo-sqlite/kv-store';
 
 /**
diff --git a/apps/expo/lib/hasUnsyncedChanges.ts b/apps/expo/lib/hasUnsyncedChanges.ts
index 6d7a80f026..55ff11dad1 100644
--- a/apps/expo/lib/hasUnsyncedChanges.ts
+++ b/apps/expo/lib/hasUnsyncedChanges.ts
@@ -1,12 +1,12 @@
 import type { Observable, ObservableSyncState } from '@legendapp/state';
-import { userSyncState } from 'expo-app/features/auth/store';
+import { userSyncState } from '@packrat/app/auth/store';
 import {
   packTemplateItemsSyncState,
   packTemplatesSyncState,
-} from 'expo-app/features/pack-templates/store';
-import { packItemsSyncState, packsSyncState } from 'expo-app/features/packs/store';
-import { packWeigthHistorySyncState } from 'expo-app/features/packs/store/packWeightHistory';
-import { tripsSyncState } from 'expo-app/features/trips/store/trips';
+} from '@packrat/app/pack-templates/store';
+import { packItemsSyncState, packsSyncState } from '@packrat/app/packs/store';
+import { packWeigthHistorySyncState } from '@packrat/app/packs/store/packWeightHistory';
+import { tripsSyncState } from '@packrat/app/trips/store/trips';
 
 const hasPendingChanges = (syncState: Observable<ObservableSyncState>): boolean =>
   Object.keys(syncState.getPendingChanges() || {}).length !== 0;
diff --git a/apps/expo/lib/hooks/useAuthenticatedQueryToolkit.ts b/apps/expo/lib/hooks/useAuthenticatedQueryToolkit.ts
index 90d6fe0f4f..c794e835f5 100644
--- a/apps/expo/lib/hooks/useAuthenticatedQueryToolkit.ts
+++ b/apps/expo/lib/hooks/useAuthenticatedQueryToolkit.ts
@@ -1,4 +1,4 @@
-import { tokenAtom } from 'expo-app/features/auth/atoms/authAtoms';
+import { tokenAtom } from '@packrat/app/auth/atoms/authAtoms';
 import { useAtomValue } from 'jotai';
 
 export const useAuthenticatedQueryToolkit = () => {
diff --git a/apps/expo/lib/utils/buildImageUrl.ts b/apps/expo/lib/utils/buildImageUrl.ts
index 014b951e7c..2cd4153dae 100644
--- a/apps/expo/lib/utils/buildImageUrl.ts
+++ b/apps/expo/lib/utils/buildImageUrl.ts
@@ -1,6 +1,6 @@
+import type { PackTemplateItem } from '@packrat/app/pack-templates';
+import type { PackItem } from '@packrat/app/packs';
 import { clientEnvs } from '@packrat/env/expo-client';
-import type { PackTemplateItem } from 'expo-app/features/pack-templates';
-import type { PackItem } from 'expo-app/features/packs';
 
 export function buildImageUrl({ userId, image }: PackTemplateItem | PackItem): string {
   const baseUrl = clientEnvs.EXPO_PUBLIC_R2_PUBLIC_URL;
diff --git a/apps/expo/lib/utils/itemCalculations.ts b/apps/expo/lib/utils/itemCalculations.ts
index 0c2df40943..0876586a98 100644
--- a/apps/expo/lib/utils/itemCalculations.ts
+++ b/apps/expo/lib/utils/itemCalculations.ts
@@ -2,8 +2,8 @@ import type { CatalogItem } from '@packrat/app/catalog';
 // Leaf import (not the barrel) — barrel re-exports hooks, one of which
 // imports back into this file, which would be a circular dependency.
 import type { PackTemplateItem } from '@packrat/app/pack-templates';
+import type { PackItem, WeightUnit } from '@packrat/app/packs';
 import { makeEnumGuard } from '@packrat/guards';
-import type { PackItem, WeightUnit } from 'expo-app/features/packs';
 
 type Item = CatalogItem | PackItem | PackTemplateItem;
 
diff --git a/apps/expo/screens/ProfileScreen.tsx b/apps/expo/screens/ProfileScreen.tsx
index 98222b82a0..a475c18871 100644
--- a/apps/expo/screens/ProfileScreen.tsx
+++ b/apps/expo/screens/ProfileScreen.tsx
@@ -1,9 +1,9 @@
+import type { Pack } from '@packrat/app/packs';
+import { PackCard } from '@packrat/app/packs/components/PackCard';
+import { usePacks } from '@packrat/app/packs/hooks/usePacks';
+import { getPackItems } from '@packrat/app/packs/store';
 import { Icon } from 'expo-app/components/Icon';
 import { UserAvatar } from 'expo-app/components/initial/UserAvatar';
-import type { Pack } from 'expo-app/features/packs';
-import { PackCard } from 'expo-app/features/packs/components/PackCard';
-import { usePacks } from 'expo-app/features/packs/hooks/usePacks';
-import { getPackItems } from 'expo-app/features/packs/store';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { ScrollView, Text, TouchableOpacity, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/apps/expo/utils/__tests__/storage.test.ts b/apps/expo/utils/__tests__/storage.test.ts
index 517d4ca838..014928d39c 100644
--- a/apps/expo/utils/__tests__/storage.test.ts
+++ b/apps/expo/utils/__tests__/storage.test.ts
@@ -14,8 +14,8 @@ vi.mock('jotai/utils', () => ({
   createJSONStorage: vi.fn((storageFunction) => storageFunction()),
 }));
 
+import type { WeatherLocation } from '@packrat/app/weather/types';
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import type { WeatherLocation } from 'expo-app/features/weather/types';
 import { asyncStorage } from '../storage';
 
 describe('storage', () => {
diff --git a/apps/expo/utils/storage.ts b/apps/expo/utils/storage.ts
index abbab9a7da..f7b52ffbc3 100644
--- a/apps/expo/utils/storage.ts
+++ b/apps/expo/utils/storage.ts
@@ -1,5 +1,5 @@
+import type { WeatherLocation } from '@packrat/app/weather/types';
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import type { WeatherLocation } from 'expo-app/features/weather/types';
 import { createJSONStorage } from 'jotai/utils';
 
 // Create a storage adapter for Jotai that uses AsyncStorage
diff --git a/biome.json b/biome.json
index e4bce1e6dc..de89ea80ff 100644
--- a/biome.json
+++ b/biome.json
@@ -62,7 +62,7 @@
     {
       "includes": [
         "apps/expo/atoms/atomWith*.ts",
-        "apps/expo/features/weather/atoms/locationsAtoms.ts",
+        "packages/app/src/weather/atoms/locationsAtoms.ts",
         "apps/expo/lib/api/client.ts",
         "packages/api/src/index.ts",
         "packages/api/src/routes/admin/index.ts",
diff --git a/apps/expo/features/ai-packs/components/AIPacksTile.tsx b/packages/app/src/ai-packs/components/AIPacksTile.tsx
similarity index 95%
rename from apps/expo/features/ai-packs/components/AIPacksTile.tsx
rename to packages/app/src/ai-packs/components/AIPacksTile.tsx
index bf6d228ec4..8f6844312e 100644
--- a/apps/expo/features/ai-packs/components/AIPacksTile.tsx
+++ b/packages/app/src/ai-packs/components/AIPacksTile.tsx
@@ -1,6 +1,6 @@
+import { useUser } from '@packrat/app/auth/hooks/useUser';
 import { ListItem } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { useUser } from 'expo-app/features/auth/hooks/useUser';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
diff --git a/apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts b/packages/app/src/ai-packs/hooks/useGeneratedPacks.ts
similarity index 89%
rename from apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts
rename to packages/app/src/ai-packs/hooks/useGeneratedPacks.ts
index 5b7cdd66ef..9090d9c9bf 100644
--- a/apps/expo/features/ai-packs/hooks/useGeneratedPacks.ts
+++ b/packages/app/src/ai-packs/hooks/useGeneratedPacks.ts
@@ -1,8 +1,8 @@
 import { use$ } from '@legendapp/state/react';
 import type { GenerationRequest } from '@packrat/app/ai-packs';
+import type { Pack } from '@packrat/app/packs';
+import { packsStore } from '@packrat/app/packs/store';
 import { useMutation } from '@tanstack/react-query';
-import type { Pack } from 'expo-app/features/packs';
-import { packsStore } from 'expo-app/features/packs/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { obs } from 'expo-app/lib/store';
 
diff --git a/apps/expo/features/ai-packs/screens/AIPacksScreen.tsx b/packages/app/src/ai-packs/screens/AIPacksScreen.tsx
similarity index 98%
rename from apps/expo/features/ai-packs/screens/AIPacksScreen.tsx
rename to packages/app/src/ai-packs/screens/AIPacksScreen.tsx
index e07cc33606..935a24308a 100644
--- a/apps/expo/features/ai-packs/screens/AIPacksScreen.tsx
+++ b/packages/app/src/ai-packs/screens/AIPacksScreen.tsx
@@ -1,3 +1,4 @@
+import { PackCard } from '@packrat/app/packs/components/PackCard';
 import {
   ActivityIndicator,
   Alert,
@@ -9,7 +10,6 @@ import {
 import { useForm } from '@tanstack/react-form';
 import { Icon } from 'expo-app/components/Icon';
 import { TextInput } from 'expo-app/components/TextInput';
-import { PackCard } from 'expo-app/features/packs/components/PackCard';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
diff --git a/apps/expo/features/ai/atoms/aiModeAtoms.ts b/packages/app/src/ai/atoms/aiModeAtoms.ts
similarity index 100%
rename from apps/expo/features/ai/atoms/aiModeAtoms.ts
rename to packages/app/src/ai/atoms/aiModeAtoms.ts
diff --git a/apps/expo/features/ai/atoms/chatStorageAtoms.ts b/packages/app/src/ai/atoms/chatStorageAtoms.ts
similarity index 100%
rename from apps/expo/features/ai/atoms/chatStorageAtoms.ts
rename to packages/app/src/ai/atoms/chatStorageAtoms.ts
diff --git a/apps/expo/features/ai/components/AIChatTile.tsx b/packages/app/src/ai/components/AIChatTile.tsx
similarity index 100%
rename from apps/expo/features/ai/components/AIChatTile.tsx
rename to packages/app/src/ai/components/AIChatTile.tsx
diff --git a/apps/expo/features/ai/components/AIModeSelector.tsx b/packages/app/src/ai/components/AIModeSelector.tsx
similarity index 100%
rename from apps/expo/features/ai/components/AIModeSelector.tsx
rename to packages/app/src/ai/components/AIModeSelector.tsx
diff --git a/apps/expo/features/ai/components/AIModeSheet.tsx b/packages/app/src/ai/components/AIModeSheet.tsx
similarity index 98%
rename from apps/expo/features/ai/components/AIModeSheet.tsx
rename to packages/app/src/ai/components/AIModeSheet.tsx
index ba61c58a6a..432778edaf 100644
--- a/apps/expo/features/ai/components/AIModeSheet.tsx
+++ b/packages/app/src/ai/components/AIModeSheet.tsx
@@ -1,10 +1,10 @@
 import type { BottomSheetModal } from '@gorhom/bottom-sheet';
 import { BottomSheetView } from '@gorhom/bottom-sheet';
 import { LLAMA_MODEL_SIZE } from '@packrat/app/ai';
+import { useAuthState } from '@packrat/app/auth/hooks/useAuthState';
 import { isFunction } from '@packrat/guards';
 import { Sheet, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { useAuthState } from 'expo-app/features/auth/hooks/useAuthState';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useAtom, useAtomValue } from 'jotai';
diff --git a/apps/expo/features/ai/components/CatalogItemsGenerativeUI.tsx b/packages/app/src/ai/components/CatalogItemsGenerativeUI.tsx
similarity index 97%
rename from apps/expo/features/ai/components/CatalogItemsGenerativeUI.tsx
rename to packages/app/src/ai/components/CatalogItemsGenerativeUI.tsx
index 31849cb652..b484de497d 100644
--- a/apps/expo/features/ai/components/CatalogItemsGenerativeUI.tsx
+++ b/packages/app/src/ai/components/CatalogItemsGenerativeUI.tsx
@@ -1,7 +1,7 @@
 import type { ToolInvocation } from '@packrat/app/ai';
 import type { CatalogItem } from '@packrat/app/catalog';
+import { CatalogItemCard } from '@packrat/app/catalog/components';
 import { Text } from '@packrat/ui/nativewindui';
-import { CatalogItemCard } from 'expo-app/features/catalog/components';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { Dimensions, ScrollView, View } from 'react-native';
diff --git a/apps/expo/features/ai/components/ChatBubble.tsx b/packages/app/src/ai/components/ChatBubble.tsx
similarity index 100%
rename from apps/expo/features/ai/components/ChatBubble.tsx
rename to packages/app/src/ai/components/ChatBubble.tsx
diff --git a/apps/expo/features/ai/components/CircularDownloadButton.tsx b/packages/app/src/ai/components/CircularDownloadButton.tsx
similarity index 100%
rename from apps/expo/features/ai/components/CircularDownloadButton.tsx
rename to packages/app/src/ai/components/CircularDownloadButton.tsx
diff --git a/apps/expo/features/ai/components/ErrorState.tsx b/packages/app/src/ai/components/ErrorState.tsx
similarity index 100%
rename from apps/expo/features/ai/components/ErrorState.tsx
rename to packages/app/src/ai/components/ErrorState.tsx
diff --git a/apps/expo/features/ai/components/GuidesRAGGenerativeUI.tsx b/packages/app/src/ai/components/GuidesRAGGenerativeUI.tsx
similarity index 100%
rename from apps/expo/features/ai/components/GuidesRAGGenerativeUI.tsx
rename to packages/app/src/ai/components/GuidesRAGGenerativeUI.tsx
diff --git a/apps/expo/features/ai/components/LocationContext.tsx b/packages/app/src/ai/components/LocationContext.tsx
similarity index 96%
rename from apps/expo/features/ai/components/LocationContext.tsx
rename to packages/app/src/ai/components/LocationContext.tsx
index 0dc79f0cc7..01128d03b3 100644
--- a/apps/expo/features/ai/components/LocationContext.tsx
+++ b/packages/app/src/ai/components/LocationContext.tsx
@@ -1,6 +1,6 @@
+import { LocationPicker } from '@packrat/app/weather/components/LocationPicker';
 import { Text, useColorScheme } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { LocationPicker } from 'expo-app/features/weather/components/LocationPicker';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router } from 'expo-router';
 import { useState } from 'react';
diff --git a/apps/expo/features/ai/components/PackDetailsGenerativeUI.tsx b/packages/app/src/ai/components/PackDetailsGenerativeUI.tsx
similarity index 94%
rename from apps/expo/features/ai/components/PackDetailsGenerativeUI.tsx
rename to packages/app/src/ai/components/PackDetailsGenerativeUI.tsx
index d0ef2908c9..466b0f016a 100644
--- a/apps/expo/features/ai/components/PackDetailsGenerativeUI.tsx
+++ b/packages/app/src/ai/components/PackDetailsGenerativeUI.tsx
@@ -1,6 +1,6 @@
 import type { ToolInvocation } from '@packrat/app/ai';
 import type { Pack } from '@packrat/app/packs';
-import { PackCard } from 'expo-app/features/packs/components/PackCard';
+import { PackCard } from '@packrat/app/packs/components/PackCard';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { ToolCard } from './ToolCard';
 
diff --git a/apps/expo/features/ai/components/PackItemDetailsGenerativeUI.tsx b/packages/app/src/ai/components/PackItemDetailsGenerativeUI.tsx
similarity index 94%
rename from apps/expo/features/ai/components/PackItemDetailsGenerativeUI.tsx
rename to packages/app/src/ai/components/PackItemDetailsGenerativeUI.tsx
index 21ad17e003..220fa01fc7 100644
--- a/apps/expo/features/ai/components/PackItemDetailsGenerativeUI.tsx
+++ b/packages/app/src/ai/components/PackItemDetailsGenerativeUI.tsx
@@ -1,6 +1,6 @@
 import type { ToolInvocation } from '@packrat/app/ai';
 import type { PackItem } from '@packrat/app/packs';
-import { PackItemCard } from 'expo-app/features/packs/components/PackItemCard';
+import { PackItemCard } from '@packrat/app/packs/components/PackItemCard';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { ToolCard } from './ToolCard';
 
diff --git a/apps/expo/features/ai/components/ReportModal.tsx b/packages/app/src/ai/components/ReportModal.tsx
similarity index 100%
rename from apps/expo/features/ai/components/ReportModal.tsx
rename to packages/app/src/ai/components/ReportModal.tsx
diff --git a/apps/expo/features/ai/components/ReportedContentTile.tsx b/packages/app/src/ai/components/ReportedContentTile.tsx
similarity index 96%
rename from apps/expo/features/ai/components/ReportedContentTile.tsx
rename to packages/app/src/ai/components/ReportedContentTile.tsx
index dff622e0a8..671e8321b9 100644
--- a/apps/expo/features/ai/components/ReportedContentTile.tsx
+++ b/packages/app/src/ai/components/ReportedContentTile.tsx
@@ -1,6 +1,6 @@
+import { useUser } from '@packrat/app/auth/hooks/useUser';
 import { ListItem, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { useUser } from 'expo-app/features/auth/hooks/useUser';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { type Href, useRouter } from 'expo-router';
diff --git a/apps/expo/features/ai/components/ToolCard.tsx b/packages/app/src/ai/components/ToolCard.tsx
similarity index 100%
rename from apps/expo/features/ai/components/ToolCard.tsx
rename to packages/app/src/ai/components/ToolCard.tsx
diff --git a/apps/expo/features/ai/components/ToolInvocationRenderer.tsx b/packages/app/src/ai/components/ToolInvocationRenderer.tsx
similarity index 100%
rename from apps/expo/features/ai/components/ToolInvocationRenderer.tsx
rename to packages/app/src/ai/components/ToolInvocationRenderer.tsx
diff --git a/apps/expo/features/ai/components/WeatherGenerativeUI.tsx b/packages/app/src/ai/components/WeatherGenerativeUI.tsx
similarity index 98%
rename from apps/expo/features/ai/components/WeatherGenerativeUI.tsx
rename to packages/app/src/ai/components/WeatherGenerativeUI.tsx
index 6e0adab4f6..f45e806859 100644
--- a/apps/expo/features/ai/components/WeatherGenerativeUI.tsx
+++ b/packages/app/src/ai/components/WeatherGenerativeUI.tsx
@@ -1,7 +1,7 @@
 import type { ToolInvocation } from '@packrat/app/ai';
+import { getWeatherIconByCondition } from '@packrat/app/weather/lib/weatherIcons';
 import { Text, useColorScheme } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { getWeatherIconByCondition } from 'expo-app/features/weather/lib/weatherIcons';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { View } from 'react-native';
 import { ToolCard } from './ToolCard';
diff --git a/apps/expo/features/ai/components/WebSearchGenerativeUI.tsx b/packages/app/src/ai/components/WebSearchGenerativeUI.tsx
similarity index 100%
rename from apps/expo/features/ai/components/WebSearchGenerativeUI.tsx
rename to packages/app/src/ai/components/WebSearchGenerativeUI.tsx
diff --git a/apps/expo/features/ai/hooks/useReportContent.ts b/packages/app/src/ai/hooks/useReportContent.ts
similarity index 100%
rename from apps/expo/features/ai/hooks/useReportContent.ts
rename to packages/app/src/ai/hooks/useReportContent.ts
diff --git a/apps/expo/features/ai/hooks/useReportedContent.ts b/packages/app/src/ai/hooks/useReportedContent.ts
similarity index 96%
rename from apps/expo/features/ai/hooks/useReportedContent.ts
rename to packages/app/src/ai/hooks/useReportedContent.ts
index cafa618ac3..281e2c2240 100644
--- a/apps/expo/features/ai/hooks/useReportedContent.ts
+++ b/packages/app/src/ai/hooks/useReportedContent.ts
@@ -1,6 +1,6 @@
+import { useUser } from '@packrat/app/auth/hooks/useUser';
 import type { User } from '@packrat/app/profile';
 import { useQuery } from '@tanstack/react-query';
-import { useUser } from 'expo-app/features/auth/hooks/useUser';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 
diff --git a/apps/expo/features/ai/hooks/useUpdateReportStatus.ts b/packages/app/src/ai/hooks/useUpdateReportStatus.ts
similarity index 100%
rename from apps/expo/features/ai/hooks/useUpdateReportStatus.ts
rename to packages/app/src/ai/hooks/useUpdateReportStatus.ts
diff --git a/apps/expo/features/ai/lib/CustomChatTransport.ts b/packages/app/src/ai/lib/CustomChatTransport.ts
similarity index 100%
rename from apps/expo/features/ai/lib/CustomChatTransport.ts
rename to packages/app/src/ai/lib/CustomChatTransport.ts
diff --git a/apps/expo/features/ai/lib/localModelManager.ts b/packages/app/src/ai/lib/localModelManager.ts
similarity index 100%
rename from apps/expo/features/ai/lib/localModelManager.ts
rename to packages/app/src/ai/lib/localModelManager.ts
diff --git a/apps/expo/features/ai/lib/reportReasons.ts b/packages/app/src/ai/lib/reportReasons.ts
similarity index 100%
rename from apps/expo/features/ai/lib/reportReasons.ts
rename to packages/app/src/ai/lib/reportReasons.ts
diff --git a/apps/expo/features/ai/lib/tools.ts b/packages/app/src/ai/lib/tools.ts
similarity index 97%
rename from apps/expo/features/ai/lib/tools.ts
rename to packages/app/src/ai/lib/tools.ts
index b627a5c26b..45e46c0727 100644
--- a/apps/expo/features/ai/lib/tools.ts
+++ b/packages/app/src/ai/lib/tools.ts
@@ -10,10 +10,10 @@
  * through authenticated API endpoints.
  */
 
+import { getPackItems, packItemsStore } from '@packrat/app/packs/store/packItems';
+import { packsStore } from '@packrat/app/packs/store/packs';
+import { getWeatherData, searchLocations } from '@packrat/app/weather/lib/weatherService';
 import { tool } from 'ai';
-import { getPackItems, packItemsStore } from 'expo-app/features/packs/store/packItems';
-import { packsStore } from 'expo-app/features/packs/store/packs';
-import { getWeatherData, searchLocations } from 'expo-app/features/weather/lib/weatherService';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { z } from 'zod';
 
diff --git a/apps/expo/features/ai/screens/ReportedContentScreen.tsx b/packages/app/src/ai/screens/ReportedContentScreen.tsx
similarity index 100%
rename from apps/expo/features/ai/screens/ReportedContentScreen.tsx
rename to packages/app/src/ai/screens/ReportedContentScreen.tsx
diff --git a/apps/expo/features/auth/atoms/authAtoms.ts b/packages/app/src/auth/atoms/authAtoms.ts
similarity index 100%
rename from apps/expo/features/auth/atoms/authAtoms.ts
rename to packages/app/src/auth/atoms/authAtoms.ts
diff --git a/apps/expo/features/auth/components/DeleteAccountButton.tsx b/packages/app/src/auth/components/DeleteAccountButton.tsx
similarity index 97%
rename from apps/expo/features/auth/components/DeleteAccountButton.tsx
rename to packages/app/src/auth/components/DeleteAccountButton.tsx
index 43654984d9..e31202dfd3 100644
--- a/apps/expo/features/auth/components/DeleteAccountButton.tsx
+++ b/packages/app/src/auth/components/DeleteAccountButton.tsx
@@ -1,7 +1,7 @@
+import { useAuth } from '@packrat/app/auth/hooks/useAuth';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { ActivityIndicator, Alert, Button, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { useAuth } from 'expo-app/features/auth/hooks/useAuth';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRef, useState } from 'react';
diff --git a/apps/expo/features/auth/hocs/index.ts b/packages/app/src/auth/hocs/index.ts
similarity index 100%
rename from apps/expo/features/auth/hocs/index.ts
rename to packages/app/src/auth/hocs/index.ts
diff --git a/apps/expo/features/auth/hocs/withAuthWall.tsx b/packages/app/src/auth/hocs/withAuthWall.tsx
similarity index 100%
rename from apps/expo/features/auth/hocs/withAuthWall.tsx
rename to packages/app/src/auth/hocs/withAuthWall.tsx
diff --git a/apps/expo/features/auth/hooks/useAuth.ts b/packages/app/src/auth/hooks/useAuth.ts
similarity index 100%
rename from apps/expo/features/auth/hooks/useAuth.ts
rename to packages/app/src/auth/hooks/useAuth.ts
diff --git a/apps/expo/features/auth/hooks/useAuthActions.ts b/packages/app/src/auth/hooks/useAuthActions.ts
similarity index 99%
rename from apps/expo/features/auth/hooks/useAuthActions.ts
rename to packages/app/src/auth/hooks/useAuthActions.ts
index 98030b51c1..222bfd2152 100644
--- a/apps/expo/features/auth/hooks/useAuthActions.ts
+++ b/packages/app/src/auth/hooks/useAuthActions.ts
@@ -1,3 +1,4 @@
+import { isAuthed, userStore } from '@packrat/app/auth/store';
 import type { User } from '@packrat/app/profile';
 import { isObject } from '@packrat/guards';
 import AsyncStorage from '@react-native-async-storage/async-storage';
@@ -6,7 +7,6 @@ import {
   isErrorWithCode,
   statusCodes,
 } from '@react-native-google-signin/google-signin';
-import { isAuthed, userStore } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { t } from 'expo-app/lib/i18n';
 import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
diff --git a/apps/expo/features/auth/hooks/useAuthInit.ts b/packages/app/src/auth/hooks/useAuthInit.ts
similarity index 100%
rename from apps/expo/features/auth/hooks/useAuthInit.ts
rename to packages/app/src/auth/hooks/useAuthInit.ts
diff --git a/apps/expo/features/auth/hooks/useAuthState.ts b/packages/app/src/auth/hooks/useAuthState.ts
similarity index 100%
rename from apps/expo/features/auth/hooks/useAuthState.ts
rename to packages/app/src/auth/hooks/useAuthState.ts
diff --git a/apps/expo/features/auth/hooks/useUser.ts b/packages/app/src/auth/hooks/useUser.ts
similarity index 100%
rename from apps/expo/features/auth/hooks/useUser.ts
rename to packages/app/src/auth/hooks/useUser.ts
diff --git a/apps/expo/features/auth/store/index.ts b/packages/app/src/auth/store/index.ts
similarity index 100%
rename from apps/expo/features/auth/store/index.ts
rename to packages/app/src/auth/store/index.ts
diff --git a/apps/expo/features/auth/store/user.ts b/packages/app/src/auth/store/user.ts
similarity index 100%
rename from apps/expo/features/auth/store/user.ts
rename to packages/app/src/auth/store/user.ts
diff --git a/apps/expo/features/catalog/components/CatalogBrowserModal.tsx b/packages/app/src/catalog/components/CatalogBrowserModal.tsx
similarity index 99%
rename from apps/expo/features/catalog/components/CatalogBrowserModal.tsx
rename to packages/app/src/catalog/components/CatalogBrowserModal.tsx
index d7d29a2586..afc1a40ae9 100644
--- a/apps/expo/features/catalog/components/CatalogBrowserModal.tsx
+++ b/packages/app/src/catalog/components/CatalogBrowserModal.tsx
@@ -1,10 +1,10 @@
 import type { CatalogItem } from '@packrat/app/catalog';
+import { HorizontalCatalogItemCard } from '@packrat/app/packs/components/HorizontalCatalogItemCard';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { searchValueAtom } from 'expo-app/atoms/itemListAtoms';
 import { CategoriesFilter } from 'expo-app/components/CategoriesFilter';
 import { Icon } from 'expo-app/components/Icon';
 import { SearchInput } from 'expo-app/components/SearchInput';
-import { HorizontalCatalogItemCard } from 'expo-app/features/packs/components/HorizontalCatalogItemCard';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useAtom } from 'jotai';
diff --git a/apps/expo/features/catalog/components/CatalogCategoriesFilter.tsx b/packages/app/src/catalog/components/CatalogCategoriesFilter.tsx
similarity index 100%
rename from apps/expo/features/catalog/components/CatalogCategoriesFilter.tsx
rename to packages/app/src/catalog/components/CatalogCategoriesFilter.tsx
diff --git a/apps/expo/features/catalog/components/CatalogItemCard.tsx b/packages/app/src/catalog/components/CatalogItemCard.tsx
similarity index 100%
rename from apps/expo/features/catalog/components/CatalogItemCard.tsx
rename to packages/app/src/catalog/components/CatalogItemCard.tsx
diff --git a/apps/expo/features/catalog/components/CatalogItemImage.tsx b/packages/app/src/catalog/components/CatalogItemImage.tsx
similarity index 100%
rename from apps/expo/features/catalog/components/CatalogItemImage.tsx
rename to packages/app/src/catalog/components/CatalogItemImage.tsx
diff --git a/apps/expo/features/catalog/components/CatalogItemSelectCard.tsx b/packages/app/src/catalog/components/CatalogItemSelectCard.tsx
similarity index 100%
rename from apps/expo/features/catalog/components/CatalogItemSelectCard.tsx
rename to packages/app/src/catalog/components/CatalogItemSelectCard.tsx
diff --git a/apps/expo/features/catalog/components/CatalogItemsAuthWall.tsx b/packages/app/src/catalog/components/CatalogItemsAuthWall.tsx
similarity index 100%
rename from apps/expo/features/catalog/components/CatalogItemsAuthWall.tsx
rename to packages/app/src/catalog/components/CatalogItemsAuthWall.tsx
diff --git a/apps/expo/features/catalog/components/ItemLinks.tsx b/packages/app/src/catalog/components/ItemLinks.tsx
similarity index 100%
rename from apps/expo/features/catalog/components/ItemLinks.tsx
rename to packages/app/src/catalog/components/ItemLinks.tsx
diff --git a/apps/expo/features/catalog/components/ItemReviews.tsx b/packages/app/src/catalog/components/ItemReviews.tsx
similarity index 100%
rename from apps/expo/features/catalog/components/ItemReviews.tsx
rename to packages/app/src/catalog/components/ItemReviews.tsx
diff --git a/apps/expo/features/catalog/components/SimilarItems.tsx b/packages/app/src/catalog/components/SimilarItems.tsx
similarity index 97%
rename from apps/expo/features/catalog/components/SimilarItems.tsx
rename to packages/app/src/catalog/components/SimilarItems.tsx
index 6883533197..9426562cf2 100644
--- a/apps/expo/features/catalog/components/SimilarItems.tsx
+++ b/packages/app/src/catalog/components/SimilarItems.tsx
@@ -1,5 +1,5 @@
+import { type SimilarItem, useSimilarCatalogItems } from '@packrat/app/catalog/hooks';
 import { Text } from '@packrat/ui/nativewindui';
-import { type SimilarItem, useSimilarCatalogItems } from 'expo-app/features/catalog/hooks';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import type React from 'react';
diff --git a/apps/expo/features/catalog/components/index.ts b/packages/app/src/catalog/components/index.ts
similarity index 100%
rename from apps/expo/features/catalog/components/index.ts
rename to packages/app/src/catalog/components/index.ts
diff --git a/apps/expo/features/catalog/hooks/index.ts b/packages/app/src/catalog/hooks/index.ts
similarity index 100%
rename from apps/expo/features/catalog/hooks/index.ts
rename to packages/app/src/catalog/hooks/index.ts
diff --git a/apps/expo/features/catalog/hooks/useCatalogItemDetails.ts b/packages/app/src/catalog/hooks/useCatalogItemDetails.ts
similarity index 100%
rename from apps/expo/features/catalog/hooks/useCatalogItemDetails.ts
rename to packages/app/src/catalog/hooks/useCatalogItemDetails.ts
diff --git a/apps/expo/features/catalog/hooks/useCatalogItems.ts b/packages/app/src/catalog/hooks/useCatalogItems.ts
similarity index 100%
rename from apps/expo/features/catalog/hooks/useCatalogItems.ts
rename to packages/app/src/catalog/hooks/useCatalogItems.ts
diff --git a/apps/expo/features/catalog/hooks/useCatalogItemsCategories.ts b/packages/app/src/catalog/hooks/useCatalogItemsCategories.ts
similarity index 100%
rename from apps/expo/features/catalog/hooks/useCatalogItemsCategories.ts
rename to packages/app/src/catalog/hooks/useCatalogItemsCategories.ts
diff --git a/apps/expo/features/catalog/hooks/usePopularCatalogItems.ts b/packages/app/src/catalog/hooks/usePopularCatalogItems.ts
similarity index 100%
rename from apps/expo/features/catalog/hooks/usePopularCatalogItems.ts
rename to packages/app/src/catalog/hooks/usePopularCatalogItems.ts
diff --git a/apps/expo/features/catalog/hooks/useRecentlyUsedCatalogItems.ts b/packages/app/src/catalog/hooks/useRecentlyUsedCatalogItems.ts
similarity index 100%
rename from apps/expo/features/catalog/hooks/useRecentlyUsedCatalogItems.ts
rename to packages/app/src/catalog/hooks/useRecentlyUsedCatalogItems.ts
diff --git a/apps/expo/features/catalog/hooks/useSimilarItems.ts b/packages/app/src/catalog/hooks/useSimilarItems.ts
similarity index 100%
rename from apps/expo/features/catalog/hooks/useSimilarItems.ts
rename to packages/app/src/catalog/hooks/useSimilarItems.ts
diff --git a/apps/expo/features/catalog/hooks/useVectorSearch.ts b/packages/app/src/catalog/hooks/useVectorSearch.ts
similarity index 100%
rename from apps/expo/features/catalog/hooks/useVectorSearch.ts
rename to packages/app/src/catalog/hooks/useVectorSearch.ts
diff --git a/apps/expo/features/catalog/lib/cacheCatalogItemImage.ts b/packages/app/src/catalog/lib/cacheCatalogItemImage.ts
similarity index 100%
rename from apps/expo/features/catalog/lib/cacheCatalogItemImage.ts
rename to packages/app/src/catalog/lib/cacheCatalogItemImage.ts
diff --git a/apps/expo/features/catalog/screens/AddCatalogItemDetailsScreen.tsx b/packages/app/src/catalog/screens/AddCatalogItemDetailsScreen.tsx
similarity index 98%
rename from apps/expo/features/catalog/screens/AddCatalogItemDetailsScreen.tsx
rename to packages/app/src/catalog/screens/AddCatalogItemDetailsScreen.tsx
index 57f8497501..a7d04d4f6b 100644
--- a/apps/expo/features/catalog/screens/AddCatalogItemDetailsScreen.tsx
+++ b/packages/app/src/catalog/screens/AddCatalogItemDetailsScreen.tsx
@@ -1,12 +1,13 @@
 import { WeightUnitSchema } from '@packrat/api/types';
 import type { CatalogItem } from '@packrat/app/catalog';
+import { useCreatePackItem } from '@packrat/app/packs/hooks/useCreatePackItem';
+import { usePackDetailsFromStore } from '@packrat/app/packs/hooks/usePackDetailsFromStore';
 import { assertDefined, fromZod } from '@packrat/guards';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { useQueryClient } from '@tanstack/react-query';
 import * as Burnt from 'burnt';
 import { Icon } from 'expo-app/components/Icon';
 import { TextInput } from 'expo-app/components/TextInput';
-import { useCreatePackItem, usePackDetailsFromStore } from 'expo-app/features/packs';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { ErrorScreen } from 'expo-app/screens/ErrorScreen';
diff --git a/apps/expo/features/catalog/screens/CatalogItemDetailScreen.tsx b/packages/app/src/catalog/screens/CatalogItemDetailScreen.tsx
similarity index 97%
rename from apps/expo/features/catalog/screens/CatalogItemDetailScreen.tsx
rename to packages/app/src/catalog/screens/CatalogItemDetailScreen.tsx
index c580b58e78..e7c771d27f 100644
--- a/apps/expo/features/catalog/screens/CatalogItemDetailScreen.tsx
+++ b/packages/app/src/catalog/screens/CatalogItemDetailScreen.tsx
@@ -1,12 +1,12 @@
 import { Ionicons } from '@expo/vector-icons';
 import { normalizeDescription } from '@packrat/app/catalog';
+import { ItemLinks } from '@packrat/app/catalog/components/ItemLinks';
+import { ItemReviews } from '@packrat/app/catalog/components/ItemReviews';
+import { SimilarItems } from '@packrat/app/catalog/components/SimilarItems';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { Chip } from 'expo-app/components/initial/Chip';
 import { ExpandableText } from 'expo-app/components/initial/ExpandableText';
-import { ItemLinks } from 'expo-app/features/catalog/components/ItemLinks';
-import { ItemReviews } from 'expo-app/features/catalog/components/ItemReviews';
-import { SimilarItems } from 'expo-app/features/catalog/components/SimilarItems';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { testIds } from 'expo-app/lib/testIds';
diff --git a/apps/expo/features/catalog/screens/CatalogItemsScreen.tsx b/packages/app/src/catalog/screens/CatalogItemsScreen.tsx
similarity index 99%
rename from apps/expo/features/catalog/screens/CatalogItemsScreen.tsx
rename to packages/app/src/catalog/screens/CatalogItemsScreen.tsx
index bc4c64b4ff..e3c4151cf7 100644
--- a/apps/expo/features/catalog/screens/CatalogItemsScreen.tsx
+++ b/packages/app/src/catalog/screens/CatalogItemsScreen.tsx
@@ -1,3 +1,4 @@
+import { withAuthWall } from '@packrat/app/auth/hocs';
 import type { CatalogItem } from '@packrat/app/catalog';
 import { LargeTitleHeader, type LargeTitleSearchBarMethods, Text } from '@packrat/ui/nativewindui';
 import { searchValueAtom } from 'expo-app/atoms/itemListAtoms';
@@ -6,7 +7,6 @@ import { CategoriesFilter } from 'expo-app/components/CategoriesFilter';
 import { Icon } from 'expo-app/components/Icon';
 import { LargeTitleHeaderOverlapFixIOS } from 'expo-app/components/LargeTitleHeaderOverlapFixIOS';
 import { LargeTitleHeaderSearchContentContainer } from 'expo-app/components/LargeTitleHeaderSearchContentContainer';
-import { withAuthWall } from 'expo-app/features/auth/hocs';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { testIds } from 'expo-app/lib/testIds';
diff --git a/apps/expo/features/catalog/screens/PackSelectionScreen.tsx b/packages/app/src/catalog/screens/PackSelectionScreen.tsx
similarity index 98%
rename from apps/expo/features/catalog/screens/PackSelectionScreen.tsx
rename to packages/app/src/catalog/screens/PackSelectionScreen.tsx
index 3ed7205a48..e537bf1d0e 100644
--- a/apps/expo/features/catalog/screens/PackSelectionScreen.tsx
+++ b/packages/app/src/catalog/screens/PackSelectionScreen.tsx
@@ -1,7 +1,7 @@
+import { useDetailedPacks } from '@packrat/app/packs/hooks/useDetailedPacks';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { SearchInput } from 'expo-app/components/SearchInput';
-import { useDetailedPacks } from 'expo-app/features/packs';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useLocalSearchParams, useRouter } from 'expo-router';
diff --git a/apps/expo/features/feed/components/CommentItem.tsx b/packages/app/src/feed/components/CommentItem.tsx
similarity index 100%
rename from apps/expo/features/feed/components/CommentItem.tsx
rename to packages/app/src/feed/components/CommentItem.tsx
diff --git a/apps/expo/features/feed/components/FeedTile.tsx b/packages/app/src/feed/components/FeedTile.tsx
similarity index 100%
rename from apps/expo/features/feed/components/FeedTile.tsx
rename to packages/app/src/feed/components/FeedTile.tsx
diff --git a/apps/expo/features/feed/components/PostCard.tsx b/packages/app/src/feed/components/PostCard.tsx
similarity index 100%
rename from apps/expo/features/feed/components/PostCard.tsx
rename to packages/app/src/feed/components/PostCard.tsx
diff --git a/apps/expo/features/feed/components/index.ts b/packages/app/src/feed/components/index.ts
similarity index 100%
rename from apps/expo/features/feed/components/index.ts
rename to packages/app/src/feed/components/index.ts
diff --git a/apps/expo/features/feed/hooks/index.ts b/packages/app/src/feed/hooks/index.ts
similarity index 100%
rename from apps/expo/features/feed/hooks/index.ts
rename to packages/app/src/feed/hooks/index.ts
diff --git a/apps/expo/features/feed/hooks/useAddComment.ts b/packages/app/src/feed/hooks/useAddComment.ts
similarity index 100%
rename from apps/expo/features/feed/hooks/useAddComment.ts
rename to packages/app/src/feed/hooks/useAddComment.ts
diff --git a/apps/expo/features/feed/hooks/useCreatePost.ts b/packages/app/src/feed/hooks/useCreatePost.ts
similarity index 100%
rename from apps/expo/features/feed/hooks/useCreatePost.ts
rename to packages/app/src/feed/hooks/useCreatePost.ts
diff --git a/apps/expo/features/feed/hooks/useDeleteComment.ts b/packages/app/src/feed/hooks/useDeleteComment.ts
similarity index 100%
rename from apps/expo/features/feed/hooks/useDeleteComment.ts
rename to packages/app/src/feed/hooks/useDeleteComment.ts
diff --git a/apps/expo/features/feed/hooks/useDeletePost.ts b/packages/app/src/feed/hooks/useDeletePost.ts
similarity index 100%
rename from apps/expo/features/feed/hooks/useDeletePost.ts
rename to packages/app/src/feed/hooks/useDeletePost.ts
diff --git a/apps/expo/features/feed/hooks/useFeed.ts b/packages/app/src/feed/hooks/useFeed.ts
similarity index 100%
rename from apps/expo/features/feed/hooks/useFeed.ts
rename to packages/app/src/feed/hooks/useFeed.ts
diff --git a/apps/expo/features/feed/hooks/usePostComments.ts b/packages/app/src/feed/hooks/usePostComments.ts
similarity index 100%
rename from apps/expo/features/feed/hooks/usePostComments.ts
rename to packages/app/src/feed/hooks/usePostComments.ts
diff --git a/apps/expo/features/feed/hooks/useToggleCommentLike.ts b/packages/app/src/feed/hooks/useToggleCommentLike.ts
similarity index 100%
rename from apps/expo/features/feed/hooks/useToggleCommentLike.ts
rename to packages/app/src/feed/hooks/useToggleCommentLike.ts
diff --git a/apps/expo/features/feed/hooks/useTogglePostLike.ts b/packages/app/src/feed/hooks/useTogglePostLike.ts
similarity index 100%
rename from apps/expo/features/feed/hooks/useTogglePostLike.ts
rename to packages/app/src/feed/hooks/useTogglePostLike.ts
diff --git a/apps/expo/features/feed/screens/CreatePostScreen.tsx b/packages/app/src/feed/screens/CreatePostScreen.tsx
similarity index 98%
rename from apps/expo/features/feed/screens/CreatePostScreen.tsx
rename to packages/app/src/feed/screens/CreatePostScreen.tsx
index 68fa39c5e1..21783fcaee 100644
--- a/apps/expo/features/feed/screens/CreatePostScreen.tsx
+++ b/packages/app/src/feed/screens/CreatePostScreen.tsx
@@ -1,7 +1,7 @@
+import { uploadImage } from '@packrat/app/packs/utils/uploadImage';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { TextInput } from 'expo-app/components/TextInput';
-import { uploadImage } from 'expo-app/features/packs/utils/uploadImage';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import * as ImagePicker from 'expo-image-picker';
diff --git a/apps/expo/features/feed/screens/FeedScreen.tsx b/packages/app/src/feed/screens/FeedScreen.tsx
similarity index 98%
rename from apps/expo/features/feed/screens/FeedScreen.tsx
rename to packages/app/src/feed/screens/FeedScreen.tsx
index 6f1b67eff5..0a13893b59 100644
--- a/apps/expo/features/feed/screens/FeedScreen.tsx
+++ b/packages/app/src/feed/screens/FeedScreen.tsx
@@ -1,7 +1,7 @@
+import { userStore } from '@packrat/app/auth/store';
 import type { Post } from '@packrat/app/feed';
 import { ActivityIndicator, Button, LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { userStore } from 'expo-app/features/auth/store';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
diff --git a/apps/expo/features/feed/screens/PostDetailScreen.tsx b/packages/app/src/feed/screens/PostDetailScreen.tsx
similarity index 100%
rename from apps/expo/features/feed/screens/PostDetailScreen.tsx
rename to packages/app/src/feed/screens/PostDetailScreen.tsx
diff --git a/apps/expo/features/feed/screens/index.ts b/packages/app/src/feed/screens/index.ts
similarity index 100%
rename from apps/expo/features/feed/screens/index.ts
rename to packages/app/src/feed/screens/index.ts
diff --git a/apps/expo/features/feed/utils/__tests__/feedUtils.test.ts b/packages/app/src/feed/utils/__tests__/feedUtils.test.ts
similarity index 100%
rename from apps/expo/features/feed/utils/__tests__/feedUtils.test.ts
rename to packages/app/src/feed/utils/__tests__/feedUtils.test.ts
diff --git a/apps/expo/features/feed/utils/index.ts b/packages/app/src/feed/utils/index.ts
similarity index 100%
rename from apps/expo/features/feed/utils/index.ts
rename to packages/app/src/feed/utils/index.ts
diff --git a/apps/expo/features/guides/components/GuideCard.tsx b/packages/app/src/guides/components/GuideCard.tsx
similarity index 100%
rename from apps/expo/features/guides/components/GuideCard.tsx
rename to packages/app/src/guides/components/GuideCard.tsx
diff --git a/apps/expo/features/guides/components/GuidesTile.tsx b/packages/app/src/guides/components/GuidesTile.tsx
similarity index 100%
rename from apps/expo/features/guides/components/GuidesTile.tsx
rename to packages/app/src/guides/components/GuidesTile.tsx
diff --git a/apps/expo/features/guides/components/index.ts b/packages/app/src/guides/components/index.ts
similarity index 100%
rename from apps/expo/features/guides/components/index.ts
rename to packages/app/src/guides/components/index.ts
diff --git a/apps/expo/features/guides/hooks/index.ts b/packages/app/src/guides/hooks/index.ts
similarity index 100%
rename from apps/expo/features/guides/hooks/index.ts
rename to packages/app/src/guides/hooks/index.ts
diff --git a/apps/expo/features/guides/hooks/useGuideCategories.ts b/packages/app/src/guides/hooks/useGuideCategories.ts
similarity index 100%
rename from apps/expo/features/guides/hooks/useGuideCategories.ts
rename to packages/app/src/guides/hooks/useGuideCategories.ts
diff --git a/apps/expo/features/guides/hooks/useGuideDetails.ts b/packages/app/src/guides/hooks/useGuideDetails.ts
similarity index 100%
rename from apps/expo/features/guides/hooks/useGuideDetails.ts
rename to packages/app/src/guides/hooks/useGuideDetails.ts
diff --git a/apps/expo/features/guides/hooks/useGuides.ts b/packages/app/src/guides/hooks/useGuides.ts
similarity index 100%
rename from apps/expo/features/guides/hooks/useGuides.ts
rename to packages/app/src/guides/hooks/useGuides.ts
diff --git a/apps/expo/features/guides/hooks/useSearchGuides.ts b/packages/app/src/guides/hooks/useSearchGuides.ts
similarity index 100%
rename from apps/expo/features/guides/hooks/useSearchGuides.ts
rename to packages/app/src/guides/hooks/useSearchGuides.ts
diff --git a/apps/expo/features/guides/screens/GuideDetailScreen.tsx b/packages/app/src/guides/screens/GuideDetailScreen.tsx
similarity index 100%
rename from apps/expo/features/guides/screens/GuideDetailScreen.tsx
rename to packages/app/src/guides/screens/GuideDetailScreen.tsx
diff --git a/apps/expo/features/guides/screens/GuidesListScreen.tsx b/packages/app/src/guides/screens/GuidesListScreen.tsx
similarity index 100%
rename from apps/expo/features/guides/screens/GuidesListScreen.tsx
rename to packages/app/src/guides/screens/GuidesListScreen.tsx
diff --git a/apps/expo/features/guides/screens/index.ts b/packages/app/src/guides/screens/index.ts
similarity index 100%
rename from apps/expo/features/guides/screens/index.ts
rename to packages/app/src/guides/screens/index.ts
diff --git a/apps/expo/features/offline-ai/__tests__/offline-ai.test.ts b/packages/app/src/offline-ai/offline-ai/__tests__/offline-ai.test.ts
similarity index 100%
rename from apps/expo/features/offline-ai/__tests__/offline-ai.test.ts
rename to packages/app/src/offline-ai/offline-ai/__tests__/offline-ai.test.ts
diff --git a/apps/expo/features/offline-ai/lib/MockLLMProvider.ts b/packages/app/src/offline-ai/offline-ai/lib/MockLLMProvider.ts
similarity index 100%
rename from apps/expo/features/offline-ai/lib/MockLLMProvider.ts
rename to packages/app/src/offline-ai/offline-ai/lib/MockLLMProvider.ts
diff --git a/apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx b/packages/app/src/pack-templates/components/AddPackTemplateItemActions.tsx
similarity index 95%
rename from apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx
rename to packages/app/src/pack-templates/components/AddPackTemplateItemActions.tsx
index 5ddda279b2..0e1f22cd52 100644
--- a/apps/expo/features/pack-templates/components/AddPackTemplateItemActions.tsx
+++ b/packages/app/src/pack-templates/components/AddPackTemplateItemActions.tsx
@@ -1,16 +1,16 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import type { BottomSheetModal } from '@gorhom/bottom-sheet';
 import { BottomSheetView } from '@gorhom/bottom-sheet';
+import { isAuthed } from '@packrat/app/auth/store';
 import type { CatalogItem } from '@packrat/app/catalog';
+import { CatalogBrowserModal } from '@packrat/app/catalog/components';
+import { useRecentlyUsedCatalogItems } from '@packrat/app/catalog/hooks/useRecentlyUsedCatalogItems';
+import { useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
 import { isFunction, nullToUndefined } from '@packrat/guards';
 import { Sheet, Text, useColorScheme } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
 import { appAlert } from 'expo-app/app/_layout';
 import { Icon } from 'expo-app/components/Icon';
-import { isAuthed } from 'expo-app/features/auth/store';
-import { CatalogBrowserModal } from 'expo-app/features/catalog/components';
-import { useRecentlyUsedCatalogItems } from 'expo-app/features/catalog/hooks/useRecentlyUsedCatalogItems';
-import { useImagePicker } from 'expo-app/features/packs';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router } from 'expo-router';
 import React from 'react';
diff --git a/apps/expo/features/pack-templates/components/AppTemplateBadge.tsx b/packages/app/src/pack-templates/components/AppTemplateBadge.tsx
similarity index 100%
rename from apps/expo/features/pack-templates/components/AppTemplateBadge.tsx
rename to packages/app/src/pack-templates/components/AppTemplateBadge.tsx
diff --git a/apps/expo/features/pack-templates/components/FeaturedPacksSection.tsx b/packages/app/src/pack-templates/components/FeaturedPacksSection.tsx
similarity index 100%
rename from apps/expo/features/pack-templates/components/FeaturedPacksSection.tsx
rename to packages/app/src/pack-templates/components/FeaturedPacksSection.tsx
diff --git a/apps/expo/features/pack-templates/components/OnlineContentImportModal.tsx b/packages/app/src/pack-templates/components/OnlineContentImportModal.tsx
similarity index 100%
rename from apps/expo/features/pack-templates/components/OnlineContentImportModal.tsx
rename to packages/app/src/pack-templates/components/OnlineContentImportModal.tsx
diff --git a/apps/expo/features/pack-templates/components/PackTemplateCard.tsx b/packages/app/src/pack-templates/components/PackTemplateCard.tsx
similarity index 100%
rename from apps/expo/features/pack-templates/components/PackTemplateCard.tsx
rename to packages/app/src/pack-templates/components/PackTemplateCard.tsx
diff --git a/apps/expo/features/pack-templates/components/PackTemplateForm.tsx b/packages/app/src/pack-templates/components/PackTemplateForm.tsx
similarity index 99%
rename from apps/expo/features/pack-templates/components/PackTemplateForm.tsx
rename to packages/app/src/pack-templates/components/PackTemplateForm.tsx
index 0c74e395d9..07e9f7d22c 100644
--- a/apps/expo/features/pack-templates/components/PackTemplateForm.tsx
+++ b/packages/app/src/pack-templates/components/PackTemplateForm.tsx
@@ -1,4 +1,5 @@
 import { PackCategorySchema } from '@packrat/api/types';
+import { useUser } from '@packrat/app/auth/hooks/useUser';
 import type { PackTemplate } from '@packrat/app/pack-templates';
 import { fromZod } from '@packrat/guards';
 import {
@@ -12,7 +13,6 @@ import {
 } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
 import { Icon } from 'expo-app/components/Icon';
-import { useUser } from 'expo-app/features/auth/hooks/useUser';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
diff --git a/apps/expo/features/pack-templates/components/PackTemplateItemCard.tsx b/packages/app/src/pack-templates/components/PackTemplateItemCard.tsx
similarity index 98%
rename from apps/expo/features/pack-templates/components/PackTemplateItemCard.tsx
rename to packages/app/src/pack-templates/components/PackTemplateItemCard.tsx
index e6a4ead02f..1a896cbef9 100644
--- a/apps/expo/features/pack-templates/components/PackTemplateItemCard.tsx
+++ b/packages/app/src/pack-templates/components/PackTemplateItemCard.tsx
@@ -1,9 +1,9 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import { useUser } from '@packrat/app/auth/hooks/useUser';
 import type { PackTemplateItem } from '@packrat/app/pack-templates';
 import { Text } from '@packrat/ui/nativewindui';
 import { appAlert } from 'expo-app/app/_layout';
 import { Icon } from 'expo-app/components/Icon';
-import { useUser } from 'expo-app/features/auth/hooks/useUser';
 import { cn } from 'expo-app/lib/cn';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
diff --git a/apps/expo/features/pack-templates/components/PackTemplateItemImage.tsx b/packages/app/src/pack-templates/components/PackTemplateItemImage.tsx
similarity index 85%
rename from apps/expo/features/pack-templates/components/PackTemplateItemImage.tsx
rename to packages/app/src/pack-templates/components/PackTemplateItemImage.tsx
index 68e7281b03..ae2a302875 100644
--- a/apps/expo/features/pack-templates/components/PackTemplateItemImage.tsx
+++ b/packages/app/src/pack-templates/components/PackTemplateItemImage.tsx
@@ -1,8 +1,8 @@
+import { CatalogItemImage } from '@packrat/app/catalog/components/CatalogItemImage';
 import type { PackTemplateItem } from '@packrat/app/pack-templates';
+import { CachedImage } from '@packrat/app/packs/components/CachedImage';
 import { useColorScheme } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { CatalogItemImage } from 'expo-app/features/catalog/components/CatalogItemImage';
-import { CachedImage } from 'expo-app/features/packs/components/CachedImage';
 import { buildImageUrl } from 'expo-app/lib/utils/buildImageUrl';
 import { type ImageProps, View } from 'react-native';
 
diff --git a/apps/expo/features/pack-templates/components/PackTemplatesTile.tsx b/packages/app/src/pack-templates/components/PackTemplatesTile.tsx
similarity index 100%
rename from apps/expo/features/pack-templates/components/PackTemplatesTile.tsx
rename to packages/app/src/pack-templates/components/PackTemplatesTile.tsx
diff --git a/apps/expo/features/pack-templates/components/TemplateCreationOptions.tsx b/packages/app/src/pack-templates/components/TemplateCreationOptions.tsx
similarity index 97%
rename from apps/expo/features/pack-templates/components/TemplateCreationOptions.tsx
rename to packages/app/src/pack-templates/components/TemplateCreationOptions.tsx
index 514b3bf0ce..d363b574aa 100644
--- a/apps/expo/features/pack-templates/components/TemplateCreationOptions.tsx
+++ b/packages/app/src/pack-templates/components/TemplateCreationOptions.tsx
@@ -1,9 +1,9 @@
 import type { BottomSheetModal } from '@gorhom/bottom-sheet';
 import { BottomSheetView } from '@gorhom/bottom-sheet';
+import { useAuth } from '@packrat/app/auth/hooks/useAuth';
+import { useUser } from '@packrat/app/auth/hooks/useUser';
 import { Sheet, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { useAuth } from 'expo-app/features/auth/hooks/useAuth';
-import { useUser } from 'expo-app/features/auth/hooks/useUser';
 import { useBottomSheetAction } from 'expo-app/lib/hooks/useBottomSheetAction';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
diff --git a/apps/expo/features/pack-templates/hooks/index.ts b/packages/app/src/pack-templates/hooks/index.ts
similarity index 100%
rename from apps/expo/features/pack-templates/hooks/index.ts
rename to packages/app/src/pack-templates/hooks/index.ts
diff --git a/apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts b/packages/app/src/pack-templates/hooks/useBulkAddCatalogItems.ts
similarity index 95%
rename from apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts
rename to packages/app/src/pack-templates/hooks/useBulkAddCatalogItems.ts
index 136d5ee641..d5982875ae 100644
--- a/apps/expo/features/pack-templates/hooks/useBulkAddCatalogItems.ts
+++ b/packages/app/src/pack-templates/hooks/useBulkAddCatalogItems.ts
@@ -1,7 +1,7 @@
 import { WeightUnitSchema } from '@packrat/api/types';
 import type { CatalogItemWithPackItemFields } from '@packrat/app/catalog';
+import { cacheCatalogItemImage } from '@packrat/app/catalog/lib/cacheCatalogItemImage';
 import { fromZod } from '@packrat/guards';
-import { cacheCatalogItemImage } from 'expo-app/features/catalog/lib/cacheCatalogItemImage';
 import { useState } from 'react';
 import { useCreatePackTemplateItem } from './useCreatePackTemplateItem';
 
diff --git a/apps/expo/features/pack-templates/hooks/useCreatePackFromTemplate.ts b/packages/app/src/pack-templates/hooks/useCreatePackFromTemplate.ts
similarity index 75%
rename from apps/expo/features/pack-templates/hooks/useCreatePackFromTemplate.ts
rename to packages/app/src/pack-templates/hooks/useCreatePackFromTemplate.ts
index c162fe59e4..a874a9d1ad 100644
--- a/apps/expo/features/pack-templates/hooks/useCreatePackFromTemplate.ts
+++ b/packages/app/src/pack-templates/hooks/useCreatePackFromTemplate.ts
@@ -1,8 +1,9 @@
 // hooks/useCreatePackFromTemplate.ts
 
+import { getTemplateItems } from '@packrat/app/pack-templates/store';
 import type { PackInput } from '@packrat/app/packs';
-import { getTemplateItems } from 'expo-app/features/pack-templates/store';
-import { useCreatePack, useCreatePackItem } from 'expo-app/features/packs';
+import { useCreatePack } from '@packrat/app/packs/hooks/useCreatePack';
+import { useCreatePackItem } from '@packrat/app/packs/hooks/useCreatePackItem';
 import { useCallback } from 'react';
 
 export function useCreatePackFromTemplate() {
diff --git a/apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts b/packages/app/src/pack-templates/hooks/useCreatePackTemplate.ts
similarity index 100%
rename from apps/expo/features/pack-templates/hooks/useCreatePackTemplate.ts
rename to packages/app/src/pack-templates/hooks/useCreatePackTemplate.ts
diff --git a/apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts b/packages/app/src/pack-templates/hooks/useCreatePackTemplateItem.ts
similarity index 100%
rename from apps/expo/features/pack-templates/hooks/useCreatePackTemplateItem.ts
rename to packages/app/src/pack-templates/hooks/useCreatePackTemplateItem.ts
diff --git a/apps/expo/features/pack-templates/hooks/useDeletePackTemplate.ts b/packages/app/src/pack-templates/hooks/useDeletePackTemplate.ts
similarity index 100%
rename from apps/expo/features/pack-templates/hooks/useDeletePackTemplate.ts
rename to packages/app/src/pack-templates/hooks/useDeletePackTemplate.ts
diff --git a/apps/expo/features/pack-templates/hooks/useDeletePackTemplateItem.ts b/packages/app/src/pack-templates/hooks/useDeletePackTemplateItem.ts
similarity index 100%
rename from apps/expo/features/pack-templates/hooks/useDeletePackTemplateItem.ts
rename to packages/app/src/pack-templates/hooks/useDeletePackTemplateItem.ts
diff --git a/apps/expo/features/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts b/packages/app/src/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts
similarity index 100%
rename from apps/expo/features/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts
rename to packages/app/src/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts
diff --git a/apps/expo/features/pack-templates/hooks/usePackTemplateItem.ts b/packages/app/src/pack-templates/hooks/usePackTemplateItem.ts
similarity index 100%
rename from apps/expo/features/pack-templates/hooks/usePackTemplateItem.ts
rename to packages/app/src/pack-templates/hooks/usePackTemplateItem.ts
diff --git a/apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts b/packages/app/src/pack-templates/hooks/usePackTemplateSummary.ts
similarity index 97%
rename from apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts
rename to packages/app/src/pack-templates/hooks/usePackTemplateSummary.ts
index be8f2e700b..ee2cf5f7f9 100644
--- a/apps/expo/features/pack-templates/hooks/usePackTemplateSummary.ts
+++ b/packages/app/src/pack-templates/hooks/usePackTemplateSummary.ts
@@ -1,6 +1,6 @@
 import { use$ } from '@legendapp/state/react';
 import type { WeightUnit } from '@packrat/app/pack-templates';
-import { convertFromGrams, convertToGrams } from 'expo-app/features/packs/utils';
+import { convertFromGrams, convertToGrams } from '@packrat/app/packs/utils';
 import { packTemplateItemsStore } from '../store/packTemplateItems';
 
 export type PackTemplateSummary = {
diff --git a/apps/expo/features/pack-templates/hooks/usePackTemplates.ts b/packages/app/src/pack-templates/hooks/usePackTemplates.ts
similarity index 100%
rename from apps/expo/features/pack-templates/hooks/usePackTemplates.ts
rename to packages/app/src/pack-templates/hooks/usePackTemplates.ts
diff --git a/apps/expo/features/pack-templates/hooks/usePackTemplatesDetails.ts b/packages/app/src/pack-templates/hooks/usePackTemplatesDetails.ts
similarity index 100%
rename from apps/expo/features/pack-templates/hooks/usePackTemplatesDetails.ts
rename to packages/app/src/pack-templates/hooks/usePackTemplatesDetails.ts
diff --git a/apps/expo/features/pack-templates/hooks/useUpdatePackTemplateItem.ts b/packages/app/src/pack-templates/hooks/useUpdatePackTemplateItem.ts
similarity index 100%
rename from apps/expo/features/pack-templates/hooks/useUpdatePackTemplateItem.ts
rename to packages/app/src/pack-templates/hooks/useUpdatePackTemplateItem.ts
diff --git a/apps/expo/features/pack-templates/hooks/useUpdatePacktemplate.ts b/packages/app/src/pack-templates/hooks/useUpdatePacktemplate.ts
similarity index 100%
rename from apps/expo/features/pack-templates/hooks/useUpdatePacktemplate.ts
rename to packages/app/src/pack-templates/hooks/useUpdatePacktemplate.ts
diff --git a/apps/expo/features/pack-templates/hooks/useWritePermissionCheck.ts b/packages/app/src/pack-templates/hooks/useWritePermissionCheck.ts
similarity index 82%
rename from apps/expo/features/pack-templates/hooks/useWritePermissionCheck.ts
rename to packages/app/src/pack-templates/hooks/useWritePermissionCheck.ts
index 1e265ed56c..1f36b3c73e 100644
--- a/apps/expo/features/pack-templates/hooks/useWritePermissionCheck.ts
+++ b/packages/app/src/pack-templates/hooks/useWritePermissionCheck.ts
@@ -1,4 +1,4 @@
-import { useUser } from 'expo-app/features/auth/hooks/useUser';
+import { useUser } from '@packrat/app/auth/hooks/useUser';
 import { obs } from 'expo-app/lib/store';
 import { packTemplatesStore } from '../store';
 
diff --git a/apps/expo/features/pack-templates/packTemplateListAtoms.ts b/packages/app/src/pack-templates/packTemplateListAtoms.ts
similarity index 100%
rename from apps/expo/features/pack-templates/packTemplateListAtoms.ts
rename to packages/app/src/pack-templates/packTemplateListAtoms.ts
diff --git a/apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx b/packages/app/src/pack-templates/screens/CreatePackTemplateItemForm.tsx
similarity index 99%
rename from apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx
rename to packages/app/src/pack-templates/screens/CreatePackTemplateItemForm.tsx
index 76ead292c0..61539a8ade 100644
--- a/apps/expo/features/pack-templates/screens/CreatePackTemplateItemForm.tsx
+++ b/packages/app/src/pack-templates/screens/CreatePackTemplateItemForm.tsx
@@ -2,11 +2,11 @@
 
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import type { PackTemplateItem } from '@packrat/app/pack-templates';
+import { useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
 import { safeIndexOf } from '@packrat/guards';
 import { Form, FormItem, FormSection, SegmentedControl, TextField } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
 import { Icon } from 'expo-app/components/Icon';
-import { useImagePicker } from 'expo-app/features/packs/hooks/useImagePicker';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
diff --git a/apps/expo/features/pack-templates/screens/CreatePackTemplateScreen.tsx b/packages/app/src/pack-templates/screens/CreatePackTemplateScreen.tsx
similarity index 100%
rename from apps/expo/features/pack-templates/screens/CreatePackTemplateScreen.tsx
rename to packages/app/src/pack-templates/screens/CreatePackTemplateScreen.tsx
diff --git a/apps/expo/features/pack-templates/screens/EditPackTemplateItemScreen.tsx b/packages/app/src/pack-templates/screens/EditPackTemplateItemScreen.tsx
similarity index 100%
rename from apps/expo/features/pack-templates/screens/EditPackTemplateItemScreen.tsx
rename to packages/app/src/pack-templates/screens/EditPackTemplateItemScreen.tsx
diff --git a/apps/expo/features/pack-templates/screens/EditPackTemplateScreen.tsx b/packages/app/src/pack-templates/screens/EditPackTemplateScreen.tsx
similarity index 100%
rename from apps/expo/features/pack-templates/screens/EditPackTemplateScreen.tsx
rename to packages/app/src/pack-templates/screens/EditPackTemplateScreen.tsx
diff --git a/apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx b/packages/app/src/pack-templates/screens/ItemsScanScreen.tsx
similarity index 97%
rename from apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx
rename to packages/app/src/pack-templates/screens/ItemsScanScreen.tsx
index 6030b5c3ec..34751e8c9b 100644
--- a/apps/expo/features/pack-templates/screens/ItemsScanScreen.tsx
+++ b/packages/app/src/pack-templates/screens/ItemsScanScreen.tsx
@@ -1,14 +1,14 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import type { CatalogItem, CatalogItemWithPackItemFields } from '@packrat/app/catalog';
+import { HorizontalCatalogItemCard } from '@packrat/app/packs/components/HorizontalCatalogItemCard';
+import { useImageDetection } from '@packrat/app/packs/hooks/useImageDetection';
+import { type SelectedImage, useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
 import { assertNonNull } from '@packrat/guards';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
 import { appAlert } from 'expo-app/app/_layout';
 import { ErrorState } from 'expo-app/components/ErrorState';
 import { Icon } from 'expo-app/components/Icon';
-import { HorizontalCatalogItemCard } from 'expo-app/features/packs/components/HorizontalCatalogItemCard';
-import { useImageDetection } from 'expo-app/features/packs/hooks/useImageDetection';
-import { type SelectedImage, useImagePicker } from 'expo-app/features/packs/hooks/useImagePicker';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Stack, useLocalSearchParams, useRouter } from 'expo-router';
diff --git a/apps/expo/features/pack-templates/screens/PackTemplateDetailScreen.tsx b/packages/app/src/pack-templates/screens/PackTemplateDetailScreen.tsx
similarity index 99%
rename from apps/expo/features/pack-templates/screens/PackTemplateDetailScreen.tsx
rename to packages/app/src/pack-templates/screens/PackTemplateDetailScreen.tsx
index cc721f99ea..8884e96280 100644
--- a/apps/expo/features/pack-templates/screens/PackTemplateDetailScreen.tsx
+++ b/packages/app/src/pack-templates/screens/PackTemplateDetailScreen.tsx
@@ -1,8 +1,8 @@
+import { useUser } from '@packrat/app/auth/hooks/useUser';
 import type { PackTemplateItem } from '@packrat/app/pack-templates';
 import { Button, Text, useSheetRef } from '@packrat/ui/nativewindui';
 import { Chip } from 'expo-app/components/initial/Chip';
 import { WeightBadge } from 'expo-app/components/initial/WeightBadge';
-import { useUser } from 'expo-app/features/auth/hooks/useUser';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { NotFoundScreen } from 'expo-app/screens/NotFoundScreen';
 import { useLocalSearchParams, useRouter } from 'expo-router';
diff --git a/apps/expo/features/pack-templates/screens/PackTemplateItemDetailScreen.tsx b/packages/app/src/pack-templates/screens/PackTemplateItemDetailScreen.tsx
similarity index 98%
rename from apps/expo/features/pack-templates/screens/PackTemplateItemDetailScreen.tsx
rename to packages/app/src/pack-templates/screens/PackTemplateItemDetailScreen.tsx
index 66178a6594..e1579ed858 100644
--- a/apps/expo/features/pack-templates/screens/PackTemplateItemDetailScreen.tsx
+++ b/packages/app/src/pack-templates/screens/PackTemplateItemDetailScreen.tsx
@@ -1,9 +1,9 @@
+import { isAuthed } from '@packrat/app/auth/store';
 import { assertDefined } from '@packrat/guards';
 import { Button, Text, useColorScheme } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { Chip } from 'expo-app/components/initial/Chip';
 import { WeightBadge } from 'expo-app/components/initial/WeightBadge';
-import { isAuthed } from 'expo-app/features/auth/store';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import {
   calculateTotalWeight,
diff --git a/apps/expo/features/pack-templates/screens/PackTemplateListScreen.tsx b/packages/app/src/pack-templates/screens/PackTemplateListScreen.tsx
similarity index 98%
rename from apps/expo/features/pack-templates/screens/PackTemplateListScreen.tsx
rename to packages/app/src/pack-templates/screens/PackTemplateListScreen.tsx
index 7945639e74..fe75b00dcf 100644
--- a/apps/expo/features/pack-templates/screens/PackTemplateListScreen.tsx
+++ b/packages/app/src/pack-templates/screens/PackTemplateListScreen.tsx
@@ -1,12 +1,12 @@
 import type { BottomSheetModal } from '@gorhom/bottom-sheet';
+import { useAuth } from '@packrat/app/auth/hooks/useAuth';
+import { useUser } from '@packrat/app/auth/hooks/useUser';
 import type { PackTemplate } from '@packrat/app/pack-templates';
 import type { PackCategory } from '@packrat/app/packs';
 import type { LargeTitleSearchBarMethods } from '@packrat/ui/nativewindui';
 import { LargeTitleHeader, SegmentedControl } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { LargeTitleHeaderSearchContentContainer } from 'expo-app/components/LargeTitleHeaderSearchContentContainer';
-import { useAuth } from 'expo-app/features/auth/hooks/useAuth';
-import { useUser } from 'expo-app/features/auth/hooks/useUser';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
diff --git a/apps/expo/features/pack-templates/store/index.ts b/packages/app/src/pack-templates/store/index.ts
similarity index 100%
rename from apps/expo/features/pack-templates/store/index.ts
rename to packages/app/src/pack-templates/store/index.ts
diff --git a/apps/expo/features/pack-templates/store/packTemplateItems.ts b/packages/app/src/pack-templates/store/packTemplateItems.ts
similarity index 98%
rename from apps/expo/features/pack-templates/store/packTemplateItems.ts
rename to packages/app/src/pack-templates/store/packTemplateItems.ts
index 79d6f82199..38b152c49e 100644
--- a/apps/expo/features/pack-templates/store/packTemplateItems.ts
+++ b/packages/app/src/pack-templates/store/packTemplateItems.ts
@@ -5,8 +5,8 @@ import {
   PackTemplateItemSchema,
   PackTemplateWithItemsSchema,
 } from '@packrat/api/schemas/packTemplates';
+import { isAuthed } from '@packrat/app/auth/store';
 import type { PackTemplateItem } from '@packrat/app/pack-templates';
-import { isAuthed } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
 
diff --git a/apps/expo/features/pack-templates/store/packTemplates.ts b/packages/app/src/pack-templates/store/packTemplates.ts
similarity index 98%
rename from apps/expo/features/pack-templates/store/packTemplates.ts
rename to packages/app/src/pack-templates/store/packTemplates.ts
index 8159ee63cf..f1a9b2b6f2 100644
--- a/apps/expo/features/pack-templates/store/packTemplates.ts
+++ b/packages/app/src/pack-templates/store/packTemplates.ts
@@ -5,8 +5,8 @@ import {
   PackTemplateSchema,
   PackTemplateWithItemsSchema,
 } from '@packrat/api/schemas/packTemplates';
+import { isAuthed } from '@packrat/app/auth/store';
 import type { PackTemplate, PackTemplateInStore } from '@packrat/app/pack-templates';
-import { isAuthed } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
 
diff --git a/apps/expo/features/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts b/packages/app/src/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts
similarity index 100%
rename from apps/expo/features/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts
rename to packages/app/src/pack-templates/utils/__tests__/computePacktemplateWeight.test.ts
diff --git a/apps/expo/features/pack-templates/utils/getPackTemplateDetailOptions.tsx b/packages/app/src/pack-templates/utils/getPackTemplateDetailOptions.tsx
similarity index 100%
rename from apps/expo/features/pack-templates/utils/getPackTemplateDetailOptions.tsx
rename to packages/app/src/pack-templates/utils/getPackTemplateDetailOptions.tsx
diff --git a/apps/expo/features/pack-templates/utils/getPackTemplateItemDetailOptions.tsx b/packages/app/src/pack-templates/utils/getPackTemplateItemDetailOptions.tsx
similarity index 100%
rename from apps/expo/features/pack-templates/utils/getPackTemplateItemDetailOptions.tsx
rename to packages/app/src/pack-templates/utils/getPackTemplateItemDetailOptions.tsx
diff --git a/apps/expo/features/packs/components/ActivityPicker.tsx b/packages/app/src/packs/components/ActivityPicker.tsx
similarity index 100%
rename from apps/expo/features/packs/components/ActivityPicker.tsx
rename to packages/app/src/packs/components/ActivityPicker.tsx
diff --git a/apps/expo/features/packs/components/AddPackItemActions.tsx b/packages/app/src/packs/components/AddPackItemActions.tsx
similarity index 96%
rename from apps/expo/features/packs/components/AddPackItemActions.tsx
rename to packages/app/src/packs/components/AddPackItemActions.tsx
index 63e251acf6..c782f597ab 100644
--- a/apps/expo/features/packs/components/AddPackItemActions.tsx
+++ b/packages/app/src/packs/components/AddPackItemActions.tsx
@@ -1,13 +1,13 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import type { BottomSheetModal } from '@gorhom/bottom-sheet';
 import { BottomSheetView } from '@gorhom/bottom-sheet';
+import { isAuthed } from '@packrat/app/auth/store';
 import type { CatalogItem } from '@packrat/app/catalog';
+import { CatalogBrowserModal } from '@packrat/app/catalog/components';
+import { useRecentlyUsedCatalogItems } from '@packrat/app/catalog/hooks/useRecentlyUsedCatalogItems';
 import { isFunction, nullToUndefined } from '@packrat/guards';
 import { Sheet, Text, useColorScheme } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { isAuthed } from 'expo-app/features/auth/store';
-import { CatalogBrowserModal } from 'expo-app/features/catalog/components';
-import { useRecentlyUsedCatalogItems } from 'expo-app/features/catalog/hooks/useRecentlyUsedCatalogItems';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { testIds } from 'expo-app/lib/testIds';
 import { router } from 'expo-router';
diff --git a/apps/expo/features/packs/components/CachedImage.tsx b/packages/app/src/packs/components/CachedImage.tsx
similarity index 100%
rename from apps/expo/features/packs/components/CachedImage.tsx
rename to packages/app/src/packs/components/CachedImage.tsx
diff --git a/apps/expo/features/packs/components/CurrentPackTile.tsx b/packages/app/src/packs/components/CurrentPackTile.tsx
similarity index 100%
rename from apps/expo/features/packs/components/CurrentPackTile.tsx
rename to packages/app/src/packs/components/CurrentPackTile.tsx
diff --git a/apps/expo/features/packs/components/GapAnalysisModal.tsx b/packages/app/src/packs/components/GapAnalysisModal.tsx
similarity index 100%
rename from apps/expo/features/packs/components/GapAnalysisModal.tsx
rename to packages/app/src/packs/components/GapAnalysisModal.tsx
diff --git a/apps/expo/features/packs/components/GapItemCatalogSuggestions.tsx b/packages/app/src/packs/components/GapItemCatalogSuggestions.tsx
similarity index 100%
rename from apps/expo/features/packs/components/GapItemCatalogSuggestions.tsx
rename to packages/app/src/packs/components/GapItemCatalogSuggestions.tsx
diff --git a/apps/expo/features/packs/components/GapSuggestion.tsx b/packages/app/src/packs/components/GapSuggestion.tsx
similarity index 98%
rename from apps/expo/features/packs/components/GapSuggestion.tsx
rename to packages/app/src/packs/components/GapSuggestion.tsx
index a689e32294..d41a60bdb9 100644
--- a/apps/expo/features/packs/components/GapSuggestion.tsx
+++ b/packages/app/src/packs/components/GapSuggestion.tsx
@@ -1,7 +1,7 @@
 import type { CatalogItem } from '@packrat/app/catalog';
+import { useVectorSearch } from '@packrat/app/catalog/hooks/useVectorSearch';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { useVectorSearch } from 'expo-app/features/catalog/hooks/useVectorSearch';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useState } from 'react';
 import { View } from 'react-native';
diff --git a/apps/expo/features/packs/components/GearInventoryTile.tsx b/packages/app/src/packs/components/GearInventoryTile.tsx
similarity index 100%
rename from apps/expo/features/packs/components/GearInventoryTile.tsx
rename to packages/app/src/packs/components/GearInventoryTile.tsx
diff --git a/apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx b/packages/app/src/packs/components/HorizontalCatalogItemCard.tsx
similarity index 97%
rename from apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx
rename to packages/app/src/packs/components/HorizontalCatalogItemCard.tsx
index 397fe7b794..e0ae99b1bf 100644
--- a/apps/expo/features/packs/components/HorizontalCatalogItemCard.tsx
+++ b/packages/app/src/packs/components/HorizontalCatalogItemCard.tsx
@@ -1,7 +1,7 @@
 import type { CatalogItem } from '@packrat/app/catalog';
+import { CatalogItemImage } from '@packrat/app/catalog/components/CatalogItemImage';
 import { Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { CatalogItemImage } from 'expo-app/features/catalog/components/CatalogItemImage';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { TouchableWithoutFeedback, View } from 'react-native';
 
diff --git a/apps/expo/features/packs/components/PackCard.tsx b/packages/app/src/packs/components/PackCard.tsx
similarity index 100%
rename from apps/expo/features/packs/components/PackCard.tsx
rename to packages/app/src/packs/components/PackCard.tsx
diff --git a/apps/expo/features/packs/components/PackCategoriesTile.tsx b/packages/app/src/packs/components/PackCategoriesTile.tsx
similarity index 100%
rename from apps/expo/features/packs/components/PackCategoriesTile.tsx
rename to packages/app/src/packs/components/PackCategoriesTile.tsx
diff --git a/apps/expo/features/packs/components/PackForm.tsx b/packages/app/src/packs/components/PackForm.tsx
similarity index 97%
rename from apps/expo/features/packs/components/PackForm.tsx
rename to packages/app/src/packs/components/PackForm.tsx
index 57f65baee0..20ef993802 100644
--- a/apps/expo/features/packs/components/PackForm.tsx
+++ b/packages/app/src/packs/components/PackForm.tsx
@@ -1,5 +1,8 @@
 import { PackCategorySchema } from '@packrat/api/types';
+import { useCreatePackFromTemplate } from '@packrat/app/pack-templates/hooks/useCreatePackFromTemplate';
+import { getTemplateItems, packTemplatesStore } from '@packrat/app/pack-templates/store';
 import type { Pack } from '@packrat/app/packs';
+import { TemplateItemsSection } from '@packrat/app/packs/components/TemplateItemsSection';
 import { fromZod } from '@packrat/guards';
 import {
   Button,
@@ -13,9 +16,6 @@ import {
 import { useForm } from '@tanstack/react-form';
 import * as Burnt from 'burnt';
 import { Icon } from 'expo-app/components/Icon';
-import { useCreatePackFromTemplate } from 'expo-app/features/pack-templates';
-import { getTemplateItems, packTemplatesStore } from 'expo-app/features/pack-templates/store';
-import { TemplateItemsSection } from 'expo-app/features/packs/components/TemplateItemsSection';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { testIds } from 'expo-app/lib/testIds';
diff --git a/apps/expo/features/packs/components/PackItemCard.tsx b/packages/app/src/packs/components/PackItemCard.tsx
similarity index 100%
rename from apps/expo/features/packs/components/PackItemCard.tsx
rename to packages/app/src/packs/components/PackItemCard.tsx
diff --git a/apps/expo/features/packs/components/PackItemImage.tsx b/packages/app/src/packs/components/PackItemImage.tsx
similarity index 93%
rename from apps/expo/features/packs/components/PackItemImage.tsx
rename to packages/app/src/packs/components/PackItemImage.tsx
index 94912b7126..45915a3795 100644
--- a/apps/expo/features/packs/components/PackItemImage.tsx
+++ b/packages/app/src/packs/components/PackItemImage.tsx
@@ -1,8 +1,8 @@
+import { CatalogItemImage } from '@packrat/app/catalog/components/CatalogItemImage';
 import type { PackItem } from '@packrat/app/packs';
 import { isRemoteUrl } from '@packrat/guards';
 import { useColorScheme } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { CatalogItemImage } from 'expo-app/features/catalog/components/CatalogItemImage';
 import { buildImageUrl } from 'expo-app/lib/utils/buildImageUrl';
 import { Image, type ImageProps, View } from 'react-native';
 import { usePackItemOwnershipCheck } from '../hooks';
diff --git a/apps/expo/features/packs/components/PackStatsTile.tsx b/packages/app/src/packs/components/PackStatsTile.tsx
similarity index 100%
rename from apps/expo/features/packs/components/PackStatsTile.tsx
rename to packages/app/src/packs/components/PackStatsTile.tsx
diff --git a/apps/expo/features/packs/components/RecentPacksTile.tsx b/packages/app/src/packs/components/RecentPacksTile.tsx
similarity index 100%
rename from apps/expo/features/packs/components/RecentPacksTile.tsx
rename to packages/app/src/packs/components/RecentPacksTile.tsx
diff --git a/apps/expo/features/packs/components/SearchResults.tsx b/packages/app/src/packs/components/SearchResults.tsx
similarity index 100%
rename from apps/expo/features/packs/components/SearchResults.tsx
rename to packages/app/src/packs/components/SearchResults.tsx
diff --git a/apps/expo/features/packs/components/SeasonSuggestionsTile.tsx b/packages/app/src/packs/components/SeasonSuggestionsTile.tsx
similarity index 100%
rename from apps/expo/features/packs/components/SeasonSuggestionsTile.tsx
rename to packages/app/src/packs/components/SeasonSuggestionsTile.tsx
diff --git a/apps/expo/features/packs/components/SharedPacksTile.tsx b/packages/app/src/packs/components/SharedPacksTile.tsx
similarity index 100%
rename from apps/expo/features/packs/components/SharedPacksTile.tsx
rename to packages/app/src/packs/components/SharedPacksTile.tsx
diff --git a/apps/expo/features/packs/components/ShoppingListTile.tsx b/packages/app/src/packs/components/ShoppingListTile.tsx
similarity index 100%
rename from apps/expo/features/packs/components/ShoppingListTile.tsx
rename to packages/app/src/packs/components/ShoppingListTile.tsx
diff --git a/apps/expo/features/packs/components/SimilarItemsForPackItem.tsx b/packages/app/src/packs/components/SimilarItemsForPackItem.tsx
similarity index 95%
rename from apps/expo/features/packs/components/SimilarItemsForPackItem.tsx
rename to packages/app/src/packs/components/SimilarItemsForPackItem.tsx
index 0d4d25aa93..5b64cb4c67 100644
--- a/apps/expo/features/packs/components/SimilarItemsForPackItem.tsx
+++ b/packages/app/src/packs/components/SimilarItemsForPackItem.tsx
@@ -1,6 +1,6 @@
+import { CatalogItemImage } from '@packrat/app/catalog/components/CatalogItemImage';
+import { type SimilarItem, useSimilarPackItems } from '@packrat/app/catalog/hooks';
 import { Text } from '@packrat/ui/nativewindui';
-import { CatalogItemImage } from 'expo-app/features/catalog/components/CatalogItemImage';
-import { type SimilarItem, useSimilarPackItems } from 'expo-app/features/catalog/hooks';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import type React from 'react';
diff --git a/apps/expo/features/packs/components/SyncBanner.tsx b/packages/app/src/packs/components/SyncBanner.tsx
similarity index 100%
rename from apps/expo/features/packs/components/SyncBanner.tsx
rename to packages/app/src/packs/components/SyncBanner.tsx
diff --git a/apps/expo/features/packs/components/TemplateItemsSection.tsx b/packages/app/src/packs/components/TemplateItemsSection.tsx
similarity index 100%
rename from apps/expo/features/packs/components/TemplateItemsSection.tsx
rename to packages/app/src/packs/components/TemplateItemsSection.tsx
diff --git a/apps/expo/features/packs/components/WeightAnalysisTile.tsx b/packages/app/src/packs/components/WeightAnalysisTile.tsx
similarity index 100%
rename from apps/expo/features/packs/components/WeightAnalysisTile.tsx
rename to packages/app/src/packs/components/WeightAnalysisTile.tsx
diff --git a/apps/expo/features/packs/hooks/index.ts b/packages/app/src/packs/hooks/index.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/index.ts
rename to packages/app/src/packs/hooks/index.ts
diff --git a/apps/expo/features/packs/hooks/useAddCatalogItem.ts b/packages/app/src/packs/hooks/useAddCatalogItem.ts
similarity index 94%
rename from apps/expo/features/packs/hooks/useAddCatalogItem.ts
rename to packages/app/src/packs/hooks/useAddCatalogItem.ts
index 8bc8ce36dd..677fd813a6 100644
--- a/apps/expo/features/packs/hooks/useAddCatalogItem.ts
+++ b/packages/app/src/packs/hooks/useAddCatalogItem.ts
@@ -1,9 +1,9 @@
 import { WeightUnitSchema } from '@packrat/api/types';
 import type { CatalogItem } from '@packrat/app/catalog';
+import { cacheCatalogItemImage } from '@packrat/app/catalog/lib/cacheCatalogItemImage';
 import type { PackItem } from '@packrat/app/packs';
 import { fromZod } from '@packrat/guards';
 import * as Burnt from 'burnt';
-import { cacheCatalogItemImage } from 'expo-app/features/catalog/lib/cacheCatalogItemImage';
 import { useState } from 'react';
 import { useCreatePackItem } from './useCreatePackItem';
 
diff --git a/apps/expo/features/packs/hooks/useAllPacks.ts b/packages/app/src/packs/hooks/useAllPacks.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/useAllPacks.ts
rename to packages/app/src/packs/hooks/useAllPacks.ts
diff --git a/apps/expo/features/packs/hooks/useBulkAddCatalogItems.ts b/packages/app/src/packs/hooks/useBulkAddCatalogItems.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/useBulkAddCatalogItems.ts
rename to packages/app/src/packs/hooks/useBulkAddCatalogItems.ts
diff --git a/apps/expo/features/packs/hooks/useCategoriesCount.ts b/packages/app/src/packs/hooks/useCategoriesCount.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/useCategoriesCount.ts
rename to packages/app/src/packs/hooks/useCategoriesCount.ts
diff --git a/apps/expo/features/packs/hooks/useCreatePack.ts b/packages/app/src/packs/hooks/useCreatePack.ts
similarity index 91%
rename from apps/expo/features/packs/hooks/useCreatePack.ts
rename to packages/app/src/packs/hooks/useCreatePack.ts
index 8124345a63..d6cd354cd8 100644
--- a/apps/expo/features/packs/hooks/useCreatePack.ts
+++ b/packages/app/src/packs/hooks/useCreatePack.ts
@@ -1,5 +1,5 @@
 import type { PackInput, PackInStore } from '@packrat/app/packs';
-import { packsStore } from 'expo-app/features/packs/store';
+import { packsStore } from '@packrat/app/packs/store';
 import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
diff --git a/apps/expo/features/packs/hooks/useCreatePackFromPack.ts b/packages/app/src/packs/hooks/useCreatePackFromPack.ts
similarity index 91%
rename from apps/expo/features/packs/hooks/useCreatePackFromPack.ts
rename to packages/app/src/packs/hooks/useCreatePackFromPack.ts
index 326a05d0d5..27a501c275 100644
--- a/apps/expo/features/packs/hooks/useCreatePackFromPack.ts
+++ b/packages/app/src/packs/hooks/useCreatePackFromPack.ts
@@ -1,6 +1,6 @@
 import type { Pack, PackInput, PackInStore } from '@packrat/app/packs';
-import { packItemsStore, packsStore } from 'expo-app/features/packs/store';
-import { recordPackWeight } from 'expo-app/features/packs/store/packWeightHistory';
+import { packItemsStore, packsStore } from '@packrat/app/packs/store';
+import { recordPackWeight } from '@packrat/app/packs/store/packWeightHistory';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 
diff --git a/apps/expo/features/packs/hooks/useCreatePackItem.ts b/packages/app/src/packs/hooks/useCreatePackItem.ts
similarity index 93%
rename from apps/expo/features/packs/hooks/useCreatePackItem.ts
rename to packages/app/src/packs/hooks/useCreatePackItem.ts
index 504e299d1b..6f21675804 100644
--- a/apps/expo/features/packs/hooks/useCreatePackItem.ts
+++ b/packages/app/src/packs/hooks/useCreatePackItem.ts
@@ -1,5 +1,5 @@
 import type { PackItem, PackItemInput } from '@packrat/app/packs';
-import { packItemsStore, packsStore } from 'expo-app/features/packs/store';
+import { packItemsStore, packsStore } from '@packrat/app/packs/store';
 import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
diff --git a/apps/expo/features/packs/hooks/useCreatePackWithItems.ts b/packages/app/src/packs/hooks/useCreatePackWithItems.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/useCreatePackWithItems.ts
rename to packages/app/src/packs/hooks/useCreatePackWithItems.ts
diff --git a/apps/expo/features/packs/hooks/useCurrentPack.ts b/packages/app/src/packs/hooks/useCurrentPack.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/useCurrentPack.ts
rename to packages/app/src/packs/hooks/useCurrentPack.ts
diff --git a/apps/expo/features/packs/hooks/useDeletePack.ts b/packages/app/src/packs/hooks/useDeletePack.ts
similarity index 81%
rename from apps/expo/features/packs/hooks/useDeletePack.ts
rename to packages/app/src/packs/hooks/useDeletePack.ts
index 9c69d93d26..9c2a379b4a 100644
--- a/apps/expo/features/packs/hooks/useDeletePack.ts
+++ b/packages/app/src/packs/hooks/useDeletePack.ts
@@ -1,4 +1,4 @@
-import { getPackItems, packItemsStore, packsStore } from 'expo-app/features/packs/store';
+import { getPackItems, packItemsStore, packsStore } from '@packrat/app/packs/store';
 import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
 
diff --git a/apps/expo/features/packs/hooks/useDeletePackItem.ts b/packages/app/src/packs/hooks/useDeletePackItem.ts
similarity index 84%
rename from apps/expo/features/packs/hooks/useDeletePackItem.ts
rename to packages/app/src/packs/hooks/useDeletePackItem.ts
index 9e8a35c557..bf93c2fb98 100644
--- a/apps/expo/features/packs/hooks/useDeletePackItem.ts
+++ b/packages/app/src/packs/hooks/useDeletePackItem.ts
@@ -1,4 +1,4 @@
-import { packItemsStore } from 'expo-app/features/packs/store';
+import { packItemsStore } from '@packrat/app/packs/store';
 import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
 
diff --git a/apps/expo/features/packs/hooks/useDetailedPacks.ts b/packages/app/src/packs/hooks/useDetailedPacks.ts
similarity index 88%
rename from apps/expo/features/packs/hooks/useDetailedPacks.ts
rename to packages/app/src/packs/hooks/useDetailedPacks.ts
index 8060e36370..cb3e9e2f70 100644
--- a/apps/expo/features/packs/hooks/useDetailedPacks.ts
+++ b/packages/app/src/packs/hooks/useDetailedPacks.ts
@@ -1,6 +1,6 @@
 import { use$ } from '@legendapp/state/react';
 import type { Pack } from '@packrat/app/packs';
-import { getPackItems, packsStore } from 'expo-app/features/packs/store';
+import { getPackItems, packsStore } from '@packrat/app/packs/store';
 import { computePackWeights } from '../utils';
 
 export function useDetailedPacks(): Pack[] {
diff --git a/apps/expo/features/packs/hooks/useDuplicatePack.ts b/packages/app/src/packs/hooks/useDuplicatePack.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/useDuplicatePack.ts
rename to packages/app/src/packs/hooks/useDuplicatePack.ts
diff --git a/apps/expo/features/packs/hooks/useHasMinimumInventory.ts b/packages/app/src/packs/hooks/useHasMinimumInventory.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/useHasMinimumInventory.ts
rename to packages/app/src/packs/hooks/useHasMinimumInventory.ts
diff --git a/apps/expo/features/packs/hooks/useImageDetection.ts b/packages/app/src/packs/hooks/useImageDetection.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/useImageDetection.ts
rename to packages/app/src/packs/hooks/useImageDetection.ts
diff --git a/apps/expo/features/packs/hooks/useImagePicker.ts b/packages/app/src/packs/hooks/useImagePicker.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/useImagePicker.ts
rename to packages/app/src/packs/hooks/useImagePicker.ts
diff --git a/apps/expo/features/packs/hooks/usePackDetailsFromApi.ts b/packages/app/src/packs/hooks/usePackDetailsFromApi.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/usePackDetailsFromApi.ts
rename to packages/app/src/packs/hooks/usePackDetailsFromApi.ts
diff --git a/apps/expo/features/packs/hooks/usePackDetailsFromStore.ts b/packages/app/src/packs/hooks/usePackDetailsFromStore.ts
similarity index 90%
rename from apps/expo/features/packs/hooks/usePackDetailsFromStore.ts
rename to packages/app/src/packs/hooks/usePackDetailsFromStore.ts
index 7b734b3fc5..cf047cc1b6 100644
--- a/apps/expo/features/packs/hooks/usePackDetailsFromStore.ts
+++ b/packages/app/src/packs/hooks/usePackDetailsFromStore.ts
@@ -1,6 +1,6 @@
 import { use$ } from '@legendapp/state/react';
 import { computePackWeights } from '@packrat/app/packs';
-import { getPackItems, packsStore } from 'expo-app/features/packs/store';
+import { getPackItems, packsStore } from '@packrat/app/packs/store';
 import { obs } from 'expo-app/lib/store';
 
 /**
diff --git a/apps/expo/features/packs/hooks/usePackGapAnalysis.ts b/packages/app/src/packs/hooks/usePackGapAnalysis.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/usePackGapAnalysis.ts
rename to packages/app/src/packs/hooks/usePackGapAnalysis.ts
diff --git a/apps/expo/features/packs/hooks/usePackItemDetailsFromApi.ts b/packages/app/src/packs/hooks/usePackItemDetailsFromApi.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/usePackItemDetailsFromApi.ts
rename to packages/app/src/packs/hooks/usePackItemDetailsFromApi.ts
diff --git a/apps/expo/features/packs/hooks/usePackItemDetailsFromStore.ts b/packages/app/src/packs/hooks/usePackItemDetailsFromStore.ts
similarity index 86%
rename from apps/expo/features/packs/hooks/usePackItemDetailsFromStore.ts
rename to packages/app/src/packs/hooks/usePackItemDetailsFromStore.ts
index a5055558e9..bf8cc2f08e 100644
--- a/apps/expo/features/packs/hooks/usePackItemDetailsFromStore.ts
+++ b/packages/app/src/packs/hooks/usePackItemDetailsFromStore.ts
@@ -1,5 +1,5 @@
 import { use$ } from '@legendapp/state/react';
-import { packItemsStore } from 'expo-app/features/packs/store';
+import { packItemsStore } from '@packrat/app/packs/store';
 
 /**
  * Retrieves item from store.
diff --git a/apps/expo/features/packs/hooks/usePackItemOwnershipCheck.ts b/packages/app/src/packs/hooks/usePackItemOwnershipCheck.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/usePackItemOwnershipCheck.ts
rename to packages/app/src/packs/hooks/usePackItemOwnershipCheck.ts
diff --git a/apps/expo/features/packs/hooks/usePackOwnershipCheck.ts b/packages/app/src/packs/hooks/usePackOwnershipCheck.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/usePackOwnershipCheck.ts
rename to packages/app/src/packs/hooks/usePackOwnershipCheck.ts
diff --git a/apps/expo/features/packs/hooks/usePackWeightAnalysis.ts b/packages/app/src/packs/hooks/usePackWeightAnalysis.ts
similarity index 95%
rename from apps/expo/features/packs/hooks/usePackWeightAnalysis.ts
rename to packages/app/src/packs/hooks/usePackWeightAnalysis.ts
index a9559d0f49..fca8510adf 100644
--- a/apps/expo/features/packs/hooks/usePackWeightAnalysis.ts
+++ b/packages/app/src/packs/hooks/usePackWeightAnalysis.ts
@@ -1,4 +1,4 @@
-import { userStore } from 'expo-app/features/auth/store';
+import { userStore } from '@packrat/app/auth/store';
 import { computeCategorySummaries, convertFromGrams, convertToGrams } from '../utils';
 import { usePackDetailsFromStore } from './usePackDetailsFromStore';
 
diff --git a/apps/expo/features/packs/hooks/usePackWeightHistory.ts b/packages/app/src/packs/hooks/usePackWeightHistory.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/usePackWeightHistory.ts
rename to packages/app/src/packs/hooks/usePackWeightHistory.ts
diff --git a/apps/expo/features/packs/hooks/usePacks.ts b/packages/app/src/packs/hooks/usePacks.ts
similarity index 83%
rename from apps/expo/features/packs/hooks/usePacks.ts
rename to packages/app/src/packs/hooks/usePacks.ts
index f241d5c9f5..55f9116281 100644
--- a/apps/expo/features/packs/hooks/usePacks.ts
+++ b/packages/app/src/packs/hooks/usePacks.ts
@@ -1,6 +1,6 @@
 import { use$ } from '@legendapp/state/react';
 
-import { packsStore } from 'expo-app/features/packs/store';
+import { packsStore } from '@packrat/app/packs/store';
 
 export function usePacks() {
   const packs = use$(() => {
diff --git a/apps/expo/features/packs/hooks/useRecentPacks.ts b/packages/app/src/packs/hooks/useRecentPacks.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/useRecentPacks.ts
rename to packages/app/src/packs/hooks/useRecentPacks.ts
diff --git a/apps/expo/features/packs/hooks/useSeasonSuggestions.ts b/packages/app/src/packs/hooks/useSeasonSuggestions.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/useSeasonSuggestions.ts
rename to packages/app/src/packs/hooks/useSeasonSuggestions.ts
diff --git a/apps/expo/features/packs/hooks/useUpdatePack.ts b/packages/app/src/packs/hooks/useUpdatePack.ts
similarity index 85%
rename from apps/expo/features/packs/hooks/useUpdatePack.ts
rename to packages/app/src/packs/hooks/useUpdatePack.ts
index 3e4a15c252..29373a4905 100644
--- a/apps/expo/features/packs/hooks/useUpdatePack.ts
+++ b/packages/app/src/packs/hooks/useUpdatePack.ts
@@ -1,5 +1,5 @@
 import type { Pack } from '@packrat/app/packs';
-import { packsStore } from 'expo-app/features/packs/store';
+import { packsStore } from '@packrat/app/packs/store';
 import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
 
diff --git a/apps/expo/features/packs/hooks/useUpdatePackItem.ts b/packages/app/src/packs/hooks/useUpdatePackItem.ts
similarity index 89%
rename from apps/expo/features/packs/hooks/useUpdatePackItem.ts
rename to packages/app/src/packs/hooks/useUpdatePackItem.ts
index eca053a742..f9672cf2f8 100644
--- a/apps/expo/features/packs/hooks/useUpdatePackItem.ts
+++ b/packages/app/src/packs/hooks/useUpdatePackItem.ts
@@ -1,5 +1,5 @@
 import type { PackItem } from '@packrat/app/packs';
-import { packItemsStore, packsStore } from 'expo-app/features/packs/store';
+import { packItemsStore, packsStore } from '@packrat/app/packs/store';
 import { useCallback } from 'react';
 import { recordPackWeight } from '../store/packWeightHistory';
 
diff --git a/apps/expo/features/packs/hooks/useUserPackItems.ts b/packages/app/src/packs/hooks/useUserPackItems.ts
similarity index 100%
rename from apps/expo/features/packs/hooks/useUserPackItems.ts
rename to packages/app/src/packs/hooks/useUserPackItems.ts
diff --git a/apps/expo/features/packs/packListAtoms.ts b/packages/app/src/packs/packListAtoms.ts
similarity index 100%
rename from apps/expo/features/packs/packListAtoms.ts
rename to packages/app/src/packs/packListAtoms.ts
diff --git a/apps/expo/features/packs/screens/CreatePackItemForm.tsx b/packages/app/src/packs/screens/CreatePackItemForm.tsx
similarity index 100%
rename from apps/expo/features/packs/screens/CreatePackItemForm.tsx
rename to packages/app/src/packs/screens/CreatePackItemForm.tsx
diff --git a/apps/expo/features/packs/screens/CreatePackScreen.tsx b/packages/app/src/packs/screens/CreatePackScreen.tsx
similarity index 100%
rename from apps/expo/features/packs/screens/CreatePackScreen.tsx
rename to packages/app/src/packs/screens/CreatePackScreen.tsx
diff --git a/apps/expo/features/packs/screens/EditPackItemScreen.tsx b/packages/app/src/packs/screens/EditPackItemScreen.tsx
similarity index 90%
rename from apps/expo/features/packs/screens/EditPackItemScreen.tsx
rename to packages/app/src/packs/screens/EditPackItemScreen.tsx
index a1035ae45e..0108d28e6a 100644
--- a/apps/expo/features/packs/screens/EditPackItemScreen.tsx
+++ b/packages/app/src/packs/screens/EditPackItemScreen.tsx
@@ -1,4 +1,4 @@
-import { CreatePackItemForm } from 'expo-app/features/packs/screens/CreatePackItemForm';
+import { CreatePackItemForm } from '@packrat/app/packs/screens/CreatePackItemForm';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { NotFoundScreen } from 'expo-app/screens/NotFoundScreen';
 import { useLocalSearchParams } from 'expo-router';
diff --git a/apps/expo/features/packs/screens/EditPackScreen.tsx b/packages/app/src/packs/screens/EditPackScreen.tsx
similarity index 70%
rename from apps/expo/features/packs/screens/EditPackScreen.tsx
rename to packages/app/src/packs/screens/EditPackScreen.tsx
index 544374b503..895c052698 100644
--- a/apps/expo/features/packs/screens/EditPackScreen.tsx
+++ b/packages/app/src/packs/screens/EditPackScreen.tsx
@@ -1,6 +1,6 @@
+import { PackForm } from '@packrat/app/packs/components/PackForm';
+import { usePackDetailsFromStore } from '@packrat/app/packs/hooks/usePackDetailsFromStore';
 import { assertDefined } from '@packrat/guards';
-import { usePackDetailsFromStore } from 'expo-app/features/packs';
-import { PackForm } from 'expo-app/features/packs/components/PackForm';
 import { useLocalSearchParams } from 'expo-router';
 
 export function EditPackScreen() {
diff --git a/apps/expo/features/packs/screens/ItemsScanScreen.tsx b/packages/app/src/packs/screens/ItemsScanScreen.tsx
similarity index 99%
rename from apps/expo/features/packs/screens/ItemsScanScreen.tsx
rename to packages/app/src/packs/screens/ItemsScanScreen.tsx
index a8dbc08b49..a21eecc976 100644
--- a/apps/expo/features/packs/screens/ItemsScanScreen.tsx
+++ b/packages/app/src/packs/screens/ItemsScanScreen.tsx
@@ -1,12 +1,12 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import type { CatalogItem, CatalogItemWithPackItemFields } from '@packrat/app/catalog';
+import { type SelectedImage, useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
 import { assertNonNull } from '@packrat/guards';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
 import { appAlert } from 'expo-app/app/_layout';
 import { ErrorState } from 'expo-app/components/ErrorState';
 import { Icon } from 'expo-app/components/Icon';
-import { type SelectedImage, useImagePicker } from 'expo-app/features/packs/hooks/useImagePicker';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Stack, useLocalSearchParams, useRouter } from 'expo-router';
diff --git a/apps/expo/features/packs/screens/PackDetailScreen.tsx b/packages/app/src/packs/screens/PackDetailScreen.tsx
similarity index 98%
rename from apps/expo/features/packs/screens/PackDetailScreen.tsx
rename to packages/app/src/packs/screens/PackDetailScreen.tsx
index ff614a2867..0baa594a08 100644
--- a/apps/expo/features/packs/screens/PackDetailScreen.tsx
+++ b/packages/app/src/packs/screens/PackDetailScreen.tsx
@@ -1,5 +1,11 @@
 import { BottomSheetView } from '@gorhom/bottom-sheet';
+import { isAuthed } from '@packrat/app/auth/store';
 import type { Pack, PackCategory, PackItem } from '@packrat/app/packs';
+import { ActivityPicker } from '@packrat/app/packs/components/ActivityPicker';
+import { GapAnalysisModal } from '@packrat/app/packs/components/GapAnalysisModal';
+import { PackItemCard } from '@packrat/app/packs/components/PackItemCard';
+import { LocationPicker } from '@packrat/app/weather/components';
+import type { WeatherLocation } from '@packrat/app/weather/types';
 import { isDefined } from '@packrat/guards';
 import { ActivityIndicator, Button, Sheet, Text, useSheetRef } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
@@ -7,12 +13,6 @@ import { appAlert } from 'expo-app/app/_layout';
 import { Icon } from 'expo-app/components/Icon';
 import { Chip } from 'expo-app/components/initial/Chip';
 import { WeightBadge } from 'expo-app/components/initial/WeightBadge';
-import { isAuthed } from 'expo-app/features/auth/store';
-import { ActivityPicker } from 'expo-app/features/packs/components/ActivityPicker';
-import { GapAnalysisModal } from 'expo-app/features/packs/components/GapAnalysisModal';
-import { PackItemCard } from 'expo-app/features/packs/components/PackItemCard';
-import { LocationPicker } from 'expo-app/features/weather/components';
-import type { WeatherLocation } from 'expo-app/features/weather/types';
 import { cn } from 'expo-app/lib/cn';
 import { useBottomSheetAction } from 'expo-app/lib/hooks/useBottomSheetAction';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
diff --git a/apps/expo/features/packs/screens/PackItemDetailScreen.tsx b/packages/app/src/packs/screens/PackItemDetailScreen.tsx
similarity index 99%
rename from apps/expo/features/packs/screens/PackItemDetailScreen.tsx
rename to packages/app/src/packs/screens/PackItemDetailScreen.tsx
index c1b67368a9..ffd914070f 100644
--- a/apps/expo/features/packs/screens/PackItemDetailScreen.tsx
+++ b/packages/app/src/packs/screens/PackItemDetailScreen.tsx
@@ -1,9 +1,9 @@
+import { isAuthed } from '@packrat/app/auth/store';
 import { isDefined } from '@packrat/guards';
 import { ActivityIndicator, Button, Text, useColorScheme } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { Chip } from 'expo-app/components/initial/Chip';
 import { WeightBadge } from 'expo-app/components/initial/WeightBadge';
-import { isAuthed } from 'expo-app/features/auth/store';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import {
   calculateTotalWeight,
diff --git a/apps/expo/features/packs/screens/PackListScreen.tsx b/packages/app/src/packs/screens/PackListScreen.tsx
similarity index 96%
rename from apps/expo/features/packs/screens/PackListScreen.tsx
rename to packages/app/src/packs/screens/PackListScreen.tsx
index fb8ee1fd2c..1660123990 100644
--- a/apps/expo/features/packs/screens/PackListScreen.tsx
+++ b/packages/app/src/packs/screens/PackListScreen.tsx
@@ -1,4 +1,9 @@
+import { useAuth } from '@packrat/app/auth/hooks/useAuth';
 import type { Pack, PackCategory, PackInStore } from '@packrat/app/packs';
+import { PackCard } from '@packrat/app/packs/components/PackCard';
+import { SearchResults } from '@packrat/app/packs/components/SearchResults';
+import SyncBanner from '@packrat/app/packs/components/SyncBanner';
+import { activeFilterAtom, searchValueAtom } from '@packrat/app/packs/packListAtoms';
 import type { LargeTitleSearchBarMethods } from '@packrat/ui/nativewindui';
 import {
   ActivityIndicator,
@@ -10,11 +15,6 @@ import { AndroidTabBarInsetFix } from 'expo-app/components/AndroidTabBarInsetFix
 import { Icon } from 'expo-app/components/Icon';
 import { LargeTitleHeaderOverlapFixIOS } from 'expo-app/components/LargeTitleHeaderOverlapFixIOS';
 import { LargeTitleHeaderSearchContentContainer } from 'expo-app/components/LargeTitleHeaderSearchContentContainer';
-import { useAuth } from 'expo-app/features/auth/hooks/useAuth';
-import { PackCard } from 'expo-app/features/packs/components/PackCard';
-import { SearchResults } from 'expo-app/features/packs/components/SearchResults';
-import SyncBanner from 'expo-app/features/packs/components/SyncBanner';
-import { activeFilterAtom, searchValueAtom } from 'expo-app/features/packs/packListAtoms';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { testIds } from 'expo-app/lib/testIds';
diff --git a/apps/expo/features/packs/store/index.ts b/packages/app/src/packs/store/index.ts
similarity index 100%
rename from apps/expo/features/packs/store/index.ts
rename to packages/app/src/packs/store/index.ts
diff --git a/apps/expo/features/packs/store/packItems.ts b/packages/app/src/packs/store/packItems.ts
similarity index 98%
rename from apps/expo/features/packs/store/packItems.ts
rename to packages/app/src/packs/store/packItems.ts
index 35ff673d53..f8c774b04b 100644
--- a/apps/expo/features/packs/store/packItems.ts
+++ b/packages/app/src/packs/store/packItems.ts
@@ -2,9 +2,9 @@ import { observable, syncState } from '@legendapp/state';
 import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { PackItemSchema, PackWithWeightsSchema } from '@packrat/api/schemas/packs';
+import { isAuthed } from '@packrat/app/auth/store';
 import type { PackItem } from '@packrat/app/packs';
 import { isRemoteUrl } from '@packrat/guards';
-import { isAuthed } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
 import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
diff --git a/apps/expo/features/packs/store/packWeightHistory.ts b/packages/app/src/packs/store/packWeightHistory.ts
similarity index 98%
rename from apps/expo/features/packs/store/packWeightHistory.ts
rename to packages/app/src/packs/store/packWeightHistory.ts
index d1941f3c50..ce6a1aebb0 100644
--- a/apps/expo/features/packs/store/packWeightHistory.ts
+++ b/packages/app/src/packs/store/packWeightHistory.ts
@@ -2,8 +2,8 @@ import { observable, syncState } from '@legendapp/state';
 import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { PackWeightHistoryResponseSchema } from '@packrat/api/schemas/packs';
+import { isAuthed } from '@packrat/app/auth/store';
 import type { PackWeightHistoryEntry } from '@packrat/app/packs';
-import { isAuthed } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
 import { obs } from 'expo-app/lib/store';
diff --git a/apps/expo/features/packs/store/packingMode.ts b/packages/app/src/packs/store/packingMode.ts
similarity index 100%
rename from apps/expo/features/packs/store/packingMode.ts
rename to packages/app/src/packs/store/packingMode.ts
diff --git a/apps/expo/features/packs/store/packs.ts b/packages/app/src/packs/store/packs.ts
similarity index 98%
rename from apps/expo/features/packs/store/packs.ts
rename to packages/app/src/packs/store/packs.ts
index d276c24408..9e175b0023 100644
--- a/apps/expo/features/packs/store/packs.ts
+++ b/packages/app/src/packs/store/packs.ts
@@ -2,8 +2,8 @@ import { observable, syncState } from '@legendapp/state';
 import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { PackWithWeightsSchema } from '@packrat/api/schemas/packs';
+import { isAuthed } from '@packrat/app/auth/store';
 import type { PackInStore } from '@packrat/app/packs';
-import { isAuthed } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
 
diff --git a/apps/expo/features/packs/utils/__tests__/computePackWeights.test.ts b/packages/app/src/packs/utils/__tests__/computePackWeights.test.ts
similarity index 100%
rename from apps/expo/features/packs/utils/__tests__/computePackWeights.test.ts
rename to packages/app/src/packs/utils/__tests__/computePackWeights.test.ts
diff --git a/apps/expo/features/packs/utils/__tests__/convertFromGrams.test.ts b/packages/app/src/packs/utils/__tests__/convertFromGrams.test.ts
similarity index 100%
rename from apps/expo/features/packs/utils/__tests__/convertFromGrams.test.ts
rename to packages/app/src/packs/utils/__tests__/convertFromGrams.test.ts
diff --git a/apps/expo/features/packs/utils/__tests__/convertToGrams.test.ts b/packages/app/src/packs/utils/__tests__/convertToGrams.test.ts
similarity index 100%
rename from apps/expo/features/packs/utils/__tests__/convertToGrams.test.ts
rename to packages/app/src/packs/utils/__tests__/convertToGrams.test.ts
diff --git a/apps/expo/features/packs/utils/computeCategories.ts b/packages/app/src/packs/utils/computeCategories.ts
similarity index 96%
rename from apps/expo/features/packs/utils/computeCategories.ts
rename to packages/app/src/packs/utils/computeCategories.ts
index 7a7fe1164c..03429da212 100644
--- a/apps/expo/features/packs/utils/computeCategories.ts
+++ b/packages/app/src/packs/utils/computeCategories.ts
@@ -1,7 +1,7 @@
+import { userStore } from '@packrat/app/auth/store';
 import type { Pack } from '@packrat/app/packs';
 import { convertFromGrams, convertToGrams } from '@packrat/app/packs';
 import { assertDefined } from '@packrat/guards';
-import { userStore } from 'expo-app/features/auth/store';
 
 export type CategorySummary = {
   name: string;
diff --git a/apps/expo/features/packs/utils/getPackDetailOptions.tsx b/packages/app/src/packs/utils/getPackDetailOptions.tsx
similarity index 100%
rename from apps/expo/features/packs/utils/getPackDetailOptions.tsx
rename to packages/app/src/packs/utils/getPackDetailOptions.tsx
diff --git a/apps/expo/features/packs/utils/getPackItemDetailOptions.tsx b/packages/app/src/packs/utils/getPackItemDetailOptions.tsx
similarity index 100%
rename from apps/expo/features/packs/utils/getPackItemDetailOptions.tsx
rename to packages/app/src/packs/utils/getPackItemDetailOptions.tsx
diff --git a/apps/expo/features/packs/utils/index.ts b/packages/app/src/packs/utils/index.ts
similarity index 100%
rename from apps/expo/features/packs/utils/index.ts
rename to packages/app/src/packs/utils/index.ts
diff --git a/apps/expo/features/packs/utils/uploadImage.ts b/packages/app/src/packs/utils/uploadImage.ts
similarity index 95%
rename from apps/expo/features/packs/utils/uploadImage.ts
rename to packages/app/src/packs/utils/uploadImage.ts
index 384c2bc8a1..5da03c8e29 100644
--- a/apps/expo/features/packs/utils/uploadImage.ts
+++ b/packages/app/src/packs/utils/uploadImage.ts
@@ -1,4 +1,4 @@
-import { userStore } from 'expo-app/features/auth/store';
+import { userStore } from '@packrat/app/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import * as FileSystem from 'expo-file-system/legacy';
 
diff --git a/apps/expo/features/profile/components/ProfileAuthWall.tsx b/packages/app/src/profile/components/ProfileAuthWall.tsx
similarity index 100%
rename from apps/expo/features/profile/components/ProfileAuthWall.tsx
rename to packages/app/src/profile/components/ProfileAuthWall.tsx
diff --git a/apps/expo/features/profile/components/index.ts b/packages/app/src/profile/components/index.ts
similarity index 100%
rename from apps/expo/features/profile/components/index.ts
rename to packages/app/src/profile/components/index.ts
diff --git a/apps/expo/features/profile/hooks/useUpdateProfile.ts b/packages/app/src/profile/hooks/useUpdateProfile.ts
similarity index 95%
rename from apps/expo/features/profile/hooks/useUpdateProfile.ts
rename to packages/app/src/profile/hooks/useUpdateProfile.ts
index 189a5fddc9..27a05e8bbc 100644
--- a/apps/expo/features/profile/hooks/useUpdateProfile.ts
+++ b/packages/app/src/profile/hooks/useUpdateProfile.ts
@@ -1,4 +1,4 @@
-import { userStore } from 'expo-app/features/auth/store';
+import { userStore } from '@packrat/app/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { useState } from 'react';
 
diff --git a/apps/expo/features/trail-conditions/components/ConditionBadge.tsx b/packages/app/src/trail-conditions/components/ConditionBadge.tsx
similarity index 100%
rename from apps/expo/features/trail-conditions/components/ConditionBadge.tsx
rename to packages/app/src/trail-conditions/components/ConditionBadge.tsx
diff --git a/apps/expo/features/trail-conditions/components/SubmitConditionReportForm.tsx b/packages/app/src/trail-conditions/components/SubmitConditionReportForm.tsx
similarity index 100%
rename from apps/expo/features/trail-conditions/components/SubmitConditionReportForm.tsx
rename to packages/app/src/trail-conditions/components/SubmitConditionReportForm.tsx
diff --git a/apps/expo/features/trail-conditions/components/TrailConditionReportCard.tsx b/packages/app/src/trail-conditions/components/TrailConditionReportCard.tsx
similarity index 100%
rename from apps/expo/features/trail-conditions/components/TrailConditionReportCard.tsx
rename to packages/app/src/trail-conditions/components/TrailConditionReportCard.tsx
diff --git a/apps/expo/features/trail-conditions/components/index.ts b/packages/app/src/trail-conditions/components/index.ts
similarity index 100%
rename from apps/expo/features/trail-conditions/components/index.ts
rename to packages/app/src/trail-conditions/components/index.ts
diff --git a/apps/expo/features/trail-conditions/hooks/index.ts b/packages/app/src/trail-conditions/hooks/index.ts
similarity index 100%
rename from apps/expo/features/trail-conditions/hooks/index.ts
rename to packages/app/src/trail-conditions/hooks/index.ts
diff --git a/apps/expo/features/trail-conditions/hooks/useSubmitTrailConditionReport.ts b/packages/app/src/trail-conditions/hooks/useSubmitTrailConditionReport.ts
similarity index 100%
rename from apps/expo/features/trail-conditions/hooks/useSubmitTrailConditionReport.ts
rename to packages/app/src/trail-conditions/hooks/useSubmitTrailConditionReport.ts
diff --git a/apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts b/packages/app/src/trail-conditions/hooks/useTrailConditionReports.ts
similarity index 98%
rename from apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts
rename to packages/app/src/trail-conditions/hooks/useTrailConditionReports.ts
index 8f97dec132..6f5f528d7e 100644
--- a/apps/expo/features/trail-conditions/hooks/useTrailConditionReports.ts
+++ b/packages/app/src/trail-conditions/hooks/useTrailConditionReports.ts
@@ -1,8 +1,8 @@
 import { useSelector } from '@legendapp/state/react';
+import { userStore } from '@packrat/app/auth/store/user';
 import type { TrailConditionReport } from '@packrat/app/trail-conditions';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { useQuery } from '@tanstack/react-query';
-import { userStore } from 'expo-app/features/auth/store/user';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 import { useEffect, useRef, useState } from 'react';
diff --git a/apps/expo/features/trail-conditions/store/trailConditionReports.ts b/packages/app/src/trail-conditions/store/trailConditionReports.ts
similarity index 98%
rename from apps/expo/features/trail-conditions/store/trailConditionReports.ts
rename to packages/app/src/trail-conditions/store/trailConditionReports.ts
index d8737f5734..51ec5fd7f6 100644
--- a/apps/expo/features/trail-conditions/store/trailConditionReports.ts
+++ b/packages/app/src/trail-conditions/store/trailConditionReports.ts
@@ -2,8 +2,8 @@ import { observable, syncState } from '@legendapp/state';
 import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { TrailConditionReportSchema } from '@packrat/api/schemas/trailConditions';
+import { isAuthed } from '@packrat/app/auth/store';
 import type { TrailConditionReportInStore } from '@packrat/app/trail-conditions';
-import { isAuthed } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
 
diff --git a/apps/expo/features/trips/components/TrailConditionsTile.tsx b/packages/app/src/trips/components/TrailConditionsTile.tsx
similarity index 100%
rename from apps/expo/features/trips/components/TrailConditionsTile.tsx
rename to packages/app/src/trips/components/TrailConditionsTile.tsx
diff --git a/apps/expo/features/trips/components/TripCard.tsx b/packages/app/src/trips/components/TripCard.tsx
similarity index 100%
rename from apps/expo/features/trips/components/TripCard.tsx
rename to packages/app/src/trips/components/TripCard.tsx
diff --git a/apps/expo/features/trips/components/TripForm.tsx b/packages/app/src/trips/components/TripForm.tsx
similarity index 99%
rename from apps/expo/features/trips/components/TripForm.tsx
rename to packages/app/src/trips/components/TripForm.tsx
index 4c38fc5a76..3f1e2268b1 100644
--- a/apps/expo/features/trips/components/TripForm.tsx
+++ b/packages/app/src/trips/components/TripForm.tsx
@@ -1,3 +1,4 @@
+import { usePacks } from '@packrat/app/packs/hooks/usePacks';
 import type { Trip } from '@packrat/app/trips';
 import { assertDefined, isString } from '@packrat/guards';
 import { Form, FormItem, FormSection, TextField } from '@packrat/ui/nativewindui';
@@ -6,7 +7,6 @@ import { Picker } from '@react-native-picker/picker';
 import { useForm } from '@tanstack/react-form';
 import * as Burnt from 'burnt';
 import { Icon } from 'expo-app/components/Icon';
-import { usePacks } from 'expo-app/features/packs/hooks/usePacks';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { testIds } from 'expo-app/lib/testIds';
diff --git a/apps/expo/features/trips/components/UpcomingTripsTile.tsx b/packages/app/src/trips/components/UpcomingTripsTile.tsx
similarity index 98%
rename from apps/expo/features/trips/components/UpcomingTripsTile.tsx
rename to packages/app/src/trips/components/UpcomingTripsTile.tsx
index 00de15c86e..9bcdb10520 100644
--- a/apps/expo/features/trips/components/UpcomingTripsTile.tsx
+++ b/packages/app/src/trips/components/UpcomingTripsTile.tsx
@@ -1,8 +1,8 @@
+import { useTrips } from '@packrat/app/trips/hooks';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { Alert, ListItem, Text, useColorScheme } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { featureFlags } from 'expo-app/config';
-import { useTrips } from 'expo-app/features/trips/hooks';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { parseLocalDate } from 'expo-app/lib/utils/dateUtils';
 import { useRouter } from 'expo-router';
diff --git a/apps/expo/features/trips/hooks/index.ts b/packages/app/src/trips/hooks/index.ts
similarity index 100%
rename from apps/expo/features/trips/hooks/index.ts
rename to packages/app/src/trips/hooks/index.ts
diff --git a/apps/expo/features/trips/hooks/useAllTrips.ts b/packages/app/src/trips/hooks/useAllTrips.ts
similarity index 100%
rename from apps/expo/features/trips/hooks/useAllTrips.ts
rename to packages/app/src/trips/hooks/useAllTrips.ts
diff --git a/apps/expo/features/trips/hooks/useCreateTrip.ts b/packages/app/src/trips/hooks/useCreateTrip.ts
similarity index 90%
rename from apps/expo/features/trips/hooks/useCreateTrip.ts
rename to packages/app/src/trips/hooks/useCreateTrip.ts
index 8220e533c6..8ab60ba2cd 100644
--- a/apps/expo/features/trips/hooks/useCreateTrip.ts
+++ b/packages/app/src/trips/hooks/useCreateTrip.ts
@@ -1,5 +1,5 @@
 import type { TripInput, TripInStore } from '@packrat/app/trips';
-import { tripsStore } from 'expo-app/features/trips/store/trips';
+import { tripsStore } from '@packrat/app/trips/store/trips';
 import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
diff --git a/apps/expo/features/trips/hooks/useDeleteTrip.ts b/packages/app/src/trips/hooks/useDeleteTrip.ts
similarity index 83%
rename from apps/expo/features/trips/hooks/useDeleteTrip.ts
rename to packages/app/src/trips/hooks/useDeleteTrip.ts
index b85b73c0af..4f4f4183b9 100644
--- a/apps/expo/features/trips/hooks/useDeleteTrip.ts
+++ b/packages/app/src/trips/hooks/useDeleteTrip.ts
@@ -1,4 +1,4 @@
-import { tripsStore } from 'expo-app/features/trips/store/trips';
+import { tripsStore } from '@packrat/app/trips/store/trips';
 import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
 
diff --git a/apps/expo/features/trips/hooks/useTripDetailsFromStore.ts b/packages/app/src/trips/hooks/useTripDetailsFromStore.ts
similarity index 87%
rename from apps/expo/features/trips/hooks/useTripDetailsFromStore.ts
rename to packages/app/src/trips/hooks/useTripDetailsFromStore.ts
index 8c3909b4b7..825c66f2e6 100644
--- a/apps/expo/features/trips/hooks/useTripDetailsFromStore.ts
+++ b/packages/app/src/trips/hooks/useTripDetailsFromStore.ts
@@ -1,5 +1,5 @@
 import { use$ } from '@legendapp/state/react';
-import { tripsStore } from 'expo-app/features/trips/store/trips';
+import { tripsStore } from '@packrat/app/trips/store/trips';
 import { obs } from 'expo-app/lib/store';
 
 /**
diff --git a/apps/expo/features/trips/hooks/useTrips.ts b/packages/app/src/trips/hooks/useTrips.ts
similarity index 100%
rename from apps/expo/features/trips/hooks/useTrips.ts
rename to packages/app/src/trips/hooks/useTrips.ts
diff --git a/apps/expo/features/trips/hooks/useUpdateTrip.ts b/packages/app/src/trips/hooks/useUpdateTrip.ts
similarity index 84%
rename from apps/expo/features/trips/hooks/useUpdateTrip.ts
rename to packages/app/src/trips/hooks/useUpdateTrip.ts
index 38e881b2c9..79a5c12b47 100644
--- a/apps/expo/features/trips/hooks/useUpdateTrip.ts
+++ b/packages/app/src/trips/hooks/useUpdateTrip.ts
@@ -1,5 +1,5 @@
 import type { Trip } from '@packrat/app/trips';
-import { tripsStore } from 'expo-app/features/trips/store/trips';
+import { tripsStore } from '@packrat/app/trips/store/trips';
 import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
 
diff --git a/apps/expo/features/trips/screens/CreateTripScreen.tsx b/packages/app/src/trips/screens/CreateTripScreen.tsx
similarity index 100%
rename from apps/expo/features/trips/screens/CreateTripScreen.tsx
rename to packages/app/src/trips/screens/CreateTripScreen.tsx
diff --git a/apps/expo/features/trips/screens/EditTripScreen.tsx b/packages/app/src/trips/screens/EditTripScreen.tsx
similarity index 94%
rename from apps/expo/features/trips/screens/EditTripScreen.tsx
rename to packages/app/src/trips/screens/EditTripScreen.tsx
index bc53d83aa6..ec5b06ebeb 100644
--- a/apps/expo/features/trips/screens/EditTripScreen.tsx
+++ b/packages/app/src/trips/screens/EditTripScreen.tsx
@@ -1,6 +1,6 @@
+import { useTripDetailsFromStore } from '@packrat/app/trips/hooks/useTripDetailsFromStore';
 import { assertDefined } from '@packrat/guards';
 import { ActivityIndicator } from '@packrat/ui/nativewindui';
-import { useTripDetailsFromStore } from 'expo-app/features/trips/hooks/useTripDetailsFromStore';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useLocalSearchParams, useRouter } from 'expo-router';
 import { useEffect, useState } from 'react';
diff --git a/apps/expo/features/trips/screens/TripDetailScreen.tsx b/packages/app/src/trips/screens/TripDetailScreen.tsx
similarity index 98%
rename from apps/expo/features/trips/screens/TripDetailScreen.tsx
rename to packages/app/src/trips/screens/TripDetailScreen.tsx
index fa1b21d5b7..cd9ff06855 100644
--- a/apps/expo/features/trips/screens/TripDetailScreen.tsx
+++ b/packages/app/src/trips/screens/TripDetailScreen.tsx
@@ -1,9 +1,9 @@
+import { SubmitConditionReportForm } from '@packrat/app/trail-conditions/components/SubmitConditionReportForm';
 import type { Trip } from '@packrat/app/trips';
 import { assertDefined } from '@packrat/guards';
 import { ActivityIndicator, Button, Card, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { featureFlags } from 'expo-app/config';
-import { SubmitConditionReportForm } from 'expo-app/features/trail-conditions/components/SubmitConditionReportForm';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { testIds } from 'expo-app/lib/testIds';
diff --git a/apps/expo/features/trips/screens/TripListScreen.tsx b/packages/app/src/trips/screens/TripListScreen.tsx
similarity index 100%
rename from apps/expo/features/trips/screens/TripListScreen.tsx
rename to packages/app/src/trips/screens/TripListScreen.tsx
diff --git a/apps/expo/features/trips/screens/TripWeatherDetailsScreen.tsx b/packages/app/src/trips/screens/TripWeatherDetailsScreen.tsx
similarity index 97%
rename from apps/expo/features/trips/screens/TripWeatherDetailsScreen.tsx
rename to packages/app/src/trips/screens/TripWeatherDetailsScreen.tsx
index bddef8c413..9177274eee 100644
--- a/apps/expo/features/trips/screens/TripWeatherDetailsScreen.tsx
+++ b/packages/app/src/trips/screens/TripWeatherDetailsScreen.tsx
@@ -1,11 +1,11 @@
 import type { WeatherAPIForecastResponse } from '@packrat/api/schemas/weather';
-import { Icon } from 'expo-app/components/Icon';
-import { WeatherForecast } from 'expo-app/features/weather/components/WeatherForecast';
+import { WeatherForecast } from '@packrat/app/weather/components/WeatherForecast';
 import {
   getWeatherBackgroundColors,
   getWeatherData,
   searchLocationsByCoordinates,
-} from 'expo-app/features/weather/lib/weatherService';
+} from '@packrat/app/weather/lib/weatherService';
+import { Icon } from 'expo-app/components/Icon';
 import { LinearGradient } from 'expo-linear-gradient';
 import { router, Stack, useLocalSearchParams } from 'expo-router';
 import { useEffect, useState } from 'react';
diff --git a/apps/expo/features/trips/store/tripLocationStore.ts b/packages/app/src/trips/store/tripLocationStore.ts
similarity index 100%
rename from apps/expo/features/trips/store/tripLocationStore.ts
rename to packages/app/src/trips/store/tripLocationStore.ts
diff --git a/apps/expo/features/trips/store/trips.ts b/packages/app/src/trips/store/trips.ts
similarity index 98%
rename from apps/expo/features/trips/store/trips.ts
rename to packages/app/src/trips/store/trips.ts
index 1c16c1e637..debd758f0f 100644
--- a/apps/expo/features/trips/store/trips.ts
+++ b/packages/app/src/trips/store/trips.ts
@@ -2,8 +2,8 @@ import { observable, syncState } from '@legendapp/state';
 import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { TripSchema } from '@packrat/api/schemas/trips';
+import { isAuthed } from '@packrat/app/auth/store';
 import type { TripInStore } from '@packrat/app/trips';
-import { isAuthed } from 'expo-app/features/auth/store';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { persistPlugin } from 'expo-app/lib/persist-plugin';
 
diff --git a/apps/expo/features/trips/tripListAtoms.tsx b/packages/app/src/trips/tripListAtoms.tsx
similarity index 100%
rename from apps/expo/features/trips/tripListAtoms.tsx
rename to packages/app/src/trips/tripListAtoms.tsx
diff --git a/apps/expo/features/trips/utils/getTripDetailOptions.tsx b/packages/app/src/trips/utils/getTripDetailOptions.tsx
similarity index 100%
rename from apps/expo/features/trips/utils/getTripDetailOptions.tsx
rename to packages/app/src/trips/utils/getTripDetailOptions.tsx
diff --git a/apps/expo/features/weather/atoms/locationsAtoms.ts b/packages/app/src/weather/atoms/locationsAtoms.ts
similarity index 100%
rename from apps/expo/features/weather/atoms/locationsAtoms.ts
rename to packages/app/src/weather/atoms/locationsAtoms.ts
diff --git a/apps/expo/features/weather/components/LocationCard.tsx b/packages/app/src/weather/components/LocationCard.tsx
similarity index 100%
rename from apps/expo/features/weather/components/LocationCard.tsx
rename to packages/app/src/weather/components/LocationCard.tsx
diff --git a/apps/expo/features/weather/components/LocationPicker.tsx b/packages/app/src/weather/components/LocationPicker.tsx
similarity index 100%
rename from apps/expo/features/weather/components/LocationPicker.tsx
rename to packages/app/src/weather/components/LocationPicker.tsx
diff --git a/apps/expo/features/weather/components/WeatherAlertsTile.tsx b/packages/app/src/weather/components/WeatherAlertsTile.tsx
similarity index 100%
rename from apps/expo/features/weather/components/WeatherAlertsTile.tsx
rename to packages/app/src/weather/components/WeatherAlertsTile.tsx
diff --git a/apps/expo/features/weather/components/WeatherAuthWall.tsx b/packages/app/src/weather/components/WeatherAuthWall.tsx
similarity index 100%
rename from apps/expo/features/weather/components/WeatherAuthWall.tsx
rename to packages/app/src/weather/components/WeatherAuthWall.tsx
diff --git a/apps/expo/features/weather/components/WeatherForecast.tsx b/packages/app/src/weather/components/WeatherForecast.tsx
similarity index 100%
rename from apps/expo/features/weather/components/WeatherForecast.tsx
rename to packages/app/src/weather/components/WeatherForecast.tsx
diff --git a/apps/expo/features/weather/components/WeatherIcon.tsx b/packages/app/src/weather/components/WeatherIcon.tsx
similarity index 100%
rename from apps/expo/features/weather/components/WeatherIcon.tsx
rename to packages/app/src/weather/components/WeatherIcon.tsx
diff --git a/apps/expo/features/weather/components/WeatherTile.tsx b/packages/app/src/weather/components/WeatherTile.tsx
similarity index 100%
rename from apps/expo/features/weather/components/WeatherTile.tsx
rename to packages/app/src/weather/components/WeatherTile.tsx
diff --git a/apps/expo/features/weather/components/index.ts b/packages/app/src/weather/components/index.ts
similarity index 100%
rename from apps/expo/features/weather/components/index.ts
rename to packages/app/src/weather/components/index.ts
diff --git a/apps/expo/features/weather/hooks/index.ts b/packages/app/src/weather/hooks/index.ts
similarity index 100%
rename from apps/expo/features/weather/hooks/index.ts
rename to packages/app/src/weather/hooks/index.ts
diff --git a/apps/expo/features/weather/hooks/useActiveLocation.ts b/packages/app/src/weather/hooks/useActiveLocation.ts
similarity index 100%
rename from apps/expo/features/weather/hooks/useActiveLocation.ts
rename to packages/app/src/weather/hooks/useActiveLocation.ts
diff --git a/apps/expo/features/weather/hooks/useLocationRefresh.ts b/packages/app/src/weather/hooks/useLocationRefresh.ts
similarity index 95%
rename from apps/expo/features/weather/hooks/useLocationRefresh.ts
rename to packages/app/src/weather/hooks/useLocationRefresh.ts
index c9ad3a8e92..24c7887420 100644
--- a/apps/expo/features/weather/hooks/useLocationRefresh.ts
+++ b/packages/app/src/weather/hooks/useLocationRefresh.ts
@@ -1,4 +1,4 @@
-import { formatWeatherData, getWeatherData } from 'expo-app/features/weather/lib/weatherService';
+import { formatWeatherData, getWeatherData } from '@packrat/app/weather/lib/weatherService';
 import { useState } from 'react';
 import type { WeatherLocation } from '../types';
 import { useLocations } from './useLocations';
diff --git a/apps/expo/features/weather/hooks/useLocationSearch.ts b/packages/app/src/weather/hooks/useLocationSearch.ts
similarity index 97%
rename from apps/expo/features/weather/hooks/useLocationSearch.ts
rename to packages/app/src/weather/hooks/useLocationSearch.ts
index 36574bf651..059fd52855 100644
--- a/apps/expo/features/weather/hooks/useLocationSearch.ts
+++ b/packages/app/src/weather/hooks/useLocationSearch.ts
@@ -3,7 +3,7 @@ import {
   getWeatherData,
   searchLocations,
   searchLocationsByCoordinates,
-} from 'expo-app/features/weather/lib/weatherService';
+} from '@packrat/app/weather/lib/weatherService';
 import { useState } from 'react';
 import type { LocationSearchResult, WeatherLocation } from '../types';
 import { useLocations } from './useLocations';
diff --git a/apps/expo/features/weather/hooks/useLocations.ts b/packages/app/src/weather/hooks/useLocations.ts
similarity index 100%
rename from apps/expo/features/weather/hooks/useLocations.ts
rename to packages/app/src/weather/hooks/useLocations.ts
diff --git a/apps/expo/features/weather/hooks/useWeatherAlert.ts b/packages/app/src/weather/hooks/useWeatherAlert.ts
similarity index 98%
rename from apps/expo/features/weather/hooks/useWeatherAlert.ts
rename to packages/app/src/weather/hooks/useWeatherAlert.ts
index 1a462f2ad2..ec7913366f 100644
--- a/apps/expo/features/weather/hooks/useWeatherAlert.ts
+++ b/packages/app/src/weather/hooks/useWeatherAlert.ts
@@ -1,4 +1,4 @@
-import { getWeatherData } from 'expo-app/features/weather/lib/weatherService';
+import { getWeatherData } from '@packrat/app/weather/lib/weatherService';
 import { useAtomValue } from 'jotai';
 import { useEffect, useState } from 'react';
 import { activeLocationAtom } from '../atoms/locationsAtoms';
diff --git a/apps/expo/features/weather/lib/weatherIcons.ts b/packages/app/src/weather/lib/weatherIcons.ts
similarity index 100%
rename from apps/expo/features/weather/lib/weatherIcons.ts
rename to packages/app/src/weather/lib/weatherIcons.ts
diff --git a/apps/expo/features/weather/lib/weatherService.ts b/packages/app/src/weather/lib/weatherService.ts
similarity index 100%
rename from apps/expo/features/weather/lib/weatherService.ts
rename to packages/app/src/weather/lib/weatherService.ts
diff --git a/apps/expo/features/weather/screens/LocationDetailScreen.tsx b/packages/app/src/weather/screens/LocationDetailScreen.tsx
similarity index 99%
rename from apps/expo/features/weather/screens/LocationDetailScreen.tsx
rename to packages/app/src/weather/screens/LocationDetailScreen.tsx
index 7fd6bf7319..4d900bcd3d 100644
--- a/apps/expo/features/weather/screens/LocationDetailScreen.tsx
+++ b/packages/app/src/weather/screens/LocationDetailScreen.tsx
@@ -1,7 +1,7 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import { getWeatherBackgroundColors } from '@packrat/app/weather/lib/weatherService';
 import { Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
-import { getWeatherBackgroundColors } from 'expo-app/features/weather/lib/weatherService';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { LinearGradient } from 'expo-linear-gradient';
diff --git a/apps/expo/features/weather/screens/LocationPreviewScreen.tsx b/packages/app/src/weather/screens/LocationPreviewScreen.tsx
similarity index 99%
rename from apps/expo/features/weather/screens/LocationPreviewScreen.tsx
rename to packages/app/src/weather/screens/LocationPreviewScreen.tsx
index b3ea514a48..4d71bf9052 100644
--- a/apps/expo/features/weather/screens/LocationPreviewScreen.tsx
+++ b/packages/app/src/weather/screens/LocationPreviewScreen.tsx
@@ -1,10 +1,10 @@
-import { Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
 import {
   formatWeatherData,
   getWeatherBackgroundColors,
   getWeatherData,
-} from 'expo-app/features/weather/lib/weatherService';
+} from '@packrat/app/weather/lib/weatherService';
+import { Text } from '@packrat/ui/nativewindui';
+import { Icon } from 'expo-app/components/Icon';
 import { cn } from 'expo-app/lib/cn';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 // import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
diff --git a/apps/expo/features/weather/screens/LocationSearchScreen.tsx b/packages/app/src/weather/screens/LocationSearchScreen.tsx
similarity index 100%
rename from apps/expo/features/weather/screens/LocationSearchScreen.tsx
rename to packages/app/src/weather/screens/LocationSearchScreen.tsx
diff --git a/apps/expo/features/weather/screens/LocationsScreen.tsx b/packages/app/src/weather/screens/LocationsScreen.tsx
similarity index 99%
rename from apps/expo/features/weather/screens/LocationsScreen.tsx
rename to packages/app/src/weather/screens/LocationsScreen.tsx
index 1c48d033b2..b189a7b4e3 100644
--- a/apps/expo/features/weather/screens/LocationsScreen.tsx
+++ b/packages/app/src/weather/screens/LocationsScreen.tsx
@@ -1,8 +1,8 @@
+import { withAuthWall } from '@packrat/app/auth/hocs';
 import { Button, LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
 import { Icon } from 'expo-app/components/Icon';
 import { LargeTitleHeaderOverlapFixIOS } from 'expo-app/components/LargeTitleHeaderOverlapFixIOS';
 import { SearchInput } from 'expo-app/components/SearchInput';
-import { withAuthWall } from 'expo-app/features/auth/hocs';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router, useNavigation } from 'expo-router';
diff --git a/apps/expo/features/weather/screens/index.ts b/packages/app/src/weather/screens/index.ts
similarity index 100%
rename from apps/expo/features/weather/screens/index.ts
rename to packages/app/src/weather/screens/index.ts
diff --git a/apps/expo/features/weather/types.ts b/packages/app/src/weather/types.ts
similarity index 100%
rename from apps/expo/features/weather/types.ts
rename to packages/app/src/weather/types.ts
diff --git a/apps/expo/features/wildlife/atoms/wildlifeAtoms.ts b/packages/app/src/wildlife/atoms/wildlifeAtoms.ts
similarity index 100%
rename from apps/expo/features/wildlife/atoms/wildlifeAtoms.ts
rename to packages/app/src/wildlife/atoms/wildlifeAtoms.ts
diff --git a/apps/expo/features/wildlife/components/SpeciesCard.tsx b/packages/app/src/wildlife/components/SpeciesCard.tsx
similarity index 100%
rename from apps/expo/features/wildlife/components/SpeciesCard.tsx
rename to packages/app/src/wildlife/components/SpeciesCard.tsx
diff --git a/apps/expo/features/wildlife/components/WildlifeTile.tsx b/packages/app/src/wildlife/components/WildlifeTile.tsx
similarity index 100%
rename from apps/expo/features/wildlife/components/WildlifeTile.tsx
rename to packages/app/src/wildlife/components/WildlifeTile.tsx
diff --git a/apps/expo/features/wildlife/components/index.ts b/packages/app/src/wildlife/components/index.ts
similarity index 100%
rename from apps/expo/features/wildlife/components/index.ts
rename to packages/app/src/wildlife/components/index.ts
diff --git a/apps/expo/features/wildlife/hooks/index.ts b/packages/app/src/wildlife/hooks/index.ts
similarity index 100%
rename from apps/expo/features/wildlife/hooks/index.ts
rename to packages/app/src/wildlife/hooks/index.ts
diff --git a/apps/expo/features/wildlife/hooks/useWildlifeHistory.ts b/packages/app/src/wildlife/hooks/useWildlifeHistory.ts
similarity index 100%
rename from apps/expo/features/wildlife/hooks/useWildlifeHistory.ts
rename to packages/app/src/wildlife/hooks/useWildlifeHistory.ts
diff --git a/apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts b/packages/app/src/wildlife/hooks/useWildlifeIdentification.ts
similarity index 95%
rename from apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts
rename to packages/app/src/wildlife/hooks/useWildlifeIdentification.ts
index 10b056ce15..ff4e274c55 100644
--- a/apps/expo/features/wildlife/hooks/useWildlifeIdentification.ts
+++ b/packages/app/src/wildlife/hooks/useWildlifeIdentification.ts
@@ -1,9 +1,9 @@
+import type { SelectedImage } from '@packrat/app/packs/hooks/useImagePicker';
+import { uploadImage } from '@packrat/app/packs/utils';
 import type { IdentificationResult } from '@packrat/app/wildlife';
 import { identifyFromDescription } from '@packrat/app/wildlife';
 import { isObject, zodGuard } from '@packrat/guards';
 import { useMutation } from '@tanstack/react-query';
-import type { SelectedImage } from 'expo-app/features/packs/hooks/useImagePicker';
-import { uploadImage } from 'expo-app/features/packs/utils';
 import { apiClient } from 'expo-app/lib/api/packrat';
 import { z } from 'zod';
 
diff --git a/apps/expo/features/wildlife/screens/IdentificationScreen.tsx b/packages/app/src/wildlife/screens/IdentificationScreen.tsx
similarity index 99%
rename from apps/expo/features/wildlife/screens/IdentificationScreen.tsx
rename to packages/app/src/wildlife/screens/IdentificationScreen.tsx
index aef1066073..ff89ef7361 100644
--- a/apps/expo/features/wildlife/screens/IdentificationScreen.tsx
+++ b/packages/app/src/wildlife/screens/IdentificationScreen.tsx
@@ -1,10 +1,10 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import { useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
 import type { IdentificationResult } from '@packrat/app/wildlife';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import { appAlert } from 'expo-app/app/_layout';
 import { Icon } from 'expo-app/components/Icon';
 import { TextInput } from 'expo-app/components/TextInput';
-import { useImagePicker } from 'expo-app/features/packs/hooks/useImagePicker';
 import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Stack, useRouter } from 'expo-router';
diff --git a/apps/expo/features/wildlife/screens/SpeciesDetailScreen.tsx b/packages/app/src/wildlife/screens/SpeciesDetailScreen.tsx
similarity index 100%
rename from apps/expo/features/wildlife/screens/SpeciesDetailScreen.tsx
rename to packages/app/src/wildlife/screens/SpeciesDetailScreen.tsx
diff --git a/apps/expo/features/wildlife/screens/WildlifeScreen.tsx b/packages/app/src/wildlife/screens/WildlifeScreen.tsx
similarity index 100%
rename from apps/expo/features/wildlife/screens/WildlifeScreen.tsx
rename to packages/app/src/wildlife/screens/WildlifeScreen.tsx
diff --git a/apps/expo/features/wildlife/screens/index.ts b/packages/app/src/wildlife/screens/index.ts
similarity index 100%
rename from apps/expo/features/wildlife/screens/index.ts
rename to packages/app/src/wildlife/screens/index.ts
diff --git a/packages/app/tsconfig.json b/packages/app/tsconfig.json
index 7ea02c30f5..c7a9b4dbd4 100644
--- a/packages/app/tsconfig.json
+++ b/packages/app/tsconfig.json
@@ -6,9 +6,9 @@
     "noEmit": true,
     "paths": {
       "@packrat/app": ["./src/index.ts"],
-      "@packrat/app/*": ["./src/*/index.ts"]
+      "@packrat/app/*": ["./src/*"]
     }
   },
-  "include": ["src/**/*.ts"],
+  "include": ["src/**/*.ts", "src/**/*.tsx"],
   "exclude": ["node_modules", "dist"]
 }

From 559d484b87a8d41ce1406dbd1a2406ce3edc7d5b Mon Sep 17 00:00:00 2001
From: Andrew Bierman <abbierman101@gmail.com>
Date: Fri, 1 May 2026 18:53:41 -0600
Subject: [PATCH 7/9] feat(app): move atoms, components, lib, screens, utils to
 @packrat/app

Relocates all remaining non-routing directories from apps/expo/ to
packages/app/src/ via git mv (atoms, components, lib, screens, types,
utils, providers, theme, data) and rewrites all expo-app/* imports in
both packages/app/src/ and apps/expo/app/ routing files to use the
@packrat/app/* path alias. The expo routing shell retains only
expo-app/app/_layout and expo-app/config cross-references which
legitimately remain in apps/expo. Also updates biome.json overrides to
point to new file paths and nativewindui tsconfig alias.
---
 apps/expo/app/(app)/(tabs)/(home)/index.tsx   | 12 +++++------
 apps/expo/app/(app)/(tabs)/_layout.tsx        |  2 +-
 apps/expo/app/(app)/(tabs)/packs/index.tsx    |  2 +-
 apps/expo/app/(app)/(tabs)/profile/index.tsx  | 16 +++++++--------
 apps/expo/app/(app)/(tabs)/profile/name.tsx   |  6 +++---
 .../(app)/(tabs)/profile/notifications.tsx    |  6 +++---
 .../app/(app)/(tabs)/profile/username.tsx     |  4 ++--
 apps/expo/app/(app)/_layout.tsx               |  8 ++++----
 apps/expo/app/(app)/ai-chat.tsx               | 15 ++++++++------
 apps/expo/app/(app)/consent-modal.tsx         |  4 ++--
 apps/expo/app/(app)/current-pack/[id].tsx     | 10 +++++-----
 apps/expo/app/(app)/demo/index.tsx            | 10 +++++-----
 apps/expo/app/(app)/feed/[id].tsx             |  2 +-
 apps/expo/app/(app)/gear-inventory.tsx        |  4 ++--
 apps/expo/app/(app)/messages/chat.android.tsx |  8 ++++----
 apps/expo/app/(app)/messages/chat.tsx         |  8 ++++----
 .../(app)/messages/conversations.android.tsx  |  6 +++---
 .../expo/app/(app)/messages/conversations.tsx |  6 +++---
 apps/expo/app/(app)/pack-categories/[id].tsx  |  6 +++---
 apps/expo/app/(app)/pack-stats/[id].tsx       |  2 +-
 apps/expo/app/(app)/recent-packs.tsx          |  8 ++++----
 apps/expo/app/(app)/season-suggestions.tsx    |  4 ++--
 apps/expo/app/(app)/settings/index.tsx        |  6 +++---
 apps/expo/app/(app)/shared-packs.tsx          |  4 ++--
 apps/expo/app/(app)/shopping-list.tsx         | 10 +++++-----
 apps/expo/app/(app)/trail-conditions.tsx      |  2 +-
 apps/expo/app/(app)/trip/location-search.tsx  |  4 ++--
 apps/expo/app/(app)/upcoming-trips.tsx        |  6 +++---
 .../app/(app)/weather-alert-preferences.tsx   |  6 +++---
 apps/expo/app/(app)/weather-alerts.tsx        |  6 +++---
 apps/expo/app/(app)/weight-analysis/[id].tsx  |  4 ++--
 apps/expo/app/(app)/wildlife/_layout.tsx      |  2 +-
 apps/expo/app/_layout.tsx                     |  6 +++---
 .../app/auth/(create-account)/_layout.tsx     |  2 +-
 .../app/auth/(create-account)/credentials.tsx |  6 +++---
 apps/expo/app/auth/(create-account)/index.tsx |  2 +-
 .../expo/app/auth/(login)/forgot-password.tsx |  2 +-
 apps/expo/app/auth/(login)/index.tsx          |  4 ++--
 apps/expo/app/auth/(login)/reset-password.tsx |  6 +++---
 apps/expo/app/auth/_layout.tsx                |  2 +-
 apps/expo/app/auth/index.tsx                  |  4 ++--
 apps/expo/app/auth/one-time-password.tsx      |  8 ++++----
 biome.json                                    |  4 ++--
 .../src/ai-packs/components/AIPacksTile.tsx   |  6 +++---
 .../src/ai-packs/hooks/useGeneratedPacks.ts   |  4 ++--
 .../src/ai-packs/screens/AIPacksScreen.tsx    |  8 ++++----
 packages/app/src/ai/atoms/aiModeAtoms.ts      |  2 +-
 packages/app/src/ai/components/AIChatTile.tsx |  6 +++---
 .../app/src/ai/components/AIModeSelector.tsx  |  6 +++---
 .../app/src/ai/components/AIModeSheet.tsx     |  6 +++---
 .../components/CatalogItemsGenerativeUI.tsx   |  2 +-
 packages/app/src/ai/components/ChatBubble.tsx | 10 +++++-----
 .../ai/components/CircularDownloadButton.tsx  |  4 ++--
 packages/app/src/ai/components/ErrorState.tsx |  4 ++--
 .../ai/components/GuidesRAGGenerativeUI.tsx   |  6 +++---
 .../app/src/ai/components/LocationContext.tsx |  4 ++--
 .../ai/components/PackDetailsGenerativeUI.tsx |  2 +-
 .../PackItemDetailsGenerativeUI.tsx           |  2 +-
 .../app/src/ai/components/ReportModal.tsx     | 10 +++++-----
 .../src/ai/components/ReportedContentTile.tsx |  6 +++---
 .../src/ai/components/WeatherGenerativeUI.tsx |  4 ++--
 .../ai/components/WebSearchGenerativeUI.tsx   |  6 +++---
 packages/app/src/ai/hooks/useReportContent.ts |  2 +-
 .../app/src/ai/hooks/useReportedContent.ts    |  4 ++--
 .../app/src/ai/hooks/useUpdateReportStatus.ts |  2 +-
 packages/app/src/ai/lib/localModelManager.ts  |  2 +-
 packages/app/src/ai/lib/reportReasons.ts      |  2 +-
 packages/app/src/ai/lib/tools.ts              |  2 +-
 .../src/ai/screens/ReportedContentScreen.tsx  |  8 ++++----
 .../app/src}/atoms/atomWithAsyncStorage.ts    |  0
 .../app/src}/atoms/atomWithKvStorage.ts       |  0
 .../app/src}/atoms/atomWithSecureStorage.ts   |  0
 .../app/src}/atoms/itemListAtoms.ts           |  0
 .../atoms/recentlyUsedCatalogItemsAtom.ts     |  0
 .../expo => packages/app/src}/atoms/store.ts  |  0
 packages/app/src/auth/atoms/authAtoms.ts      |  2 +-
 .../auth/components/DeleteAccountButton.tsx   |  6 +++---
 packages/app/src/auth/hooks/useAuthActions.ts |  6 +++---
 packages/app/src/auth/hooks/useAuthInit.ts    |  2 +-
 packages/app/src/auth/store/user.ts           |  2 +-
 .../components/CatalogBrowserModal.tsx        | 12 +++++------
 .../components/CatalogCategoriesFilter.tsx    |  2 +-
 .../catalog/components/CatalogItemCard.tsx    |  6 +++---
 .../catalog/components/CatalogItemImage.tsx   |  2 +-
 .../components/CatalogItemSelectCard.tsx      |  6 +++---
 .../components/CatalogItemsAuthWall.tsx       |  4 ++--
 .../app/src/catalog/components/ItemLinks.tsx  |  6 +++---
 .../src/catalog/components/ItemReviews.tsx    |  6 +++---
 .../src/catalog/components/SimilarItems.tsx   |  2 +-
 .../catalog/hooks/useCatalogItemDetails.ts    |  4 ++--
 .../app/src/catalog/hooks/useCatalogItems.ts  |  2 +-
 .../hooks/useCatalogItemsCategories.ts        |  4 ++--
 .../hooks/useRecentlyUsedCatalogItems.ts      |  4 ++--
 .../app/src/catalog/hooks/useSimilarItems.ts  |  4 ++--
 .../app/src/catalog/hooks/useVectorSearch.ts  |  4 ++--
 .../src/catalog/lib/cacheCatalogItemImage.ts  |  4 ++--
 .../screens/AddCatalogItemDetailsScreen.tsx   | 10 +++++-----
 .../screens/CatalogItemDetailScreen.tsx       | 20 +++++++++----------
 .../catalog/screens/CatalogItemsScreen.tsx    | 20 +++++++++----------
 .../catalog/screens/PackSelectionScreen.tsx   |  8 ++++----
 .../src}/components/AndroidTabBarInsetFix.tsx |  0
 .../app/src}/components/BackButton.tsx        |  2 +-
 .../app/src}/components/Button.tsx            |  0
 .../app/src}/components/Card.tsx              |  0
 .../app/src}/components/CategoriesFilter.tsx  |  4 ++--
 .../app/src}/components/Container.tsx         |  0
 .../app/src}/components/EditScreenInfo.tsx    |  0
 .../app/src}/components/ErrorState.tsx        |  4 ++--
 .../app/src}/components/HeaderButton.tsx      |  0
 .../app/src}/components/Icon/Icon.ios.tsx     |  0
 .../app/src}/components/Icon/Icon.tsx         |  0
 .../src}/components/Icon/get-icon-names.ts    |  0
 .../app/src}/components/Icon/index.ts         |  0
 .../app/src}/components/Icon/types.ts         |  0
 .../LargeTitleHeaderOverlapFixIOS.tsx         |  0
 ...LargeTitleHeaderSearchContentContainer.tsx |  0
 .../app/src}/components/Markdown.tsx          |  0
 .../app/src}/components/ScreenContent.tsx     |  0
 .../app/src}/components/SearchInput.tsx       |  4 ++--
 .../app/src}/components/TabBarIcon.tsx        |  0
 .../app/src}/components/TextInput.tsx         |  4 ++--
 .../app/src}/components/ThemeToggle.tsx       |  8 ++++----
 .../app/src}/components/ai-chatHeader.tsx     |  6 +++---
 .../app/src}/components/initial/Chip.tsx      |  2 +-
 .../src}/components/initial/ErrorBoundary.tsx |  6 +++---
 .../components/initial/ExpandableText.tsx     |  0
 .../src}/components/initial/UserAvatar.tsx    |  2 +-
 .../src}/components/initial/WeightBadge.tsx   |  6 +++---
 .../app/src}/data/mockData.ts                 |  2 +-
 .../app/src/feed/components/CommentItem.tsx   |  4 ++--
 packages/app/src/feed/components/FeedTile.tsx |  6 +++---
 packages/app/src/feed/components/PostCard.tsx |  4 ++--
 packages/app/src/feed/hooks/useAddComment.ts  |  2 +-
 packages/app/src/feed/hooks/useCreatePost.ts  |  2 +-
 .../app/src/feed/hooks/useDeleteComment.ts    |  2 +-
 packages/app/src/feed/hooks/useDeletePost.ts  |  2 +-
 packages/app/src/feed/hooks/useFeed.ts        |  2 +-
 .../app/src/feed/hooks/usePostComments.ts     |  2 +-
 .../src/feed/hooks/useToggleCommentLike.ts    |  2 +-
 .../app/src/feed/hooks/useTogglePostLike.ts   |  2 +-
 .../app/src/feed/screens/CreatePostScreen.tsx |  8 ++++----
 packages/app/src/feed/screens/FeedScreen.tsx  |  6 +++---
 .../app/src/feed/screens/PostDetailScreen.tsx |  8 ++++----
 .../feed/utils/__tests__/feedUtils.test.ts    |  2 +-
 packages/app/src/feed/utils/index.ts          |  4 ++--
 .../app/src/guides/components/GuideCard.tsx   |  2 +-
 .../app/src/guides/components/GuidesTile.tsx  |  6 +++---
 .../src/guides/hooks/useGuideCategories.ts    |  4 ++--
 .../app/src/guides/hooks/useGuideDetails.ts   |  2 +-
 packages/app/src/guides/hooks/useGuides.ts    |  2 +-
 .../app/src/guides/hooks/useSearchGuides.ts   |  2 +-
 .../src/guides/screens/GuideDetailScreen.tsx  |  8 ++++----
 .../src/guides/screens/GuidesListScreen.tsx   | 12 +++++------
 .../app/src}/lib/api/index.ts                 |  0
 .../app/src}/lib/api/packrat.ts               |  4 ++--
 {apps/expo => packages/app/src}/lib/cn.ts     |  0
 .../app/src}/lib/constants.ts                 |  0
 .../app/src}/lib/hasUnsyncedChanges.ts        |  0
 .../lib/hooks/useAuthenticatedQueryToolkit.ts |  0
 .../src}/lib/hooks/useBottomSheetAction.ts    |  0
 .../app/src}/lib/hooks/useColorScheme.tsx     |  2 +-
 .../app/src}/lib/hooks/useHeaderSearchBar.tsx |  2 +-
 .../src}/lib/hooks/useKeyboardHideBlur.tsx    |  0
 .../app/src}/lib/hooks/useTranslation.ts      |  2 +-
 .../app/src}/lib/i18n/EXAMPLES.tsx            |  8 ++++----
 .../app/src}/lib/i18n/MIGRATION.md            |  0
 .../app/src}/lib/i18n/QUICKSTART.md           |  0
 .../app/src}/lib/i18n/README.md               |  0
 .../app/src}/lib/i18n/i18next.d.ts            |  0
 .../app/src}/lib/i18n/index.ts                |  2 +-
 .../app/src}/lib/i18n/locales/en.json         |  0
 .../app/src}/lib/i18n/types.ts                |  2 +-
 .../app/src}/lib/kvStorage.ts                 |  0
 .../app/src}/lib/kvStorage.web.ts             |  0
 .../app/src}/lib/persist-plugin.ts            |  0
 .../app/src}/lib/persist-plugin.web.ts        |  0
 {apps/expo => packages/app/src}/lib/store.ts  |  0
 .../expo => packages/app/src}/lib/testIds.ts  |  2 +-
 .../app/src}/lib/utils/ImageCacheManager.ts   |  0
 .../utils/__tests__/ImageCacheManager.test.ts |  0
 .../utils/__tests__/asNonNullableRef.test.ts  |  0
 .../lib/utils/__tests__/buildImageUrl.test.ts |  0
 .../buildPackTemplateItemImageUrl.test.ts     |  0
 .../lib/utils/__tests__/compute-pack.test.ts  |  2 +-
 .../__tests__/decodeHtmlEntities.test.ts      |  0
 .../domain-specific-extensions.test.ts        |  0
 .../utils/__tests__/getRelativeTime.test.ts   |  0
 .../lib/utils/__tests__/imageUtils.test.ts    |  0
 .../utils/__tests__/itemCalculations.test.ts  |  0
 .../app/src}/lib/utils/asNonNullableRef.ts    |  0
 .../app/src}/lib/utils/buildImageUrl.ts       |  0
 .../utils/buildPackTemplateItemImageUrl.ts    |  0
 .../app/src}/lib/utils/compute-pack.ts        |  2 +-
 .../app/src}/lib/utils/dateUtils.ts           |  0
 .../app/src}/lib/utils/decodeHtmlEntities.ts  |  0
 .../lib/utils/domain-specific-extensions.ts   |  0
 .../app/src}/lib/utils/getRelativeTime.ts     |  2 +-
 .../app/src}/lib/utils/imageUtils.ts          |  0
 .../app/src}/lib/utils/itemCalculations.ts    |  0
 .../components/AddPackTemplateItemActions.tsx |  4 ++--
 .../components/AppTemplateBadge.tsx           |  2 +-
 .../components/FeaturedPacksSection.tsx       |  4 ++--
 .../components/OnlineContentImportModal.tsx   |  6 +++---
 .../components/PackTemplateCard.tsx           |  8 ++++----
 .../components/PackTemplateForm.tsx           |  6 +++---
 .../components/PackTemplateItemCard.tsx       |  8 ++++----
 .../components/PackTemplateItemImage.tsx      |  4 ++--
 .../components/PackTemplatesTile.tsx          |  6 +++---
 .../components/TemplateCreationOptions.tsx    |  8 ++++----
 .../hooks/useCreatePackTemplate.ts            |  2 +-
 .../hooks/useCreatePackTemplateItem.ts        |  2 +-
 .../hooks/useDeletePackTemplate.ts            |  2 +-
 .../hooks/useDeletePackTemplateItem.ts        |  2 +-
 .../useGenerateTemplateFromOnlineContent.ts   |  6 +++---
 .../hooks/usePackTemplatesDetails.ts          |  2 +-
 .../hooks/useUpdatePackTemplateItem.ts        |  2 +-
 .../hooks/useUpdatePacktemplate.ts            |  2 +-
 .../hooks/useWritePermissionCheck.ts          |  2 +-
 .../pack-templates/packTemplateListAtoms.ts   |  2 +-
 .../screens/CreatePackTemplateItemForm.tsx    | 10 +++++-----
 .../screens/EditPackTemplateItemScreen.tsx    |  4 ++--
 .../screens/EditPackTemplateScreen.tsx        |  4 ++--
 .../screens/ItemsScanScreen.tsx               |  8 ++++----
 .../screens/PackTemplateDetailScreen.tsx      |  8 ++++----
 .../screens/PackTemplateItemDetailScreen.tsx  | 14 ++++++-------
 .../screens/PackTemplateListScreen.tsx        | 10 +++++-----
 .../pack-templates/store/packTemplateItems.ts |  4 ++--
 .../src/pack-templates/store/packTemplates.ts |  4 ++--
 .../utils/getPackTemplateDetailOptions.tsx    |  6 +++---
 .../getPackTemplateItemDetailOptions.tsx      |  6 +++---
 .../src/packs/components/ActivityPicker.tsx   |  6 +++---
 .../packs/components/AddPackItemActions.tsx   |  6 +++---
 .../app/src/packs/components/CachedImage.tsx  |  2 +-
 .../src/packs/components/CurrentPackTile.tsx  |  6 +++---
 .../src/packs/components/GapAnalysisModal.tsx |  6 +++---
 .../components/GapItemCatalogSuggestions.tsx  |  4 ++--
 .../src/packs/components/GapSuggestion.tsx    |  4 ++--
 .../packs/components/GearInventoryTile.tsx    |  6 +++---
 .../components/HorizontalCatalogItemCard.tsx  |  4 ++--
 .../app/src/packs/components/PackCard.tsx     |  6 +++---
 .../packs/components/PackCategoriesTile.tsx   |  6 +++---
 .../app/src/packs/components/PackForm.tsx     |  8 ++++----
 .../app/src/packs/components/PackItemCard.tsx |  8 ++++----
 .../src/packs/components/PackItemImage.tsx    |  4 ++--
 .../src/packs/components/PackStatsTile.tsx    |  6 +++---
 .../src/packs/components/RecentPacksTile.tsx  |  8 ++++----
 .../src/packs/components/SearchResults.tsx    |  2 +-
 .../components/SeasonSuggestionsTile.tsx      |  6 +++---
 .../src/packs/components/SharedPacksTile.tsx  |  6 +++---
 .../src/packs/components/ShoppingListTile.tsx |  6 +++---
 .../components/SimilarItemsForPackItem.tsx    |  2 +-
 .../app/src/packs/components/SyncBanner.tsx   |  4 ++--
 .../packs/components/TemplateItemsSection.tsx | 12 +++++------
 .../packs/components/WeightAnalysisTile.tsx   |  6 +++---
 packages/app/src/packs/hooks/useAllPacks.ts   |  4 ++--
 packages/app/src/packs/hooks/useCreatePack.ts |  2 +-
 .../app/src/packs/hooks/useCreatePackItem.ts  |  2 +-
 packages/app/src/packs/hooks/useDeletePack.ts |  2 +-
 .../app/src/packs/hooks/useDeletePackItem.ts  |  2 +-
 .../app/src/packs/hooks/useDuplicatePack.ts   |  2 +-
 .../app/src/packs/hooks/useImageDetection.ts  |  2 +-
 .../app/src/packs/hooks/useImagePicker.ts     |  2 +-
 .../src/packs/hooks/usePackDetailsFromApi.ts  |  4 ++--
 .../packs/hooks/usePackDetailsFromStore.ts    |  2 +-
 .../app/src/packs/hooks/usePackGapAnalysis.ts |  2 +-
 .../packs/hooks/usePackItemDetailsFromApi.ts  |  4 ++--
 .../packs/hooks/usePackItemOwnershipCheck.ts  |  2 +-
 .../src/packs/hooks/usePackOwnershipCheck.ts  |  2 +-
 .../src/packs/hooks/useSeasonSuggestions.ts   |  2 +-
 packages/app/src/packs/hooks/useUpdatePack.ts |  2 +-
 packages/app/src/packs/packListAtoms.ts       |  2 +-
 .../src/packs/screens/CreatePackItemForm.tsx  | 12 +++++------
 .../src/packs/screens/EditPackItemScreen.tsx  |  4 ++--
 .../app/src/packs/screens/ItemsScanScreen.tsx |  8 ++++----
 .../src/packs/screens/PackDetailScreen.tsx    | 18 ++++++++---------
 .../packs/screens/PackItemDetailScreen.tsx    | 14 ++++++-------
 .../app/src/packs/screens/PackListScreen.tsx  | 16 +++++++--------
 packages/app/src/packs/store/packItems.ts     |  6 +++---
 .../app/src/packs/store/packWeightHistory.ts  |  6 +++---
 packages/app/src/packs/store/packingMode.ts   |  2 +-
 packages/app/src/packs/store/packs.ts         |  4 ++--
 .../src/packs/utils/getPackDetailOptions.tsx  |  6 +++---
 .../packs/utils/getPackItemDetailOptions.tsx  |  4 ++--
 packages/app/src/packs/utils/uploadImage.ts   |  2 +-
 .../profile/components/ProfileAuthWall.tsx    |  4 ++--
 .../app/src/profile/hooks/useUpdateProfile.ts |  2 +-
 .../app/src}/providers/JotaiProvider.tsx      |  2 +-
 .../app/src}/providers/TanstackProvider.tsx   |  0
 .../app/src}/providers/index.tsx              |  4 ++--
 .../app/src}/screens/ConsentWelcomeScreen.tsx |  6 +++---
 .../app/src}/screens/ErrorScreen.tsx          |  6 +++---
 .../app/src}/screens/LoadingSpinnerScreen.tsx |  0
 .../app/src}/screens/NotFoundScreen.tsx       |  4 ++--
 .../app/src}/screens/ProfileScreen.tsx        |  6 +++---
 .../expo => packages/app/src}/theme/colors.ts |  0
 .../expo => packages/app/src}/theme/index.ts  |  0
 .../components/ConditionBadge.tsx             |  2 +-
 .../components/SubmitConditionReportForm.tsx  |  4 ++--
 .../components/TrailConditionReportCard.tsx   |  2 +-
 .../hooks/useTrailConditionReports.ts         |  4 ++--
 .../store/trailConditionReports.ts            |  4 ++--
 .../trips/components/TrailConditionsTile.tsx  |  6 +++---
 .../app/src/trips/components/TripCard.tsx     |  8 ++++----
 .../app/src/trips/components/TripForm.tsx     |  8 ++++----
 .../trips/components/UpcomingTripsTile.tsx    |  6 +++---
 packages/app/src/trips/hooks/useAllTrips.ts   |  4 ++--
 packages/app/src/trips/hooks/useCreateTrip.ts |  2 +-
 packages/app/src/trips/hooks/useDeleteTrip.ts |  2 +-
 .../trips/hooks/useTripDetailsFromStore.ts    |  2 +-
 packages/app/src/trips/hooks/useUpdateTrip.ts |  2 +-
 .../app/src/trips/screens/EditTripScreen.tsx  |  2 +-
 .../src/trips/screens/TripDetailScreen.tsx    |  8 ++++----
 .../app/src/trips/screens/TripListScreen.tsx  | 14 ++++++-------
 .../screens/TripWeatherDetailsScreen.tsx      |  2 +-
 packages/app/src/trips/store/trips.ts         |  4 ++--
 .../src/trips/utils/getTripDetailOptions.tsx  |  6 +++---
 .../app/src}/types/global.d.ts                |  0
 .../expo => packages/app/src}/types/index.ts  |  0
 .../__tests__/chatContextHelpers.test.ts      |  0
 .../__tests__/format-ai-response.test.ts      |  0
 .../app/src}/utils/__tests__/storage.test.ts  |  0
 .../app/src}/utils/__tests__/weight.test.ts   |  2 +-
 .../app/src}/utils/chatContextHelpers.ts      |  0
 .../app/src}/utils/format-ai-response.ts      |  0
 .../app/src}/utils/polyfills.ts               |  0
 .../app/src}/utils/storage.ts                 |  0
 .../expo => packages/app/src}/utils/weight.ts |  2 +-
 .../app/src/weather/atoms/locationsAtoms.ts   |  2 +-
 .../src/weather/components/LocationCard.tsx   |  6 +++---
 .../src/weather/components/LocationPicker.tsx |  8 ++++----
 .../weather/components/WeatherAlertsTile.tsx  |  6 +++---
 .../weather/components/WeatherAuthWall.tsx    |  4 ++--
 .../weather/components/WeatherForecast.tsx    |  6 +++---
 .../src/weather/components/WeatherIcon.tsx    |  2 +-
 .../src/weather/components/WeatherTile.tsx    |  6 +++---
 packages/app/src/weather/lib/weatherIcons.ts  |  2 +-
 .../app/src/weather/lib/weatherService.ts     |  2 +-
 .../weather/screens/LocationDetailScreen.tsx  |  6 +++---
 .../weather/screens/LocationPreviewScreen.tsx |  8 ++++----
 .../weather/screens/LocationSearchScreen.tsx  | 10 +++++-----
 .../src/weather/screens/LocationsScreen.tsx   | 10 +++++-----
 packages/app/src/weather/types.ts             |  2 +-
 .../src/wildlife/components/SpeciesCard.tsx   |  2 +-
 .../src/wildlife/components/WildlifeTile.tsx  |  6 +++---
 .../src/wildlife/hooks/useWildlifeHistory.ts  |  2 +-
 .../hooks/useWildlifeIdentification.ts        |  2 +-
 .../wildlife/screens/IdentificationScreen.tsx |  8 ++++----
 .../wildlife/screens/SpeciesDetailScreen.tsx  |  2 +-
 .../src/wildlife/screens/WildlifeScreen.tsx   |  6 +++---
 tsconfig.json                                 |  2 +-
 350 files changed, 683 insertions(+), 680 deletions(-)
 rename {apps/expo => packages/app/src}/atoms/atomWithAsyncStorage.ts (100%)
 rename {apps/expo => packages/app/src}/atoms/atomWithKvStorage.ts (100%)
 rename {apps/expo => packages/app/src}/atoms/atomWithSecureStorage.ts (100%)
 rename {apps/expo => packages/app/src}/atoms/itemListAtoms.ts (100%)
 rename {apps/expo => packages/app/src}/atoms/recentlyUsedCatalogItemsAtom.ts (100%)
 rename {apps/expo => packages/app/src}/atoms/store.ts (100%)
 rename {apps/expo => packages/app/src}/components/AndroidTabBarInsetFix.tsx (100%)
 rename {apps/expo => packages/app/src}/components/BackButton.tsx (89%)
 rename {apps/expo => packages/app/src}/components/Button.tsx (100%)
 rename {apps/expo => packages/app/src}/components/Card.tsx (100%)
 rename {apps/expo => packages/app/src}/components/CategoriesFilter.tsx (93%)
 rename {apps/expo => packages/app/src}/components/Container.tsx (100%)
 rename {apps/expo => packages/app/src}/components/EditScreenInfo.tsx (100%)
 rename {apps/expo => packages/app/src}/components/ErrorState.tsx (90%)
 rename {apps/expo => packages/app/src}/components/HeaderButton.tsx (100%)
 rename {apps/expo => packages/app/src}/components/Icon/Icon.ios.tsx (100%)
 rename {apps/expo => packages/app/src}/components/Icon/Icon.tsx (100%)
 rename {apps/expo => packages/app/src}/components/Icon/get-icon-names.ts (100%)
 rename {apps/expo => packages/app/src}/components/Icon/index.ts (100%)
 rename {apps/expo => packages/app/src}/components/Icon/types.ts (100%)
 rename {apps/expo => packages/app/src}/components/LargeTitleHeaderOverlapFixIOS.tsx (100%)
 rename {apps/expo => packages/app/src}/components/LargeTitleHeaderSearchContentContainer.tsx (100%)
 rename {apps/expo => packages/app/src}/components/Markdown.tsx (100%)
 rename {apps/expo => packages/app/src}/components/ScreenContent.tsx (100%)
 rename {apps/expo => packages/app/src}/components/SearchInput.tsx (86%)
 rename {apps/expo => packages/app/src}/components/TabBarIcon.tsx (100%)
 rename {apps/expo => packages/app/src}/components/TextInput.tsx (84%)
 rename {apps/expo => packages/app/src}/components/ThemeToggle.tsx (83%)
 rename {apps/expo => packages/app/src}/components/ai-chatHeader.tsx (93%)
 rename {apps/expo => packages/app/src}/components/initial/Chip.tsx (97%)
 rename {apps/expo => packages/app/src}/components/initial/ErrorBoundary.tsx (92%)
 rename {apps/expo => packages/app/src}/components/initial/ExpandableText.tsx (100%)
 rename {apps/expo => packages/app/src}/components/initial/UserAvatar.tsx (95%)
 rename {apps/expo => packages/app/src}/components/initial/WeightBadge.tsx (87%)
 rename {apps/expo => packages/app/src}/data/mockData.ts (98%)
 rename {apps/expo => packages/app/src}/lib/api/index.ts (100%)
 rename {apps/expo => packages/app/src}/lib/api/packrat.ts (94%)
 rename {apps/expo => packages/app/src}/lib/cn.ts (100%)
 rename {apps/expo => packages/app/src}/lib/constants.ts (100%)
 rename {apps/expo => packages/app/src}/lib/hasUnsyncedChanges.ts (100%)
 rename {apps/expo => packages/app/src}/lib/hooks/useAuthenticatedQueryToolkit.ts (100%)
 rename {apps/expo => packages/app/src}/lib/hooks/useBottomSheetAction.ts (100%)
 rename {apps/expo => packages/app/src}/lib/hooks/useColorScheme.tsx (96%)
 rename {apps/expo => packages/app/src}/lib/hooks/useHeaderSearchBar.tsx (95%)
 rename {apps/expo => packages/app/src}/lib/hooks/useKeyboardHideBlur.tsx (100%)
 rename {apps/expo => packages/app/src}/lib/hooks/useTranslation.ts (92%)
 rename {apps/expo => packages/app/src}/lib/i18n/EXAMPLES.tsx (92%)
 rename {apps/expo => packages/app/src}/lib/i18n/MIGRATION.md (100%)
 rename {apps/expo => packages/app/src}/lib/i18n/QUICKSTART.md (100%)
 rename {apps/expo => packages/app/src}/lib/i18n/README.md (100%)
 rename {apps/expo => packages/app/src}/lib/i18n/i18next.d.ts (100%)
 rename {apps/expo => packages/app/src}/lib/i18n/index.ts (96%)
 rename {apps/expo => packages/app/src}/lib/i18n/locales/en.json (100%)
 rename {apps/expo => packages/app/src}/lib/i18n/types.ts (92%)
 rename {apps/expo => packages/app/src}/lib/kvStorage.ts (100%)
 rename {apps/expo => packages/app/src}/lib/kvStorage.web.ts (100%)
 rename {apps/expo => packages/app/src}/lib/persist-plugin.ts (100%)
 rename {apps/expo => packages/app/src}/lib/persist-plugin.web.ts (100%)
 rename {apps/expo => packages/app/src}/lib/store.ts (100%)
 rename {apps/expo => packages/app/src}/lib/testIds.ts (99%)
 rename {apps/expo => packages/app/src}/lib/utils/ImageCacheManager.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/__tests__/ImageCacheManager.test.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/__tests__/asNonNullableRef.test.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/__tests__/buildImageUrl.test.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/__tests__/buildPackTemplateItemImageUrl.test.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/__tests__/compute-pack.test.ts (98%)
 rename {apps/expo => packages/app/src}/lib/utils/__tests__/decodeHtmlEntities.test.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/__tests__/domain-specific-extensions.test.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/__tests__/getRelativeTime.test.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/__tests__/imageUtils.test.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/__tests__/itemCalculations.test.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/asNonNullableRef.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/buildImageUrl.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/buildPackTemplateItemImageUrl.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/compute-pack.ts (96%)
 rename {apps/expo => packages/app/src}/lib/utils/dateUtils.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/decodeHtmlEntities.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/domain-specific-extensions.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/getRelativeTime.ts (95%)
 rename {apps/expo => packages/app/src}/lib/utils/imageUtils.ts (100%)
 rename {apps/expo => packages/app/src}/lib/utils/itemCalculations.ts (100%)
 rename {apps/expo => packages/app/src}/providers/JotaiProvider.tsx (77%)
 rename {apps/expo => packages/app/src}/providers/TanstackProvider.tsx (100%)
 rename {apps/expo => packages/app/src}/providers/index.tsx (90%)
 rename {apps/expo => packages/app/src}/screens/ConsentWelcomeScreen.tsx (93%)
 rename {apps/expo => packages/app/src}/screens/ErrorScreen.tsx (90%)
 rename {apps/expo => packages/app/src}/screens/LoadingSpinnerScreen.tsx (100%)
 rename {apps/expo => packages/app/src}/screens/NotFoundScreen.tsx (92%)
 rename {apps/expo => packages/app/src}/screens/ProfileScreen.tsx (95%)
 rename {apps/expo => packages/app/src}/theme/colors.ts (100%)
 rename {apps/expo => packages/app/src}/theme/index.ts (100%)
 rename {apps/expo => packages/app/src}/types/global.d.ts (100%)
 rename {apps/expo => packages/app/src}/types/index.ts (100%)
 rename {apps/expo => packages/app/src}/utils/__tests__/chatContextHelpers.test.ts (100%)
 rename {apps/expo => packages/app/src}/utils/__tests__/format-ai-response.test.ts (100%)
 rename {apps/expo => packages/app/src}/utils/__tests__/storage.test.ts (100%)
 rename {apps/expo => packages/app/src}/utils/__tests__/weight.test.ts (98%)
 rename {apps/expo => packages/app/src}/utils/chatContextHelpers.ts (100%)
 rename {apps/expo => packages/app/src}/utils/format-ai-response.ts (100%)
 rename {apps/expo => packages/app/src}/utils/polyfills.ts (100%)
 rename {apps/expo => packages/app/src}/utils/storage.ts (100%)
 rename {apps/expo => packages/app/src}/utils/weight.ts (95%)

diff --git a/apps/expo/app/(app)/(tabs)/(home)/index.tsx b/apps/expo/app/(app)/(tabs)/(home)/index.tsx
index c031bcdd5e..7f55171b99 100644
--- a/apps/expo/app/(app)/(tabs)/(home)/index.tsx
+++ b/apps/expo/app/(app)/(tabs)/(home)/index.tsx
@@ -3,8 +3,14 @@
 import { AIChatTile } from '@packrat/app/ai/components/AIChatTile';
 import { ReportedContentTile } from '@packrat/app/ai/components/ReportedContentTile';
 import { AIPacksTile } from '@packrat/app/ai-packs/components/AIPacksTile';
+import { AndroidTabBarInsetFix } from '@packrat/app/components/AndroidTabBarInsetFix';
+import { Icon } from '@packrat/app/components/Icon';
+import { LargeTitleHeaderSearchContentContainer } from '@packrat/app/components/LargeTitleHeaderSearchContentContainer';
 import { FeedTile } from '@packrat/app/feed/components/FeedTile';
 import { GuidesTile } from '@packrat/app/guides/components/GuidesTile';
+import { cn } from '@packrat/app/lib/cn';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { asNonNullableRef } from '@packrat/app/lib/utils/asNonNullableRef';
 import { PackTemplatesTile } from '@packrat/app/pack-templates/components/PackTemplatesTile';
 import { CurrentPackTile } from '@packrat/app/packs/components/CurrentPackTile';
 import { GearInventoryTile } from '@packrat/app/packs/components/GearInventoryTile';
@@ -28,13 +34,7 @@ import {
   type ListRenderItemInfo,
   ListSectionHeader,
 } from '@packrat/ui/nativewindui';
-import { AndroidTabBarInsetFix } from 'expo-app/components/AndroidTabBarInsetFix';
-import { Icon } from 'expo-app/components/Icon';
-import { LargeTitleHeaderSearchContentContainer } from 'expo-app/components/LargeTitleHeaderSearchContentContainer';
 import { appConfig, featureFlags } from 'expo-app/config';
-import { cn } from 'expo-app/lib/cn';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
 import { useMemo, useRef, useState } from 'react';
 import { FlatList, Platform, Pressable, Text, View } from 'react-native';
 
diff --git a/apps/expo/app/(app)/(tabs)/_layout.tsx b/apps/expo/app/(app)/(tabs)/_layout.tsx
index c87a283b5e..a59fc78429 100644
--- a/apps/expo/app/(app)/(tabs)/_layout.tsx
+++ b/apps/expo/app/(app)/(tabs)/_layout.tsx
@@ -1,5 +1,5 @@
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { featureFlags } from 'expo-app/config';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { NativeTabs } from 'expo-router/unstable-native-tabs';
 
 export default function TabLayout() {
diff --git a/apps/expo/app/(app)/(tabs)/packs/index.tsx b/apps/expo/app/(app)/(tabs)/packs/index.tsx
index d3b87ce208..2c6c200909 100644
--- a/apps/expo/app/(app)/(tabs)/packs/index.tsx
+++ b/apps/expo/app/(app)/(tabs)/packs/index.tsx
@@ -1,5 +1,5 @@
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { PackListScreen } from '@packrat/app/packs/screens/PackListScreen';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { StatusBar } from 'expo-status-bar';
 import { Platform } from 'react-native';
 
diff --git a/apps/expo/app/(app)/(tabs)/profile/index.tsx b/apps/expo/app/(app)/(tabs)/profile/index.tsx
index 84bbe1206c..3ea5543400 100644
--- a/apps/expo/app/(app)/(tabs)/profile/index.tsx
+++ b/apps/expo/app/(app)/(tabs)/profile/index.tsx
@@ -1,6 +1,14 @@
 import { withAuthWall } from '@packrat/app/auth/hocs';
 import { useAuth } from '@packrat/app/auth/hooks/useAuth';
 import { useUser } from '@packrat/app/auth/hooks/useUser';
+import { AndroidTabBarInsetFix } from '@packrat/app/components/AndroidTabBarInsetFix';
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { hasUnsyncedChanges } from '@packrat/app/lib/hasUnsyncedChanges';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { testIds } from '@packrat/app/lib/testIds';
+import { buildPackTemplateItemImageUrl } from '@packrat/app/lib/utils/buildPackTemplateItemImageUrl';
 import { useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
 import { uploadImage } from '@packrat/app/packs/utils/uploadImage';
 import { ProfileAuthWall } from '@packrat/app/profile/components';
@@ -20,14 +28,6 @@ import {
   ListSectionHeader,
   Text,
 } from '@packrat/ui/nativewindui';
-import { AndroidTabBarInsetFix } from 'expo-app/components/AndroidTabBarInsetFix';
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { hasUnsyncedChanges } from 'expo-app/lib/hasUnsyncedChanges';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { testIds } from 'expo-app/lib/testIds';
-import { buildPackTemplateItemImageUrl } from 'expo-app/lib/utils/buildPackTemplateItemImageUrl';
 import * as FileSystem from 'expo-file-system/legacy';
 import { Link, router, Stack } from 'expo-router';
 import { useState } from 'react';
diff --git a/apps/expo/app/(app)/(tabs)/profile/name.tsx b/apps/expo/app/(app)/(tabs)/profile/name.tsx
index 98e30d8b13..7636561883 100644
--- a/apps/expo/app/(app)/(tabs)/profile/name.tsx
+++ b/apps/expo/app/(app)/(tabs)/profile/name.tsx
@@ -1,9 +1,9 @@
 import { useUser } from '@packrat/app/auth/hooks/useUser';
+import { cn } from '@packrat/app/lib/cn';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { testIds } from '@packrat/app/lib/testIds';
 import { useUpdateProfile } from '@packrat/app/profile/hooks/useUpdateProfile';
 import { Button, Form, FormItem, FormSection, Text, TextField } from '@packrat/ui/nativewindui';
-import { cn } from 'expo-app/lib/cn';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { testIds } from 'expo-app/lib/testIds';
 import { router, Stack } from 'expo-router';
 import * as React from 'react';
 import { Alert, Platform, View } from 'react-native';
diff --git a/apps/expo/app/(app)/(tabs)/profile/notifications.tsx b/apps/expo/app/(app)/(tabs)/profile/notifications.tsx
index 6b2aad3e2c..09f9b0db0c 100644
--- a/apps/expo/app/(app)/(tabs)/profile/notifications.tsx
+++ b/apps/expo/app/(app)/(tabs)/profile/notifications.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Button, Form, FormItem, FormSection, Text, Toggle } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router, Stack } from 'expo-router';
 import * as React from 'react';
 import { Platform, Pressable, ScrollView, View } from 'react-native';
diff --git a/apps/expo/app/(app)/(tabs)/profile/username.tsx b/apps/expo/app/(app)/(tabs)/profile/username.tsx
index ed6af20998..38cc0442f0 100644
--- a/apps/expo/app/(app)/(tabs)/profile/username.tsx
+++ b/apps/expo/app/(app)/(tabs)/profile/username.tsx
@@ -1,6 +1,6 @@
+import { cn } from '@packrat/app/lib/cn';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Button, Form, FormItem, FormSection, Text, TextField } from '@packrat/ui/nativewindui';
-import { cn } from 'expo-app/lib/cn';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router, Stack } from 'expo-router';
 import * as React from 'react';
 import { Platform, View } from 'react-native';
diff --git a/apps/expo/app/(app)/_layout.tsx b/apps/expo/app/(app)/_layout.tsx
index 7616b17881..5cb4dc9542 100644
--- a/apps/expo/app/(app)/_layout.tsx
+++ b/apps/expo/app/(app)/_layout.tsx
@@ -2,6 +2,10 @@ import { use$ } from '@legendapp/state/react';
 import { isLoadingAtom, needsReauthAtom } from '@packrat/app/auth/atoms/authAtoms';
 import { useAuthInit } from '@packrat/app/auth/hooks/useAuthInit';
 import { isAuthed } from '@packrat/app/auth/store';
+import { ThemeToggle } from '@packrat/app/components/ThemeToggle';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import type { TranslationFunction } from '@packrat/app/lib/i18n/types';
+import { testIds } from '@packrat/app/lib/testIds';
 import { getPackTemplateDetailOptions } from '@packrat/app/pack-templates/utils/getPackTemplateDetailOptions';
 import { getPackTemplateItemDetailOptions } from '@packrat/app/pack-templates/utils/getPackTemplateItemDetailOptions';
 import SyncBanner from '@packrat/app/packs/components/SyncBanner';
@@ -9,10 +13,6 @@ import { getPackDetailOptions } from '@packrat/app/packs/utils/getPackDetailOpti
 import { getPackItemDetailOptions } from '@packrat/app/packs/utils/getPackItemDetailOptions';
 import { getTripDetailOptions } from '@packrat/app/trips/utils/getTripDetailOptions';
 import { ActivityIndicator } from '@packrat/ui/nativewindui';
-import { ThemeToggle } from 'expo-app/components/ThemeToggle';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import type { TranslationFunction } from 'expo-app/lib/i18n/types';
-import { testIds } from 'expo-app/lib/testIds';
 import 'expo-dev-client';
 import { type Href, router, Stack, useRouter } from 'expo-router';
 import { useAtomValue } from 'jotai';
diff --git a/apps/expo/app/(app)/ai-chat.tsx b/apps/expo/app/(app)/ai-chat.tsx
index 35ec4d76b4..344a24b607 100644
--- a/apps/expo/app/(app)/ai-chat.tsx
+++ b/apps/expo/app/(app)/ai-chat.tsx
@@ -12,6 +12,15 @@ import { CustomChatTransport } from '@packrat/app/ai/lib/CustomChatTransport';
 import { getLocalModel, initLocalModel } from '@packrat/app/ai/lib/localModelManager';
 import { createLocalTools } from '@packrat/app/ai/lib/tools';
 import { tokenAtom } from '@packrat/app/auth/atoms/authAtoms';
+import { AiChatHeader } from '@packrat/app/components/ai-chatHeader';
+import { Icon } from '@packrat/app/components/Icon';
+import { TextInput } from '@packrat/app/components/TextInput';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import {
+  getContextualGreeting,
+  getContextualSuggestions,
+} from '@packrat/app/utils/chatContextHelpers';
 import { useActiveLocation } from '@packrat/app/weather/hooks';
 import type { WeatherLocation } from '@packrat/app/weather/types';
 import { clientEnvs } from '@packrat/env/expo-client';
@@ -19,13 +28,7 @@ import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import { DefaultChatTransport, type TextUIPart } from 'ai';
 import * as Burnt from 'burnt';
 import { fetch as expoFetch } from 'expo/fetch';
-import { AiChatHeader } from 'expo-app/components/ai-chatHeader';
-import { Icon } from 'expo-app/components/Icon';
-import { TextInput } from 'expo-app/components/TextInput';
 import { featureFlags } from 'expo-app/config';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { getContextualGreeting, getContextualSuggestions } from 'expo-app/utils/chatContextHelpers';
 import { BlurView } from 'expo-blur';
 import { Stack, useLocalSearchParams } from 'expo-router';
 import { useAtomValue } from 'jotai';
diff --git a/apps/expo/app/(app)/consent-modal.tsx b/apps/expo/app/(app)/consent-modal.tsx
index d8658cf152..68c9eb5f61 100644
--- a/apps/expo/app/(app)/consent-modal.tsx
+++ b/apps/expo/app/(app)/consent-modal.tsx
@@ -1,5 +1,5 @@
-// import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { WelcomeConsentScreen } from 'expo-app/screens/ConsentWelcomeScreen';
+// import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { WelcomeConsentScreen } from '@packrat/app/screens/ConsentWelcomeScreen';
 
 export default function ModalScreen() {
   // const { colors, colorScheme } = useColorScheme();
diff --git a/apps/expo/app/(app)/current-pack/[id].tsx b/apps/expo/app/(app)/current-pack/[id].tsx
index 47ccc12214..18e35e97e7 100644
--- a/apps/expo/app/(app)/current-pack/[id].tsx
+++ b/apps/expo/app/(app)/current-pack/[id].tsx
@@ -1,6 +1,11 @@
 import { userStore } from '@packrat/app/auth/store';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { getRelativeTime } from '@packrat/app/lib/utils/getRelativeTime';
 import { usePackDetailsFromStore } from '@packrat/app/packs/hooks/usePackDetailsFromStore';
 import { type CategorySummary, computeCategorySummaries } from '@packrat/app/packs/utils';
+import type { PackItem } from '@packrat/app/types';
 import {
   Avatar,
   AvatarFallback,
@@ -8,11 +13,6 @@ import {
   LargeTitleHeader,
   Text,
 } from '@packrat/ui/nativewindui';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { getRelativeTime } from 'expo-app/lib/utils/getRelativeTime';
-import type { PackItem } from 'expo-app/types';
 import { useLocalSearchParams } from 'expo-router';
 import type React from 'react';
 import { ScrollView, View } from 'react-native';
diff --git a/apps/expo/app/(app)/demo/index.tsx b/apps/expo/app/(app)/demo/index.tsx
index d2cd374c29..25c1c6c107 100644
--- a/apps/expo/app/(app)/demo/index.tsx
+++ b/apps/expo/app/(app)/demo/index.tsx
@@ -1,11 +1,11 @@
+import { Card } from '@packrat/app/components/Card';
+import { Icon } from '@packrat/app/components/Icon';
+import { ThemeToggle } from '@packrat/app/components/ThemeToggle';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useHeaderSearchBar } from '@packrat/app/lib/hooks/useHeaderSearchBar';
 import { Button, LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
 import { useHeaderHeight } from '@react-navigation/elements';
 import { FlashList } from '@shopify/flash-list';
-import { Card } from 'expo-app/components/Card';
-import { Icon } from 'expo-app/components/Icon';
-import { ThemeToggle } from 'expo-app/components/ThemeToggle';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useHeaderSearchBar } from 'expo-app/lib/hooks/useHeaderSearchBar';
 import { useRouter } from 'expo-router';
 import { cssInterop } from 'nativewind';
 import type * as React from 'react';
diff --git a/apps/expo/app/(app)/feed/[id].tsx b/apps/expo/app/(app)/feed/[id].tsx
index 9cc6b663ba..f636371d97 100644
--- a/apps/expo/app/(app)/feed/[id].tsx
+++ b/apps/expo/app/(app)/feed/[id].tsx
@@ -1,8 +1,8 @@
 import { userStore } from '@packrat/app/auth/store';
 import { PostDetailScreen } from '@packrat/app/feed/screens/PostDetailScreen';
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { Text } from '@packrat/ui/nativewindui';
 import { useQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 import { useLocalSearchParams } from 'expo-router';
 import { ActivityIndicator, View } from 'react-native';
 
diff --git a/apps/expo/app/(app)/gear-inventory.tsx b/apps/expo/app/(app)/gear-inventory.tsx
index 891ed15dc6..01d78c673c 100644
--- a/apps/expo/app/(app)/gear-inventory.tsx
+++ b/apps/expo/app/(app)/gear-inventory.tsx
@@ -1,10 +1,10 @@
+import { cn } from '@packrat/app/lib/cn';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { PackItem } from '@packrat/app/packs';
 import { PackItemCard } from '@packrat/app/packs/components/PackItemCard';
 import { useUserPackItems } from '@packrat/app/packs/hooks/useUserPackItems';
 import { assertDefined } from '@packrat/guards';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { cn } from 'expo-app/lib/cn';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useState } from 'react';
 import { Pressable, ScrollView, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/apps/expo/app/(app)/messages/chat.android.tsx b/apps/expo/app/(app)/messages/chat.android.tsx
index 34ebcd27dc..49fea0e783 100644
--- a/apps/expo/app/(app)/messages/chat.android.tsx
+++ b/apps/expo/app/(app)/messages/chat.android.tsx
@@ -1,3 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { TextInput } from '@packrat/app/components/TextInput';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { isString } from '@packrat/guards';
 import {
   Avatar,
@@ -10,10 +14,6 @@ import {
 } from '@packrat/ui/nativewindui';
 import { Portal } from '@rn-primitives/portal';
 import { FlashList } from '@shopify/flash-list';
-import { Icon } from 'expo-app/components/Icon';
-import { TextInput } from 'expo-app/components/TextInput';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { router, Stack } from 'expo-router';
 import * as React from 'react';
 import {
diff --git a/apps/expo/app/(app)/messages/chat.tsx b/apps/expo/app/(app)/messages/chat.tsx
index f6c94459ad..e89b09235e 100644
--- a/apps/expo/app/(app)/messages/chat.tsx
+++ b/apps/expo/app/(app)/messages/chat.tsx
@@ -1,3 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { TextInput } from '@packrat/app/components/TextInput';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { assertDefined, isString } from '@packrat/guards';
 import type { ContextMenuMethods } from '@packrat/ui/nativewindui';
 import {
@@ -9,10 +13,6 @@ import {
   Text,
 } from '@packrat/ui/nativewindui';
 import { FlashList } from '@shopify/flash-list';
-import { Icon } from 'expo-app/components/Icon';
-import { TextInput } from 'expo-app/components/TextInput';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { BlurView } from 'expo-blur';
 import { router, Stack } from 'expo-router';
 import * as React from 'react';
diff --git a/apps/expo/app/(app)/messages/conversations.android.tsx b/apps/expo/app/(app)/messages/conversations.android.tsx
index 742d7bfa52..cba414b56b 100644
--- a/apps/expo/app/(app)/messages/conversations.android.tsx
+++ b/apps/expo/app/(app)/messages/conversations.android.tsx
@@ -1,3 +1,6 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { assertDefined } from '@packrat/guards';
 import {
   AdaptiveSearchHeader,
@@ -16,9 +19,6 @@ import {
   ToolbarCTA,
 } from '@packrat/ui/nativewindui';
 import { Portal } from '@rn-primitives/portal';
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import * as Haptics from 'expo-haptics';
 import { router } from 'expo-router';
 import * as React from 'react';
diff --git a/apps/expo/app/(app)/messages/conversations.tsx b/apps/expo/app/(app)/messages/conversations.tsx
index 676d8e7c29..c6f477f6fb 100644
--- a/apps/expo/app/(app)/messages/conversations.tsx
+++ b/apps/expo/app/(app)/messages/conversations.tsx
@@ -1,3 +1,6 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { assertDefined } from '@packrat/guards';
 import {
   Avatar,
@@ -15,9 +18,6 @@ import {
   Text,
   Toolbar,
 } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import * as Haptics from 'expo-haptics';
 import { router } from 'expo-router';
 import * as React from 'react';
diff --git a/apps/expo/app/(app)/pack-categories/[id].tsx b/apps/expo/app/(app)/pack-categories/[id].tsx
index 3ab98c74ed..8e4a1b42a6 100644
--- a/apps/expo/app/(app)/pack-categories/[id].tsx
+++ b/apps/expo/app/(app)/pack-categories/[id].tsx
@@ -1,10 +1,10 @@
 import { userStore } from '@packrat/app/auth/store';
+import { Icon, type MaterialIconName } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { usePackDetailsFromStore } from '@packrat/app/packs/hooks/usePackDetailsFromStore';
 import { computeCategorySummaries } from '@packrat/app/packs/utils';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { Icon, type MaterialIconName } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useLocalSearchParams } from 'expo-router';
 import { ScrollView, View } from 'react-native';
 
diff --git a/apps/expo/app/(app)/pack-stats/[id].tsx b/apps/expo/app/(app)/pack-stats/[id].tsx
index 13feb1fd3c..174e8939e9 100644
--- a/apps/expo/app/(app)/pack-stats/[id].tsx
+++ b/apps/expo/app/(app)/pack-stats/[id].tsx
@@ -1,10 +1,10 @@
 import { userStore } from '@packrat/app/auth/store';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { usePackDetailsFromStore } from '@packrat/app/packs/hooks/usePackDetailsFromStore';
 import { usePackWeightHistory } from '@packrat/app/packs/hooks/usePackWeightHistory';
 import { computeCategorySummaries } from '@packrat/app/packs/utils';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
 import { featureFlags } from 'expo-app/config';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useLocalSearchParams } from 'expo-router';
 import { ScrollView, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/apps/expo/app/(app)/recent-packs.tsx b/apps/expo/app/(app)/recent-packs.tsx
index df41f84b9b..d530df071c 100644
--- a/apps/expo/app/(app)/recent-packs.tsx
+++ b/apps/expo/app/(app)/recent-packs.tsx
@@ -1,10 +1,10 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { getRelativeTime } from '@packrat/app/lib/utils/getRelativeTime';
 import type { Pack } from '@packrat/app/packs';
 import { useRecentPacks } from '@packrat/app/packs/hooks/useRecentPacks';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { getRelativeTime } from 'expo-app/lib/utils/getRelativeTime';
 import { Image, ScrollView, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 
diff --git a/apps/expo/app/(app)/season-suggestions.tsx b/apps/expo/app/(app)/season-suggestions.tsx
index 5c4202900e..a74fed85ed 100644
--- a/apps/expo/app/(app)/season-suggestions.tsx
+++ b/apps/expo/app/(app)/season-suggestions.tsx
@@ -1,3 +1,5 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { useCreatePackWithItems } from '@packrat/app/packs/hooks/useCreatePackWithItems';
 import {
   type PackSuggestion,
@@ -7,8 +9,6 @@ import { LocationPicker } from '@packrat/app/weather/components';
 import type { WeatherLocation } from '@packrat/app/weather/types';
 import { assertDefined } from '@packrat/guards';
 import { Button, LargeTitleHeader, Text, useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { useState } from 'react';
 import { ActivityIndicator, ScrollView, View } from 'react-native';
diff --git a/apps/expo/app/(app)/settings/index.tsx b/apps/expo/app/(app)/settings/index.tsx
index 68100598d3..3666761659 100644
--- a/apps/expo/app/(app)/settings/index.tsx
+++ b/apps/expo/app/(app)/settings/index.tsx
@@ -12,12 +12,12 @@ import {
 } from '@packrat/app/ai/lib/localModelManager';
 import { DeleteAccountButton } from '@packrat/app/auth/components/DeleteAccountButton';
 import { useAuth } from '@packrat/app/auth/hooks/useAuth';
+import { Icon, type MaterialIconName } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ActivityIndicator, Text } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
 import { appAlert } from 'expo-app/app/_layout';
-import { Icon, type MaterialIconName } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import Constants from 'expo-constants';
 import { StatusBar } from 'expo-status-bar';
 import { useAtomValue } from 'jotai';
diff --git a/apps/expo/app/(app)/shared-packs.tsx b/apps/expo/app/(app)/shared-packs.tsx
index 76ab6cf6ed..8ae1991254 100644
--- a/apps/expo/app/(app)/shared-packs.tsx
+++ b/apps/expo/app/(app)/shared-packs.tsx
@@ -1,3 +1,5 @@
+import { cn } from '@packrat/app/lib/cn';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import {
   Avatar,
   AvatarFallback,
@@ -5,8 +7,6 @@ import {
   LargeTitleHeader,
   Text,
 } from '@packrat/ui/nativewindui';
-import { cn } from 'expo-app/lib/cn';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { ScrollView, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 
diff --git a/apps/expo/app/(app)/shopping-list.tsx b/apps/expo/app/(app)/shopping-list.tsx
index 931afdd7e4..d252689b43 100644
--- a/apps/expo/app/(app)/shopping-list.tsx
+++ b/apps/expo/app/(app)/shopping-list.tsx
@@ -1,11 +1,11 @@
 'use client';
 
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import type { TranslationKeys } from '@packrat/app/lib/i18n/types';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import type { TranslationKeys } from 'expo-app/lib/i18n/types';
 import { useState } from 'react';
 import { Pressable, ScrollView, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/apps/expo/app/(app)/trail-conditions.tsx b/apps/expo/app/(app)/trail-conditions.tsx
index 3d6063c148..535b0cea5d 100644
--- a/apps/expo/app/(app)/trail-conditions.tsx
+++ b/apps/expo/app/(app)/trail-conditions.tsx
@@ -1,10 +1,10 @@
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { TrailConditionReport, TrailSurface } from '@packrat/app/trail-conditions';
 import { SubmitConditionReportForm } from '@packrat/app/trail-conditions/components/SubmitConditionReportForm';
 import { TrailConditionReportCard } from '@packrat/app/trail-conditions/components/TrailConditionReportCard';
 import { useTrailConditionReports } from '@packrat/app/trail-conditions/hooks/useTrailConditionReports';
 import { ActivityIndicator, LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
 import { featureFlags } from 'expo-app/config';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useMemo, useState } from 'react';
 import { FlatList, Modal, Pressable, ScrollView, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/apps/expo/app/(app)/trip/location-search.tsx b/apps/expo/app/(app)/trip/location-search.tsx
index 110da77a67..683abcf958 100644
--- a/apps/expo/app/(app)/trip/location-search.tsx
+++ b/apps/expo/app/(app)/trip/location-search.tsx
@@ -1,8 +1,8 @@
+import { SearchInput } from '@packrat/app/components/SearchInput';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { useTripLocation } from '@packrat/app/trips/store/tripLocationStore';
 import { clientEnvs } from '@packrat/env/expo-client';
 import { ActivityIndicator, Button } from '@packrat/ui/nativewindui';
-import { SearchInput } from 'expo-app/components/SearchInput';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import Constants from 'expo-constants';
 import { useRouter } from 'expo-router';
 import { useRef, useState } from 'react';
diff --git a/apps/expo/app/(app)/upcoming-trips.tsx b/apps/expo/app/(app)/upcoming-trips.tsx
index 0871999788..ecb2f355cd 100644
--- a/apps/expo/app/(app)/upcoming-trips.tsx
+++ b/apps/expo/app/(app)/upcoming-trips.tsx
@@ -1,11 +1,11 @@
+import { cn } from '@packrat/app/lib/cn';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import type { TranslationFunction } from '@packrat/app/lib/i18n/types';
 import { useDetailedPacks } from '@packrat/app/packs/hooks/useDetailedPacks';
 import { useTrips } from '@packrat/app/trips/hooks';
 import { List, ListItem, Text } from '@packrat/ui/nativewindui';
 import { format } from 'date-fns';
 import { featureFlags } from 'expo-app/config';
-import { cn } from 'expo-app/lib/cn';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import type { TranslationFunction } from 'expo-app/lib/i18n/types';
 import { Redirect } from 'expo-router';
 import { useEffect, useMemo, useState } from 'react';
 import { ScrollView, View } from 'react-native';
diff --git a/apps/expo/app/(app)/weather-alert-preferences.tsx b/apps/expo/app/(app)/weather-alert-preferences.tsx
index 1f58119699..41b8eb285e 100644
--- a/apps/expo/app/(app)/weather-alert-preferences.tsx
+++ b/apps/expo/app/(app)/weather-alert-preferences.tsx
@@ -1,3 +1,6 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import {
   Form,
   FormItem,
@@ -6,9 +9,6 @@ import {
   Text,
   Toggle,
 } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import * as React from 'react';
 import { ScrollView, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
diff --git a/apps/expo/app/(app)/weather-alerts.tsx b/apps/expo/app/(app)/weather-alerts.tsx
index f2f40dfab3..91ccb65625 100644
--- a/apps/expo/app/(app)/weather-alerts.tsx
+++ b/apps/expo/app/(app)/weather-alerts.tsx
@@ -1,9 +1,9 @@
 import { MaterialCommunityIcons } from '@expo/vector-icons';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { useWeatherAlerts } from '@packrat/app/weather/hooks/useWeatherAlert';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { Pressable, ScrollView, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/apps/expo/app/(app)/weight-analysis/[id].tsx b/apps/expo/app/(app)/weight-analysis/[id].tsx
index e71180f285..17dff2064e 100644
--- a/apps/expo/app/(app)/weight-analysis/[id].tsx
+++ b/apps/expo/app/(app)/weight-analysis/[id].tsx
@@ -1,10 +1,10 @@
 'use client';
 
 import { userStore } from '@packrat/app/auth/store';
+import { cn } from '@packrat/app/lib/cn';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { usePackWeightAnalysis } from '@packrat/app/packs/hooks/usePackWeightAnalysis';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { cn } from 'expo-app/lib/cn';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useLocalSearchParams } from 'expo-router';
 import { ScrollView, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/apps/expo/app/(app)/wildlife/_layout.tsx b/apps/expo/app/(app)/wildlife/_layout.tsx
index dae2b4a976..348e9851e0 100644
--- a/apps/expo/app/(app)/wildlife/_layout.tsx
+++ b/apps/expo/app/(app)/wildlife/_layout.tsx
@@ -1,4 +1,4 @@
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Stack } from 'expo-router';
 
 export default function WildlifeLayout() {
diff --git a/apps/expo/app/_layout.tsx b/apps/expo/app/_layout.tsx
index 86a937eee2..4a72e2ab6e 100644
--- a/apps/expo/app/_layout.tsx
+++ b/apps/expo/app/_layout.tsx
@@ -7,12 +7,12 @@ import { StatusBar } from 'expo-status-bar';
 import '../global.css';
 
 import { userStore } from '@packrat/app/auth/store';
+import { useColorScheme, useInitialAndroidBarSync } from '@packrat/app/lib/hooks/useColorScheme';
+import { Providers } from '@packrat/app/providers';
+import { NAV_THEME } from '@packrat/app/theme';
 import { clientEnvs } from '@packrat/env/expo-client';
 import { Alert, type AlertMethods } from '@packrat/ui/nativewindui';
 import * as Sentry from '@sentry/react-native';
-import { useColorScheme, useInitialAndroidBarSync } from 'expo-app/lib/hooks/useColorScheme';
-import { Providers } from 'expo-app/providers';
-import { NAV_THEME } from 'expo-app/theme';
 import { useEffect, useRef } from 'react';
 
 Sentry.init({
diff --git a/apps/expo/app/auth/(create-account)/_layout.tsx b/apps/expo/app/auth/(create-account)/_layout.tsx
index 30ec86f709..555b029cc6 100644
--- a/apps/expo/app/auth/(create-account)/_layout.tsx
+++ b/apps/expo/app/auth/(create-account)/_layout.tsx
@@ -1,4 +1,4 @@
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Stack } from 'expo-router';
 
 export default function CreateAccountLayout() {
diff --git a/apps/expo/app/auth/(create-account)/credentials.tsx b/apps/expo/app/auth/(create-account)/credentials.tsx
index 0dc1081ddf..a300f48244 100644
--- a/apps/expo/app/auth/(create-account)/credentials.tsx
+++ b/apps/expo/app/auth/(create-account)/credentials.tsx
@@ -1,4 +1,7 @@
 import { useAuthActions } from '@packrat/app/auth/hooks/useAuthActions';
+import { Icon } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import type { TranslationKeys } from '@packrat/app/lib/i18n/types';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import {
   AlertAnchor,
@@ -11,9 +14,6 @@ import {
   TextField,
 } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
-import { Icon } from 'expo-app/components/Icon';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import type { TranslationKeys } from 'expo-app/lib/i18n/types';
 import { router, useLocalSearchParams } from 'expo-router';
 import * as React from 'react';
 import { Alert, Image, Platform, View } from 'react-native';
diff --git a/apps/expo/app/auth/(create-account)/index.tsx b/apps/expo/app/auth/(create-account)/index.tsx
index 912b5e1654..14c1b6e9f3 100644
--- a/apps/expo/app/auth/(create-account)/index.tsx
+++ b/apps/expo/app/auth/(create-account)/index.tsx
@@ -1,8 +1,8 @@
 'use client';
 
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Button, Form, FormItem, FormSection, Text, TextField } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router } from 'expo-router';
 import * as React from 'react';
 import { Image, Platform, View } from 'react-native';
diff --git a/apps/expo/app/auth/(login)/forgot-password.tsx b/apps/expo/app/auth/(login)/forgot-password.tsx
index 1fa8a15b44..7d48b6da8d 100644
--- a/apps/expo/app/auth/(login)/forgot-password.tsx
+++ b/apps/expo/app/auth/(login)/forgot-password.tsx
@@ -1,5 +1,6 @@
 import { needsReauthAtom } from '@packrat/app/auth/atoms/authAtoms';
 import { useAuthActions } from '@packrat/app/auth/hooks/useAuthActions';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import {
   AlertAnchor,
@@ -11,7 +12,6 @@ import {
   TextField,
 } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router, Stack } from 'expo-router';
 import { useAtomValue } from 'jotai';
 import * as React from 'react';
diff --git a/apps/expo/app/auth/(login)/index.tsx b/apps/expo/app/auth/(login)/index.tsx
index 8c1a6ca839..a68c44d91e 100644
--- a/apps/expo/app/auth/(login)/index.tsx
+++ b/apps/expo/app/auth/(login)/index.tsx
@@ -1,9 +1,9 @@
 import { needsReauthAtom } from '@packrat/app/auth/atoms/authAtoms';
 import { useAuth } from '@packrat/app/auth/hooks/useAuth';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { testIds } from '@packrat/app/lib/testIds';
 import { Button, Form, FormItem, FormSection, Text, TextField } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { testIds } from 'expo-app/lib/testIds';
 import { Link, router, Stack, useLocalSearchParams } from 'expo-router';
 import { useAtomValue } from 'jotai';
 import * as React from 'react';
diff --git a/apps/expo/app/auth/(login)/reset-password.tsx b/apps/expo/app/auth/(login)/reset-password.tsx
index 7853e0600f..5855b79f24 100644
--- a/apps/expo/app/auth/(login)/reset-password.tsx
+++ b/apps/expo/app/auth/(login)/reset-password.tsx
@@ -1,4 +1,7 @@
 import { useAuthActions } from '@packrat/app/auth/hooks/useAuthActions';
+import { Icon } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import type { TranslationKeys } from '@packrat/app/lib/i18n/types';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import {
   AlertAnchor,
@@ -11,9 +14,6 @@ import {
   TextField,
 } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
-import { Icon } from 'expo-app/components/Icon';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import type { TranslationKeys } from 'expo-app/lib/i18n/types';
 import { router, Stack, useLocalSearchParams } from 'expo-router';
 import * as React from 'react';
 import { Alert, Image, Platform, View } from 'react-native';
diff --git a/apps/expo/app/auth/_layout.tsx b/apps/expo/app/auth/_layout.tsx
index dc4a2981df..d064cc00a7 100644
--- a/apps/expo/app/auth/_layout.tsx
+++ b/apps/expo/app/auth/_layout.tsx
@@ -1,5 +1,5 @@
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router, Stack } from 'expo-router';
 import { Platform } from 'react-native';
 
diff --git a/apps/expo/app/auth/index.tsx b/apps/expo/app/auth/index.tsx
index c0c8f032ed..7bf92606d1 100644
--- a/apps/expo/app/auth/index.tsx
+++ b/apps/expo/app/auth/index.tsx
@@ -1,11 +1,11 @@
 import { isLoadingAtom, needsReauthAtom, redirectToAtom } from '@packrat/app/auth/atoms/authAtoms';
 import { useAuth } from '@packrat/app/auth/hooks/useAuth';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { testIds } from '@packrat/app/lib/testIds';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { ActivityIndicator, AlertAnchor, Button, Text } from '@packrat/ui/nativewindui';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { featureFlags } from 'expo-app/config';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { testIds } from 'expo-app/lib/testIds';
 import { Link, router, useLocalSearchParams } from 'expo-router';
 import { useAtomValue, useSetAtom } from 'jotai';
 import * as React from 'react';
diff --git a/apps/expo/app/auth/one-time-password.tsx b/apps/expo/app/auth/one-time-password.tsx
index d23a4ac46f..1aa9ae3040 100644
--- a/apps/expo/app/auth/one-time-password.tsx
+++ b/apps/expo/app/auth/one-time-password.tsx
@@ -1,11 +1,11 @@
 import { useAuthActions } from '@packrat/app/auth/hooks/useAuthActions';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useKeyboardHideBlur } from '@packrat/app/lib/hooks/useKeyboardHideBlur';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { asNonNullableRef } from '@packrat/app/lib/utils/asNonNullableRef';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { ActivityIndicator, AlertAnchor, Button, Text, TextField } from '@packrat/ui/nativewindui';
 import { useHeaderHeight } from '@react-navigation/elements';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useKeyboardHideBlur } from 'expo-app/lib/hooks/useKeyboardHideBlur';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
 import { router, Stack, useLocalSearchParams } from 'expo-router';
 import * as React from 'react';
 import {
diff --git a/biome.json b/biome.json
index de89ea80ff..b276ea1e8e 100644
--- a/biome.json
+++ b/biome.json
@@ -61,7 +61,7 @@
   "overrides": [
     {
       "includes": [
-        "apps/expo/atoms/atomWith*.ts",
+        "packages/app/src/atoms/atomWith*.ts",
         "packages/app/src/weather/atoms/locationsAtoms.ts",
         "apps/expo/lib/api/client.ts",
         "packages/api/src/index.ts",
@@ -70,7 +70,7 @@
         "packages/api/src/services/etl/processCatalogEtl.ts",
         "packages/api/test/guides.test.ts",
         "packages/api/test/setup.ts",
-        "apps/expo/utils/weight.ts",
+        "packages/app/src/utils/weight.ts",
         "packages/api/src/utils/weight.ts",
         "packages/mcp/src/index.ts",
         "scripts/lint/**",
diff --git a/packages/app/src/ai-packs/components/AIPacksTile.tsx b/packages/app/src/ai-packs/components/AIPacksTile.tsx
index 8f6844312e..af3de1bcea 100644
--- a/packages/app/src/ai-packs/components/AIPacksTile.tsx
+++ b/packages/app/src/ai-packs/components/AIPacksTile.tsx
@@ -1,8 +1,8 @@
 import { useUser } from '@packrat/app/auth/hooks/useUser';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ListItem } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { View } from 'react-native';
 
diff --git a/packages/app/src/ai-packs/hooks/useGeneratedPacks.ts b/packages/app/src/ai-packs/hooks/useGeneratedPacks.ts
index 9090d9c9bf..1eba09f01c 100644
--- a/packages/app/src/ai-packs/hooks/useGeneratedPacks.ts
+++ b/packages/app/src/ai-packs/hooks/useGeneratedPacks.ts
@@ -1,10 +1,10 @@
 import { use$ } from '@legendapp/state/react';
 import type { GenerationRequest } from '@packrat/app/ai-packs';
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { obs } from '@packrat/app/lib/store';
 import type { Pack } from '@packrat/app/packs';
 import { packsStore } from '@packrat/app/packs/store';
 import { useMutation } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { obs } from 'expo-app/lib/store';
 
 const generatePacks = async (request: GenerationRequest): Promise<Pack[]> => {
   const { data, error } = await apiClient.packs['generate-packs'].post(request);
diff --git a/packages/app/src/ai-packs/screens/AIPacksScreen.tsx b/packages/app/src/ai-packs/screens/AIPacksScreen.tsx
index 935a24308a..678c1113c1 100644
--- a/packages/app/src/ai-packs/screens/AIPacksScreen.tsx
+++ b/packages/app/src/ai-packs/screens/AIPacksScreen.tsx
@@ -1,3 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { TextInput } from '@packrat/app/components/TextInput';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { PackCard } from '@packrat/app/packs/components/PackCard';
 import {
   ActivityIndicator,
@@ -8,10 +12,6 @@ import {
   Text,
 } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
-import { Icon } from 'expo-app/components/Icon';
-import { TextInput } from 'expo-app/components/TextInput';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { useRef, useState } from 'react';
 import { Modal, Platform, ScrollView, TouchableOpacity, View } from 'react-native';
diff --git a/packages/app/src/ai/atoms/aiModeAtoms.ts b/packages/app/src/ai/atoms/aiModeAtoms.ts
index dac4395bcd..c0a7838529 100644
--- a/packages/app/src/ai/atoms/aiModeAtoms.ts
+++ b/packages/app/src/ai/atoms/aiModeAtoms.ts
@@ -1,4 +1,4 @@
-import { atomWithAsyncStorage } from 'expo-app/atoms/atomWithAsyncStorage';
+import { atomWithAsyncStorage } from '@packrat/app/atoms/atomWithAsyncStorage';
 import { atom } from 'jotai';
 
 export type AIMode = 'cloud' | 'local';
diff --git a/packages/app/src/ai/components/AIChatTile.tsx b/packages/app/src/ai/components/AIChatTile.tsx
index 85c2bfe907..1b11e4aa9d 100644
--- a/packages/app/src/ai/components/AIChatTile.tsx
+++ b/packages/app/src/ai/components/AIChatTile.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { type Href, useRouter } from 'expo-router';
 import { Platform, View } from 'react-native';
 
diff --git a/packages/app/src/ai/components/AIModeSelector.tsx b/packages/app/src/ai/components/AIModeSelector.tsx
index 5a4b819280..d48b22d10a 100644
--- a/packages/app/src/ai/components/AIModeSelector.tsx
+++ b/packages/app/src/ai/components/AIModeSelector.tsx
@@ -1,9 +1,9 @@
 import type { BottomSheetModal } from '@gorhom/bottom-sheet';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ActivityIndicator, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
 import { featureFlags } from 'expo-app/config';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useAtomValue } from 'jotai';
 import * as React from 'react';
 import { TouchableOpacity } from 'react-native';
diff --git a/packages/app/src/ai/components/AIModeSheet.tsx b/packages/app/src/ai/components/AIModeSheet.tsx
index 432778edaf..4e71a1a490 100644
--- a/packages/app/src/ai/components/AIModeSheet.tsx
+++ b/packages/app/src/ai/components/AIModeSheet.tsx
@@ -2,11 +2,11 @@ import type { BottomSheetModal } from '@gorhom/bottom-sheet';
 import { BottomSheetView } from '@gorhom/bottom-sheet';
 import { LLAMA_MODEL_SIZE } from '@packrat/app/ai';
 import { useAuthState } from '@packrat/app/auth/hooks/useAuthState';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { isFunction } from '@packrat/guards';
 import { Sheet, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useAtom, useAtomValue } from 'jotai';
 import * as React from 'react';
 import { TouchableOpacity, View } from 'react-native';
diff --git a/packages/app/src/ai/components/CatalogItemsGenerativeUI.tsx b/packages/app/src/ai/components/CatalogItemsGenerativeUI.tsx
index b484de497d..bb959b42ea 100644
--- a/packages/app/src/ai/components/CatalogItemsGenerativeUI.tsx
+++ b/packages/app/src/ai/components/CatalogItemsGenerativeUI.tsx
@@ -1,8 +1,8 @@
 import type { ToolInvocation } from '@packrat/app/ai';
 import type { CatalogItem } from '@packrat/app/catalog';
 import { CatalogItemCard } from '@packrat/app/catalog/components';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Text } from '@packrat/ui/nativewindui';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { Dimensions, ScrollView, View } from 'react-native';
 import { ToolCard } from './ToolCard';
diff --git a/packages/app/src/ai/components/ChatBubble.tsx b/packages/app/src/ai/components/ChatBubble.tsx
index fd65130483..00d5297b1c 100644
--- a/packages/app/src/ai/components/ChatBubble.tsx
+++ b/packages/app/src/ai/components/ChatBubble.tsx
@@ -1,13 +1,13 @@
 import { BottomSheetScrollView } from '@gorhom/bottom-sheet';
+import { Icon } from '@packrat/app/components/Icon';
+import { Markdown } from '@packrat/app/components/Markdown';
+import { cn } from '@packrat/app/lib/cn';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { formatAIResponse } from '@packrat/app/utils/format-ai-response';
 import { keyIn } from '@packrat/guards';
 import { Sheet, Text, useColorScheme, useSheetRef } from '@packrat/ui/nativewindui';
 import type { ToolUIPart, UIMessage } from 'ai';
 import * as Burnt from 'burnt';
-import { Icon } from 'expo-app/components/Icon';
-import { Markdown } from 'expo-app/components/Markdown';
-import { cn } from 'expo-app/lib/cn';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { formatAIResponse } from 'expo-app/utils/format-ai-response';
 import * as Clipboard from 'expo-clipboard';
 import * as Haptics from 'expo-haptics';
 import React, { useCallback, useState } from 'react';
diff --git a/packages/app/src/ai/components/CircularDownloadButton.tsx b/packages/app/src/ai/components/CircularDownloadButton.tsx
index 4707567605..474fc75568 100644
--- a/packages/app/src/ai/components/CircularDownloadButton.tsx
+++ b/packages/app/src/ai/components/CircularDownloadButton.tsx
@@ -1,5 +1,5 @@
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { TouchableOpacity, View } from 'react-native';
 
 type Props = {
diff --git a/packages/app/src/ai/components/ErrorState.tsx b/packages/app/src/ai/components/ErrorState.tsx
index b23e4d6049..8a3c2778bf 100644
--- a/packages/app/src/ai/components/ErrorState.tsx
+++ b/packages/app/src/ai/components/ErrorState.tsx
@@ -1,7 +1,7 @@
 import { EvilIcons, Ionicons } from '@expo/vector-icons';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Card, CardContent, Text } from '@packrat/ui/nativewindui';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Pressable, View } from 'react-native';
 
 interface ErrorStateProps {
diff --git a/packages/app/src/ai/components/GuidesRAGGenerativeUI.tsx b/packages/app/src/ai/components/GuidesRAGGenerativeUI.tsx
index 089aa1ce4f..ba735ba709 100644
--- a/packages/app/src/ai/components/GuidesRAGGenerativeUI.tsx
+++ b/packages/app/src/ai/components/GuidesRAGGenerativeUI.tsx
@@ -1,7 +1,7 @@
 import type { ToolInvocation } from '@packrat/app/ai';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { useRef, useState } from 'react';
 import {
   Dimensions,
diff --git a/packages/app/src/ai/components/LocationContext.tsx b/packages/app/src/ai/components/LocationContext.tsx
index 01128d03b3..119852eac7 100644
--- a/packages/app/src/ai/components/LocationContext.tsx
+++ b/packages/app/src/ai/components/LocationContext.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { LocationPicker } from '@packrat/app/weather/components/LocationPicker';
 import { Text, useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router } from 'expo-router';
 import { useState } from 'react';
 import { TouchableOpacity, View } from 'react-native';
diff --git a/packages/app/src/ai/components/PackDetailsGenerativeUI.tsx b/packages/app/src/ai/components/PackDetailsGenerativeUI.tsx
index 466b0f016a..69b28b6bde 100644
--- a/packages/app/src/ai/components/PackDetailsGenerativeUI.tsx
+++ b/packages/app/src/ai/components/PackDetailsGenerativeUI.tsx
@@ -1,7 +1,7 @@
 import type { ToolInvocation } from '@packrat/app/ai';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { Pack } from '@packrat/app/packs';
 import { PackCard } from '@packrat/app/packs/components/PackCard';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { ToolCard } from './ToolCard';
 
 type PackDetailsToolOutput =
diff --git a/packages/app/src/ai/components/PackItemDetailsGenerativeUI.tsx b/packages/app/src/ai/components/PackItemDetailsGenerativeUI.tsx
index 220fa01fc7..c17ae7c2b4 100644
--- a/packages/app/src/ai/components/PackItemDetailsGenerativeUI.tsx
+++ b/packages/app/src/ai/components/PackItemDetailsGenerativeUI.tsx
@@ -1,7 +1,7 @@
 import type { ToolInvocation } from '@packrat/app/ai';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { PackItem } from '@packrat/app/packs';
 import { PackItemCard } from '@packrat/app/packs/components/PackItemCard';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { ToolCard } from './ToolCard';
 
 type PackItemToolInput = {
diff --git a/packages/app/src/ai/components/ReportModal.tsx b/packages/app/src/ai/components/ReportModal.tsx
index 02a4ca1fbf..9641c03dbc 100644
--- a/packages/app/src/ai/components/ReportModal.tsx
+++ b/packages/app/src/ai/components/ReportModal.tsx
@@ -1,9 +1,9 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { TextInput } from '@packrat/app/components/TextInput';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { TextInput } from 'expo-app/components/TextInput';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useState } from 'react';
 import { Modal, ScrollView, TouchableOpacity, View } from 'react-native';
 import { KeyboardStickyView } from 'react-native-keyboard-controller';
diff --git a/packages/app/src/ai/components/ReportedContentTile.tsx b/packages/app/src/ai/components/ReportedContentTile.tsx
index 671e8321b9..2147e1ecac 100644
--- a/packages/app/src/ai/components/ReportedContentTile.tsx
+++ b/packages/app/src/ai/components/ReportedContentTile.tsx
@@ -1,8 +1,8 @@
 import { useUser } from '@packrat/app/auth/hooks/useUser';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { type Href, useRouter } from 'expo-router';
 import { View } from 'react-native';
 import { useReportedContentCount } from '../hooks/useReportedContent';
diff --git a/packages/app/src/ai/components/WeatherGenerativeUI.tsx b/packages/app/src/ai/components/WeatherGenerativeUI.tsx
index f45e806859..7f7a953b08 100644
--- a/packages/app/src/ai/components/WeatherGenerativeUI.tsx
+++ b/packages/app/src/ai/components/WeatherGenerativeUI.tsx
@@ -1,8 +1,8 @@
 import type { ToolInvocation } from '@packrat/app/ai';
+import { Icon } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { getWeatherIconByCondition } from '@packrat/app/weather/lib/weatherIcons';
 import { Text, useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { View } from 'react-native';
 import { ToolCard } from './ToolCard';
 
diff --git a/packages/app/src/ai/components/WebSearchGenerativeUI.tsx b/packages/app/src/ai/components/WebSearchGenerativeUI.tsx
index 2d4d6bc74c..d78e3f648d 100644
--- a/packages/app/src/ai/components/WebSearchGenerativeUI.tsx
+++ b/packages/app/src/ai/components/WebSearchGenerativeUI.tsx
@@ -3,10 +3,10 @@ import Fontisto from '@expo/vector-icons/Fontisto';
 import Ionicons from '@expo/vector-icons/Ionicons';
 import { BottomSheetScrollView } from '@gorhom/bottom-sheet';
 import type { ToolInvocation } from '@packrat/app/ai';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Card, CardContent, Sheet, Text, useSheetRef } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Linking, Pressable, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { ToolCard } from './ToolCard';
diff --git a/packages/app/src/ai/hooks/useReportContent.ts b/packages/app/src/ai/hooks/useReportContent.ts
index 6b0f792c52..7879abe118 100644
--- a/packages/app/src/ai/hooks/useReportContent.ts
+++ b/packages/app/src/ai/hooks/useReportContent.ts
@@ -1,5 +1,5 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useMutation } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 import type { ReportReason } from '../lib/reportReasons';
 
 type ReportContentPayload = {
diff --git a/packages/app/src/ai/hooks/useReportedContent.ts b/packages/app/src/ai/hooks/useReportedContent.ts
index 281e2c2240..466f64b1aa 100644
--- a/packages/app/src/ai/hooks/useReportedContent.ts
+++ b/packages/app/src/ai/hooks/useReportedContent.ts
@@ -1,8 +1,8 @@
 import { useUser } from '@packrat/app/auth/hooks/useUser';
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { useAuthenticatedQueryToolkit } from '@packrat/app/lib/hooks/useAuthenticatedQueryToolkit';
 import type { User } from '@packrat/app/profile';
 import { useQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 
 type ReportedContentResponse = {
   reportedItems: Array<{
diff --git a/packages/app/src/ai/hooks/useUpdateReportStatus.ts b/packages/app/src/ai/hooks/useUpdateReportStatus.ts
index 27ea2cf28a..f07aec2b5c 100644
--- a/packages/app/src/ai/hooks/useUpdateReportStatus.ts
+++ b/packages/app/src/ai/hooks/useUpdateReportStatus.ts
@@ -1,5 +1,5 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 type UpdateReportStatusPayload = {
   id: string;
diff --git a/packages/app/src/ai/lib/localModelManager.ts b/packages/app/src/ai/lib/localModelManager.ts
index e0318a7b87..fe34b5f713 100644
--- a/packages/app/src/ai/lib/localModelManager.ts
+++ b/packages/app/src/ai/lib/localModelManager.ts
@@ -9,9 +9,9 @@
  */
 
 import { LLAMA_MODEL_ID, LLAMA_MODEL_SIZE_BYTES } from '@packrat/app/ai';
+import { store } from '@packrat/app/atoms/store';
 import { isString } from '@packrat/guards';
 import { type LlamaLanguageModel, llama } from '@react-native-ai/llama';
-import { store } from 'expo-app/atoms/store';
 import { Platform } from 'react-native';
 import RNBlobUtil from 'react-native-blob-util';
 import {
diff --git a/packages/app/src/ai/lib/reportReasons.ts b/packages/app/src/ai/lib/reportReasons.ts
index 8ad018de21..38f4d84d08 100644
--- a/packages/app/src/ai/lib/reportReasons.ts
+++ b/packages/app/src/ai/lib/reportReasons.ts
@@ -1,4 +1,4 @@
-import type { TranslationKeys } from 'expo-app/lib/i18n/types';
+import type { TranslationKeys } from '@packrat/app/lib/i18n/types';
 
 export const reportReasons = [
   'inappropriate_content',
diff --git a/packages/app/src/ai/lib/tools.ts b/packages/app/src/ai/lib/tools.ts
index 45e46c0727..0bdbbfb178 100644
--- a/packages/app/src/ai/lib/tools.ts
+++ b/packages/app/src/ai/lib/tools.ts
@@ -10,11 +10,11 @@
  * through authenticated API endpoints.
  */
 
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { getPackItems, packItemsStore } from '@packrat/app/packs/store/packItems';
 import { packsStore } from '@packrat/app/packs/store/packs';
 import { getWeatherData, searchLocations } from '@packrat/app/weather/lib/weatherService';
 import { tool } from 'ai';
-import { apiClient } from 'expo-app/lib/api/packrat';
 import { z } from 'zod';
 
 export function createLocalTools() {
diff --git a/packages/app/src/ai/screens/ReportedContentScreen.tsx b/packages/app/src/ai/screens/ReportedContentScreen.tsx
index b7e98df99d..b297191d61 100644
--- a/packages/app/src/ai/screens/ReportedContentScreen.tsx
+++ b/packages/app/src/ai/screens/ReportedContentScreen.tsx
@@ -1,10 +1,10 @@
 'use client';
 
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Button, LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useState } from 'react';
 import { ActivityIndicator, FlatList, TouchableOpacity, View } from 'react-native';
 import { useReportedContent } from '../hooks/useReportedContent';
diff --git a/apps/expo/atoms/atomWithAsyncStorage.ts b/packages/app/src/atoms/atomWithAsyncStorage.ts
similarity index 100%
rename from apps/expo/atoms/atomWithAsyncStorage.ts
rename to packages/app/src/atoms/atomWithAsyncStorage.ts
diff --git a/apps/expo/atoms/atomWithKvStorage.ts b/packages/app/src/atoms/atomWithKvStorage.ts
similarity index 100%
rename from apps/expo/atoms/atomWithKvStorage.ts
rename to packages/app/src/atoms/atomWithKvStorage.ts
diff --git a/apps/expo/atoms/atomWithSecureStorage.ts b/packages/app/src/atoms/atomWithSecureStorage.ts
similarity index 100%
rename from apps/expo/atoms/atomWithSecureStorage.ts
rename to packages/app/src/atoms/atomWithSecureStorage.ts
diff --git a/apps/expo/atoms/itemListAtoms.ts b/packages/app/src/atoms/itemListAtoms.ts
similarity index 100%
rename from apps/expo/atoms/itemListAtoms.ts
rename to packages/app/src/atoms/itemListAtoms.ts
diff --git a/apps/expo/atoms/recentlyUsedCatalogItemsAtom.ts b/packages/app/src/atoms/recentlyUsedCatalogItemsAtom.ts
similarity index 100%
rename from apps/expo/atoms/recentlyUsedCatalogItemsAtom.ts
rename to packages/app/src/atoms/recentlyUsedCatalogItemsAtom.ts
diff --git a/apps/expo/atoms/store.ts b/packages/app/src/atoms/store.ts
similarity index 100%
rename from apps/expo/atoms/store.ts
rename to packages/app/src/atoms/store.ts
diff --git a/packages/app/src/auth/atoms/authAtoms.ts b/packages/app/src/auth/atoms/authAtoms.ts
index f745f8b176..7d821c2b01 100644
--- a/packages/app/src/auth/atoms/authAtoms.ts
+++ b/packages/app/src/auth/atoms/authAtoms.ts
@@ -1,4 +1,4 @@
-import kvStorage from 'expo-app/lib/kvStorage';
+import kvStorage from '@packrat/app/lib/kvStorage';
 import { atom } from 'jotai';
 import { atomWithStorage } from 'jotai/utils';
 
diff --git a/packages/app/src/auth/components/DeleteAccountButton.tsx b/packages/app/src/auth/components/DeleteAccountButton.tsx
index e31202dfd3..4133e53c56 100644
--- a/packages/app/src/auth/components/DeleteAccountButton.tsx
+++ b/packages/app/src/auth/components/DeleteAccountButton.tsx
@@ -1,9 +1,9 @@
 import { useAuth } from '@packrat/app/auth/hooks/useAuth';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { ActivityIndicator, Alert, Button, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRef, useState } from 'react';
 import { View } from 'react-native';
 
diff --git a/packages/app/src/auth/hooks/useAuthActions.ts b/packages/app/src/auth/hooks/useAuthActions.ts
index 222bfd2152..392de07915 100644
--- a/packages/app/src/auth/hooks/useAuthActions.ts
+++ b/packages/app/src/auth/hooks/useAuthActions.ts
@@ -1,4 +1,7 @@
 import { isAuthed, userStore } from '@packrat/app/auth/store';
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { t } from '@packrat/app/lib/i18n';
+import ImageCacheManager from '@packrat/app/lib/utils/ImageCacheManager';
 import type { User } from '@packrat/app/profile';
 import { isObject } from '@packrat/guards';
 import AsyncStorage from '@react-native-async-storage/async-storage';
@@ -7,9 +10,6 @@ import {
   isErrorWithCode,
   statusCodes,
 } from '@react-native-google-signin/google-signin';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { t } from 'expo-app/lib/i18n';
-import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
 import * as AppleAuthentication from 'expo-apple-authentication';
 import { type Href, router } from 'expo-router';
 import Storage from 'expo-sqlite/kv-store';
diff --git a/packages/app/src/auth/hooks/useAuthInit.ts b/packages/app/src/auth/hooks/useAuthInit.ts
index aa790aec35..eef32e0cfd 100644
--- a/packages/app/src/auth/hooks/useAuthInit.ts
+++ b/packages/app/src/auth/hooks/useAuthInit.ts
@@ -1,7 +1,7 @@
+import { store } from '@packrat/app/atoms/store';
 import { clientEnvs } from '@packrat/env/expo-client';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { GoogleSignin } from '@react-native-google-signin/google-signin';
-import { store } from 'expo-app/atoms/store';
 import { router } from 'expo-router';
 import Storage from 'expo-sqlite/kv-store';
 import { useEffect, useState } from 'react';
diff --git a/packages/app/src/auth/store/user.ts b/packages/app/src/auth/store/user.ts
index 96c9d44be0..c6a9d503fb 100644
--- a/packages/app/src/auth/store/user.ts
+++ b/packages/app/src/auth/store/user.ts
@@ -1,8 +1,8 @@
 import { observable, syncState } from '@legendapp/state';
 import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
+import { persistPlugin } from '@packrat/app/lib/persist-plugin';
 import type { User } from '@packrat/app/profile';
-import { persistPlugin } from 'expo-app/lib/persist-plugin';
 
 export const userStore = observable<User | null>(null);
 
diff --git a/packages/app/src/catalog/components/CatalogBrowserModal.tsx b/packages/app/src/catalog/components/CatalogBrowserModal.tsx
index afc1a40ae9..d5d23793e5 100644
--- a/packages/app/src/catalog/components/CatalogBrowserModal.tsx
+++ b/packages/app/src/catalog/components/CatalogBrowserModal.tsx
@@ -1,12 +1,12 @@
+import { searchValueAtom } from '@packrat/app/atoms/itemListAtoms';
 import type { CatalogItem } from '@packrat/app/catalog';
+import { CategoriesFilter } from '@packrat/app/components/CategoriesFilter';
+import { Icon } from '@packrat/app/components/Icon';
+import { SearchInput } from '@packrat/app/components/SearchInput';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { HorizontalCatalogItemCard } from '@packrat/app/packs/components/HorizontalCatalogItemCard';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { searchValueAtom } from 'expo-app/atoms/itemListAtoms';
-import { CategoriesFilter } from 'expo-app/components/CategoriesFilter';
-import { Icon } from 'expo-app/components/Icon';
-import { SearchInput } from 'expo-app/components/SearchInput';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useAtom } from 'jotai';
 import { useCallback, useMemo, useState } from 'react';
 import {
diff --git a/packages/app/src/catalog/components/CatalogCategoriesFilter.tsx b/packages/app/src/catalog/components/CatalogCategoriesFilter.tsx
index 34b4218d00..407ba733bf 100644
--- a/packages/app/src/catalog/components/CatalogCategoriesFilter.tsx
+++ b/packages/app/src/catalog/components/CatalogCategoriesFilter.tsx
@@ -1,5 +1,5 @@
+import { decodeHtmlEntities } from '@packrat/app/lib/utils/decodeHtmlEntities';
 import { Text } from '@packrat/ui/nativewindui';
-import { decodeHtmlEntities } from 'expo-app/lib/utils/decodeHtmlEntities';
 import { ScrollView, TouchableOpacity, View } from 'react-native';
 import { useCatalogItemsCategories } from '../hooks/useCatalogItemsCategories';
 
diff --git a/packages/app/src/catalog/components/CatalogItemCard.tsx b/packages/app/src/catalog/components/CatalogItemCard.tsx
index e969b826fa..e7478ad960 100644
--- a/packages/app/src/catalog/components/CatalogItemCard.tsx
+++ b/packages/app/src/catalog/components/CatalogItemCard.tsx
@@ -1,5 +1,8 @@
 import type { CatalogItem } from '@packrat/app/catalog';
 import { normalizeDescription } from '@packrat/app/catalog';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import {
   Card,
   CardContent,
@@ -9,9 +12,6 @@ import {
   CardTitle,
   Text,
 } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { TouchableWithoutFeedback, View } from 'react-native';
 import { CatalogItemImage } from './CatalogItemImage';
 
diff --git a/packages/app/src/catalog/components/CatalogItemImage.tsx b/packages/app/src/catalog/components/CatalogItemImage.tsx
index f5360f33f1..0a5852cc12 100644
--- a/packages/app/src/catalog/components/CatalogItemImage.tsx
+++ b/packages/app/src/catalog/components/CatalogItemImage.tsx
@@ -1,5 +1,5 @@
+import { Icon } from '@packrat/app/components/Icon';
 import { useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
 import { Image, type ImageProps, View } from 'react-native';
 
 interface PackItemImageProps extends Omit<ImageProps, 'source'> {
diff --git a/packages/app/src/catalog/components/CatalogItemSelectCard.tsx b/packages/app/src/catalog/components/CatalogItemSelectCard.tsx
index 53717b6991..5766f8d622 100644
--- a/packages/app/src/catalog/components/CatalogItemSelectCard.tsx
+++ b/packages/app/src/catalog/components/CatalogItemSelectCard.tsx
@@ -1,4 +1,7 @@
 import type { CatalogItem } from '@packrat/app/catalog';
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import {
   Card,
   CardContent,
@@ -8,9 +11,6 @@ import {
   CardTitle,
   Text,
 } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { TouchableWithoutFeedback, View } from 'react-native';
 import { CatalogItemImage } from './CatalogItemImage';
 
diff --git a/packages/app/src/catalog/components/CatalogItemsAuthWall.tsx b/packages/app/src/catalog/components/CatalogItemsAuthWall.tsx
index c9929a0171..279b5b8a4f 100644
--- a/packages/app/src/catalog/components/CatalogItemsAuthWall.tsx
+++ b/packages/app/src/catalog/components/CatalogItemsAuthWall.tsx
@@ -1,6 +1,6 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Stack, usePathname, useRouter } from 'expo-router';
 import { View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/packages/app/src/catalog/components/ItemLinks.tsx b/packages/app/src/catalog/components/ItemLinks.tsx
index 5c148ecd0c..6f3177a9c1 100644
--- a/packages/app/src/catalog/components/ItemLinks.tsx
+++ b/packages/app/src/catalog/components/ItemLinks.tsx
@@ -1,8 +1,8 @@
 import type { CatalogItem } from '@packrat/app/catalog';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Linking, TouchableOpacity, View } from 'react-native';
 
 type ItemLinksProps = {
diff --git a/packages/app/src/catalog/components/ItemReviews.tsx b/packages/app/src/catalog/components/ItemReviews.tsx
index a4378f2f22..4b07abf444 100644
--- a/packages/app/src/catalog/components/ItemReviews.tsx
+++ b/packages/app/src/catalog/components/ItemReviews.tsx
@@ -1,10 +1,10 @@
 'use client';
 
 import type { CatalogItem } from '@packrat/app/catalog';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useState } from 'react';
 import { Image, TouchableOpacity, View } from 'react-native';
 
diff --git a/packages/app/src/catalog/components/SimilarItems.tsx b/packages/app/src/catalog/components/SimilarItems.tsx
index 9426562cf2..51311889b2 100644
--- a/packages/app/src/catalog/components/SimilarItems.tsx
+++ b/packages/app/src/catalog/components/SimilarItems.tsx
@@ -1,6 +1,6 @@
 import { type SimilarItem, useSimilarCatalogItems } from '@packrat/app/catalog/hooks';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Text } from '@packrat/ui/nativewindui';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import type React from 'react';
 import { FlatList, Pressable, View } from 'react-native';
diff --git a/packages/app/src/catalog/hooks/useCatalogItemDetails.ts b/packages/app/src/catalog/hooks/useCatalogItemDetails.ts
index 1881874c01..a881cd56d5 100644
--- a/packages/app/src/catalog/hooks/useCatalogItemDetails.ts
+++ b/packages/app/src/catalog/hooks/useCatalogItemDetails.ts
@@ -1,6 +1,6 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { useAuthenticatedQueryToolkit } from '@packrat/app/lib/hooks/useAuthenticatedQueryToolkit';
 import { useQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 
 export const getCatalogItem = async (id: string) => {
   const { data, error } = await apiClient.catalog({ id }).get();
diff --git a/packages/app/src/catalog/hooks/useCatalogItems.ts b/packages/app/src/catalog/hooks/useCatalogItems.ts
index 50e9e0e7c9..5494547bfb 100644
--- a/packages/app/src/catalog/hooks/useCatalogItems.ts
+++ b/packages/app/src/catalog/hooks/useCatalogItems.ts
@@ -1,6 +1,6 @@
 import { CatalogItemsResponseSchema } from '@packrat/api/schemas/catalog';
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useInfiniteQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 type CatalogSortField =
   | 'name'
diff --git a/packages/app/src/catalog/hooks/useCatalogItemsCategories.ts b/packages/app/src/catalog/hooks/useCatalogItemsCategories.ts
index cb68f8976f..fe4594bf28 100644
--- a/packages/app/src/catalog/hooks/useCatalogItemsCategories.ts
+++ b/packages/app/src/catalog/hooks/useCatalogItemsCategories.ts
@@ -1,6 +1,6 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { useAuthenticatedQueryToolkit } from '@packrat/app/lib/hooks/useAuthenticatedQueryToolkit';
 import { useQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 
 const getCategories = async (): Promise<string[]> => {
   // Treaty types `limit` as required despite Zod's `.default(10)` — pass it
diff --git a/packages/app/src/catalog/hooks/useRecentlyUsedCatalogItems.ts b/packages/app/src/catalog/hooks/useRecentlyUsedCatalogItems.ts
index 27ff1e056c..77eab615c4 100644
--- a/packages/app/src/catalog/hooks/useRecentlyUsedCatalogItems.ts
+++ b/packages/app/src/catalog/hooks/useRecentlyUsedCatalogItems.ts
@@ -1,8 +1,8 @@
-import type { CatalogItem } from '@packrat/app/catalog';
 import {
   buildUpdatedRecentlyUsed,
   recentlyUsedCatalogItemsAtom,
-} from 'expo-app/atoms/recentlyUsedCatalogItemsAtom';
+} from '@packrat/app/atoms/recentlyUsedCatalogItemsAtom';
+import type { CatalogItem } from '@packrat/app/catalog';
 import { useAtom } from 'jotai';
 import { useCallback } from 'react';
 
diff --git a/packages/app/src/catalog/hooks/useSimilarItems.ts b/packages/app/src/catalog/hooks/useSimilarItems.ts
index 6b306d876c..32c923f249 100644
--- a/packages/app/src/catalog/hooks/useSimilarItems.ts
+++ b/packages/app/src/catalog/hooks/useSimilarItems.ts
@@ -1,7 +1,7 @@
 import type { CatalogItem } from '@packrat/app/catalog';
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { useAuthenticatedQueryToolkit } from '@packrat/app/lib/hooks/useAuthenticatedQueryToolkit';
 import { useQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 
 export interface SimilarItem extends Omit<CatalogItem, 'embedding'> {
   similarity: number;
diff --git a/packages/app/src/catalog/hooks/useVectorSearch.ts b/packages/app/src/catalog/hooks/useVectorSearch.ts
index 70680e8f7b..d9bb4997ff 100644
--- a/packages/app/src/catalog/hooks/useVectorSearch.ts
+++ b/packages/app/src/catalog/hooks/useVectorSearch.ts
@@ -1,6 +1,6 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { useAuthenticatedQueryToolkit } from '@packrat/app/lib/hooks/useAuthenticatedQueryToolkit';
 import { useQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 
 const vectorSearchApi = async (query: string, limit?: number) => {
   const { data, error } = await apiClient.catalog['vector-search'].get({
diff --git a/packages/app/src/catalog/lib/cacheCatalogItemImage.ts b/packages/app/src/catalog/lib/cacheCatalogItemImage.ts
index e33322022c..bcc68d55b7 100644
--- a/packages/app/src/catalog/lib/cacheCatalogItemImage.ts
+++ b/packages/app/src/catalog/lib/cacheCatalogItemImage.ts
@@ -1,5 +1,5 @@
-import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
-import { getImageExtension } from 'expo-app/lib/utils/imageUtils';
+import ImageCacheManager from '@packrat/app/lib/utils/ImageCacheManager';
+import { getImageExtension } from '@packrat/app/lib/utils/imageUtils';
 import { nanoid } from 'nanoid';
 
 export async function cacheCatalogItemImage(imageUrl?: string): Promise<string | null> {
diff --git a/packages/app/src/catalog/screens/AddCatalogItemDetailsScreen.tsx b/packages/app/src/catalog/screens/AddCatalogItemDetailsScreen.tsx
index a7d04d4f6b..df05412781 100644
--- a/packages/app/src/catalog/screens/AddCatalogItemDetailsScreen.tsx
+++ b/packages/app/src/catalog/screens/AddCatalogItemDetailsScreen.tsx
@@ -1,16 +1,16 @@
 import { WeightUnitSchema } from '@packrat/api/types';
 import type { CatalogItem } from '@packrat/app/catalog';
+import { Icon } from '@packrat/app/components/Icon';
+import { TextInput } from '@packrat/app/components/TextInput';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { useCreatePackItem } from '@packrat/app/packs/hooks/useCreatePackItem';
 import { usePackDetailsFromStore } from '@packrat/app/packs/hooks/usePackDetailsFromStore';
+import { ErrorScreen } from '@packrat/app/screens/ErrorScreen';
 import { assertDefined, fromZod } from '@packrat/guards';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { useQueryClient } from '@tanstack/react-query';
 import * as Burnt from 'burnt';
-import { Icon } from 'expo-app/components/Icon';
-import { TextInput } from 'expo-app/components/TextInput';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { ErrorScreen } from 'expo-app/screens/ErrorScreen';
 import { useLocalSearchParams, useRouter } from 'expo-router';
 import { useEffect, useState } from 'react';
 import {
diff --git a/packages/app/src/catalog/screens/CatalogItemDetailScreen.tsx b/packages/app/src/catalog/screens/CatalogItemDetailScreen.tsx
index e7c771d27f..a8b39ec764 100644
--- a/packages/app/src/catalog/screens/CatalogItemDetailScreen.tsx
+++ b/packages/app/src/catalog/screens/CatalogItemDetailScreen.tsx
@@ -3,17 +3,17 @@ import { normalizeDescription } from '@packrat/app/catalog';
 import { ItemLinks } from '@packrat/app/catalog/components/ItemLinks';
 import { ItemReviews } from '@packrat/app/catalog/components/ItemReviews';
 import { SimilarItems } from '@packrat/app/catalog/components/SimilarItems';
+import { Icon } from '@packrat/app/components/Icon';
+import { Chip } from '@packrat/app/components/initial/Chip';
+import { ExpandableText } from '@packrat/app/components/initial/ExpandableText';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { testIds } from '@packrat/app/lib/testIds';
+import { decodeHtmlEntities } from '@packrat/app/lib/utils/decodeHtmlEntities';
+import { ErrorScreen } from '@packrat/app/screens/ErrorScreen';
+import { LoadingSpinnerScreen } from '@packrat/app/screens/LoadingSpinnerScreen';
+import { NotFoundScreen } from '@packrat/app/screens/NotFoundScreen';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { Chip } from 'expo-app/components/initial/Chip';
-import { ExpandableText } from 'expo-app/components/initial/ExpandableText';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { testIds } from 'expo-app/lib/testIds';
-import { decodeHtmlEntities } from 'expo-app/lib/utils/decodeHtmlEntities';
-import { ErrorScreen } from 'expo-app/screens/ErrorScreen';
-import { LoadingSpinnerScreen } from 'expo-app/screens/LoadingSpinnerScreen';
-import { NotFoundScreen } from 'expo-app/screens/NotFoundScreen';
 import { useLocalSearchParams, useRouter } from 'expo-router';
 import { Linking, Text as RNText, ScrollView, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/packages/app/src/catalog/screens/CatalogItemsScreen.tsx b/packages/app/src/catalog/screens/CatalogItemsScreen.tsx
index e3c4151cf7..78753f3117 100644
--- a/packages/app/src/catalog/screens/CatalogItemsScreen.tsx
+++ b/packages/app/src/catalog/screens/CatalogItemsScreen.tsx
@@ -1,16 +1,16 @@
+import { searchValueAtom } from '@packrat/app/atoms/itemListAtoms';
 import { withAuthWall } from '@packrat/app/auth/hocs';
 import type { CatalogItem } from '@packrat/app/catalog';
+import { AndroidTabBarInsetFix } from '@packrat/app/components/AndroidTabBarInsetFix';
+import { CategoriesFilter } from '@packrat/app/components/CategoriesFilter';
+import { Icon } from '@packrat/app/components/Icon';
+import { LargeTitleHeaderOverlapFixIOS } from '@packrat/app/components/LargeTitleHeaderOverlapFixIOS';
+import { LargeTitleHeaderSearchContentContainer } from '@packrat/app/components/LargeTitleHeaderSearchContentContainer';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { testIds } from '@packrat/app/lib/testIds';
+import { asNonNullableRef } from '@packrat/app/lib/utils/asNonNullableRef';
 import { LargeTitleHeader, type LargeTitleSearchBarMethods, Text } from '@packrat/ui/nativewindui';
-import { searchValueAtom } from 'expo-app/atoms/itemListAtoms';
-import { AndroidTabBarInsetFix } from 'expo-app/components/AndroidTabBarInsetFix';
-import { CategoriesFilter } from 'expo-app/components/CategoriesFilter';
-import { Icon } from 'expo-app/components/Icon';
-import { LargeTitleHeaderOverlapFixIOS } from 'expo-app/components/LargeTitleHeaderOverlapFixIOS';
-import { LargeTitleHeaderSearchContentContainer } from 'expo-app/components/LargeTitleHeaderSearchContentContainer';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { testIds } from 'expo-app/lib/testIds';
-import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
 import { useRouter } from 'expo-router';
 import { useAtom } from 'jotai';
 import { useMemo, useRef, useState } from 'react';
diff --git a/packages/app/src/catalog/screens/PackSelectionScreen.tsx b/packages/app/src/catalog/screens/PackSelectionScreen.tsx
index e537bf1d0e..1d93722b78 100644
--- a/packages/app/src/catalog/screens/PackSelectionScreen.tsx
+++ b/packages/app/src/catalog/screens/PackSelectionScreen.tsx
@@ -1,9 +1,9 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { SearchInput } from '@packrat/app/components/SearchInput';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { useDetailedPacks } from '@packrat/app/packs/hooks/useDetailedPacks';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { SearchInput } from 'expo-app/components/SearchInput';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useLocalSearchParams, useRouter } from 'expo-router';
 import { useMemo, useState } from 'react';
 import { FlatList, TouchableOpacity, View } from 'react-native';
diff --git a/apps/expo/components/AndroidTabBarInsetFix.tsx b/packages/app/src/components/AndroidTabBarInsetFix.tsx
similarity index 100%
rename from apps/expo/components/AndroidTabBarInsetFix.tsx
rename to packages/app/src/components/AndroidTabBarInsetFix.tsx
diff --git a/apps/expo/components/BackButton.tsx b/packages/app/src/components/BackButton.tsx
similarity index 89%
rename from apps/expo/components/BackButton.tsx
rename to packages/app/src/components/BackButton.tsx
index a746b6c08b..a885f869e9 100644
--- a/apps/expo/components/BackButton.tsx
+++ b/packages/app/src/components/BackButton.tsx
@@ -1,5 +1,5 @@
 import { Feather } from '@expo/vector-icons';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { StyleSheet, Text, View } from 'react-native';
 
 export const BackButton = ({ onPress }: { onPress: () => void }) => {
diff --git a/apps/expo/components/Button.tsx b/packages/app/src/components/Button.tsx
similarity index 100%
rename from apps/expo/components/Button.tsx
rename to packages/app/src/components/Button.tsx
diff --git a/apps/expo/components/Card.tsx b/packages/app/src/components/Card.tsx
similarity index 100%
rename from apps/expo/components/Card.tsx
rename to packages/app/src/components/Card.tsx
diff --git a/apps/expo/components/CategoriesFilter.tsx b/packages/app/src/components/CategoriesFilter.tsx
similarity index 93%
rename from apps/expo/components/CategoriesFilter.tsx
rename to packages/app/src/components/CategoriesFilter.tsx
index b70144247a..a781ab05f7 100644
--- a/apps/expo/components/CategoriesFilter.tsx
+++ b/packages/app/src/components/CategoriesFilter.tsx
@@ -1,7 +1,7 @@
 import { Ionicons } from '@expo/vector-icons';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { decodeHtmlEntities } from '@packrat/app/lib/utils/decodeHtmlEntities';
 import { Text } from '@packrat/ui/nativewindui';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { decodeHtmlEntities } from 'expo-app/lib/utils/decodeHtmlEntities';
 import { ScrollView, TouchableOpacity, View } from 'react-native';
 
 export function CategoriesFilter({
diff --git a/apps/expo/components/Container.tsx b/packages/app/src/components/Container.tsx
similarity index 100%
rename from apps/expo/components/Container.tsx
rename to packages/app/src/components/Container.tsx
diff --git a/apps/expo/components/EditScreenInfo.tsx b/packages/app/src/components/EditScreenInfo.tsx
similarity index 100%
rename from apps/expo/components/EditScreenInfo.tsx
rename to packages/app/src/components/EditScreenInfo.tsx
diff --git a/apps/expo/components/ErrorState.tsx b/packages/app/src/components/ErrorState.tsx
similarity index 90%
rename from apps/expo/components/ErrorState.tsx
rename to packages/app/src/components/ErrorState.tsx
index efcfb200d1..b428b4a1b8 100644
--- a/apps/expo/components/ErrorState.tsx
+++ b/packages/app/src/components/ErrorState.tsx
@@ -1,6 +1,6 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Button, cn, Text, useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { View } from 'react-native';
 
 interface ErrorStateProps {
diff --git a/apps/expo/components/HeaderButton.tsx b/packages/app/src/components/HeaderButton.tsx
similarity index 100%
rename from apps/expo/components/HeaderButton.tsx
rename to packages/app/src/components/HeaderButton.tsx
diff --git a/apps/expo/components/Icon/Icon.ios.tsx b/packages/app/src/components/Icon/Icon.ios.tsx
similarity index 100%
rename from apps/expo/components/Icon/Icon.ios.tsx
rename to packages/app/src/components/Icon/Icon.ios.tsx
diff --git a/apps/expo/components/Icon/Icon.tsx b/packages/app/src/components/Icon/Icon.tsx
similarity index 100%
rename from apps/expo/components/Icon/Icon.tsx
rename to packages/app/src/components/Icon/Icon.tsx
diff --git a/apps/expo/components/Icon/get-icon-names.ts b/packages/app/src/components/Icon/get-icon-names.ts
similarity index 100%
rename from apps/expo/components/Icon/get-icon-names.ts
rename to packages/app/src/components/Icon/get-icon-names.ts
diff --git a/apps/expo/components/Icon/index.ts b/packages/app/src/components/Icon/index.ts
similarity index 100%
rename from apps/expo/components/Icon/index.ts
rename to packages/app/src/components/Icon/index.ts
diff --git a/apps/expo/components/Icon/types.ts b/packages/app/src/components/Icon/types.ts
similarity index 100%
rename from apps/expo/components/Icon/types.ts
rename to packages/app/src/components/Icon/types.ts
diff --git a/apps/expo/components/LargeTitleHeaderOverlapFixIOS.tsx b/packages/app/src/components/LargeTitleHeaderOverlapFixIOS.tsx
similarity index 100%
rename from apps/expo/components/LargeTitleHeaderOverlapFixIOS.tsx
rename to packages/app/src/components/LargeTitleHeaderOverlapFixIOS.tsx
diff --git a/apps/expo/components/LargeTitleHeaderSearchContentContainer.tsx b/packages/app/src/components/LargeTitleHeaderSearchContentContainer.tsx
similarity index 100%
rename from apps/expo/components/LargeTitleHeaderSearchContentContainer.tsx
rename to packages/app/src/components/LargeTitleHeaderSearchContentContainer.tsx
diff --git a/apps/expo/components/Markdown.tsx b/packages/app/src/components/Markdown.tsx
similarity index 100%
rename from apps/expo/components/Markdown.tsx
rename to packages/app/src/components/Markdown.tsx
diff --git a/apps/expo/components/ScreenContent.tsx b/packages/app/src/components/ScreenContent.tsx
similarity index 100%
rename from apps/expo/components/ScreenContent.tsx
rename to packages/app/src/components/ScreenContent.tsx
diff --git a/apps/expo/components/SearchInput.tsx b/packages/app/src/components/SearchInput.tsx
similarity index 86%
rename from apps/expo/components/SearchInput.tsx
rename to packages/app/src/components/SearchInput.tsx
index a0eda25565..bc82aaeaa8 100644
--- a/apps/expo/components/SearchInput.tsx
+++ b/packages/app/src/components/SearchInput.tsx
@@ -1,7 +1,7 @@
+import { useKeyboardHideBlur } from '@packrat/app/lib/hooks/useKeyboardHideBlur';
+import { asNonNullableRef } from '@packrat/app/lib/utils/asNonNullableRef';
 import { assertPresent } from '@packrat/guards';
 import { SearchInput as NativeWindUISearchInput } from '@packrat/ui/nativewindui';
-import { useKeyboardHideBlur } from 'expo-app/lib/hooks/useKeyboardHideBlur';
-import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
 import { forwardRef, useImperativeHandle, useRef } from 'react';
 
 /**
diff --git a/apps/expo/components/TabBarIcon.tsx b/packages/app/src/components/TabBarIcon.tsx
similarity index 100%
rename from apps/expo/components/TabBarIcon.tsx
rename to packages/app/src/components/TabBarIcon.tsx
diff --git a/apps/expo/components/TextInput.tsx b/packages/app/src/components/TextInput.tsx
similarity index 84%
rename from apps/expo/components/TextInput.tsx
rename to packages/app/src/components/TextInput.tsx
index 8dd0219ed2..9b6eb24fe7 100644
--- a/apps/expo/components/TextInput.tsx
+++ b/packages/app/src/components/TextInput.tsx
@@ -1,6 +1,6 @@
+import { useKeyboardHideBlur } from '@packrat/app/lib/hooks/useKeyboardHideBlur';
+import { asNonNullableRef } from '@packrat/app/lib/utils/asNonNullableRef';
 import { assertPresent } from '@packrat/guards';
-import { useKeyboardHideBlur } from 'expo-app/lib/hooks/useKeyboardHideBlur';
-import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
 import { forwardRef, useImperativeHandle, useRef } from 'react';
 import { TextInput as RNTextInput, type TextInputProps } from 'react-native';
 
diff --git a/apps/expo/components/ThemeToggle.tsx b/packages/app/src/components/ThemeToggle.tsx
similarity index 83%
rename from apps/expo/components/ThemeToggle.tsx
rename to packages/app/src/components/ThemeToggle.tsx
index dbea2cfd10..560f0f6f28 100644
--- a/apps/expo/components/ThemeToggle.tsx
+++ b/packages/app/src/components/ThemeToggle.tsx
@@ -1,7 +1,7 @@
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { COLORS } from 'expo-app/theme/colors';
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { COLORS } from '@packrat/app/theme/colors';
 import { Pressable, View } from 'react-native';
 import Animated, { LayoutAnimationConfig, ZoomInRotate } from 'react-native-reanimated';
 
diff --git a/apps/expo/components/ai-chatHeader.tsx b/packages/app/src/components/ai-chatHeader.tsx
similarity index 93%
rename from apps/expo/components/ai-chatHeader.tsx
rename to packages/app/src/components/ai-chatHeader.tsx
index e42695c863..b8df194b05 100644
--- a/apps/expo/components/ai-chatHeader.tsx
+++ b/packages/app/src/components/ai-chatHeader.tsx
@@ -1,8 +1,8 @@
 import { AIModeSelector } from '@packrat/app/ai/components/AIModeSelector';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { BlurView } from 'expo-blur';
 import { router } from 'expo-router';
 import { Platform, View } from 'react-native';
diff --git a/apps/expo/components/initial/Chip.tsx b/packages/app/src/components/initial/Chip.tsx
similarity index 97%
rename from apps/expo/components/initial/Chip.tsx
rename to packages/app/src/components/initial/Chip.tsx
index 8c532da624..ff60c44b89 100644
--- a/apps/expo/components/initial/Chip.tsx
+++ b/packages/app/src/components/initial/Chip.tsx
@@ -1,4 +1,4 @@
-import { cn } from 'expo-app/lib/cn';
+import { cn } from '@packrat/app/lib/cn';
 import type React from 'react';
 import { Text, View } from 'react-native';
 
diff --git a/apps/expo/components/initial/ErrorBoundary.tsx b/packages/app/src/components/initial/ErrorBoundary.tsx
similarity index 92%
rename from apps/expo/components/initial/ErrorBoundary.tsx
rename to packages/app/src/components/initial/ErrorBoundary.tsx
index 9f9f893418..c0c631cd12 100644
--- a/apps/expo/components/initial/ErrorBoundary.tsx
+++ b/packages/app/src/components/initial/ErrorBoundary.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import * as Sentry from '@sentry/react-native';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router } from 'expo-router';
 import type { ErrorInfo, ReactElement } from 'react';
 import { Pressable, Text, View } from 'react-native';
diff --git a/apps/expo/components/initial/ExpandableText.tsx b/packages/app/src/components/initial/ExpandableText.tsx
similarity index 100%
rename from apps/expo/components/initial/ExpandableText.tsx
rename to packages/app/src/components/initial/ExpandableText.tsx
diff --git a/apps/expo/components/initial/UserAvatar.tsx b/packages/app/src/components/initial/UserAvatar.tsx
similarity index 95%
rename from apps/expo/components/initial/UserAvatar.tsx
rename to packages/app/src/components/initial/UserAvatar.tsx
index 7ced670e65..25a5419192 100644
--- a/apps/expo/components/initial/UserAvatar.tsx
+++ b/packages/app/src/components/initial/UserAvatar.tsx
@@ -1,4 +1,4 @@
-import type { User } from 'expo-app/types';
+import type { User } from '@packrat/app/types';
 import { Image, Text, View } from 'react-native';
 
 type UserAvatarProps = {
diff --git a/apps/expo/components/initial/WeightBadge.tsx b/packages/app/src/components/initial/WeightBadge.tsx
similarity index 87%
rename from apps/expo/components/initial/WeightBadge.tsx
rename to packages/app/src/components/initial/WeightBadge.tsx
index 83c5326a36..19dade223d 100644
--- a/apps/expo/components/initial/WeightBadge.tsx
+++ b/packages/app/src/components/initial/WeightBadge.tsx
@@ -1,7 +1,7 @@
+import { cn } from '@packrat/app/lib/cn';
+import type { WeightUnit } from '@packrat/app/types';
+import { formatWeight } from '@packrat/app/utils/weight';
 import { isString } from '@packrat/guards';
-import { cn } from 'expo-app/lib/cn';
-import type { WeightUnit } from 'expo-app/types';
-import { formatWeight } from 'expo-app/utils/weight';
 import { Text, View } from 'react-native';
 
 type WeightBadgeProps = {
diff --git a/apps/expo/data/mockData.ts b/packages/app/src/data/mockData.ts
similarity index 98%
rename from apps/expo/data/mockData.ts
rename to packages/app/src/data/mockData.ts
index f39d3619e8..0345336cb8 100644
--- a/apps/expo/data/mockData.ts
+++ b/packages/app/src/data/mockData.ts
@@ -1,4 +1,4 @@
-import type { User } from 'expo-app/types';
+import type { User } from '@packrat/app/types';
 
 // --- Users ---
 export const mockUsers: [User, ...User[]] = [
diff --git a/packages/app/src/feed/components/CommentItem.tsx b/packages/app/src/feed/components/CommentItem.tsx
index a4294c5668..c2f6b65de9 100644
--- a/packages/app/src/feed/components/CommentItem.tsx
+++ b/packages/app/src/feed/components/CommentItem.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
 import type { Comment } from '@packrat/app/feed';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { TouchableOpacity, View } from 'react-native';
 import { formatAuthorName, formatRelativeDate } from '../utils';
 
diff --git a/packages/app/src/feed/components/FeedTile.tsx b/packages/app/src/feed/components/FeedTile.tsx
index 86cd2ae911..5894a12f9c 100644
--- a/packages/app/src/feed/components/FeedTile.tsx
+++ b/packages/app/src/feed/components/FeedTile.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { View } from 'react-native';
 
diff --git a/packages/app/src/feed/components/PostCard.tsx b/packages/app/src/feed/components/PostCard.tsx
index b1382fe99c..ab6067178e 100644
--- a/packages/app/src/feed/components/PostCard.tsx
+++ b/packages/app/src/feed/components/PostCard.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
 import type { Post } from '@packrat/app/feed';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useRouter } from 'expo-router';
 import { useCallback } from 'react';
 import {
diff --git a/packages/app/src/feed/hooks/useAddComment.ts b/packages/app/src/feed/hooks/useAddComment.ts
index 12264fa19a..b911e58c20 100644
--- a/packages/app/src/feed/hooks/useAddComment.ts
+++ b/packages/app/src/feed/hooks/useAddComment.ts
@@ -1,5 +1,5 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 interface AddCommentInput {
   postId: number;
diff --git a/packages/app/src/feed/hooks/useCreatePost.ts b/packages/app/src/feed/hooks/useCreatePost.ts
index 485af1d50c..a80a7f3fa5 100644
--- a/packages/app/src/feed/hooks/useCreatePost.ts
+++ b/packages/app/src/feed/hooks/useCreatePost.ts
@@ -1,5 +1,5 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 interface CreatePostInput {
   caption?: string;
diff --git a/packages/app/src/feed/hooks/useDeleteComment.ts b/packages/app/src/feed/hooks/useDeleteComment.ts
index 75a7a852b2..8972936ee1 100644
--- a/packages/app/src/feed/hooks/useDeleteComment.ts
+++ b/packages/app/src/feed/hooks/useDeleteComment.ts
@@ -1,5 +1,5 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 export const useDeleteComment = () => {
   const queryClient = useQueryClient();
diff --git a/packages/app/src/feed/hooks/useDeletePost.ts b/packages/app/src/feed/hooks/useDeletePost.ts
index d9347d7cbc..4e6880d9b7 100644
--- a/packages/app/src/feed/hooks/useDeletePost.ts
+++ b/packages/app/src/feed/hooks/useDeletePost.ts
@@ -1,5 +1,5 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 export const useDeletePost = () => {
   const queryClient = useQueryClient();
diff --git a/packages/app/src/feed/hooks/useFeed.ts b/packages/app/src/feed/hooks/useFeed.ts
index ffed652b87..dceee116b0 100644
--- a/packages/app/src/feed/hooks/useFeed.ts
+++ b/packages/app/src/feed/hooks/useFeed.ts
@@ -1,5 +1,5 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useInfiniteQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 export const useFeed = () => {
   return useInfiniteQuery({
diff --git a/packages/app/src/feed/hooks/usePostComments.ts b/packages/app/src/feed/hooks/usePostComments.ts
index 7354d7f33e..4fb826d91f 100644
--- a/packages/app/src/feed/hooks/usePostComments.ts
+++ b/packages/app/src/feed/hooks/usePostComments.ts
@@ -1,5 +1,5 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useInfiniteQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 export const usePostComments = (postId: number) => {
   return useInfiniteQuery({
diff --git a/packages/app/src/feed/hooks/useToggleCommentLike.ts b/packages/app/src/feed/hooks/useToggleCommentLike.ts
index 72c50c5482..e6d19d9797 100644
--- a/packages/app/src/feed/hooks/useToggleCommentLike.ts
+++ b/packages/app/src/feed/hooks/useToggleCommentLike.ts
@@ -1,5 +1,5 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 export const useToggleCommentLike = () => {
   const queryClient = useQueryClient();
diff --git a/packages/app/src/feed/hooks/useTogglePostLike.ts b/packages/app/src/feed/hooks/useTogglePostLike.ts
index bc0a1e1d06..e3e63e2c0e 100644
--- a/packages/app/src/feed/hooks/useTogglePostLike.ts
+++ b/packages/app/src/feed/hooks/useTogglePostLike.ts
@@ -1,5 +1,5 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 export const useTogglePostLike = () => {
   const queryClient = useQueryClient();
diff --git a/packages/app/src/feed/screens/CreatePostScreen.tsx b/packages/app/src/feed/screens/CreatePostScreen.tsx
index 21783fcaee..c79f21b41d 100644
--- a/packages/app/src/feed/screens/CreatePostScreen.tsx
+++ b/packages/app/src/feed/screens/CreatePostScreen.tsx
@@ -1,9 +1,9 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { TextInput } from '@packrat/app/components/TextInput';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { uploadImage } from '@packrat/app/packs/utils/uploadImage';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { TextInput } from 'expo-app/components/TextInput';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import * as ImagePicker from 'expo-image-picker';
 import { nanoid } from 'nanoid';
 import { useCallback, useState } from 'react';
diff --git a/packages/app/src/feed/screens/FeedScreen.tsx b/packages/app/src/feed/screens/FeedScreen.tsx
index 0a13893b59..35eafa3d0b 100644
--- a/packages/app/src/feed/screens/FeedScreen.tsx
+++ b/packages/app/src/feed/screens/FeedScreen.tsx
@@ -1,9 +1,9 @@
 import { userStore } from '@packrat/app/auth/store';
+import { Icon } from '@packrat/app/components/Icon';
 import type { Post } from '@packrat/app/feed';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ActivityIndicator, Button, LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { useCallback } from 'react';
 import { FlatList, RefreshControl, View } from 'react-native';
diff --git a/packages/app/src/feed/screens/PostDetailScreen.tsx b/packages/app/src/feed/screens/PostDetailScreen.tsx
index 3c4f40dce0..da0f0fac15 100644
--- a/packages/app/src/feed/screens/PostDetailScreen.tsx
+++ b/packages/app/src/feed/screens/PostDetailScreen.tsx
@@ -1,9 +1,9 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { TextInput } from '@packrat/app/components/TextInput';
 import type { Comment, Post } from '@packrat/app/feed';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ActivityIndicator, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { TextInput } from 'expo-app/components/TextInput';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useCallback, useRef, useState } from 'react';
 import {
   Dimensions,
diff --git a/packages/app/src/feed/utils/__tests__/feedUtils.test.ts b/packages/app/src/feed/utils/__tests__/feedUtils.test.ts
index d59194232c..76a94a9410 100644
--- a/packages/app/src/feed/utils/__tests__/feedUtils.test.ts
+++ b/packages/app/src/feed/utils/__tests__/feedUtils.test.ts
@@ -10,7 +10,7 @@ vi.mock('@packrat/env/expo-client', () => ({
 
 // Also mock getRelativeTime so that formatRelativeDate has a predictable
 // alias target that does not depend on the current clock.
-vi.mock('expo-app/lib/utils/getRelativeTime', () => ({
+vi.mock('@packrat/app/lib/utils/getRelativeTime', () => ({
   getRelativeTime: (input: string | Date) => `relative(${String(input)})`,
 }));
 
diff --git a/packages/app/src/feed/utils/index.ts b/packages/app/src/feed/utils/index.ts
index 4e431c1ab3..00fe4636ff 100644
--- a/packages/app/src/feed/utils/index.ts
+++ b/packages/app/src/feed/utils/index.ts
@@ -1,6 +1,6 @@
 import type { Comment, Post } from '@packrat/app/feed';
+import { getRelativeTime } from '@packrat/app/lib/utils/getRelativeTime';
 import { clientEnvs } from '@packrat/env/expo-client';
-import { getRelativeTime } from 'expo-app/lib/utils/getRelativeTime';
 
 export function buildPostImageUrl(imageKey: string): string {
   return `${clientEnvs.EXPO_PUBLIC_R2_PUBLIC_URL}/${imageKey}`;
@@ -16,6 +16,6 @@ export function formatAuthorName(entity: Post | Comment): string {
 }
 
 /**
- * @deprecated Use getRelativeTime from 'expo-app/lib/utils/getRelativeTime' directly.
+ * @deprecated Use getRelativeTime from '@packrat/app/lib/utils/getRelativeTime' directly.
  */
 export const formatRelativeDate = getRelativeTime;
diff --git a/packages/app/src/guides/components/GuideCard.tsx b/packages/app/src/guides/components/GuideCard.tsx
index 9c77001689..4ef5ce14dd 100644
--- a/packages/app/src/guides/components/GuideCard.tsx
+++ b/packages/app/src/guides/components/GuideCard.tsx
@@ -1,6 +1,6 @@
 import type { Guide } from '@packrat/app/guides';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Card, CardContent, CardTitle, Text } from '@packrat/ui/nativewindui';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { TouchableOpacity, View } from 'react-native';
 
 interface GuideCardProps {
diff --git a/packages/app/src/guides/components/GuidesTile.tsx b/packages/app/src/guides/components/GuidesTile.tsx
index 7bb23bab64..80c3c30ded 100644
--- a/packages/app/src/guides/components/GuidesTile.tsx
+++ b/packages/app/src/guides/components/GuidesTile.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { View } from 'react-native';
 
diff --git a/packages/app/src/guides/hooks/useGuideCategories.ts b/packages/app/src/guides/hooks/useGuideCategories.ts
index 25027a9e53..7a4ae62992 100644
--- a/packages/app/src/guides/hooks/useGuideCategories.ts
+++ b/packages/app/src/guides/hooks/useGuideCategories.ts
@@ -1,6 +1,6 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { useQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 
 export const useGuideCategories = () => {
   const { t } = useTranslation();
diff --git a/packages/app/src/guides/hooks/useGuideDetails.ts b/packages/app/src/guides/hooks/useGuideDetails.ts
index 2013cbb1df..428663292b 100644
--- a/packages/app/src/guides/hooks/useGuideDetails.ts
+++ b/packages/app/src/guides/hooks/useGuideDetails.ts
@@ -1,5 +1,5 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 export const useGuideDetails = (id: string) => {
   return useQuery({
diff --git a/packages/app/src/guides/hooks/useGuides.ts b/packages/app/src/guides/hooks/useGuides.ts
index 962c637db3..6bfdd1e01e 100644
--- a/packages/app/src/guides/hooks/useGuides.ts
+++ b/packages/app/src/guides/hooks/useGuides.ts
@@ -1,5 +1,5 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useInfiniteQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 interface UseGuidesParams {
   category?: string;
diff --git a/packages/app/src/guides/hooks/useSearchGuides.ts b/packages/app/src/guides/hooks/useSearchGuides.ts
index ae64cfb708..fa09cae647 100644
--- a/packages/app/src/guides/hooks/useSearchGuides.ts
+++ b/packages/app/src/guides/hooks/useSearchGuides.ts
@@ -1,5 +1,5 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useInfiniteQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 interface UseSearchGuidesParams {
   query: string;
diff --git a/packages/app/src/guides/screens/GuideDetailScreen.tsx b/packages/app/src/guides/screens/GuideDetailScreen.tsx
index 2cd50eabe2..0bc8d486ae 100644
--- a/packages/app/src/guides/screens/GuideDetailScreen.tsx
+++ b/packages/app/src/guides/screens/GuideDetailScreen.tsx
@@ -1,8 +1,8 @@
+import { Chip } from '@packrat/app/components/initial/Chip';
+import { Markdown } from '@packrat/app/components/Markdown';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Text } from '@packrat/ui/nativewindui';
-import { Chip } from 'expo-app/components/initial/Chip';
-import { Markdown } from 'expo-app/components/Markdown';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useLocalSearchParams, useNavigation } from 'expo-router';
 import { useLayoutEffect } from 'react';
 import { ActivityIndicator, ScrollView, View } from 'react-native';
diff --git a/packages/app/src/guides/screens/GuidesListScreen.tsx b/packages/app/src/guides/screens/GuidesListScreen.tsx
index 7ec4ce8764..bcc6271f27 100644
--- a/packages/app/src/guides/screens/GuidesListScreen.tsx
+++ b/packages/app/src/guides/screens/GuidesListScreen.tsx
@@ -1,11 +1,11 @@
+import { CategoriesFilter } from '@packrat/app/components/CategoriesFilter';
+import { LargeTitleHeaderOverlapFixIOS } from '@packrat/app/components/LargeTitleHeaderOverlapFixIOS';
+import { LargeTitleHeaderSearchContentContainer } from '@packrat/app/components/LargeTitleHeaderSearchContentContainer';
 import type { Guide } from '@packrat/app/guides';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { asNonNullableRef } from '@packrat/app/lib/utils/asNonNullableRef';
 import { LargeTitleHeader, type LargeTitleSearchBarMethods, Text } from '@packrat/ui/nativewindui';
-import { CategoriesFilter } from 'expo-app/components/CategoriesFilter';
-import { LargeTitleHeaderOverlapFixIOS } from 'expo-app/components/LargeTitleHeaderOverlapFixIOS';
-import { LargeTitleHeaderSearchContentContainer } from 'expo-app/components/LargeTitleHeaderSearchContentContainer';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
 import { useRouter } from 'expo-router';
 import { useCallback, useRef, useState } from 'react';
 import { ActivityIndicator, FlatList, RefreshControl, View } from 'react-native';
diff --git a/apps/expo/lib/api/index.ts b/packages/app/src/lib/api/index.ts
similarity index 100%
rename from apps/expo/lib/api/index.ts
rename to packages/app/src/lib/api/index.ts
diff --git a/apps/expo/lib/api/packrat.ts b/packages/app/src/lib/api/packrat.ts
similarity index 94%
rename from apps/expo/lib/api/packrat.ts
rename to packages/app/src/lib/api/packrat.ts
index f6df7e3274..5f6f22b06e 100644
--- a/apps/expo/lib/api/packrat.ts
+++ b/packages/app/src/lib/api/packrat.ts
@@ -1,8 +1,8 @@
 import { createApiClient } from '@packrat/api-client';
+import { store } from '@packrat/app/atoms/store';
 import { needsReauthAtom, refreshTokenAtom, tokenAtom } from '@packrat/app/auth/atoms/authAtoms';
 import { isAuthed } from '@packrat/app/auth/store';
 import { clientEnvs } from '@packrat/env/expo-client';
-import { store } from 'expo-app/atoms/store';
 import Storage from 'expo-sqlite/kv-store';
 
 /**
@@ -15,7 +15,7 @@ import Storage from 'expo-sqlite/kv-store';
  *
  * Usage:
  * ```ts
- * import { apiClient } from 'expo-app/lib/api/packrat';
+ * import { apiClient } from '@packrat/app/lib/api/packrat';
  * const { data, error } = await apiClient.catalog.get({ query: { limit: 10 } });
  * ```
  */
diff --git a/apps/expo/lib/cn.ts b/packages/app/src/lib/cn.ts
similarity index 100%
rename from apps/expo/lib/cn.ts
rename to packages/app/src/lib/cn.ts
diff --git a/apps/expo/lib/constants.ts b/packages/app/src/lib/constants.ts
similarity index 100%
rename from apps/expo/lib/constants.ts
rename to packages/app/src/lib/constants.ts
diff --git a/apps/expo/lib/hasUnsyncedChanges.ts b/packages/app/src/lib/hasUnsyncedChanges.ts
similarity index 100%
rename from apps/expo/lib/hasUnsyncedChanges.ts
rename to packages/app/src/lib/hasUnsyncedChanges.ts
diff --git a/apps/expo/lib/hooks/useAuthenticatedQueryToolkit.ts b/packages/app/src/lib/hooks/useAuthenticatedQueryToolkit.ts
similarity index 100%
rename from apps/expo/lib/hooks/useAuthenticatedQueryToolkit.ts
rename to packages/app/src/lib/hooks/useAuthenticatedQueryToolkit.ts
diff --git a/apps/expo/lib/hooks/useBottomSheetAction.ts b/packages/app/src/lib/hooks/useBottomSheetAction.ts
similarity index 100%
rename from apps/expo/lib/hooks/useBottomSheetAction.ts
rename to packages/app/src/lib/hooks/useBottomSheetAction.ts
diff --git a/apps/expo/lib/hooks/useColorScheme.tsx b/packages/app/src/lib/hooks/useColorScheme.tsx
similarity index 96%
rename from apps/expo/lib/hooks/useColorScheme.tsx
rename to packages/app/src/lib/hooks/useColorScheme.tsx
index 3c637c8480..3678b1690d 100644
--- a/apps/expo/lib/hooks/useColorScheme.tsx
+++ b/packages/app/src/lib/hooks/useColorScheme.tsx
@@ -1,4 +1,4 @@
-import { COLORS } from 'expo-app/theme/colors';
+import { COLORS } from '@packrat/app/theme/colors';
 import * as NavigationBar from 'expo-navigation-bar';
 import { useColorScheme as useNativewindColorScheme } from 'nativewind';
 import * as React from 'react';
diff --git a/apps/expo/lib/hooks/useHeaderSearchBar.tsx b/packages/app/src/lib/hooks/useHeaderSearchBar.tsx
similarity index 95%
rename from apps/expo/lib/hooks/useHeaderSearchBar.tsx
rename to packages/app/src/lib/hooks/useHeaderSearchBar.tsx
index b659073cf1..fc223fe804 100644
--- a/apps/expo/lib/hooks/useHeaderSearchBar.tsx
+++ b/packages/app/src/lib/hooks/useHeaderSearchBar.tsx
@@ -1,4 +1,4 @@
-import { COLORS } from 'expo-app/theme/colors';
+import { COLORS } from '@packrat/app/theme/colors';
 import { useNavigation } from 'expo-router';
 import * as React from 'react';
 import type { SearchBarProps } from 'react-native-screens';
diff --git a/apps/expo/lib/hooks/useKeyboardHideBlur.tsx b/packages/app/src/lib/hooks/useKeyboardHideBlur.tsx
similarity index 100%
rename from apps/expo/lib/hooks/useKeyboardHideBlur.tsx
rename to packages/app/src/lib/hooks/useKeyboardHideBlur.tsx
diff --git a/apps/expo/lib/hooks/useTranslation.ts b/packages/app/src/lib/hooks/useTranslation.ts
similarity index 92%
rename from apps/expo/lib/hooks/useTranslation.ts
rename to packages/app/src/lib/hooks/useTranslation.ts
index a2aca75c9e..03534070ba 100644
--- a/apps/expo/lib/hooks/useTranslation.ts
+++ b/packages/app/src/lib/hooks/useTranslation.ts
@@ -14,7 +14,7 @@
  *
  * Usage:
  * ```tsx
- * import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
+ * import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
  *
  * function MyComponent() {
  *   const { t } = useTranslation();
diff --git a/apps/expo/lib/i18n/EXAMPLES.tsx b/packages/app/src/lib/i18n/EXAMPLES.tsx
similarity index 92%
rename from apps/expo/lib/i18n/EXAMPLES.tsx
rename to packages/app/src/lib/i18n/EXAMPLES.tsx
index fa61040bb5..8ae9f08b48 100644
--- a/apps/expo/lib/i18n/EXAMPLES.tsx
+++ b/packages/app/src/lib/i18n/EXAMPLES.tsx
@@ -5,8 +5,8 @@
  * system in the PackRat app.
  */
 
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { t } from 'expo-app/lib/i18n';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { t } from '@packrat/app/lib/i18n';
 import { Button, Text, View } from 'react-native';
 
 /**
@@ -128,11 +128,11 @@ export function ListExample() {
 /**
  * Quick Reference:
  *
- * 1. Import the hook: import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
+ * 1. Import the hook: import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
  * 2. Use in component: const { t } = useTranslation();
  * 3. Translate text: t('section.key')
  * 4. With variables: t('key', { variable: value })
- * 5. Outside components: import { t } from 'expo-app/lib/i18n'; t('key')
+ * 5. Outside components: import { t } from '@packrat/app/lib/i18n'; t('key')
  *
  * Translation file location: apps/expo/lib/i18n/locales/en.json
  * TypeScript types: apps/expo/lib/i18n/i18next.d.ts (module augmentation)
diff --git a/apps/expo/lib/i18n/MIGRATION.md b/packages/app/src/lib/i18n/MIGRATION.md
similarity index 100%
rename from apps/expo/lib/i18n/MIGRATION.md
rename to packages/app/src/lib/i18n/MIGRATION.md
diff --git a/apps/expo/lib/i18n/QUICKSTART.md b/packages/app/src/lib/i18n/QUICKSTART.md
similarity index 100%
rename from apps/expo/lib/i18n/QUICKSTART.md
rename to packages/app/src/lib/i18n/QUICKSTART.md
diff --git a/apps/expo/lib/i18n/README.md b/packages/app/src/lib/i18n/README.md
similarity index 100%
rename from apps/expo/lib/i18n/README.md
rename to packages/app/src/lib/i18n/README.md
diff --git a/apps/expo/lib/i18n/i18next.d.ts b/packages/app/src/lib/i18n/i18next.d.ts
similarity index 100%
rename from apps/expo/lib/i18n/i18next.d.ts
rename to packages/app/src/lib/i18n/i18next.d.ts
diff --git a/apps/expo/lib/i18n/index.ts b/packages/app/src/lib/i18n/index.ts
similarity index 96%
rename from apps/expo/lib/i18n/index.ts
rename to packages/app/src/lib/i18n/index.ts
index 633be3593a..d09ff84fb6 100644
--- a/apps/expo/lib/i18n/index.ts
+++ b/packages/app/src/lib/i18n/index.ts
@@ -35,7 +35,7 @@ if (!i18next.isInitialized) {
  *
  * Usage:
  * ```ts
- * import { t } from 'expo-app/lib/i18n';
+ * import { t } from '@packrat/app/lib/i18n';
  * const msg = t('errors.somethingWentWrong');
  * ```
  */
diff --git a/apps/expo/lib/i18n/locales/en.json b/packages/app/src/lib/i18n/locales/en.json
similarity index 100%
rename from apps/expo/lib/i18n/locales/en.json
rename to packages/app/src/lib/i18n/locales/en.json
diff --git a/apps/expo/lib/i18n/types.ts b/packages/app/src/lib/i18n/types.ts
similarity index 92%
rename from apps/expo/lib/i18n/types.ts
rename to packages/app/src/lib/i18n/types.ts
index 7653b36a72..e9f11ab800 100644
--- a/apps/expo/lib/i18n/types.ts
+++ b/packages/app/src/lib/i18n/types.ts
@@ -22,7 +22,7 @@ export type TranslationKeys = ParseKeys;
  *
  * Example:
  * ```ts
- * import type { TranslationFunction } from 'expo-app/lib/i18n/types';
+ * import type { TranslationFunction } from '@packrat/app/lib/i18n/types';
  * function getOptions(t: TranslationFunction) { ... }
  * ```
  */
diff --git a/apps/expo/lib/kvStorage.ts b/packages/app/src/lib/kvStorage.ts
similarity index 100%
rename from apps/expo/lib/kvStorage.ts
rename to packages/app/src/lib/kvStorage.ts
diff --git a/apps/expo/lib/kvStorage.web.ts b/packages/app/src/lib/kvStorage.web.ts
similarity index 100%
rename from apps/expo/lib/kvStorage.web.ts
rename to packages/app/src/lib/kvStorage.web.ts
diff --git a/apps/expo/lib/persist-plugin.ts b/packages/app/src/lib/persist-plugin.ts
similarity index 100%
rename from apps/expo/lib/persist-plugin.ts
rename to packages/app/src/lib/persist-plugin.ts
diff --git a/apps/expo/lib/persist-plugin.web.ts b/packages/app/src/lib/persist-plugin.web.ts
similarity index 100%
rename from apps/expo/lib/persist-plugin.web.ts
rename to packages/app/src/lib/persist-plugin.web.ts
diff --git a/apps/expo/lib/store.ts b/packages/app/src/lib/store.ts
similarity index 100%
rename from apps/expo/lib/store.ts
rename to packages/app/src/lib/store.ts
diff --git a/apps/expo/lib/testIds.ts b/packages/app/src/lib/testIds.ts
similarity index 99%
rename from apps/expo/lib/testIds.ts
rename to packages/app/src/lib/testIds.ts
index fe5448600c..f514807f24 100644
--- a/apps/expo/lib/testIds.ts
+++ b/packages/app/src/lib/testIds.ts
@@ -8,7 +8,7 @@
  *   never hand-interpolate strings.
  *
  * Usage in components:
- *   import { testIds } from 'expo-app/lib/testIds';
+ *   import { testIds } from '@packrat/app/lib/testIds';
  *   <TextInput testID={testIds.packs.nameInput} />
  *
  * Usage in Playwright specs:
diff --git a/apps/expo/lib/utils/ImageCacheManager.ts b/packages/app/src/lib/utils/ImageCacheManager.ts
similarity index 100%
rename from apps/expo/lib/utils/ImageCacheManager.ts
rename to packages/app/src/lib/utils/ImageCacheManager.ts
diff --git a/apps/expo/lib/utils/__tests__/ImageCacheManager.test.ts b/packages/app/src/lib/utils/__tests__/ImageCacheManager.test.ts
similarity index 100%
rename from apps/expo/lib/utils/__tests__/ImageCacheManager.test.ts
rename to packages/app/src/lib/utils/__tests__/ImageCacheManager.test.ts
diff --git a/apps/expo/lib/utils/__tests__/asNonNullableRef.test.ts b/packages/app/src/lib/utils/__tests__/asNonNullableRef.test.ts
similarity index 100%
rename from apps/expo/lib/utils/__tests__/asNonNullableRef.test.ts
rename to packages/app/src/lib/utils/__tests__/asNonNullableRef.test.ts
diff --git a/apps/expo/lib/utils/__tests__/buildImageUrl.test.ts b/packages/app/src/lib/utils/__tests__/buildImageUrl.test.ts
similarity index 100%
rename from apps/expo/lib/utils/__tests__/buildImageUrl.test.ts
rename to packages/app/src/lib/utils/__tests__/buildImageUrl.test.ts
diff --git a/apps/expo/lib/utils/__tests__/buildPackTemplateItemImageUrl.test.ts b/packages/app/src/lib/utils/__tests__/buildPackTemplateItemImageUrl.test.ts
similarity index 100%
rename from apps/expo/lib/utils/__tests__/buildPackTemplateItemImageUrl.test.ts
rename to packages/app/src/lib/utils/__tests__/buildPackTemplateItemImageUrl.test.ts
diff --git a/apps/expo/lib/utils/__tests__/compute-pack.test.ts b/packages/app/src/lib/utils/__tests__/compute-pack.test.ts
similarity index 98%
rename from apps/expo/lib/utils/__tests__/compute-pack.test.ts
rename to packages/app/src/lib/utils/__tests__/compute-pack.test.ts
index 90825eac36..3c7ff85103 100644
--- a/apps/expo/lib/utils/__tests__/compute-pack.test.ts
+++ b/packages/app/src/lib/utils/__tests__/compute-pack.test.ts
@@ -1,4 +1,4 @@
-import type { Pack, PackItem } from 'expo-app/types';
+import type { Pack, PackItem } from '@packrat/app/types';
 import { describe, expect, it } from 'vitest';
 import { computePacksWeights, computePackWeights } from '../compute-pack';
 
diff --git a/apps/expo/lib/utils/__tests__/decodeHtmlEntities.test.ts b/packages/app/src/lib/utils/__tests__/decodeHtmlEntities.test.ts
similarity index 100%
rename from apps/expo/lib/utils/__tests__/decodeHtmlEntities.test.ts
rename to packages/app/src/lib/utils/__tests__/decodeHtmlEntities.test.ts
diff --git a/apps/expo/lib/utils/__tests__/domain-specific-extensions.test.ts b/packages/app/src/lib/utils/__tests__/domain-specific-extensions.test.ts
similarity index 100%
rename from apps/expo/lib/utils/__tests__/domain-specific-extensions.test.ts
rename to packages/app/src/lib/utils/__tests__/domain-specific-extensions.test.ts
diff --git a/apps/expo/lib/utils/__tests__/getRelativeTime.test.ts b/packages/app/src/lib/utils/__tests__/getRelativeTime.test.ts
similarity index 100%
rename from apps/expo/lib/utils/__tests__/getRelativeTime.test.ts
rename to packages/app/src/lib/utils/__tests__/getRelativeTime.test.ts
diff --git a/apps/expo/lib/utils/__tests__/imageUtils.test.ts b/packages/app/src/lib/utils/__tests__/imageUtils.test.ts
similarity index 100%
rename from apps/expo/lib/utils/__tests__/imageUtils.test.ts
rename to packages/app/src/lib/utils/__tests__/imageUtils.test.ts
diff --git a/apps/expo/lib/utils/__tests__/itemCalculations.test.ts b/packages/app/src/lib/utils/__tests__/itemCalculations.test.ts
similarity index 100%
rename from apps/expo/lib/utils/__tests__/itemCalculations.test.ts
rename to packages/app/src/lib/utils/__tests__/itemCalculations.test.ts
diff --git a/apps/expo/lib/utils/asNonNullableRef.ts b/packages/app/src/lib/utils/asNonNullableRef.ts
similarity index 100%
rename from apps/expo/lib/utils/asNonNullableRef.ts
rename to packages/app/src/lib/utils/asNonNullableRef.ts
diff --git a/apps/expo/lib/utils/buildImageUrl.ts b/packages/app/src/lib/utils/buildImageUrl.ts
similarity index 100%
rename from apps/expo/lib/utils/buildImageUrl.ts
rename to packages/app/src/lib/utils/buildImageUrl.ts
diff --git a/apps/expo/lib/utils/buildPackTemplateItemImageUrl.ts b/packages/app/src/lib/utils/buildPackTemplateItemImageUrl.ts
similarity index 100%
rename from apps/expo/lib/utils/buildPackTemplateItemImageUrl.ts
rename to packages/app/src/lib/utils/buildPackTemplateItemImageUrl.ts
diff --git a/apps/expo/lib/utils/compute-pack.ts b/packages/app/src/lib/utils/compute-pack.ts
similarity index 96%
rename from apps/expo/lib/utils/compute-pack.ts
rename to packages/app/src/lib/utils/compute-pack.ts
index 22766ac1ea..89cad0d14e 100644
--- a/apps/expo/lib/utils/compute-pack.ts
+++ b/packages/app/src/lib/utils/compute-pack.ts
@@ -1,4 +1,4 @@
-import type { Pack, WeightUnit } from 'expo-app/types';
+import type { Pack, WeightUnit } from '@packrat/app/types';
 
 // Convert weights to a standard unit (grams) for calculations
 const convertToGrams = (weight: number, unit: WeightUnit): number => {
diff --git a/apps/expo/lib/utils/dateUtils.ts b/packages/app/src/lib/utils/dateUtils.ts
similarity index 100%
rename from apps/expo/lib/utils/dateUtils.ts
rename to packages/app/src/lib/utils/dateUtils.ts
diff --git a/apps/expo/lib/utils/decodeHtmlEntities.ts b/packages/app/src/lib/utils/decodeHtmlEntities.ts
similarity index 100%
rename from apps/expo/lib/utils/decodeHtmlEntities.ts
rename to packages/app/src/lib/utils/decodeHtmlEntities.ts
diff --git a/apps/expo/lib/utils/domain-specific-extensions.ts b/packages/app/src/lib/utils/domain-specific-extensions.ts
similarity index 100%
rename from apps/expo/lib/utils/domain-specific-extensions.ts
rename to packages/app/src/lib/utils/domain-specific-extensions.ts
diff --git a/apps/expo/lib/utils/getRelativeTime.ts b/packages/app/src/lib/utils/getRelativeTime.ts
similarity index 95%
rename from apps/expo/lib/utils/getRelativeTime.ts
rename to packages/app/src/lib/utils/getRelativeTime.ts
index d77644a356..84c123613e 100644
--- a/apps/expo/lib/utils/getRelativeTime.ts
+++ b/packages/app/src/lib/utils/getRelativeTime.ts
@@ -1,5 +1,5 @@
+import type { TranslationFunction } from '@packrat/app/lib/i18n/types';
 import { differenceInSeconds } from 'date-fns';
-import type { TranslationFunction } from 'expo-app/lib/i18n/types';
 
 const UNITS: Array<{ key: string; seconds: number }> = [
   { key: 'months', seconds: 2592000 },
diff --git a/apps/expo/lib/utils/imageUtils.ts b/packages/app/src/lib/utils/imageUtils.ts
similarity index 100%
rename from apps/expo/lib/utils/imageUtils.ts
rename to packages/app/src/lib/utils/imageUtils.ts
diff --git a/apps/expo/lib/utils/itemCalculations.ts b/packages/app/src/lib/utils/itemCalculations.ts
similarity index 100%
rename from apps/expo/lib/utils/itemCalculations.ts
rename to packages/app/src/lib/utils/itemCalculations.ts
diff --git a/packages/app/src/pack-templates/components/AddPackTemplateItemActions.tsx b/packages/app/src/pack-templates/components/AddPackTemplateItemActions.tsx
index 0e1f22cd52..5b9c4b1a63 100644
--- a/packages/app/src/pack-templates/components/AddPackTemplateItemActions.tsx
+++ b/packages/app/src/pack-templates/components/AddPackTemplateItemActions.tsx
@@ -5,13 +5,13 @@ import { isAuthed } from '@packrat/app/auth/store';
 import type { CatalogItem } from '@packrat/app/catalog';
 import { CatalogBrowserModal } from '@packrat/app/catalog/components';
 import { useRecentlyUsedCatalogItems } from '@packrat/app/catalog/hooks/useRecentlyUsedCatalogItems';
+import { Icon } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
 import { isFunction, nullToUndefined } from '@packrat/guards';
 import { Sheet, Text, useColorScheme } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
 import { appAlert } from 'expo-app/app/_layout';
-import { Icon } from 'expo-app/components/Icon';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router } from 'expo-router';
 import React from 'react';
 import { TouchableOpacity, View } from 'react-native';
diff --git a/packages/app/src/pack-templates/components/AppTemplateBadge.tsx b/packages/app/src/pack-templates/components/AppTemplateBadge.tsx
index 8b7ddfca6d..1fbf9971ed 100644
--- a/packages/app/src/pack-templates/components/AppTemplateBadge.tsx
+++ b/packages/app/src/pack-templates/components/AppTemplateBadge.tsx
@@ -1,5 +1,5 @@
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Text } from '@packrat/ui/nativewindui';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Image, View } from 'react-native';
 
 const LOGO_SOURCE = require('expo-app/assets/adaptive-icon.png');
diff --git a/packages/app/src/pack-templates/components/FeaturedPacksSection.tsx b/packages/app/src/pack-templates/components/FeaturedPacksSection.tsx
index 856dfdcb40..409e35f81d 100644
--- a/packages/app/src/pack-templates/components/FeaturedPacksSection.tsx
+++ b/packages/app/src/pack-templates/components/FeaturedPacksSection.tsx
@@ -1,7 +1,7 @@
+import { WeightBadge } from '@packrat/app/components/initial/WeightBadge';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { PackTemplate, PackTemplateInStore } from '@packrat/app/pack-templates';
 import { Text } from '@packrat/ui/nativewindui';
-import { WeightBadge } from 'expo-app/components/initial/WeightBadge';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { isArray } from 'radash';
 import { useMemo } from 'react';
diff --git a/packages/app/src/pack-templates/components/OnlineContentImportModal.tsx b/packages/app/src/pack-templates/components/OnlineContentImportModal.tsx
index 2525a92451..ae2a26a43f 100644
--- a/packages/app/src/pack-templates/components/OnlineContentImportModal.tsx
+++ b/packages/app/src/pack-templates/components/OnlineContentImportModal.tsx
@@ -1,8 +1,8 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ActivityIndicator, Text, TextField } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { useState } from 'react';
 import {
diff --git a/packages/app/src/pack-templates/components/PackTemplateCard.tsx b/packages/app/src/pack-templates/components/PackTemplateCard.tsx
index 029afb5274..cf80788873 100644
--- a/packages/app/src/pack-templates/components/PackTemplateCard.tsx
+++ b/packages/app/src/pack-templates/components/PackTemplateCard.tsx
@@ -1,12 +1,12 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import { Icon } from '@packrat/app/components/Icon';
+import { WeightBadge } from '@packrat/app/components/initial/WeightBadge';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { PackTemplate } from '@packrat/app/pack-templates';
 import { isArray } from '@packrat/guards';
 import { Button, Text } from '@packrat/ui/nativewindui';
 import { appAlert } from 'expo-app/app/_layout';
-import { Icon } from 'expo-app/components/Icon';
-import { WeightBadge } from 'expo-app/components/initial/WeightBadge';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router } from 'expo-router';
 import { Image, Pressable, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
diff --git a/packages/app/src/pack-templates/components/PackTemplateForm.tsx b/packages/app/src/pack-templates/components/PackTemplateForm.tsx
index 07e9f7d22c..181efae69e 100644
--- a/packages/app/src/pack-templates/components/PackTemplateForm.tsx
+++ b/packages/app/src/pack-templates/components/PackTemplateForm.tsx
@@ -1,5 +1,8 @@
 import { PackCategorySchema } from '@packrat/api/types';
 import { useUser } from '@packrat/app/auth/hooks/useUser';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { PackTemplate } from '@packrat/app/pack-templates';
 import { fromZod } from '@packrat/guards';
 import {
@@ -12,9 +15,6 @@ import {
   TextField,
 } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import {
   KeyboardAvoidingView,
diff --git a/packages/app/src/pack-templates/components/PackTemplateItemCard.tsx b/packages/app/src/pack-templates/components/PackTemplateItemCard.tsx
index 1a896cbef9..9d94d746c6 100644
--- a/packages/app/src/pack-templates/components/PackTemplateItemCard.tsx
+++ b/packages/app/src/pack-templates/components/PackTemplateItemCard.tsx
@@ -1,12 +1,12 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import { useUser } from '@packrat/app/auth/hooks/useUser';
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { PackTemplateItem } from '@packrat/app/pack-templates';
 import { Text } from '@packrat/ui/nativewindui';
 import { appAlert } from 'expo-app/app/_layout';
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { Pressable, TouchableWithoutFeedback, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
diff --git a/packages/app/src/pack-templates/components/PackTemplateItemImage.tsx b/packages/app/src/pack-templates/components/PackTemplateItemImage.tsx
index ae2a302875..a7806916cf 100644
--- a/packages/app/src/pack-templates/components/PackTemplateItemImage.tsx
+++ b/packages/app/src/pack-templates/components/PackTemplateItemImage.tsx
@@ -1,9 +1,9 @@
 import { CatalogItemImage } from '@packrat/app/catalog/components/CatalogItemImage';
+import { Icon } from '@packrat/app/components/Icon';
+import { buildImageUrl } from '@packrat/app/lib/utils/buildImageUrl';
 import type { PackTemplateItem } from '@packrat/app/pack-templates';
 import { CachedImage } from '@packrat/app/packs/components/CachedImage';
 import { useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { buildImageUrl } from 'expo-app/lib/utils/buildImageUrl';
 import { type ImageProps, View } from 'react-native';
 
 interface PackTemplateItemImageProps extends Omit<ImageProps, 'source'> {
diff --git a/packages/app/src/pack-templates/components/PackTemplatesTile.tsx b/packages/app/src/pack-templates/components/PackTemplatesTile.tsx
index 3b9c5f0a5e..33c9e02db6 100644
--- a/packages/app/src/pack-templates/components/PackTemplatesTile.tsx
+++ b/packages/app/src/pack-templates/components/PackTemplatesTile.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { Platform, View } from 'react-native';
 import { usePackTemplates } from '../hooks';
diff --git a/packages/app/src/pack-templates/components/TemplateCreationOptions.tsx b/packages/app/src/pack-templates/components/TemplateCreationOptions.tsx
index d363b574aa..08cddc5761 100644
--- a/packages/app/src/pack-templates/components/TemplateCreationOptions.tsx
+++ b/packages/app/src/pack-templates/components/TemplateCreationOptions.tsx
@@ -2,11 +2,11 @@ import type { BottomSheetModal } from '@gorhom/bottom-sheet';
 import { BottomSheetView } from '@gorhom/bottom-sheet';
 import { useAuth } from '@packrat/app/auth/hooks/useAuth';
 import { useUser } from '@packrat/app/auth/hooks/useUser';
+import { Icon } from '@packrat/app/components/Icon';
+import { useBottomSheetAction } from '@packrat/app/lib/hooks/useBottomSheetAction';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Sheet, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useBottomSheetAction } from 'expo-app/lib/hooks/useBottomSheetAction';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import React, { useState } from 'react';
 import { TouchableOpacity, View } from 'react-native';
diff --git a/packages/app/src/pack-templates/hooks/useCreatePackTemplate.ts b/packages/app/src/pack-templates/hooks/useCreatePackTemplate.ts
index b5aa4a31bb..6af5787fc5 100644
--- a/packages/app/src/pack-templates/hooks/useCreatePackTemplate.ts
+++ b/packages/app/src/pack-templates/hooks/useCreatePackTemplate.ts
@@ -1,5 +1,5 @@
+import { obs } from '@packrat/app/lib/store';
 import type { PackTemplateInput, PackTemplateInStore } from '@packrat/app/pack-templates';
-import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 import { packTemplatesStore } from '../store/packTemplates';
diff --git a/packages/app/src/pack-templates/hooks/useCreatePackTemplateItem.ts b/packages/app/src/pack-templates/hooks/useCreatePackTemplateItem.ts
index c95204a587..624ff3e488 100644
--- a/packages/app/src/pack-templates/hooks/useCreatePackTemplateItem.ts
+++ b/packages/app/src/pack-templates/hooks/useCreatePackTemplateItem.ts
@@ -1,7 +1,7 @@
 // useCreatePackTemplateItem.ts
 
+import { obs } from '@packrat/app/lib/store';
 import type { PackTemplateItem, PackTemplateItemInput } from '@packrat/app/pack-templates';
-import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 import { packTemplateItemsStore } from '../store/packTemplateItems';
diff --git a/packages/app/src/pack-templates/hooks/useDeletePackTemplate.ts b/packages/app/src/pack-templates/hooks/useDeletePackTemplate.ts
index 10c9f1f2ba..7aec95109f 100644
--- a/packages/app/src/pack-templates/hooks/useDeletePackTemplate.ts
+++ b/packages/app/src/pack-templates/hooks/useDeletePackTemplate.ts
@@ -1,4 +1,4 @@
-import { obs } from 'expo-app/lib/store';
+import { obs } from '@packrat/app/lib/store';
 import { useCallback } from 'react';
 import { packTemplatesStore } from '../store/packTemplates';
 
diff --git a/packages/app/src/pack-templates/hooks/useDeletePackTemplateItem.ts b/packages/app/src/pack-templates/hooks/useDeletePackTemplateItem.ts
index 8c8d4c0b2c..1021463a20 100644
--- a/packages/app/src/pack-templates/hooks/useDeletePackTemplateItem.ts
+++ b/packages/app/src/pack-templates/hooks/useDeletePackTemplateItem.ts
@@ -1,4 +1,4 @@
-import { obs } from 'expo-app/lib/store';
+import { obs } from '@packrat/app/lib/store';
 import { useCallback } from 'react';
 import { packTemplateItemsStore } from '../store/packTemplateItems';
 
diff --git a/packages/app/src/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts b/packages/app/src/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts
index 86bce87721..178e577dfb 100644
--- a/packages/app/src/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts
+++ b/packages/app/src/pack-templates/hooks/useGenerateTemplateFromOnlineContent.ts
@@ -1,9 +1,9 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { obs } from '@packrat/app/lib/store';
+import { isWeightUnit } from '@packrat/app/lib/utils/itemCalculations';
 import type { PackTemplateInStore, PackTemplateItem } from '@packrat/app/pack-templates';
 import { isObject } from '@packrat/guards';
 import { useMutation } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { obs } from 'expo-app/lib/store';
-import { isWeightUnit } from 'expo-app/lib/utils/itemCalculations';
 import { packTemplateItemsStore } from '../store/packTemplateItems';
 import { packTemplatesStore } from '../store/packTemplates';
 
diff --git a/packages/app/src/pack-templates/hooks/usePackTemplatesDetails.ts b/packages/app/src/pack-templates/hooks/usePackTemplatesDetails.ts
index 21f71c2a04..890270d0d4 100644
--- a/packages/app/src/pack-templates/hooks/usePackTemplatesDetails.ts
+++ b/packages/app/src/pack-templates/hooks/usePackTemplatesDetails.ts
@@ -1,6 +1,6 @@
 import { use$ } from '@legendapp/state/react';
+import { obs } from '@packrat/app/lib/store';
 import { computePackTemplateWeights } from '@packrat/app/pack-templates';
-import { obs } from 'expo-app/lib/store';
 import { getTemplateItems } from '../store/packTemplateItems';
 import { packTemplatesStore } from '../store/packTemplates';
 
diff --git a/packages/app/src/pack-templates/hooks/useUpdatePackTemplateItem.ts b/packages/app/src/pack-templates/hooks/useUpdatePackTemplateItem.ts
index 8d97e1b519..bb61ea1a5b 100644
--- a/packages/app/src/pack-templates/hooks/useUpdatePackTemplateItem.ts
+++ b/packages/app/src/pack-templates/hooks/useUpdatePackTemplateItem.ts
@@ -1,7 +1,7 @@
 // useUpdatePackTemplateItem.ts
 
+import { obs } from '@packrat/app/lib/store';
 import type { PackTemplateItem } from '@packrat/app/pack-templates';
-import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
 import { packTemplateItemsStore, packTemplatesStore } from '../store';
 
diff --git a/packages/app/src/pack-templates/hooks/useUpdatePacktemplate.ts b/packages/app/src/pack-templates/hooks/useUpdatePacktemplate.ts
index 74c89312ed..062a45789a 100644
--- a/packages/app/src/pack-templates/hooks/useUpdatePacktemplate.ts
+++ b/packages/app/src/pack-templates/hooks/useUpdatePacktemplate.ts
@@ -1,5 +1,5 @@
+import { obs } from '@packrat/app/lib/store';
 import type { PackTemplate } from '@packrat/app/pack-templates';
-import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
 import { packTemplatesStore } from '../store/packTemplates';
 
diff --git a/packages/app/src/pack-templates/hooks/useWritePermissionCheck.ts b/packages/app/src/pack-templates/hooks/useWritePermissionCheck.ts
index 1f36b3c73e..01620ee06d 100644
--- a/packages/app/src/pack-templates/hooks/useWritePermissionCheck.ts
+++ b/packages/app/src/pack-templates/hooks/useWritePermissionCheck.ts
@@ -1,5 +1,5 @@
 import { useUser } from '@packrat/app/auth/hooks/useUser';
-import { obs } from 'expo-app/lib/store';
+import { obs } from '@packrat/app/lib/store';
 import { packTemplatesStore } from '../store';
 
 export function useWritePermissionCheck(id: string) {
diff --git a/packages/app/src/pack-templates/packTemplateListAtoms.ts b/packages/app/src/pack-templates/packTemplateListAtoms.ts
index 293d6d3ce0..f8c9e7a625 100644
--- a/packages/app/src/pack-templates/packTemplateListAtoms.ts
+++ b/packages/app/src/pack-templates/packTemplateListAtoms.ts
@@ -1,4 +1,4 @@
-import type { PackCategory } from 'expo-app/types';
+import type { PackCategory } from '@packrat/app/types';
 import { atom } from 'jotai';
 
 export const activeTemplateFilterAtom = atom<PackCategory | 'all'>('all');
diff --git a/packages/app/src/pack-templates/screens/CreatePackTemplateItemForm.tsx b/packages/app/src/pack-templates/screens/CreatePackTemplateItemForm.tsx
index 61539a8ade..3829574ce1 100644
--- a/packages/app/src/pack-templates/screens/CreatePackTemplateItemForm.tsx
+++ b/packages/app/src/pack-templates/screens/CreatePackTemplateItemForm.tsx
@@ -1,16 +1,16 @@
 // CreatePackTemplateItemForm.tsx
 
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import ImageCacheManager from '@packrat/app/lib/utils/ImageCacheManager';
 import type { PackTemplateItem } from '@packrat/app/pack-templates';
 import { useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
+import type { WeightUnit } from '@packrat/app/types';
 import { safeIndexOf } from '@packrat/guards';
 import { Form, FormItem, FormSection, SegmentedControl, TextField } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
-import type { WeightUnit } from 'expo-app/types';
 import { useRouter } from 'expo-router';
 import { useMemo, useRef, useState } from 'react';
 import { Alert, Image, Pressable, Switch, Text, TouchableOpacity, View } from 'react-native';
diff --git a/packages/app/src/pack-templates/screens/EditPackTemplateItemScreen.tsx b/packages/app/src/pack-templates/screens/EditPackTemplateItemScreen.tsx
index acc7808389..19de382d76 100644
--- a/packages/app/src/pack-templates/screens/EditPackTemplateItemScreen.tsx
+++ b/packages/app/src/pack-templates/screens/EditPackTemplateItemScreen.tsx
@@ -1,5 +1,5 @@
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { NotFoundScreen } from 'expo-app/screens/NotFoundScreen';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { NotFoundScreen } from '@packrat/app/screens/NotFoundScreen';
 import { useLocalSearchParams } from 'expo-router';
 import { usePackTemplateItem } from '../hooks/usePackTemplateItem';
 import { CreatePackTemplateItemForm } from './CreatePackTemplateItemForm';
diff --git a/packages/app/src/pack-templates/screens/EditPackTemplateScreen.tsx b/packages/app/src/pack-templates/screens/EditPackTemplateScreen.tsx
index 4e2729f291..01edccab96 100644
--- a/packages/app/src/pack-templates/screens/EditPackTemplateScreen.tsx
+++ b/packages/app/src/pack-templates/screens/EditPackTemplateScreen.tsx
@@ -1,5 +1,5 @@
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { NotFoundScreen } from 'expo-app/screens/NotFoundScreen';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { NotFoundScreen } from '@packrat/app/screens/NotFoundScreen';
 import { useLocalSearchParams } from 'expo-router';
 import { PackTemplateForm } from '../components/PackTemplateForm';
 import { usePackTemplateDetails } from '../hooks/usePackTemplatesDetails';
diff --git a/packages/app/src/pack-templates/screens/ItemsScanScreen.tsx b/packages/app/src/pack-templates/screens/ItemsScanScreen.tsx
index 34751e8c9b..2d46c35e42 100644
--- a/packages/app/src/pack-templates/screens/ItemsScanScreen.tsx
+++ b/packages/app/src/pack-templates/screens/ItemsScanScreen.tsx
@@ -1,5 +1,9 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import type { CatalogItem, CatalogItemWithPackItemFields } from '@packrat/app/catalog';
+import { ErrorState } from '@packrat/app/components/ErrorState';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { HorizontalCatalogItemCard } from '@packrat/app/packs/components/HorizontalCatalogItemCard';
 import { useImageDetection } from '@packrat/app/packs/hooks/useImageDetection';
 import { type SelectedImage, useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
@@ -7,10 +11,6 @@ import { assertNonNull } from '@packrat/guards';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
 import { appAlert } from 'expo-app/app/_layout';
-import { ErrorState } from 'expo-app/components/ErrorState';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Stack, useLocalSearchParams, useRouter } from 'expo-router';
 import { useCallback, useEffect, useState } from 'react';
 import { Image, ScrollView, View } from 'react-native';
diff --git a/packages/app/src/pack-templates/screens/PackTemplateDetailScreen.tsx b/packages/app/src/pack-templates/screens/PackTemplateDetailScreen.tsx
index 8884e96280..d5a01e737b 100644
--- a/packages/app/src/pack-templates/screens/PackTemplateDetailScreen.tsx
+++ b/packages/app/src/pack-templates/screens/PackTemplateDetailScreen.tsx
@@ -1,10 +1,10 @@
 import { useUser } from '@packrat/app/auth/hooks/useUser';
+import { Chip } from '@packrat/app/components/initial/Chip';
+import { WeightBadge } from '@packrat/app/components/initial/WeightBadge';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { PackTemplateItem } from '@packrat/app/pack-templates';
+import { NotFoundScreen } from '@packrat/app/screens/NotFoundScreen';
 import { Button, Text, useSheetRef } from '@packrat/ui/nativewindui';
-import { Chip } from 'expo-app/components/initial/Chip';
-import { WeightBadge } from 'expo-app/components/initial/WeightBadge';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { NotFoundScreen } from 'expo-app/screens/NotFoundScreen';
 import { useLocalSearchParams, useRouter } from 'expo-router';
 import { useCallback, useState } from 'react';
 import { Image, ScrollView, TouchableOpacity, View } from 'react-native';
diff --git a/packages/app/src/pack-templates/screens/PackTemplateItemDetailScreen.tsx b/packages/app/src/pack-templates/screens/PackTemplateItemDetailScreen.tsx
index e1579ed858..0f9568af82 100644
--- a/packages/app/src/pack-templates/screens/PackTemplateItemDetailScreen.tsx
+++ b/packages/app/src/pack-templates/screens/PackTemplateItemDetailScreen.tsx
@@ -1,10 +1,8 @@
 import { isAuthed } from '@packrat/app/auth/store';
-import { assertDefined } from '@packrat/guards';
-import { Button, Text, useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { Chip } from 'expo-app/components/initial/Chip';
-import { WeightBadge } from 'expo-app/components/initial/WeightBadge';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
+import { Icon } from '@packrat/app/components/Icon';
+import { Chip } from '@packrat/app/components/initial/Chip';
+import { WeightBadge } from '@packrat/app/components/initial/WeightBadge';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import {
   calculateTotalWeight,
   getNotes,
@@ -13,7 +11,9 @@ import {
   isConsumable,
   isWorn,
   shouldShowQuantity,
-} from 'expo-app/lib/utils/itemCalculations';
+} from '@packrat/app/lib/utils/itemCalculations';
+import { assertDefined } from '@packrat/guards';
+import { Button, Text, useColorScheme } from '@packrat/ui/nativewindui';
 import { router, useLocalSearchParams } from 'expo-router';
 import { ScrollView, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/packages/app/src/pack-templates/screens/PackTemplateListScreen.tsx b/packages/app/src/pack-templates/screens/PackTemplateListScreen.tsx
index fe75b00dcf..35fef9018b 100644
--- a/packages/app/src/pack-templates/screens/PackTemplateListScreen.tsx
+++ b/packages/app/src/pack-templates/screens/PackTemplateListScreen.tsx
@@ -1,15 +1,15 @@
 import type { BottomSheetModal } from '@gorhom/bottom-sheet';
 import { useAuth } from '@packrat/app/auth/hooks/useAuth';
 import { useUser } from '@packrat/app/auth/hooks/useUser';
+import { Icon } from '@packrat/app/components/Icon';
+import { LargeTitleHeaderSearchContentContainer } from '@packrat/app/components/LargeTitleHeaderSearchContentContainer';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { asNonNullableRef } from '@packrat/app/lib/utils/asNonNullableRef';
 import type { PackTemplate } from '@packrat/app/pack-templates';
 import type { PackCategory } from '@packrat/app/packs';
 import type { LargeTitleSearchBarMethods } from '@packrat/ui/nativewindui';
 import { LargeTitleHeader, SegmentedControl } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { LargeTitleHeaderSearchContentContainer } from 'expo-app/components/LargeTitleHeaderSearchContentContainer';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
 import { useRouter } from 'expo-router';
 import { useAtom } from 'jotai';
 import { useCallback, useRef, useState } from 'react';
diff --git a/packages/app/src/pack-templates/store/packTemplateItems.ts b/packages/app/src/pack-templates/store/packTemplateItems.ts
index 38b152c49e..6b11ec4507 100644
--- a/packages/app/src/pack-templates/store/packTemplateItems.ts
+++ b/packages/app/src/pack-templates/store/packTemplateItems.ts
@@ -6,9 +6,9 @@ import {
   PackTemplateWithItemsSchema,
 } from '@packrat/api/schemas/packTemplates';
 import { isAuthed } from '@packrat/app/auth/store';
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { persistPlugin } from '@packrat/app/lib/persist-plugin';
 import type { PackTemplateItem } from '@packrat/app/pack-templates';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { persistPlugin } from 'expo-app/lib/persist-plugin';
 
 const listAllPackTemplateItems = async (): Promise<PackTemplateItem[]> => {
   const { data, error } = await apiClient['pack-templates'].get();
diff --git a/packages/app/src/pack-templates/store/packTemplates.ts b/packages/app/src/pack-templates/store/packTemplates.ts
index f1a9b2b6f2..30bc9543aa 100644
--- a/packages/app/src/pack-templates/store/packTemplates.ts
+++ b/packages/app/src/pack-templates/store/packTemplates.ts
@@ -6,9 +6,9 @@ import {
   PackTemplateWithItemsSchema,
 } from '@packrat/api/schemas/packTemplates';
 import { isAuthed } from '@packrat/app/auth/store';
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { persistPlugin } from '@packrat/app/lib/persist-plugin';
 import type { PackTemplate, PackTemplateInStore } from '@packrat/app/pack-templates';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { persistPlugin } from 'expo-app/lib/persist-plugin';
 
 const listPackTemplates = async (): Promise<PackTemplateInStore[] | null> => {
   const { data, error } = await apiClient['pack-templates'].get();
diff --git a/packages/app/src/pack-templates/utils/getPackTemplateDetailOptions.tsx b/packages/app/src/pack-templates/utils/getPackTemplateDetailOptions.tsx
index 2fd3de7770..86e65b6a79 100644
--- a/packages/app/src/pack-templates/utils/getPackTemplateDetailOptions.tsx
+++ b/packages/app/src/pack-templates/utils/getPackTemplateDetailOptions.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { t } from '@packrat/app/lib/i18n';
 import { Alert, Button, useColorScheme, useSheetRef } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { t } from 'expo-app/lib/i18n';
 import { useRouter } from 'expo-router';
 import { View } from 'react-native';
 import AddPackTemplateItemActions from '../components/AddPackTemplateItemActions';
diff --git a/packages/app/src/pack-templates/utils/getPackTemplateItemDetailOptions.tsx b/packages/app/src/pack-templates/utils/getPackTemplateItemDetailOptions.tsx
index 6fba2ec10c..362ad590d4 100644
--- a/packages/app/src/pack-templates/utils/getPackTemplateItemDetailOptions.tsx
+++ b/packages/app/src/pack-templates/utils/getPackTemplateItemDetailOptions.tsx
@@ -1,8 +1,8 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { t } from '@packrat/app/lib/i18n';
 import { assertDefined } from '@packrat/guards';
 import { Alert, Button, useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { t } from 'expo-app/lib/i18n';
 import { useRouter } from 'expo-router';
 import { View } from 'react-native';
 import { useDeletePackTemplateItem, usePackTemplateItem } from '../hooks';
diff --git a/packages/app/src/packs/components/ActivityPicker.tsx b/packages/app/src/packs/components/ActivityPicker.tsx
index 39e8afcc84..23bed4f0d3 100644
--- a/packages/app/src/packs/components/ActivityPicker.tsx
+++ b/packages/app/src/packs/components/ActivityPicker.tsx
@@ -1,8 +1,8 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import type { PackCategory } from '@packrat/app/packs';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useState } from 'react';
 import { Modal, Pressable, ScrollView, TouchableOpacity, View } from 'react-native';
 
diff --git a/packages/app/src/packs/components/AddPackItemActions.tsx b/packages/app/src/packs/components/AddPackItemActions.tsx
index c782f597ab..d5f70c19d8 100644
--- a/packages/app/src/packs/components/AddPackItemActions.tsx
+++ b/packages/app/src/packs/components/AddPackItemActions.tsx
@@ -5,11 +5,11 @@ import { isAuthed } from '@packrat/app/auth/store';
 import type { CatalogItem } from '@packrat/app/catalog';
 import { CatalogBrowserModal } from '@packrat/app/catalog/components';
 import { useRecentlyUsedCatalogItems } from '@packrat/app/catalog/hooks/useRecentlyUsedCatalogItems';
+import { Icon } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { testIds } from '@packrat/app/lib/testIds';
 import { isFunction, nullToUndefined } from '@packrat/guards';
 import { Sheet, Text, useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { testIds } from 'expo-app/lib/testIds';
 import { router } from 'expo-router';
 import React from 'react';
 import { Alert, TouchableOpacity, View } from 'react-native';
diff --git a/packages/app/src/packs/components/CachedImage.tsx b/packages/app/src/packs/components/CachedImage.tsx
index 5d12cf739a..80396f97aa 100644
--- a/packages/app/src/packs/components/CachedImage.tsx
+++ b/packages/app/src/packs/components/CachedImage.tsx
@@ -1,4 +1,4 @@
-import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
+import ImageCacheManager from '@packrat/app/lib/utils/ImageCacheManager';
 import type React from 'react';
 import { useEffect, useState } from 'react';
 import { ActivityIndicator, Image, type ImageProps, View } from 'react-native';
diff --git a/packages/app/src/packs/components/CurrentPackTile.tsx b/packages/app/src/packs/components/CurrentPackTile.tsx
index 6895e65342..8e465aa7eb 100644
--- a/packages/app/src/packs/components/CurrentPackTile.tsx
+++ b/packages/app/src/packs/components/CurrentPackTile.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Avatar, AvatarFallback, AvatarImage, ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { Platform, View } from 'react-native';
 import { useCurrentPack } from '../hooks';
diff --git a/packages/app/src/packs/components/GapAnalysisModal.tsx b/packages/app/src/packs/components/GapAnalysisModal.tsx
index 4a4939f6b3..4ca04f6dac 100644
--- a/packages/app/src/packs/components/GapAnalysisModal.tsx
+++ b/packages/app/src/packs/components/GapAnalysisModal.tsx
@@ -1,8 +1,8 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { Pack, PackCategory } from '@packrat/app/packs';
 import { ActivityIndicator, Button, cn, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Modal, ScrollView, TouchableOpacity, View } from 'react-native';
 import type { GapAnalysisResponse } from '../hooks/usePackGapAnalysis';
 import { GapSuggestion } from './GapSuggestion';
diff --git a/packages/app/src/packs/components/GapItemCatalogSuggestions.tsx b/packages/app/src/packs/components/GapItemCatalogSuggestions.tsx
index 270b121662..4544987dc8 100644
--- a/packages/app/src/packs/components/GapItemCatalogSuggestions.tsx
+++ b/packages/app/src/packs/components/GapItemCatalogSuggestions.tsx
@@ -1,8 +1,8 @@
 import type { CatalogItem } from '@packrat/app/catalog';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { assertDefined } from '@packrat/guards';
 import { ActivityIndicator, Button, cn, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useState } from 'react';
 import { Modal, ScrollView, TouchableOpacity, View } from 'react-native';
 import type { GapAnalysisItem } from '../hooks/usePackGapAnalysis';
diff --git a/packages/app/src/packs/components/GapSuggestion.tsx b/packages/app/src/packs/components/GapSuggestion.tsx
index d41a60bdb9..7b5a363e46 100644
--- a/packages/app/src/packs/components/GapSuggestion.tsx
+++ b/packages/app/src/packs/components/GapSuggestion.tsx
@@ -1,8 +1,8 @@
 import type { CatalogItem } from '@packrat/app/catalog';
 import { useVectorSearch } from '@packrat/app/catalog/hooks/useVectorSearch';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useState } from 'react';
 import { View } from 'react-native';
 import type { GapAnalysisItem } from '../hooks';
diff --git a/packages/app/src/packs/components/GearInventoryTile.tsx b/packages/app/src/packs/components/GearInventoryTile.tsx
index 2efede9639..debdf585a1 100644
--- a/packages/app/src/packs/components/GearInventoryTile.tsx
+++ b/packages/app/src/packs/components/GearInventoryTile.tsx
@@ -1,8 +1,8 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { Alert, ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { useRef } from 'react';
 import { Platform, View } from 'react-native';
diff --git a/packages/app/src/packs/components/HorizontalCatalogItemCard.tsx b/packages/app/src/packs/components/HorizontalCatalogItemCard.tsx
index e0ae99b1bf..c4047b246f 100644
--- a/packages/app/src/packs/components/HorizontalCatalogItemCard.tsx
+++ b/packages/app/src/packs/components/HorizontalCatalogItemCard.tsx
@@ -1,8 +1,8 @@
 import type { CatalogItem } from '@packrat/app/catalog';
 import { CatalogItemImage } from '@packrat/app/catalog/components/CatalogItemImage';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { TouchableWithoutFeedback, View } from 'react-native';
 
 type HorizontalCatalogItemCardProps = {
diff --git a/packages/app/src/packs/components/PackCard.tsx b/packages/app/src/packs/components/PackCard.tsx
index c73961b7b1..aaf46237af 100644
--- a/packages/app/src/packs/components/PackCard.tsx
+++ b/packages/app/src/packs/components/PackCard.tsx
@@ -1,10 +1,10 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import { Icon } from '@packrat/app/components/Icon';
+import { WeightBadge } from '@packrat/app/components/initial/WeightBadge';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import type { Pack, PackInStore } from '@packrat/app/packs';
 import { isArray } from '@packrat/guards';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { WeightBadge } from 'expo-app/components/initial/WeightBadge';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { router } from 'expo-router';
 import { ActivityIndicator, Alert, Image, Pressable, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
diff --git a/packages/app/src/packs/components/PackCategoriesTile.tsx b/packages/app/src/packs/components/PackCategoriesTile.tsx
index e91096206c..42435ed1f1 100644
--- a/packages/app/src/packs/components/PackCategoriesTile.tsx
+++ b/packages/app/src/packs/components/PackCategoriesTile.tsx
@@ -1,8 +1,8 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { Alert, ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { useRef } from 'react';
 import { Platform, View } from 'react-native';
diff --git a/packages/app/src/packs/components/PackForm.tsx b/packages/app/src/packs/components/PackForm.tsx
index 20ef993802..c298aaaa25 100644
--- a/packages/app/src/packs/components/PackForm.tsx
+++ b/packages/app/src/packs/components/PackForm.tsx
@@ -1,4 +1,8 @@
 import { PackCategorySchema } from '@packrat/api/types';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { testIds } from '@packrat/app/lib/testIds';
 import { useCreatePackFromTemplate } from '@packrat/app/pack-templates/hooks/useCreatePackFromTemplate';
 import { getTemplateItems, packTemplatesStore } from '@packrat/app/pack-templates/store';
 import type { Pack } from '@packrat/app/packs';
@@ -15,10 +19,6 @@ import {
 } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
 import * as Burnt from 'burnt';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { testIds } from 'expo-app/lib/testIds';
 import { Stack, useLocalSearchParams, useRouter } from 'expo-router';
 import { useEffect, useRef, useState } from 'react';
 import {
diff --git a/packages/app/src/packs/components/PackItemCard.tsx b/packages/app/src/packs/components/PackItemCard.tsx
index 78f1300138..574e773cd5 100644
--- a/packages/app/src/packs/components/PackItemCard.tsx
+++ b/packages/app/src/packs/components/PackItemCard.tsx
@@ -1,11 +1,11 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { testIds } from '@packrat/app/lib/testIds';
 import type { PackItem } from '@packrat/app/packs';
 import { assertDefined } from '@packrat/guards';
 import { Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { testIds } from 'expo-app/lib/testIds';
 import { useRouter } from 'expo-router';
 import { Alert, Pressable, TouchableWithoutFeedback, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
diff --git a/packages/app/src/packs/components/PackItemImage.tsx b/packages/app/src/packs/components/PackItemImage.tsx
index 45915a3795..dd480acee5 100644
--- a/packages/app/src/packs/components/PackItemImage.tsx
+++ b/packages/app/src/packs/components/PackItemImage.tsx
@@ -1,9 +1,9 @@
 import { CatalogItemImage } from '@packrat/app/catalog/components/CatalogItemImage';
+import { Icon } from '@packrat/app/components/Icon';
+import { buildImageUrl } from '@packrat/app/lib/utils/buildImageUrl';
 import type { PackItem } from '@packrat/app/packs';
 import { isRemoteUrl } from '@packrat/guards';
 import { useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { buildImageUrl } from 'expo-app/lib/utils/buildImageUrl';
 import { Image, type ImageProps, View } from 'react-native';
 import { usePackItemOwnershipCheck } from '../hooks';
 import { CachedImage } from './CachedImage';
diff --git a/packages/app/src/packs/components/PackStatsTile.tsx b/packages/app/src/packs/components/PackStatsTile.tsx
index 72259eeebe..79ca1068f5 100644
--- a/packages/app/src/packs/components/PackStatsTile.tsx
+++ b/packages/app/src/packs/components/PackStatsTile.tsx
@@ -1,8 +1,8 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { Alert, ListItem } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { type Href, useRouter } from 'expo-router';
 import { useRef } from 'react';
 import { Platform, View } from 'react-native';
diff --git a/packages/app/src/packs/components/RecentPacksTile.tsx b/packages/app/src/packs/components/RecentPacksTile.tsx
index 8958356406..cd585218de 100644
--- a/packages/app/src/packs/components/RecentPacksTile.tsx
+++ b/packages/app/src/packs/components/RecentPacksTile.tsx
@@ -1,8 +1,8 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Avatar, AvatarFallback, AvatarImage, ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { Platform, View } from 'react-native';
 import { useRecentPacks } from '../hooks/useRecentPacks';
diff --git a/packages/app/src/packs/components/SearchResults.tsx b/packages/app/src/packs/components/SearchResults.tsx
index 7167886340..45f51efa69 100644
--- a/packages/app/src/packs/components/SearchResults.tsx
+++ b/packages/app/src/packs/components/SearchResults.tsx
@@ -1,5 +1,5 @@
+import { Icon } from '@packrat/app/components/Icon';
 import type { Pack } from '@packrat/app/packs';
-import { Icon } from 'expo-app/components/Icon';
 import { FlatList, Pressable, Text, View } from 'react-native';
 
 type SearchResultsProps = {
diff --git a/packages/app/src/packs/components/SeasonSuggestionsTile.tsx b/packages/app/src/packs/components/SeasonSuggestionsTile.tsx
index 832503a11a..df7075e078 100644
--- a/packages/app/src/packs/components/SeasonSuggestionsTile.tsx
+++ b/packages/app/src/packs/components/SeasonSuggestionsTile.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { Platform, View } from 'react-native';
 import { useHasMinimumInventory } from '../hooks/useHasMinimumInventory';
diff --git a/packages/app/src/packs/components/SharedPacksTile.tsx b/packages/app/src/packs/components/SharedPacksTile.tsx
index 4151c10e36..8b8cd933b1 100644
--- a/packages/app/src/packs/components/SharedPacksTile.tsx
+++ b/packages/app/src/packs/components/SharedPacksTile.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ListItem } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { Platform, View } from 'react-native';
 
diff --git a/packages/app/src/packs/components/ShoppingListTile.tsx b/packages/app/src/packs/components/ShoppingListTile.tsx
index c875b2059e..d77f3208cb 100644
--- a/packages/app/src/packs/components/ShoppingListTile.tsx
+++ b/packages/app/src/packs/components/ShoppingListTile.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { Platform, View } from 'react-native';
 
diff --git a/packages/app/src/packs/components/SimilarItemsForPackItem.tsx b/packages/app/src/packs/components/SimilarItemsForPackItem.tsx
index 5b64cb4c67..fc6eeadd6a 100644
--- a/packages/app/src/packs/components/SimilarItemsForPackItem.tsx
+++ b/packages/app/src/packs/components/SimilarItemsForPackItem.tsx
@@ -1,7 +1,7 @@
 import { CatalogItemImage } from '@packrat/app/catalog/components/CatalogItemImage';
 import { type SimilarItem, useSimilarPackItems } from '@packrat/app/catalog/hooks';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Text } from '@packrat/ui/nativewindui';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import type React from 'react';
 import { FlatList, Pressable, View } from 'react-native';
diff --git a/packages/app/src/packs/components/SyncBanner.tsx b/packages/app/src/packs/components/SyncBanner.tsx
index ed779257cf..fd9ad244c1 100644
--- a/packages/app/src/packs/components/SyncBanner.tsx
+++ b/packages/app/src/packs/components/SyncBanner.tsx
@@ -1,5 +1,5 @@
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { usePathname, useRouter } from 'expo-router';
 import { Pressable, Text, View } from 'react-native';
 
diff --git a/packages/app/src/packs/components/TemplateItemsSection.tsx b/packages/app/src/packs/components/TemplateItemsSection.tsx
index 41823d6e60..319b518e4b 100644
--- a/packages/app/src/packs/components/TemplateItemsSection.tsx
+++ b/packages/app/src/packs/components/TemplateItemsSection.tsx
@@ -1,9 +1,9 @@
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { buildPackTemplateItemImageUrl } from 'expo-app/lib/utils/buildPackTemplateItemImageUrl';
-import type { WeightUnit } from 'expo-app/types';
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { buildPackTemplateItemImageUrl } from '@packrat/app/lib/utils/buildPackTemplateItemImageUrl';
+import type { WeightUnit } from '@packrat/app/types';
 import { Image, ScrollView, Text, View } from 'react-native';
 
 export interface PackTemplateItem {
diff --git a/packages/app/src/packs/components/WeightAnalysisTile.tsx b/packages/app/src/packs/components/WeightAnalysisTile.tsx
index d1060dee14..fc2bc94ac3 100644
--- a/packages/app/src/packs/components/WeightAnalysisTile.tsx
+++ b/packages/app/src/packs/components/WeightAnalysisTile.tsx
@@ -1,8 +1,8 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { Alert, ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { type Href, useRouter } from 'expo-router';
 import { useRef } from 'react';
 import { Platform, View } from 'react-native';
diff --git a/packages/app/src/packs/hooks/useAllPacks.ts b/packages/app/src/packs/hooks/useAllPacks.ts
index d3431230a5..5be1d532c2 100644
--- a/packages/app/src/packs/hooks/useAllPacks.ts
+++ b/packages/app/src/packs/hooks/useAllPacks.ts
@@ -1,6 +1,6 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { useAuthenticatedQueryToolkit } from '@packrat/app/lib/hooks/useAuthenticatedQueryToolkit';
 import { useQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 
 export const fetchAllPacks = async () => {
   const { data, error } = await apiClient.packs.get({ query: { includePublic: 0 } });
diff --git a/packages/app/src/packs/hooks/useCreatePack.ts b/packages/app/src/packs/hooks/useCreatePack.ts
index d6cd354cd8..79524abf39 100644
--- a/packages/app/src/packs/hooks/useCreatePack.ts
+++ b/packages/app/src/packs/hooks/useCreatePack.ts
@@ -1,6 +1,6 @@
+import { obs } from '@packrat/app/lib/store';
 import type { PackInput, PackInStore } from '@packrat/app/packs';
 import { packsStore } from '@packrat/app/packs/store';
-import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 
diff --git a/packages/app/src/packs/hooks/useCreatePackItem.ts b/packages/app/src/packs/hooks/useCreatePackItem.ts
index 6f21675804..1b3e375592 100644
--- a/packages/app/src/packs/hooks/useCreatePackItem.ts
+++ b/packages/app/src/packs/hooks/useCreatePackItem.ts
@@ -1,6 +1,6 @@
+import { obs } from '@packrat/app/lib/store';
 import type { PackItem, PackItemInput } from '@packrat/app/packs';
 import { packItemsStore, packsStore } from '@packrat/app/packs/store';
-import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 import { recordPackWeight } from '../store/packWeightHistory';
diff --git a/packages/app/src/packs/hooks/useDeletePack.ts b/packages/app/src/packs/hooks/useDeletePack.ts
index 9c2a379b4a..7ebeafcad0 100644
--- a/packages/app/src/packs/hooks/useDeletePack.ts
+++ b/packages/app/src/packs/hooks/useDeletePack.ts
@@ -1,5 +1,5 @@
+import { obs } from '@packrat/app/lib/store';
 import { getPackItems, packItemsStore, packsStore } from '@packrat/app/packs/store';
-import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
 
 export function useDeletePack() {
diff --git a/packages/app/src/packs/hooks/useDeletePackItem.ts b/packages/app/src/packs/hooks/useDeletePackItem.ts
index bf93c2fb98..e9de2b6f0a 100644
--- a/packages/app/src/packs/hooks/useDeletePackItem.ts
+++ b/packages/app/src/packs/hooks/useDeletePackItem.ts
@@ -1,5 +1,5 @@
+import { obs } from '@packrat/app/lib/store';
 import { packItemsStore } from '@packrat/app/packs/store';
-import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
 
 export function useDeletePackItem() {
diff --git a/packages/app/src/packs/hooks/useDuplicatePack.ts b/packages/app/src/packs/hooks/useDuplicatePack.ts
index 312025057b..0747916b27 100644
--- a/packages/app/src/packs/hooks/useDuplicatePack.ts
+++ b/packages/app/src/packs/hooks/useDuplicatePack.ts
@@ -1,6 +1,6 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import type { Pack, PackInput } from '@packrat/app/packs';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 import { useCallback } from 'react';
 import { useCreatePackFromPack } from './useCreatePackFromPack';
 
diff --git a/packages/app/src/packs/hooks/useImageDetection.ts b/packages/app/src/packs/hooks/useImageDetection.ts
index 97e1b30a6c..71e2ccd6aa 100644
--- a/packages/app/src/packs/hooks/useImageDetection.ts
+++ b/packages/app/src/packs/hooks/useImageDetection.ts
@@ -1,6 +1,6 @@
 import type { CatalogItem } from '@packrat/app/catalog';
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useMutation } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 import { uploadImage } from '../utils';
 import type { SelectedImage } from './useImagePicker';
 
diff --git a/packages/app/src/packs/hooks/useImagePicker.ts b/packages/app/src/packs/hooks/useImagePicker.ts
index bde40fae25..f52ca0ce93 100644
--- a/packages/app/src/packs/hooks/useImagePicker.ts
+++ b/packages/app/src/packs/hooks/useImagePicker.ts
@@ -1,5 +1,5 @@
+import ImageCacheManager from '@packrat/app/lib/utils/ImageCacheManager';
 import { assertDefined } from '@packrat/guards';
-import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
 import * as ImagePicker from 'expo-image-picker';
 import { nanoid } from 'nanoid';
 import { useState } from 'react';
diff --git a/packages/app/src/packs/hooks/usePackDetailsFromApi.ts b/packages/app/src/packs/hooks/usePackDetailsFromApi.ts
index 67714cec3f..cf71ddf1f2 100644
--- a/packages/app/src/packs/hooks/usePackDetailsFromApi.ts
+++ b/packages/app/src/packs/hooks/usePackDetailsFromApi.ts
@@ -1,7 +1,7 @@
 import { PackWithWeightsSchema } from '@packrat/api/schemas/packs';
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { useAuthenticatedQueryToolkit } from '@packrat/app/lib/hooks/useAuthenticatedQueryToolkit';
 import { useQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 
 const fetchPackById = async (id: string) => {
   const { data, error } = await apiClient.packs({ packId: id }).get();
diff --git a/packages/app/src/packs/hooks/usePackDetailsFromStore.ts b/packages/app/src/packs/hooks/usePackDetailsFromStore.ts
index cf047cc1b6..215bd7a54b 100644
--- a/packages/app/src/packs/hooks/usePackDetailsFromStore.ts
+++ b/packages/app/src/packs/hooks/usePackDetailsFromStore.ts
@@ -1,7 +1,7 @@
 import { use$ } from '@legendapp/state/react';
+import { obs } from '@packrat/app/lib/store';
 import { computePackWeights } from '@packrat/app/packs';
 import { getPackItems, packsStore } from '@packrat/app/packs/store';
-import { obs } from 'expo-app/lib/store';
 
 /**
  * Retrieves pack from store.
diff --git a/packages/app/src/packs/hooks/usePackGapAnalysis.ts b/packages/app/src/packs/hooks/usePackGapAnalysis.ts
index 3387d24278..fed0951bd9 100644
--- a/packages/app/src/packs/hooks/usePackGapAnalysis.ts
+++ b/packages/app/src/packs/hooks/usePackGapAnalysis.ts
@@ -1,5 +1,5 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useMutation } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 export interface GapAnalysisRequest {
   destination?: string;
diff --git a/packages/app/src/packs/hooks/usePackItemDetailsFromApi.ts b/packages/app/src/packs/hooks/usePackItemDetailsFromApi.ts
index b21e065d31..61fc917cb4 100644
--- a/packages/app/src/packs/hooks/usePackItemDetailsFromApi.ts
+++ b/packages/app/src/packs/hooks/usePackItemDetailsFromApi.ts
@@ -1,8 +1,8 @@
 import { PackItemSchema } from '@packrat/api/schemas/packs';
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { useAuthenticatedQueryToolkit } from '@packrat/app/lib/hooks/useAuthenticatedQueryToolkit';
 import type { PackItem } from '@packrat/app/packs';
 import { useQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 
 export async function fetchPackItemById(id: string) {
   const { data, error } = await apiClient.packs.items({ itemId: id }).get();
diff --git a/packages/app/src/packs/hooks/usePackItemOwnershipCheck.ts b/packages/app/src/packs/hooks/usePackItemOwnershipCheck.ts
index 563e42f3ce..58c9c3d1c1 100644
--- a/packages/app/src/packs/hooks/usePackItemOwnershipCheck.ts
+++ b/packages/app/src/packs/hooks/usePackItemOwnershipCheck.ts
@@ -1,4 +1,4 @@
-import { obs } from 'expo-app/lib/store';
+import { obs } from '@packrat/app/lib/store';
 import { packItemsStore } from '../store';
 
 export function usePackItemOwnershipCheck(id: string) {
diff --git a/packages/app/src/packs/hooks/usePackOwnershipCheck.ts b/packages/app/src/packs/hooks/usePackOwnershipCheck.ts
index a681ce4edf..73ffce6fb8 100644
--- a/packages/app/src/packs/hooks/usePackOwnershipCheck.ts
+++ b/packages/app/src/packs/hooks/usePackOwnershipCheck.ts
@@ -1,4 +1,4 @@
-import { obs } from 'expo-app/lib/store';
+import { obs } from '@packrat/app/lib/store';
 import { packsStore } from '../store';
 
 export function usePackOwnershipCheck(id: string) {
diff --git a/packages/app/src/packs/hooks/useSeasonSuggestions.ts b/packages/app/src/packs/hooks/useSeasonSuggestions.ts
index 10c0df0810..49089c8ef0 100644
--- a/packages/app/src/packs/hooks/useSeasonSuggestions.ts
+++ b/packages/app/src/packs/hooks/useSeasonSuggestions.ts
@@ -1,6 +1,6 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import type { PackInput, PackItemInput } from '@packrat/app/packs';
 import { useMutation } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 
 export interface SeasonSuggestionsRequest {
   location: string;
diff --git a/packages/app/src/packs/hooks/useUpdatePack.ts b/packages/app/src/packs/hooks/useUpdatePack.ts
index 29373a4905..cd41e0ede8 100644
--- a/packages/app/src/packs/hooks/useUpdatePack.ts
+++ b/packages/app/src/packs/hooks/useUpdatePack.ts
@@ -1,6 +1,6 @@
+import { obs } from '@packrat/app/lib/store';
 import type { Pack } from '@packrat/app/packs';
 import { packsStore } from '@packrat/app/packs/store';
-import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
 
 export function useUpdatePack() {
diff --git a/packages/app/src/packs/packListAtoms.ts b/packages/app/src/packs/packListAtoms.ts
index daf48bb44b..52973f5ad7 100644
--- a/packages/app/src/packs/packListAtoms.ts
+++ b/packages/app/src/packs/packListAtoms.ts
@@ -1,4 +1,4 @@
-import type { PackCategory } from 'expo-app/types';
+import type { PackCategory } from '@packrat/app/types';
 import { atom } from 'jotai';
 
 export const activeFilterAtom = atom<PackCategory | 'all'>('all');
diff --git a/packages/app/src/packs/screens/CreatePackItemForm.tsx b/packages/app/src/packs/screens/CreatePackItemForm.tsx
index b814f76ee1..ee9819e90a 100644
--- a/packages/app/src/packs/screens/CreatePackItemForm.tsx
+++ b/packages/app/src/packs/screens/CreatePackItemForm.tsx
@@ -1,14 +1,14 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { testIds } from '@packrat/app/lib/testIds';
+import ImageCacheManager from '@packrat/app/lib/utils/ImageCacheManager';
 import type { PackItem } from '@packrat/app/packs';
+import type { WeightUnit } from '@packrat/app/types';
 import { safeIndexOf } from '@packrat/guards';
 import { Form, FormItem, FormSection, SegmentedControl, TextField } from '@packrat/ui/nativewindui';
 import { useForm } from '@tanstack/react-form';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { testIds } from 'expo-app/lib/testIds';
-import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
-import type { WeightUnit } from 'expo-app/types';
 import { useRouter } from 'expo-router';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { Alert, Image, Pressable, Switch, Text, TouchableOpacity, View } from 'react-native';
diff --git a/packages/app/src/packs/screens/EditPackItemScreen.tsx b/packages/app/src/packs/screens/EditPackItemScreen.tsx
index 0108d28e6a..dc54ae4b84 100644
--- a/packages/app/src/packs/screens/EditPackItemScreen.tsx
+++ b/packages/app/src/packs/screens/EditPackItemScreen.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { CreatePackItemForm } from '@packrat/app/packs/screens/CreatePackItemForm';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { NotFoundScreen } from 'expo-app/screens/NotFoundScreen';
+import { NotFoundScreen } from '@packrat/app/screens/NotFoundScreen';
 import { useLocalSearchParams } from 'expo-router';
 import { usePackItemDetailsFromStore } from '../hooks';
 
diff --git a/packages/app/src/packs/screens/ItemsScanScreen.tsx b/packages/app/src/packs/screens/ItemsScanScreen.tsx
index a21eecc976..71b4f72e5a 100644
--- a/packages/app/src/packs/screens/ItemsScanScreen.tsx
+++ b/packages/app/src/packs/screens/ItemsScanScreen.tsx
@@ -1,14 +1,14 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import type { CatalogItem, CatalogItemWithPackItemFields } from '@packrat/app/catalog';
+import { ErrorState } from '@packrat/app/components/ErrorState';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { type SelectedImage, useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
 import { assertNonNull } from '@packrat/guards';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
 import { appAlert } from 'expo-app/app/_layout';
-import { ErrorState } from 'expo-app/components/ErrorState';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Stack, useLocalSearchParams, useRouter } from 'expo-router';
 import { useCallback, useEffect, useState } from 'react';
 import { Image, ScrollView, View } from 'react-native';
diff --git a/packages/app/src/packs/screens/PackDetailScreen.tsx b/packages/app/src/packs/screens/PackDetailScreen.tsx
index 0baa594a08..e100d01c14 100644
--- a/packages/app/src/packs/screens/PackDetailScreen.tsx
+++ b/packages/app/src/packs/screens/PackDetailScreen.tsx
@@ -1,5 +1,14 @@
 import { BottomSheetView } from '@gorhom/bottom-sheet';
 import { isAuthed } from '@packrat/app/auth/store';
+import { Icon } from '@packrat/app/components/Icon';
+import { Chip } from '@packrat/app/components/initial/Chip';
+import { WeightBadge } from '@packrat/app/components/initial/WeightBadge';
+import { cn } from '@packrat/app/lib/cn';
+import { useBottomSheetAction } from '@packrat/app/lib/hooks/useBottomSheetAction';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { obs } from '@packrat/app/lib/store';
+import { testIds } from '@packrat/app/lib/testIds';
 import type { Pack, PackCategory, PackItem } from '@packrat/app/packs';
 import { ActivityPicker } from '@packrat/app/packs/components/ActivityPicker';
 import { GapAnalysisModal } from '@packrat/app/packs/components/GapAnalysisModal';
@@ -10,15 +19,6 @@ import { isDefined } from '@packrat/guards';
 import { ActivityIndicator, Button, Sheet, Text, useSheetRef } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
 import { appAlert } from 'expo-app/app/_layout';
-import { Icon } from 'expo-app/components/Icon';
-import { Chip } from 'expo-app/components/initial/Chip';
-import { WeightBadge } from 'expo-app/components/initial/WeightBadge';
-import { cn } from 'expo-app/lib/cn';
-import { useBottomSheetAction } from 'expo-app/lib/hooks/useBottomSheetAction';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { obs } from 'expo-app/lib/store';
-import { testIds } from 'expo-app/lib/testIds';
 import { useLocalSearchParams, useRouter } from 'expo-router';
 import { useMemo, useState } from 'react';
 import { Image, ScrollView, Share, TouchableOpacity, View } from 'react-native';
diff --git a/packages/app/src/packs/screens/PackItemDetailScreen.tsx b/packages/app/src/packs/screens/PackItemDetailScreen.tsx
index ffd914070f..20f28e11f4 100644
--- a/packages/app/src/packs/screens/PackItemDetailScreen.tsx
+++ b/packages/app/src/packs/screens/PackItemDetailScreen.tsx
@@ -1,10 +1,8 @@
 import { isAuthed } from '@packrat/app/auth/store';
-import { isDefined } from '@packrat/guards';
-import { ActivityIndicator, Button, Text, useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { Chip } from 'expo-app/components/initial/Chip';
-import { WeightBadge } from 'expo-app/components/initial/WeightBadge';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
+import { Icon } from '@packrat/app/components/Icon';
+import { Chip } from '@packrat/app/components/initial/Chip';
+import { WeightBadge } from '@packrat/app/components/initial/WeightBadge';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import {
   calculateTotalWeight,
   getNotes,
@@ -13,7 +11,9 @@ import {
   isConsumable,
   isWorn,
   shouldShowQuantity,
-} from 'expo-app/lib/utils/itemCalculations';
+} from '@packrat/app/lib/utils/itemCalculations';
+import { isDefined } from '@packrat/guards';
+import { ActivityIndicator, Button, Text, useColorScheme } from '@packrat/ui/nativewindui';
 import { router, useLocalSearchParams } from 'expo-router';
 import { ScrollView, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/packages/app/src/packs/screens/PackListScreen.tsx b/packages/app/src/packs/screens/PackListScreen.tsx
index 1660123990..803bd4cdf7 100644
--- a/packages/app/src/packs/screens/PackListScreen.tsx
+++ b/packages/app/src/packs/screens/PackListScreen.tsx
@@ -1,4 +1,12 @@
 import { useAuth } from '@packrat/app/auth/hooks/useAuth';
+import { AndroidTabBarInsetFix } from '@packrat/app/components/AndroidTabBarInsetFix';
+import { Icon } from '@packrat/app/components/Icon';
+import { LargeTitleHeaderOverlapFixIOS } from '@packrat/app/components/LargeTitleHeaderOverlapFixIOS';
+import { LargeTitleHeaderSearchContentContainer } from '@packrat/app/components/LargeTitleHeaderSearchContentContainer';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { testIds } from '@packrat/app/lib/testIds';
+import { asNonNullableRef } from '@packrat/app/lib/utils/asNonNullableRef';
 import type { Pack, PackCategory, PackInStore } from '@packrat/app/packs';
 import { PackCard } from '@packrat/app/packs/components/PackCard';
 import { SearchResults } from '@packrat/app/packs/components/SearchResults';
@@ -11,14 +19,6 @@ import {
   LargeTitleHeader,
   SegmentedControl,
 } from '@packrat/ui/nativewindui';
-import { AndroidTabBarInsetFix } from 'expo-app/components/AndroidTabBarInsetFix';
-import { Icon } from 'expo-app/components/Icon';
-import { LargeTitleHeaderOverlapFixIOS } from 'expo-app/components/LargeTitleHeaderOverlapFixIOS';
-import { LargeTitleHeaderSearchContentContainer } from 'expo-app/components/LargeTitleHeaderSearchContentContainer';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { testIds } from 'expo-app/lib/testIds';
-import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
 import { Link, useFocusEffect, useLocalSearchParams, useRouter } from 'expo-router';
 import { useAtom } from 'jotai';
 import { useCallback, useRef, useState } from 'react';
diff --git a/packages/app/src/packs/store/packItems.ts b/packages/app/src/packs/store/packItems.ts
index f8c774b04b..7508216363 100644
--- a/packages/app/src/packs/store/packItems.ts
+++ b/packages/app/src/packs/store/packItems.ts
@@ -3,11 +3,11 @@ import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { PackItemSchema, PackWithWeightsSchema } from '@packrat/api/schemas/packs';
 import { isAuthed } from '@packrat/app/auth/store';
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { persistPlugin } from '@packrat/app/lib/persist-plugin';
+import ImageCacheManager from '@packrat/app/lib/utils/ImageCacheManager';
 import type { PackItem } from '@packrat/app/packs';
 import { isRemoteUrl } from '@packrat/guards';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { persistPlugin } from 'expo-app/lib/persist-plugin';
-import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
 import { uploadImage } from '../utils';
 
 const listAllPackItems = async (): Promise<PackItem[] | null> => {
diff --git a/packages/app/src/packs/store/packWeightHistory.ts b/packages/app/src/packs/store/packWeightHistory.ts
index ce6a1aebb0..1c47c91661 100644
--- a/packages/app/src/packs/store/packWeightHistory.ts
+++ b/packages/app/src/packs/store/packWeightHistory.ts
@@ -3,10 +3,10 @@ import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { PackWeightHistoryResponseSchema } from '@packrat/api/schemas/packs';
 import { isAuthed } from '@packrat/app/auth/store';
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { persistPlugin } from '@packrat/app/lib/persist-plugin';
+import { obs } from '@packrat/app/lib/store';
 import type { PackWeightHistoryEntry } from '@packrat/app/packs';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { persistPlugin } from 'expo-app/lib/persist-plugin';
-import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
 import { computePackWeights } from '../utils';
 import { packItemsStore } from './packItems';
diff --git a/packages/app/src/packs/store/packingMode.ts b/packages/app/src/packs/store/packingMode.ts
index 18ca1cb146..ac8bfbe69b 100644
--- a/packages/app/src/packs/store/packingMode.ts
+++ b/packages/app/src/packs/store/packingMode.ts
@@ -1,6 +1,6 @@
 import { observable } from '@legendapp/state';
 import { syncObservable } from '@legendapp/state/sync';
-import { persistPlugin } from 'expo-app/lib/persist-plugin';
+import { persistPlugin } from '@packrat/app/lib/persist-plugin';
 
 export const packingModeStore = observable<Record<string, Record<string, boolean>>>({});
 
diff --git a/packages/app/src/packs/store/packs.ts b/packages/app/src/packs/store/packs.ts
index 9e175b0023..36733e68a6 100644
--- a/packages/app/src/packs/store/packs.ts
+++ b/packages/app/src/packs/store/packs.ts
@@ -3,9 +3,9 @@ import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { PackWithWeightsSchema } from '@packrat/api/schemas/packs';
 import { isAuthed } from '@packrat/app/auth/store';
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { persistPlugin } from '@packrat/app/lib/persist-plugin';
 import type { PackInStore } from '@packrat/app/packs';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { persistPlugin } from 'expo-app/lib/persist-plugin';
 
 let _refreshPacksList: (() => void) | undefined;
 export const refreshPacksList = () => _refreshPacksList?.();
diff --git a/packages/app/src/packs/utils/getPackDetailOptions.tsx b/packages/app/src/packs/utils/getPackDetailOptions.tsx
index ccf3497987..5b0de95531 100644
--- a/packages/app/src/packs/utils/getPackDetailOptions.tsx
+++ b/packages/app/src/packs/utils/getPackDetailOptions.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { t } from '@packrat/app/lib/i18n';
+import { testIds } from '@packrat/app/lib/testIds';
 import { Alert, Button, useColorScheme, useSheetRef } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { t } from 'expo-app/lib/i18n';
-import { testIds } from 'expo-app/lib/testIds';
 import { useRouter } from 'expo-router';
 import { View } from 'react-native';
 import AddPackItemActions from '../components/AddPackItemActions';
diff --git a/packages/app/src/packs/utils/getPackItemDetailOptions.tsx b/packages/app/src/packs/utils/getPackItemDetailOptions.tsx
index 6f166f2862..eac8a8d32a 100644
--- a/packages/app/src/packs/utils/getPackItemDetailOptions.tsx
+++ b/packages/app/src/packs/utils/getPackItemDetailOptions.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { t } from '@packrat/app/lib/i18n';
 import { assertDefined } from '@packrat/guards';
 import { Alert, Button, useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { t } from 'expo-app/lib/i18n';
 import { useRouter } from 'expo-router';
 import { View } from 'react-native';
 import {
diff --git a/packages/app/src/packs/utils/uploadImage.ts b/packages/app/src/packs/utils/uploadImage.ts
index 5da03c8e29..5efd93e154 100644
--- a/packages/app/src/packs/utils/uploadImage.ts
+++ b/packages/app/src/packs/utils/uploadImage.ts
@@ -1,5 +1,5 @@
 import { userStore } from '@packrat/app/auth/store';
-import { apiClient } from 'expo-app/lib/api/packrat';
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import * as FileSystem from 'expo-file-system/legacy';
 
 export const uploadImage = async (fileName: string, uri: string): Promise<string | undefined> => {
diff --git a/packages/app/src/profile/components/ProfileAuthWall.tsx b/packages/app/src/profile/components/ProfileAuthWall.tsx
index fee0cdc17f..82aedfe204 100644
--- a/packages/app/src/profile/components/ProfileAuthWall.tsx
+++ b/packages/app/src/profile/components/ProfileAuthWall.tsx
@@ -1,6 +1,6 @@
+import { Icon, type MaterialIconName } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { Icon, type MaterialIconName } from 'expo-app/components/Icon';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Stack, usePathname, useRouter } from 'expo-router';
 import { View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/packages/app/src/profile/hooks/useUpdateProfile.ts b/packages/app/src/profile/hooks/useUpdateProfile.ts
index 27a05e8bbc..637a9cbe94 100644
--- a/packages/app/src/profile/hooks/useUpdateProfile.ts
+++ b/packages/app/src/profile/hooks/useUpdateProfile.ts
@@ -1,5 +1,5 @@
 import { userStore } from '@packrat/app/auth/store';
-import { apiClient } from 'expo-app/lib/api/packrat';
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { useState } from 'react';
 
 export type UpdateProfilePayload = {
diff --git a/apps/expo/providers/JotaiProvider.tsx b/packages/app/src/providers/JotaiProvider.tsx
similarity index 77%
rename from apps/expo/providers/JotaiProvider.tsx
rename to packages/app/src/providers/JotaiProvider.tsx
index 7434e0876b..c18b84de5f 100644
--- a/apps/expo/providers/JotaiProvider.tsx
+++ b/packages/app/src/providers/JotaiProvider.tsx
@@ -1,4 +1,4 @@
-import { store } from 'expo-app/atoms/store';
+import { store } from '@packrat/app/atoms/store';
 import { Provider } from 'jotai';
 
 export function JotaiProvider({ children }: { children: React.ReactNode }) {
diff --git a/apps/expo/providers/TanstackProvider.tsx b/packages/app/src/providers/TanstackProvider.tsx
similarity index 100%
rename from apps/expo/providers/TanstackProvider.tsx
rename to packages/app/src/providers/TanstackProvider.tsx
diff --git a/apps/expo/providers/index.tsx b/packages/app/src/providers/index.tsx
similarity index 90%
rename from apps/expo/providers/index.tsx
rename to packages/app/src/providers/index.tsx
index 8bb092b9a4..fa92681d81 100644
--- a/apps/expo/providers/index.tsx
+++ b/packages/app/src/providers/index.tsx
@@ -1,8 +1,8 @@
 import { ActionSheetProvider } from '@expo/react-native-action-sheet';
 import { BottomSheetModalProvider } from '@gorhom/bottom-sheet';
+import { ErrorBoundary } from '@packrat/app/components/initial/ErrorBoundary';
 import { PortalHost } from '@rn-primitives/portal';
-import { ErrorBoundary } from 'expo-app/components/initial/ErrorBoundary';
-import 'expo-app/utils/polyfills';
+import '@packrat/app/utils/polyfills';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import { KeyboardProvider } from 'react-native-keyboard-controller';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
diff --git a/apps/expo/screens/ConsentWelcomeScreen.tsx b/packages/app/src/screens/ConsentWelcomeScreen.tsx
similarity index 93%
rename from apps/expo/screens/ConsentWelcomeScreen.tsx
rename to packages/app/src/screens/ConsentWelcomeScreen.tsx
index d9cd215900..7ff67ee7dc 100644
--- a/apps/expo/screens/ConsentWelcomeScreen.tsx
+++ b/packages/app/src/screens/ConsentWelcomeScreen.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Link } from 'expo-router';
 import { Platform, View, type ViewStyle } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/apps/expo/screens/ErrorScreen.tsx b/packages/app/src/screens/ErrorScreen.tsx
similarity index 90%
rename from apps/expo/screens/ErrorScreen.tsx
rename to packages/app/src/screens/ErrorScreen.tsx
index 4d6d617796..56aea422c8 100644
--- a/apps/expo/screens/ErrorScreen.tsx
+++ b/packages/app/src/screens/ErrorScreen.tsx
@@ -1,9 +1,9 @@
 'use client';
 
+import { Icon, type MaterialIconName } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Button } from '@packrat/ui/nativewindui';
-import { Icon, type MaterialIconName } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { Text, View } from 'react-native';
 
diff --git a/apps/expo/screens/LoadingSpinnerScreen.tsx b/packages/app/src/screens/LoadingSpinnerScreen.tsx
similarity index 100%
rename from apps/expo/screens/LoadingSpinnerScreen.tsx
rename to packages/app/src/screens/LoadingSpinnerScreen.tsx
diff --git a/apps/expo/screens/NotFoundScreen.tsx b/packages/app/src/screens/NotFoundScreen.tsx
similarity index 92%
rename from apps/expo/screens/NotFoundScreen.tsx
rename to packages/app/src/screens/NotFoundScreen.tsx
index 5165b48cd3..21d73b3cf2 100644
--- a/apps/expo/screens/NotFoundScreen.tsx
+++ b/packages/app/src/screens/NotFoundScreen.tsx
@@ -1,7 +1,7 @@
 'use client';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { Button } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
 import { useRouter } from 'expo-router';
 import { Text, View } from 'react-native';
 
diff --git a/apps/expo/screens/ProfileScreen.tsx b/packages/app/src/screens/ProfileScreen.tsx
similarity index 95%
rename from apps/expo/screens/ProfileScreen.tsx
rename to packages/app/src/screens/ProfileScreen.tsx
index a475c18871..52509155c3 100644
--- a/apps/expo/screens/ProfileScreen.tsx
+++ b/packages/app/src/screens/ProfileScreen.tsx
@@ -1,10 +1,10 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { UserAvatar } from '@packrat/app/components/initial/UserAvatar';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { Pack } from '@packrat/app/packs';
 import { PackCard } from '@packrat/app/packs/components/PackCard';
 import { usePacks } from '@packrat/app/packs/hooks/usePacks';
 import { getPackItems } from '@packrat/app/packs/store';
-import { Icon } from 'expo-app/components/Icon';
-import { UserAvatar } from 'expo-app/components/initial/UserAvatar';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { ScrollView, Text, TouchableOpacity, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { currentUser } from '../data/mockData';
diff --git a/apps/expo/theme/colors.ts b/packages/app/src/theme/colors.ts
similarity index 100%
rename from apps/expo/theme/colors.ts
rename to packages/app/src/theme/colors.ts
diff --git a/apps/expo/theme/index.ts b/packages/app/src/theme/index.ts
similarity index 100%
rename from apps/expo/theme/index.ts
rename to packages/app/src/theme/index.ts
diff --git a/packages/app/src/trail-conditions/components/ConditionBadge.tsx b/packages/app/src/trail-conditions/components/ConditionBadge.tsx
index 1a9364133b..fe60fe7eb8 100644
--- a/packages/app/src/trail-conditions/components/ConditionBadge.tsx
+++ b/packages/app/src/trail-conditions/components/ConditionBadge.tsx
@@ -1,6 +1,6 @@
+import { cn } from '@packrat/app/lib/cn';
 import type { OverallCondition } from '@packrat/app/trail-conditions';
 import { Text } from '@packrat/ui/nativewindui';
-import { cn } from 'expo-app/lib/cn';
 import { View } from 'react-native';
 
 interface ConditionBadgeProps {
diff --git a/packages/app/src/trail-conditions/components/SubmitConditionReportForm.tsx b/packages/app/src/trail-conditions/components/SubmitConditionReportForm.tsx
index e6a11d4e85..2c061219ea 100644
--- a/packages/app/src/trail-conditions/components/SubmitConditionReportForm.tsx
+++ b/packages/app/src/trail-conditions/components/SubmitConditionReportForm.tsx
@@ -1,11 +1,11 @@
+import { TextInput } from '@packrat/app/components/TextInput';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type {
   OverallCondition,
   TrailSurface,
   WaterCrossingDifficulty,
 } from '@packrat/app/trail-conditions';
 import { Text } from '@packrat/ui/nativewindui';
-import { TextInput } from 'expo-app/components/TextInput';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useState } from 'react';
 import { Alert, KeyboardAvoidingView, Platform, Pressable, ScrollView, View } from 'react-native';
 import { useSubmitTrailConditionReport } from '../hooks/useSubmitTrailConditionReport';
diff --git a/packages/app/src/trail-conditions/components/TrailConditionReportCard.tsx b/packages/app/src/trail-conditions/components/TrailConditionReportCard.tsx
index c76e356568..5a0c1c0e3b 100644
--- a/packages/app/src/trail-conditions/components/TrailConditionReportCard.tsx
+++ b/packages/app/src/trail-conditions/components/TrailConditionReportCard.tsx
@@ -1,10 +1,10 @@
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type {
   TrailConditionReport,
   TrailSurface,
   WaterCrossingDifficulty,
 } from '@packrat/app/trail-conditions';
 import { Text } from '@packrat/ui/nativewindui';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { View } from 'react-native';
 import { ConditionBadge } from './ConditionBadge';
 
diff --git a/packages/app/src/trail-conditions/hooks/useTrailConditionReports.ts b/packages/app/src/trail-conditions/hooks/useTrailConditionReports.ts
index 6f5f528d7e..5a2420371e 100644
--- a/packages/app/src/trail-conditions/hooks/useTrailConditionReports.ts
+++ b/packages/app/src/trail-conditions/hooks/useTrailConditionReports.ts
@@ -1,10 +1,10 @@
 import { useSelector } from '@legendapp/state/react';
 import { userStore } from '@packrat/app/auth/store/user';
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { useAuthenticatedQueryToolkit } from '@packrat/app/lib/hooks/useAuthenticatedQueryToolkit';
 import type { TrailConditionReport } from '@packrat/app/trail-conditions';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { useQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 import { useEffect, useRef, useState } from 'react';
 import { trailConditionReportsStore } from '../store/trailConditionReports';
 
diff --git a/packages/app/src/trail-conditions/store/trailConditionReports.ts b/packages/app/src/trail-conditions/store/trailConditionReports.ts
index 51ec5fd7f6..7cb4cb5099 100644
--- a/packages/app/src/trail-conditions/store/trailConditionReports.ts
+++ b/packages/app/src/trail-conditions/store/trailConditionReports.ts
@@ -3,9 +3,9 @@ import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { TrailConditionReportSchema } from '@packrat/api/schemas/trailConditions';
 import { isAuthed } from '@packrat/app/auth/store';
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { persistPlugin } from '@packrat/app/lib/persist-plugin';
 import type { TrailConditionReportInStore } from '@packrat/app/trail-conditions';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { persistPlugin } from 'expo-app/lib/persist-plugin';
 
 const listMyReports = async (_params: unknown, { lastSync }: { lastSync?: number } = {}) => {
   const { data, error } = await apiClient['trail-conditions'].mine.get({
diff --git a/packages/app/src/trips/components/TrailConditionsTile.tsx b/packages/app/src/trips/components/TrailConditionsTile.tsx
index ca57e1c64f..f4aa32e62c 100644
--- a/packages/app/src/trips/components/TrailConditionsTile.tsx
+++ b/packages/app/src/trips/components/TrailConditionsTile.tsx
@@ -1,9 +1,9 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { Alert, ListItem } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
 import { featureFlags } from 'expo-app/config';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { useRef } from 'react';
 import { View } from 'react-native';
diff --git a/packages/app/src/trips/components/TripCard.tsx b/packages/app/src/trips/components/TripCard.tsx
index 507f34866a..91fcf60de0 100644
--- a/packages/app/src/trips/components/TripCard.tsx
+++ b/packages/app/src/trips/components/TripCard.tsx
@@ -1,10 +1,10 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { formatLocalDate } from '@packrat/app/lib/utils/dateUtils';
 import type { Trip } from '@packrat/app/trips';
 import { Alert, type AlertMethods, Button } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { formatLocalDate } from 'expo-app/lib/utils/dateUtils';
 import { useRouter } from 'expo-router';
 import { useRef } from 'react';
 import { Pressable, Text, View } from 'react-native';
diff --git a/packages/app/src/trips/components/TripForm.tsx b/packages/app/src/trips/components/TripForm.tsx
index 3f1e2268b1..b5cc938826 100644
--- a/packages/app/src/trips/components/TripForm.tsx
+++ b/packages/app/src/trips/components/TripForm.tsx
@@ -1,3 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { testIds } from '@packrat/app/lib/testIds';
 import { usePacks } from '@packrat/app/packs/hooks/usePacks';
 import type { Trip } from '@packrat/app/trips';
 import { assertDefined, isString } from '@packrat/guards';
@@ -6,10 +10,6 @@ import DateTimePicker from '@react-native-community/datetimepicker';
 import { Picker } from '@react-native-picker/picker';
 import { useForm } from '@tanstack/react-form';
 import * as Burnt from 'burnt';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { testIds } from 'expo-app/lib/testIds';
 import { Stack, useRouter } from 'expo-router';
 import { useEffect, useMemo, useState } from 'react';
 import { Keyboard, Modal, Platform, Pressable, Text, View } from 'react-native';
diff --git a/packages/app/src/trips/components/UpcomingTripsTile.tsx b/packages/app/src/trips/components/UpcomingTripsTile.tsx
index 9bcdb10520..bf658c0df7 100644
--- a/packages/app/src/trips/components/UpcomingTripsTile.tsx
+++ b/packages/app/src/trips/components/UpcomingTripsTile.tsx
@@ -1,10 +1,10 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { parseLocalDate } from '@packrat/app/lib/utils/dateUtils';
 import { useTrips } from '@packrat/app/trips/hooks';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { Alert, ListItem, Text, useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
 import { featureFlags } from 'expo-app/config';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { parseLocalDate } from 'expo-app/lib/utils/dateUtils';
 import { useRouter } from 'expo-router';
 import { useMemo, useRef, useState } from 'react';
 import { View } from 'react-native';
diff --git a/packages/app/src/trips/hooks/useAllTrips.ts b/packages/app/src/trips/hooks/useAllTrips.ts
index 46a24d1561..52d6f19260 100644
--- a/packages/app/src/trips/hooks/useAllTrips.ts
+++ b/packages/app/src/trips/hooks/useAllTrips.ts
@@ -1,6 +1,6 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { useAuthenticatedQueryToolkit } from '@packrat/app/lib/hooks/useAuthenticatedQueryToolkit';
 import { useQuery } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { useAuthenticatedQueryToolkit } from 'expo-app/lib/hooks/useAuthenticatedQueryToolkit';
 export const fetchAllTrips = async () => {
   const { data, error } = await apiClient.trips.get();
   if (error) throw new Error(`Failed to fetch trips: ${error.value}`);
diff --git a/packages/app/src/trips/hooks/useCreateTrip.ts b/packages/app/src/trips/hooks/useCreateTrip.ts
index 8ab60ba2cd..e729d31f72 100644
--- a/packages/app/src/trips/hooks/useCreateTrip.ts
+++ b/packages/app/src/trips/hooks/useCreateTrip.ts
@@ -1,6 +1,6 @@
+import { obs } from '@packrat/app/lib/store';
 import type { TripInput, TripInStore } from '@packrat/app/trips';
 import { tripsStore } from '@packrat/app/trips/store/trips';
-import { obs } from 'expo-app/lib/store';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
 
diff --git a/packages/app/src/trips/hooks/useDeleteTrip.ts b/packages/app/src/trips/hooks/useDeleteTrip.ts
index 4f4f4183b9..896d6675ec 100644
--- a/packages/app/src/trips/hooks/useDeleteTrip.ts
+++ b/packages/app/src/trips/hooks/useDeleteTrip.ts
@@ -1,5 +1,5 @@
+import { obs } from '@packrat/app/lib/store';
 import { tripsStore } from '@packrat/app/trips/store/trips';
-import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
 
 export function useDeleteTrip() {
diff --git a/packages/app/src/trips/hooks/useTripDetailsFromStore.ts b/packages/app/src/trips/hooks/useTripDetailsFromStore.ts
index 825c66f2e6..c79631d347 100644
--- a/packages/app/src/trips/hooks/useTripDetailsFromStore.ts
+++ b/packages/app/src/trips/hooks/useTripDetailsFromStore.ts
@@ -1,6 +1,6 @@
 import { use$ } from '@legendapp/state/react';
+import { obs } from '@packrat/app/lib/store';
 import { tripsStore } from '@packrat/app/trips/store/trips';
-import { obs } from 'expo-app/lib/store';
 
 /**
  * Retrieves a trip from the store.
diff --git a/packages/app/src/trips/hooks/useUpdateTrip.ts b/packages/app/src/trips/hooks/useUpdateTrip.ts
index 79a5c12b47..98b48a4fc0 100644
--- a/packages/app/src/trips/hooks/useUpdateTrip.ts
+++ b/packages/app/src/trips/hooks/useUpdateTrip.ts
@@ -1,6 +1,6 @@
+import { obs } from '@packrat/app/lib/store';
 import type { Trip } from '@packrat/app/trips';
 import { tripsStore } from '@packrat/app/trips/store/trips';
-import { obs } from 'expo-app/lib/store';
 import { useCallback } from 'react';
 
 export function useUpdateTrip() {
diff --git a/packages/app/src/trips/screens/EditTripScreen.tsx b/packages/app/src/trips/screens/EditTripScreen.tsx
index ec5b06ebeb..f17c381d6d 100644
--- a/packages/app/src/trips/screens/EditTripScreen.tsx
+++ b/packages/app/src/trips/screens/EditTripScreen.tsx
@@ -1,7 +1,7 @@
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { useTripDetailsFromStore } from '@packrat/app/trips/hooks/useTripDetailsFromStore';
 import { assertDefined } from '@packrat/guards';
 import { ActivityIndicator } from '@packrat/ui/nativewindui';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useLocalSearchParams, useRouter } from 'expo-router';
 import { useEffect, useState } from 'react';
 import { Pressable, SafeAreaView, Text } from 'react-native';
diff --git a/packages/app/src/trips/screens/TripDetailScreen.tsx b/packages/app/src/trips/screens/TripDetailScreen.tsx
index cd9ff06855..23bf80b898 100644
--- a/packages/app/src/trips/screens/TripDetailScreen.tsx
+++ b/packages/app/src/trips/screens/TripDetailScreen.tsx
@@ -1,12 +1,12 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { testIds } from '@packrat/app/lib/testIds';
 import { SubmitConditionReportForm } from '@packrat/app/trail-conditions/components/SubmitConditionReportForm';
 import type { Trip } from '@packrat/app/trips';
 import { assertDefined } from '@packrat/guards';
 import { ActivityIndicator, Button, Card, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
 import { featureFlags } from 'expo-app/config';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { testIds } from 'expo-app/lib/testIds';
 import { useLocalSearchParams, useRouter } from 'expo-router';
 import { useMemo, useState } from 'react';
 import { Modal, ScrollView, Share, View } from 'react-native';
diff --git a/packages/app/src/trips/screens/TripListScreen.tsx b/packages/app/src/trips/screens/TripListScreen.tsx
index c1986065bb..18a190e5f8 100644
--- a/packages/app/src/trips/screens/TripListScreen.tsx
+++ b/packages/app/src/trips/screens/TripListScreen.tsx
@@ -1,12 +1,12 @@
+import { AndroidTabBarInsetFix } from '@packrat/app/components/AndroidTabBarInsetFix';
+import { Icon } from '@packrat/app/components/Icon';
+import { LargeTitleHeaderSearchContentContainer } from '@packrat/app/components/LargeTitleHeaderSearchContentContainer';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { testIds } from '@packrat/app/lib/testIds';
+import { asNonNullableRef } from '@packrat/app/lib/utils/asNonNullableRef';
 import type { Trip } from '@packrat/app/trips';
 import { LargeTitleHeader, type LargeTitleSearchBarMethods } from '@packrat/ui/nativewindui';
-import { AndroidTabBarInsetFix } from 'expo-app/components/AndroidTabBarInsetFix';
-import { Icon } from 'expo-app/components/Icon';
-import { LargeTitleHeaderSearchContentContainer } from 'expo-app/components/LargeTitleHeaderSearchContentContainer';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { testIds } from 'expo-app/lib/testIds';
-import { asNonNullableRef } from 'expo-app/lib/utils/asNonNullableRef';
 import { Link, useRouter } from 'expo-router';
 import { useCallback, useMemo, useRef, useState } from 'react';
 import { FlatList, Pressable, ScrollView, Text, TouchableOpacity, View } from 'react-native';
diff --git a/packages/app/src/trips/screens/TripWeatherDetailsScreen.tsx b/packages/app/src/trips/screens/TripWeatherDetailsScreen.tsx
index 9177274eee..81bae81919 100644
--- a/packages/app/src/trips/screens/TripWeatherDetailsScreen.tsx
+++ b/packages/app/src/trips/screens/TripWeatherDetailsScreen.tsx
@@ -1,11 +1,11 @@
 import type { WeatherAPIForecastResponse } from '@packrat/api/schemas/weather';
+import { Icon } from '@packrat/app/components/Icon';
 import { WeatherForecast } from '@packrat/app/weather/components/WeatherForecast';
 import {
   getWeatherBackgroundColors,
   getWeatherData,
   searchLocationsByCoordinates,
 } from '@packrat/app/weather/lib/weatherService';
-import { Icon } from 'expo-app/components/Icon';
 import { LinearGradient } from 'expo-linear-gradient';
 import { router, Stack, useLocalSearchParams } from 'expo-router';
 import { useEffect, useState } from 'react';
diff --git a/packages/app/src/trips/store/trips.ts b/packages/app/src/trips/store/trips.ts
index debd758f0f..6a2fb4d33b 100644
--- a/packages/app/src/trips/store/trips.ts
+++ b/packages/app/src/trips/store/trips.ts
@@ -3,9 +3,9 @@ import { syncObservable } from '@legendapp/state/sync';
 import { syncedCrud } from '@legendapp/state/sync-plugins/crud';
 import { TripSchema } from '@packrat/api/schemas/trips';
 import { isAuthed } from '@packrat/app/auth/store';
+import { apiClient } from '@packrat/app/lib/api/packrat';
+import { persistPlugin } from '@packrat/app/lib/persist-plugin';
 import type { TripInStore } from '@packrat/app/trips';
-import { apiClient } from 'expo-app/lib/api/packrat';
-import { persistPlugin } from 'expo-app/lib/persist-plugin';
 
 let _refreshTripsList: (() => void) | undefined;
 export const refreshTripsList = () => _refreshTripsList?.();
diff --git a/packages/app/src/trips/utils/getTripDetailOptions.tsx b/packages/app/src/trips/utils/getTripDetailOptions.tsx
index b971c8327b..bb84157bda 100644
--- a/packages/app/src/trips/utils/getTripDetailOptions.tsx
+++ b/packages/app/src/trips/utils/getTripDetailOptions.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
+import { t } from '@packrat/app/lib/i18n';
 import { Alert, Button, useColorScheme } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-import { t } from 'expo-app/lib/i18n';
 import { useRouter } from 'expo-router';
 import { View } from 'react-native';
 import { useDeleteTrip } from '../hooks';
diff --git a/apps/expo/types/global.d.ts b/packages/app/src/types/global.d.ts
similarity index 100%
rename from apps/expo/types/global.d.ts
rename to packages/app/src/types/global.d.ts
diff --git a/apps/expo/types/index.ts b/packages/app/src/types/index.ts
similarity index 100%
rename from apps/expo/types/index.ts
rename to packages/app/src/types/index.ts
diff --git a/apps/expo/utils/__tests__/chatContextHelpers.test.ts b/packages/app/src/utils/__tests__/chatContextHelpers.test.ts
similarity index 100%
rename from apps/expo/utils/__tests__/chatContextHelpers.test.ts
rename to packages/app/src/utils/__tests__/chatContextHelpers.test.ts
diff --git a/apps/expo/utils/__tests__/format-ai-response.test.ts b/packages/app/src/utils/__tests__/format-ai-response.test.ts
similarity index 100%
rename from apps/expo/utils/__tests__/format-ai-response.test.ts
rename to packages/app/src/utils/__tests__/format-ai-response.test.ts
diff --git a/apps/expo/utils/__tests__/storage.test.ts b/packages/app/src/utils/__tests__/storage.test.ts
similarity index 100%
rename from apps/expo/utils/__tests__/storage.test.ts
rename to packages/app/src/utils/__tests__/storage.test.ts
diff --git a/apps/expo/utils/__tests__/weight.test.ts b/packages/app/src/utils/__tests__/weight.test.ts
similarity index 98%
rename from apps/expo/utils/__tests__/weight.test.ts
rename to packages/app/src/utils/__tests__/weight.test.ts
index d53da50a98..a01d878b8a 100644
--- a/apps/expo/utils/__tests__/weight.test.ts
+++ b/packages/app/src/utils/__tests__/weight.test.ts
@@ -1,4 +1,4 @@
-import type { PackItem } from 'expo-app/types';
+import type { PackItem } from '@packrat/app/types';
 import { describe, expect, it } from 'vitest';
 import { calculateBaseWeight, calculateTotalWeight, convertWeight, formatWeight } from '../weight';
 
diff --git a/apps/expo/utils/chatContextHelpers.ts b/packages/app/src/utils/chatContextHelpers.ts
similarity index 100%
rename from apps/expo/utils/chatContextHelpers.ts
rename to packages/app/src/utils/chatContextHelpers.ts
diff --git a/apps/expo/utils/format-ai-response.ts b/packages/app/src/utils/format-ai-response.ts
similarity index 100%
rename from apps/expo/utils/format-ai-response.ts
rename to packages/app/src/utils/format-ai-response.ts
diff --git a/apps/expo/utils/polyfills.ts b/packages/app/src/utils/polyfills.ts
similarity index 100%
rename from apps/expo/utils/polyfills.ts
rename to packages/app/src/utils/polyfills.ts
diff --git a/apps/expo/utils/storage.ts b/packages/app/src/utils/storage.ts
similarity index 100%
rename from apps/expo/utils/storage.ts
rename to packages/app/src/utils/storage.ts
diff --git a/apps/expo/utils/weight.ts b/packages/app/src/utils/weight.ts
similarity index 95%
rename from apps/expo/utils/weight.ts
rename to packages/app/src/utils/weight.ts
index 771bbba3a3..851833d870 100644
--- a/apps/expo/utils/weight.ts
+++ b/packages/app/src/utils/weight.ts
@@ -1,4 +1,4 @@
-import type { PackItem, WeightUnit } from 'expo-app/types';
+import type { PackItem, WeightUnit } from '@packrat/app/types';
 
 // Convert weight between units
 export const convertWeight = (weight: number, from: WeightUnit, to: WeightUnit): number => {
diff --git a/packages/app/src/weather/atoms/locationsAtoms.ts b/packages/app/src/weather/atoms/locationsAtoms.ts
index 52231d8c15..06d1372317 100644
--- a/packages/app/src/weather/atoms/locationsAtoms.ts
+++ b/packages/app/src/weather/atoms/locationsAtoms.ts
@@ -1,4 +1,4 @@
-import { asyncStorage } from 'expo-app/utils/storage';
+import { asyncStorage } from '@packrat/app/utils/storage';
 import { atom } from 'jotai';
 import { atomWithStorage, loadable } from 'jotai/utils';
 import type { WeatherLocation } from '../types';
diff --git a/packages/app/src/weather/components/LocationCard.tsx b/packages/app/src/weather/components/LocationCard.tsx
index 3a83c9eb6e..3a3d78b8ba 100644
--- a/packages/app/src/weather/components/LocationCard.tsx
+++ b/packages/app/src/weather/components/LocationCard.tsx
@@ -1,8 +1,8 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Text } from '@packrat/ui/nativewindui';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Pressable, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import type { WeatherLocation } from '../types';
diff --git a/packages/app/src/weather/components/LocationPicker.tsx b/packages/app/src/weather/components/LocationPicker.tsx
index b0f250245d..810857d307 100644
--- a/packages/app/src/weather/components/LocationPicker.tsx
+++ b/packages/app/src/weather/components/LocationPicker.tsx
@@ -1,9 +1,9 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { assertNonNull } from '@packrat/guards';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { useState } from 'react';
 import { Modal, Pressable, ScrollView, TouchableOpacity, View } from 'react-native';
diff --git a/packages/app/src/weather/components/WeatherAlertsTile.tsx b/packages/app/src/weather/components/WeatherAlertsTile.tsx
index c3f42bfd1f..372af15cfe 100644
--- a/packages/app/src/weather/components/WeatherAlertsTile.tsx
+++ b/packages/app/src/weather/components/WeatherAlertsTile.tsx
@@ -1,8 +1,8 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { Alert, ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { useRef } from 'react';
 import { Platform, View } from 'react-native';
diff --git a/packages/app/src/weather/components/WeatherAuthWall.tsx b/packages/app/src/weather/components/WeatherAuthWall.tsx
index 5df04b2bd5..6b3ed45cea 100644
--- a/packages/app/src/weather/components/WeatherAuthWall.tsx
+++ b/packages/app/src/weather/components/WeatherAuthWall.tsx
@@ -1,6 +1,6 @@
+import { Icon, type MaterialIconName } from '@packrat/app/components/Icon';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { Icon, type MaterialIconName } from 'expo-app/components/Icon';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Stack, usePathname, useRouter } from 'expo-router';
 import { Image, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/packages/app/src/weather/components/WeatherForecast.tsx b/packages/app/src/weather/components/WeatherForecast.tsx
index 54337d0225..25b44e6f08 100644
--- a/packages/app/src/weather/components/WeatherForecast.tsx
+++ b/packages/app/src/weather/components/WeatherForecast.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { ScrollView, View } from 'react-native';
 import { WeatherIcon } from './WeatherIcon';
 
diff --git a/packages/app/src/weather/components/WeatherIcon.tsx b/packages/app/src/weather/components/WeatherIcon.tsx
index 7cdf6ec53a..94c4abd2f7 100644
--- a/packages/app/src/weather/components/WeatherIcon.tsx
+++ b/packages/app/src/weather/components/WeatherIcon.tsx
@@ -1,4 +1,4 @@
-import { Icon, type MaterialIconName } from 'expo-app/components/Icon';
+import { Icon, type MaterialIconName } from '@packrat/app/components/Icon';
 import { View } from 'react-native';
 import { getWeatherIconByCondition, getWeatherIconName } from '../lib/weatherIcons';
 
diff --git a/packages/app/src/weather/components/WeatherTile.tsx b/packages/app/src/weather/components/WeatherTile.tsx
index 510736bdd5..9a5e5fb6b5 100644
--- a/packages/app/src/weather/components/WeatherTile.tsx
+++ b/packages/app/src/weather/components/WeatherTile.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router } from 'expo-router';
 import { Platform, View } from 'react-native';
 import { useActiveLocation } from '../hooks';
diff --git a/packages/app/src/weather/lib/weatherIcons.ts b/packages/app/src/weather/lib/weatherIcons.ts
index 29f986d0a7..c5aea4e48e 100644
--- a/packages/app/src/weather/lib/weatherIcons.ts
+++ b/packages/app/src/weather/lib/weatherIcons.ts
@@ -1,4 +1,4 @@
-import type { MaterialIconName } from 'expo-app/components/Icon';
+import type { MaterialIconName } from '@packrat/app/components/Icon';
 
 /**
  * Maps weather condition codes to available icons
diff --git a/packages/app/src/weather/lib/weatherService.ts b/packages/app/src/weather/lib/weatherService.ts
index 836e07f111..c4e192b43d 100644
--- a/packages/app/src/weather/lib/weatherService.ts
+++ b/packages/app/src/weather/lib/weatherService.ts
@@ -3,8 +3,8 @@ import {
   type WeatherAPIForecastResponse,
   WeatherAPIForecastResponseSchema,
 } from '@packrat/api/schemas/weather';
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import { assertDefined } from '@packrat/guards';
-import { apiClient } from 'expo-app/lib/api/packrat';
 import { getWeatherIconName as getIconNameFromCode } from './weatherIcons';
 
 /**
diff --git a/packages/app/src/weather/screens/LocationDetailScreen.tsx b/packages/app/src/weather/screens/LocationDetailScreen.tsx
index 4d900bcd3d..96d6e07277 100644
--- a/packages/app/src/weather/screens/LocationDetailScreen.tsx
+++ b/packages/app/src/weather/screens/LocationDetailScreen.tsx
@@ -1,9 +1,9 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { getWeatherBackgroundColors } from '@packrat/app/weather/lib/weatherService';
 import { Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { LinearGradient } from 'expo-linear-gradient';
 import { router, Stack, useLocalSearchParams } from 'expo-router';
 import { useEffect, useState } from 'react';
diff --git a/packages/app/src/weather/screens/LocationPreviewScreen.tsx b/packages/app/src/weather/screens/LocationPreviewScreen.tsx
index 4d71bf9052..4a3714edba 100644
--- a/packages/app/src/weather/screens/LocationPreviewScreen.tsx
+++ b/packages/app/src/weather/screens/LocationPreviewScreen.tsx
@@ -1,13 +1,13 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { cn } from '@packrat/app/lib/cn';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import {
   formatWeatherData,
   getWeatherBackgroundColors,
   getWeatherData,
 } from '@packrat/app/weather/lib/weatherService';
 import { Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { cn } from 'expo-app/lib/cn';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-// import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
+// import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { LinearGradient } from 'expo-linear-gradient';
 import { router, Stack, useLocalSearchParams } from 'expo-router';
 import { useEffect, useState } from 'react';
diff --git a/packages/app/src/weather/screens/LocationSearchScreen.tsx b/packages/app/src/weather/screens/LocationSearchScreen.tsx
index 43822e5695..1674b01df4 100644
--- a/packages/app/src/weather/screens/LocationSearchScreen.tsx
+++ b/packages/app/src/weather/screens/LocationSearchScreen.tsx
@@ -1,10 +1,10 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { SearchInput } from '@packrat/app/components/SearchInput';
+import { cn } from '@packrat/app/lib/cn';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Text } from '@packrat/ui/nativewindui';
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import { Icon } from 'expo-app/components/Icon';
-import { SearchInput } from 'expo-app/components/SearchInput';
-import { cn } from 'expo-app/lib/cn';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import * as Location from 'expo-location';
 import { router } from 'expo-router';
 import { useEffect, useRef, useState } from 'react';
diff --git a/packages/app/src/weather/screens/LocationsScreen.tsx b/packages/app/src/weather/screens/LocationsScreen.tsx
index b189a7b4e3..5819c9984d 100644
--- a/packages/app/src/weather/screens/LocationsScreen.tsx
+++ b/packages/app/src/weather/screens/LocationsScreen.tsx
@@ -1,10 +1,10 @@
 import { withAuthWall } from '@packrat/app/auth/hocs';
+import { Icon } from '@packrat/app/components/Icon';
+import { LargeTitleHeaderOverlapFixIOS } from '@packrat/app/components/LargeTitleHeaderOverlapFixIOS';
+import { SearchInput } from '@packrat/app/components/SearchInput';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Button, LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { LargeTitleHeaderOverlapFixIOS } from 'expo-app/components/LargeTitleHeaderOverlapFixIOS';
-import { SearchInput } from 'expo-app/components/SearchInput';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { router, useNavigation } from 'expo-router';
 import { useAtom } from 'jotai';
 import { useCallback, useEffect, useRef, useState } from 'react';
diff --git a/packages/app/src/weather/types.ts b/packages/app/src/weather/types.ts
index 42ba85b31c..2e57849f8a 100644
--- a/packages/app/src/weather/types.ts
+++ b/packages/app/src/weather/types.ts
@@ -1,4 +1,4 @@
-import type { MaterialIconName } from 'expo-app/components/Icon';
+import type { MaterialIconName } from '@packrat/app/components/Icon';
 
 export interface WeatherApiForecastResponse {
   location: Location;
diff --git a/packages/app/src/wildlife/components/SpeciesCard.tsx b/packages/app/src/wildlife/components/SpeciesCard.tsx
index 58b11e99e6..e6631f7621 100644
--- a/packages/app/src/wildlife/components/SpeciesCard.tsx
+++ b/packages/app/src/wildlife/components/SpeciesCard.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { IdentificationResult } from '@packrat/app/wildlife';
 import { Text } from '@packrat/ui/nativewindui';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Pressable, View } from 'react-native';
 
 interface SpeciesCardProps {
diff --git a/packages/app/src/wildlife/components/WildlifeTile.tsx b/packages/app/src/wildlife/components/WildlifeTile.tsx
index c155d610de..74f903b9eb 100644
--- a/packages/app/src/wildlife/components/WildlifeTile.tsx
+++ b/packages/app/src/wildlife/components/WildlifeTile.tsx
@@ -1,7 +1,7 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ListItem, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { View } from 'react-native';
 
diff --git a/packages/app/src/wildlife/hooks/useWildlifeHistory.ts b/packages/app/src/wildlife/hooks/useWildlifeHistory.ts
index 9f9695d5b2..42c49ad7e8 100644
--- a/packages/app/src/wildlife/hooks/useWildlifeHistory.ts
+++ b/packages/app/src/wildlife/hooks/useWildlifeHistory.ts
@@ -1,5 +1,5 @@
+import ImageCacheManager from '@packrat/app/lib/utils/ImageCacheManager';
 import type { IdentificationResult, WildlifeIdentification } from '@packrat/app/wildlife';
-import ImageCacheManager from 'expo-app/lib/utils/ImageCacheManager';
 import { useAtom } from 'jotai';
 import { nanoid } from 'nanoid';
 import { useCallback } from 'react';
diff --git a/packages/app/src/wildlife/hooks/useWildlifeIdentification.ts b/packages/app/src/wildlife/hooks/useWildlifeIdentification.ts
index ff4e274c55..7529a66cf6 100644
--- a/packages/app/src/wildlife/hooks/useWildlifeIdentification.ts
+++ b/packages/app/src/wildlife/hooks/useWildlifeIdentification.ts
@@ -1,10 +1,10 @@
+import { apiClient } from '@packrat/app/lib/api/packrat';
 import type { SelectedImage } from '@packrat/app/packs/hooks/useImagePicker';
 import { uploadImage } from '@packrat/app/packs/utils';
 import type { IdentificationResult } from '@packrat/app/wildlife';
 import { identifyFromDescription } from '@packrat/app/wildlife';
 import { isObject, zodGuard } from '@packrat/guards';
 import { useMutation } from '@tanstack/react-query';
-import { apiClient } from 'expo-app/lib/api/packrat';
 import { z } from 'zod';
 
 const isIdentifyResponse = zodGuard(z.object({ results: z.array(z.unknown()) }));
diff --git a/packages/app/src/wildlife/screens/IdentificationScreen.tsx b/packages/app/src/wildlife/screens/IdentificationScreen.tsx
index ff89ef7361..b062b845d9 100644
--- a/packages/app/src/wildlife/screens/IdentificationScreen.tsx
+++ b/packages/app/src/wildlife/screens/IdentificationScreen.tsx
@@ -1,12 +1,12 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
+import { Icon } from '@packrat/app/components/Icon';
+import { TextInput } from '@packrat/app/components/TextInput';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
 import type { IdentificationResult } from '@packrat/app/wildlife';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import { appAlert } from 'expo-app/app/_layout';
-import { Icon } from 'expo-app/components/Icon';
-import { TextInput } from 'expo-app/components/TextInput';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Stack, useRouter } from 'expo-router';
 import { useEffect, useRef, useState } from 'react';
 import { Image, ScrollView, View } from 'react-native';
diff --git a/packages/app/src/wildlife/screens/SpeciesDetailScreen.tsx b/packages/app/src/wildlife/screens/SpeciesDetailScreen.tsx
index c0037a4af1..e545d7ec53 100644
--- a/packages/app/src/wildlife/screens/SpeciesDetailScreen.tsx
+++ b/packages/app/src/wildlife/screens/SpeciesDetailScreen.tsx
@@ -1,6 +1,6 @@
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { getSpeciesById } from '@packrat/app/wildlife';
 import { Text } from '@packrat/ui/nativewindui';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { Stack, useLocalSearchParams } from 'expo-router';
 import { useAtom } from 'jotai';
 import { ActivityIndicator, ScrollView, View } from 'react-native';
diff --git a/packages/app/src/wildlife/screens/WildlifeScreen.tsx b/packages/app/src/wildlife/screens/WildlifeScreen.tsx
index c4f9c1d7a7..222b23a8d9 100644
--- a/packages/app/src/wildlife/screens/WildlifeScreen.tsx
+++ b/packages/app/src/wildlife/screens/WildlifeScreen.tsx
@@ -1,8 +1,8 @@
+import { Icon } from '@packrat/app/components/Icon';
+import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
+import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { WildlifeIdentification } from '@packrat/app/wildlife';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { Icon } from 'expo-app/components/Icon';
-import { useColorScheme } from 'expo-app/lib/hooks/useColorScheme';
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
 import { useRouter } from 'expo-router';
 import { ActivityIndicator, FlatList, Pressable, SafeAreaView, View } from 'react-native';
 import { useWildlifeHistory } from '../hooks/useWildlifeHistory';
diff --git a/tsconfig.json b/tsconfig.json
index 34067b3dd9..eb37032eaf 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -40,7 +40,7 @@
       "@packrat/app/*": ["./packages/app/src/*"],
       "@packrat/web-ui": ["./packages/web-ui/src"],
       "@packrat/web-ui/*": ["./packages/web-ui/src/*"],
-      "nativewindui/*": ["./apps/expo/components/ui/*"]
+      "nativewindui/*": ["./packages/app/src/components/ui/*"]
     }
   },
   "include": [

From caa7c5d1692c548c7b572e3e2412462ece8c7229 Mon Sep 17 00:00:00 2001
From: Andrew Bierman <abbierman101@gmail.com>
Date: Fri, 1 May 2026 19:02:26 -0600
Subject: [PATCH 8/9] =?UTF-8?q?feat(app):=20complete=20expo=E2=86=92@packr?=
 =?UTF-8?q?at/app=20migration=20=E2=80=94=20fix=20all=20remaining=20import?=
 =?UTF-8?q?=20paths?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fix all expo routing files: expo-app/config → @packrat/app/config
- Fix settings screen: expo-app/app/_layout appAlert → @packrat/app/lib/appAlert
- Fix auth screens: expo-app/assets → @packrat/app/assets requires
- Add packages/app/src/lib/appAlert.ts with registerAppAlert() pattern
- Move apps/expo/config.ts → packages/app/src/config.ts (git rename)
- Move assets/packrat-app-icon-gradient.png and adaptive-icon.png to packages/app/src/assets/
- Fix biome formatting on all changed files

Zero type errors, zero remaining expo-app/ imports outside comments.
apps/expo is now a thin routing shell with only routing files and base config.
---
 apps/expo/app/(app)/(tabs)/(home)/index.tsx         |   2 +-
 apps/expo/app/(app)/(tabs)/_layout.tsx              |   2 +-
 apps/expo/app/(app)/(tabs)/trips/index.tsx          |   2 +-
 apps/expo/app/(app)/ai-chat.tsx                     |   2 +-
 apps/expo/app/(app)/pack-stats/[id].tsx             |   2 +-
 apps/expo/app/(app)/settings/index.tsx              |   2 +-
 apps/expo/app/(app)/trail-conditions.tsx            |   2 +-
 apps/expo/app/(app)/trip/[id]/index.tsx             |   2 +-
 apps/expo/app/(app)/trip/new.tsx                    |   2 +-
 apps/expo/app/(app)/upcoming-trips.tsx              |   2 +-
 apps/expo/app/(app)/wildlife/[id].tsx               |   2 +-
 apps/expo/app/(app)/wildlife/identify.tsx           |   2 +-
 apps/expo/app/(app)/wildlife/index.tsx              |   2 +-
 apps/expo/app/_layout.tsx                           |   8 ++++----
 apps/expo/app/auth/(create-account)/credentials.tsx |   2 +-
 apps/expo/app/auth/(create-account)/index.tsx       |   2 +-
 apps/expo/app/auth/(login)/forgot-password.tsx      |   2 +-
 apps/expo/app/auth/(login)/index.tsx                |   2 +-
 apps/expo/app/auth/(login)/reset-password.tsx       |   2 +-
 apps/expo/app/auth/index.tsx                        |   4 ++--
 apps/expo/app/auth/one-time-password.tsx            |   2 +-
 packages/app/src/ai/components/AIModeSelector.tsx   |   2 +-
 .../app/src}/assets/adaptive-icon.png               | Bin
 .../app/src}/assets/packrat-app-icon-gradient.png   | Bin
 {apps/expo => packages/app/src}/config.ts           |   0
 packages/app/src/lib/appAlert.ts                    |   8 ++++++++
 .../components/AddPackTemplateItemActions.tsx       |   2 +-
 .../pack-templates/components/AppTemplateBadge.tsx  |   2 +-
 .../pack-templates/components/PackTemplateCard.tsx  |   2 +-
 .../components/PackTemplateItemCard.tsx             |   2 +-
 .../src/pack-templates/screens/ItemsScanScreen.tsx  |   2 +-
 .../app/src/packs/components/CurrentPackTile.tsx    |   2 +-
 packages/app/src/packs/screens/ItemsScanScreen.tsx  |   2 +-
 packages/app/src/packs/screens/PackDetailScreen.tsx |   2 +-
 .../src/trips/components/TrailConditionsTile.tsx    |   2 +-
 .../app/src/trips/components/UpcomingTripsTile.tsx  |   2 +-
 packages/app/src/trips/screens/TripDetailScreen.tsx |   2 +-
 .../app/src/weather/components/WeatherAuthWall.tsx  |   2 +-
 .../src/wildlife/screens/IdentificationScreen.tsx   |   2 +-
 39 files changed, 47 insertions(+), 39 deletions(-)
 rename {apps/expo => packages/app/src}/assets/adaptive-icon.png (100%)
 rename {apps/expo => packages/app/src}/assets/packrat-app-icon-gradient.png (100%)
 rename {apps/expo => packages/app/src}/config.ts (100%)
 create mode 100644 packages/app/src/lib/appAlert.ts

diff --git a/apps/expo/app/(app)/(tabs)/(home)/index.tsx b/apps/expo/app/(app)/(tabs)/(home)/index.tsx
index 7f55171b99..0b8ad05a0f 100644
--- a/apps/expo/app/(app)/(tabs)/(home)/index.tsx
+++ b/apps/expo/app/(app)/(tabs)/(home)/index.tsx
@@ -6,6 +6,7 @@ import { AIPacksTile } from '@packrat/app/ai-packs/components/AIPacksTile';
 import { AndroidTabBarInsetFix } from '@packrat/app/components/AndroidTabBarInsetFix';
 import { Icon } from '@packrat/app/components/Icon';
 import { LargeTitleHeaderSearchContentContainer } from '@packrat/app/components/LargeTitleHeaderSearchContentContainer';
+import { appConfig, featureFlags } from '@packrat/app/config';
 import { FeedTile } from '@packrat/app/feed/components/FeedTile';
 import { GuidesTile } from '@packrat/app/guides/components/GuidesTile';
 import { cn } from '@packrat/app/lib/cn';
@@ -34,7 +35,6 @@ import {
   type ListRenderItemInfo,
   ListSectionHeader,
 } from '@packrat/ui/nativewindui';
-import { appConfig, featureFlags } from 'expo-app/config';
 import { useMemo, useRef, useState } from 'react';
 import { FlatList, Platform, Pressable, Text, View } from 'react-native';
 
diff --git a/apps/expo/app/(app)/(tabs)/_layout.tsx b/apps/expo/app/(app)/(tabs)/_layout.tsx
index a59fc78429..44e506e4a7 100644
--- a/apps/expo/app/(app)/(tabs)/_layout.tsx
+++ b/apps/expo/app/(app)/(tabs)/_layout.tsx
@@ -1,5 +1,5 @@
+import { featureFlags } from '@packrat/app/config';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
-import { featureFlags } from 'expo-app/config';
 import { NativeTabs } from 'expo-router/unstable-native-tabs';
 
 export default function TabLayout() {
diff --git a/apps/expo/app/(app)/(tabs)/trips/index.tsx b/apps/expo/app/(app)/(tabs)/trips/index.tsx
index 2e33529481..6ac7c5ccfe 100644
--- a/apps/expo/app/(app)/(tabs)/trips/index.tsx
+++ b/apps/expo/app/(app)/(tabs)/trips/index.tsx
@@ -1,5 +1,5 @@
+import { featureFlags } from '@packrat/app/config';
 import { TripsListScreen } from '@packrat/app/trips/screens/TripListScreen';
-import { featureFlags } from 'expo-app/config';
 import { Redirect } from 'expo-router';
 import { StatusBar } from 'expo-status-bar';
 
diff --git a/apps/expo/app/(app)/ai-chat.tsx b/apps/expo/app/(app)/ai-chat.tsx
index 344a24b607..3bfee7655d 100644
--- a/apps/expo/app/(app)/ai-chat.tsx
+++ b/apps/expo/app/(app)/ai-chat.tsx
@@ -15,6 +15,7 @@ import { tokenAtom } from '@packrat/app/auth/atoms/authAtoms';
 import { AiChatHeader } from '@packrat/app/components/ai-chatHeader';
 import { Icon } from '@packrat/app/components/Icon';
 import { TextInput } from '@packrat/app/components/TextInput';
+import { featureFlags } from '@packrat/app/config';
 import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import {
@@ -28,7 +29,6 @@ import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import { DefaultChatTransport, type TextUIPart } from 'ai';
 import * as Burnt from 'burnt';
 import { fetch as expoFetch } from 'expo/fetch';
-import { featureFlags } from 'expo-app/config';
 import { BlurView } from 'expo-blur';
 import { Stack, useLocalSearchParams } from 'expo-router';
 import { useAtomValue } from 'jotai';
diff --git a/apps/expo/app/(app)/pack-stats/[id].tsx b/apps/expo/app/(app)/pack-stats/[id].tsx
index 174e8939e9..869d4bfdd7 100644
--- a/apps/expo/app/(app)/pack-stats/[id].tsx
+++ b/apps/expo/app/(app)/pack-stats/[id].tsx
@@ -1,10 +1,10 @@
 import { userStore } from '@packrat/app/auth/store';
+import { featureFlags } from '@packrat/app/config';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { usePackDetailsFromStore } from '@packrat/app/packs/hooks/usePackDetailsFromStore';
 import { usePackWeightHistory } from '@packrat/app/packs/hooks/usePackWeightHistory';
 import { computeCategorySummaries } from '@packrat/app/packs/utils';
 import { LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { featureFlags } from 'expo-app/config';
 import { useLocalSearchParams } from 'expo-router';
 import { ScrollView, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/apps/expo/app/(app)/settings/index.tsx b/apps/expo/app/(app)/settings/index.tsx
index 3666761659..9cabe83ec7 100644
--- a/apps/expo/app/(app)/settings/index.tsx
+++ b/apps/expo/app/(app)/settings/index.tsx
@@ -13,11 +13,11 @@ import {
 import { DeleteAccountButton } from '@packrat/app/auth/components/DeleteAccountButton';
 import { useAuth } from '@packrat/app/auth/hooks/useAuth';
 import { Icon, type MaterialIconName } from '@packrat/app/components/Icon';
+import { appAlert } from '@packrat/app/lib/appAlert';
 import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ActivityIndicator, Text } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
-import { appAlert } from 'expo-app/app/_layout';
 import Constants from 'expo-constants';
 import { StatusBar } from 'expo-status-bar';
 import { useAtomValue } from 'jotai';
diff --git a/apps/expo/app/(app)/trail-conditions.tsx b/apps/expo/app/(app)/trail-conditions.tsx
index 535b0cea5d..2961387a03 100644
--- a/apps/expo/app/(app)/trail-conditions.tsx
+++ b/apps/expo/app/(app)/trail-conditions.tsx
@@ -1,10 +1,10 @@
+import { featureFlags } from '@packrat/app/config';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { TrailConditionReport, TrailSurface } from '@packrat/app/trail-conditions';
 import { SubmitConditionReportForm } from '@packrat/app/trail-conditions/components/SubmitConditionReportForm';
 import { TrailConditionReportCard } from '@packrat/app/trail-conditions/components/TrailConditionReportCard';
 import { useTrailConditionReports } from '@packrat/app/trail-conditions/hooks/useTrailConditionReports';
 import { ActivityIndicator, LargeTitleHeader, Text } from '@packrat/ui/nativewindui';
-import { featureFlags } from 'expo-app/config';
 import { useMemo, useState } from 'react';
 import { FlatList, Modal, Pressable, ScrollView, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
diff --git a/apps/expo/app/(app)/trip/[id]/index.tsx b/apps/expo/app/(app)/trip/[id]/index.tsx
index bc7a2b6999..917c9c2d2d 100644
--- a/apps/expo/app/(app)/trip/[id]/index.tsx
+++ b/apps/expo/app/(app)/trip/[id]/index.tsx
@@ -1,5 +1,5 @@
+import { featureFlags } from '@packrat/app/config';
 import { TripDetailScreen } from '@packrat/app/trips/screens/TripDetailScreen';
-import { featureFlags } from 'expo-app/config';
 import { Redirect } from 'expo-router';
 
 export default function TripDetailScreenRoute() {
diff --git a/apps/expo/app/(app)/trip/new.tsx b/apps/expo/app/(app)/trip/new.tsx
index 86362a24c3..dbebacfd9e 100644
--- a/apps/expo/app/(app)/trip/new.tsx
+++ b/apps/expo/app/(app)/trip/new.tsx
@@ -1,5 +1,5 @@
+import { featureFlags } from '@packrat/app/config';
 import { CreateTripScreen } from '@packrat/app/trips/screens/CreateTripScreen';
-import { featureFlags } from 'expo-app/config';
 import { Redirect } from 'expo-router';
 
 export default function TripNewScreen() {
diff --git a/apps/expo/app/(app)/upcoming-trips.tsx b/apps/expo/app/(app)/upcoming-trips.tsx
index ecb2f355cd..dae40a3de8 100644
--- a/apps/expo/app/(app)/upcoming-trips.tsx
+++ b/apps/expo/app/(app)/upcoming-trips.tsx
@@ -1,3 +1,4 @@
+import { featureFlags } from '@packrat/app/config';
 import { cn } from '@packrat/app/lib/cn';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { TranslationFunction } from '@packrat/app/lib/i18n/types';
@@ -5,7 +6,6 @@ import { useDetailedPacks } from '@packrat/app/packs/hooks/useDetailedPacks';
 import { useTrips } from '@packrat/app/trips/hooks';
 import { List, ListItem, Text } from '@packrat/ui/nativewindui';
 import { format } from 'date-fns';
-import { featureFlags } from 'expo-app/config';
 import { Redirect } from 'expo-router';
 import { useEffect, useMemo, useState } from 'react';
 import { ScrollView, View } from 'react-native';
diff --git a/apps/expo/app/(app)/wildlife/[id].tsx b/apps/expo/app/(app)/wildlife/[id].tsx
index c2a909d612..49fca8c50c 100644
--- a/apps/expo/app/(app)/wildlife/[id].tsx
+++ b/apps/expo/app/(app)/wildlife/[id].tsx
@@ -1,5 +1,5 @@
+import { featureFlags } from '@packrat/app/config';
 import { SpeciesDetailScreen } from '@packrat/app/wildlife/screens/SpeciesDetailScreen';
-import { featureFlags } from 'expo-app/config';
 import { Redirect } from 'expo-router';
 
 export default function SpeciesDetailRoute() {
diff --git a/apps/expo/app/(app)/wildlife/identify.tsx b/apps/expo/app/(app)/wildlife/identify.tsx
index e03caa9c52..a2ac238aec 100644
--- a/apps/expo/app/(app)/wildlife/identify.tsx
+++ b/apps/expo/app/(app)/wildlife/identify.tsx
@@ -1,5 +1,5 @@
+import { featureFlags } from '@packrat/app/config';
 import { IdentificationScreen } from '@packrat/app/wildlife/screens/IdentificationScreen';
-import { featureFlags } from 'expo-app/config';
 import { Redirect } from 'expo-router';
 
 export default function IdentifyRoute() {
diff --git a/apps/expo/app/(app)/wildlife/index.tsx b/apps/expo/app/(app)/wildlife/index.tsx
index bbfd6994ba..645b3fbba7 100644
--- a/apps/expo/app/(app)/wildlife/index.tsx
+++ b/apps/expo/app/(app)/wildlife/index.tsx
@@ -1,5 +1,5 @@
+import { featureFlags } from '@packrat/app/config';
 import { WildlifeScreen } from '@packrat/app/wildlife/screens/WildlifeScreen';
-import { featureFlags } from 'expo-app/config';
 import { Redirect } from 'expo-router';
 
 export default function WildlifeRoute() {
diff --git a/apps/expo/app/_layout.tsx b/apps/expo/app/_layout.tsx
index 4a72e2ab6e..a475c07a0a 100644
--- a/apps/expo/app/_layout.tsx
+++ b/apps/expo/app/_layout.tsx
@@ -7,6 +7,7 @@ import { StatusBar } from 'expo-status-bar';
 import '../global.css';
 
 import { userStore } from '@packrat/app/auth/store';
+import { registerAppAlert } from '@packrat/app/lib/appAlert';
 import { useColorScheme, useInitialAndroidBarSync } from '@packrat/app/lib/hooks/useColorScheme';
 import { Providers } from '@packrat/app/providers';
 import { NAV_THEME } from '@packrat/app/theme';
@@ -32,12 +33,11 @@ export {
   ErrorBoundary,
 } from 'expo-router';
 
-export let appAlert: React.RefObject<AlertMethods | null>;
-
 function RootLayout() {
   useInitialAndroidBarSync();
 
-  appAlert = useRef<AlertMethods>(null);
+  const alertRef = useRef<AlertMethods>(null);
+  registerAppAlert(alertRef);
 
   const { colorScheme, isDarkColorScheme } = useColorScheme();
 
@@ -59,7 +59,7 @@ function RootLayout() {
           <Stack.Screen name="(app)" />
           <Stack.Screen name="auth" />
         </Stack>
-        <Alert title="" buttons={[]} ref={appAlert} />
+        <Alert title="" buttons={[]} ref={alertRef} />
       </NavThemeProvider>
     </Providers>
   );
diff --git a/apps/expo/app/auth/(create-account)/credentials.tsx b/apps/expo/app/auth/(create-account)/credentials.tsx
index a300f48244..a1e569422a 100644
--- a/apps/expo/app/auth/(create-account)/credentials.tsx
+++ b/apps/expo/app/auth/(create-account)/credentials.tsx
@@ -25,7 +25,7 @@ import {
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { z } from 'zod';
 
-const LOGO_SOURCE = require('expo-app/assets/packrat-app-icon-gradient.png');
+const LOGO_SOURCE = require('@packrat/app/assets/packrat-app-icon-gradient.png');
 
 const RE_HAS_UPPERCASE = /[A-Z]/;
 const RE_HAS_LOWERCASE = /[a-z]/;
diff --git a/apps/expo/app/auth/(create-account)/index.tsx b/apps/expo/app/auth/(create-account)/index.tsx
index 14c1b6e9f3..ffb5a9bbcc 100644
--- a/apps/expo/app/auth/(create-account)/index.tsx
+++ b/apps/expo/app/auth/(create-account)/index.tsx
@@ -14,7 +14,7 @@ import {
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { z } from 'zod';
 
-const LOGO_SOURCE = require('expo-app/assets/packrat-app-icon-gradient.png');
+const LOGO_SOURCE = require('@packrat/app/assets/packrat-app-icon-gradient.png');
 
 // Define Zod schema for name validation
 const nameFormSchema = z.object({
diff --git a/apps/expo/app/auth/(login)/forgot-password.tsx b/apps/expo/app/auth/(login)/forgot-password.tsx
index 7d48b6da8d..7f2c36a915 100644
--- a/apps/expo/app/auth/(login)/forgot-password.tsx
+++ b/apps/expo/app/auth/(login)/forgot-password.tsx
@@ -20,7 +20,7 @@ import { KeyboardAwareScrollView, KeyboardStickyView } from 'react-native-keyboa
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { z } from 'zod';
 
-const LOGO_SOURCE = require('expo-app/assets/packrat-app-icon-gradient.png');
+const LOGO_SOURCE = require('@packrat/app/assets/packrat-app-icon-gradient.png');
 
 // Define Zod schema for email validation
 const emailSchema = z.object({
diff --git a/apps/expo/app/auth/(login)/index.tsx b/apps/expo/app/auth/(login)/index.tsx
index a68c44d91e..5777b8f53d 100644
--- a/apps/expo/app/auth/(login)/index.tsx
+++ b/apps/expo/app/auth/(login)/index.tsx
@@ -16,7 +16,7 @@ import {
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { z } from 'zod';
 
-const LOGO_SOURCE = require('expo-app/assets/packrat-app-icon-gradient.png');
+const LOGO_SOURCE = require('@packrat/app/assets/packrat-app-icon-gradient.png');
 
 // Define Zod schema for login validation
 const loginFormSchema = z.object({
diff --git a/apps/expo/app/auth/(login)/reset-password.tsx b/apps/expo/app/auth/(login)/reset-password.tsx
index 5855b79f24..b904e569a8 100644
--- a/apps/expo/app/auth/(login)/reset-password.tsx
+++ b/apps/expo/app/auth/(login)/reset-password.tsx
@@ -25,7 +25,7 @@ import {
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { z } from 'zod';
 
-const LOGO_SOURCE = require('expo-app/assets/packrat-app-icon-gradient.png');
+const LOGO_SOURCE = require('@packrat/app/assets/packrat-app-icon-gradient.png');
 
 const RE_HAS_UPPERCASE = /[A-Z]/;
 const RE_HAS_LOWERCASE = /[a-z]/;
diff --git a/apps/expo/app/auth/index.tsx b/apps/expo/app/auth/index.tsx
index 7bf92606d1..ea0f41f0d1 100644
--- a/apps/expo/app/auth/index.tsx
+++ b/apps/expo/app/auth/index.tsx
@@ -1,18 +1,18 @@
 import { isLoadingAtom, needsReauthAtom, redirectToAtom } from '@packrat/app/auth/atoms/authAtoms';
 import { useAuth } from '@packrat/app/auth/hooks/useAuth';
+import { featureFlags } from '@packrat/app/config';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { testIds } from '@packrat/app/lib/testIds';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { ActivityIndicator, AlertAnchor, Button, Text } from '@packrat/ui/nativewindui';
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import { featureFlags } from 'expo-app/config';
 import { Link, router, useLocalSearchParams } from 'expo-router';
 import { useAtomValue, useSetAtom } from 'jotai';
 import * as React from 'react';
 import { Image, Platform, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 
-const LOGO_SOURCE = require('expo-app/assets/packrat-app-icon-gradient.png');
+const LOGO_SOURCE = require('@packrat/app/assets/packrat-app-icon-gradient.png');
 
 const GOOGLE_SOURCE = {
   uri: 'https://www.pngall.com/wp-content/uploads/13/Google-Logo.png',
diff --git a/apps/expo/app/auth/one-time-password.tsx b/apps/expo/app/auth/one-time-password.tsx
index 1aa9ae3040..309ecdf9be 100644
--- a/apps/expo/app/auth/one-time-password.tsx
+++ b/apps/expo/app/auth/one-time-password.tsx
@@ -24,7 +24,7 @@ import { KeyboardAwareScrollView, KeyboardController } from 'react-native-keyboa
 import Animated, { FadeIn, LinearTransition } from 'react-native-reanimated';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
-const LOGO_SOURCE = require('expo-app/assets/packrat-app-icon-gradient.png');
+const LOGO_SOURCE = require('@packrat/app/assets/packrat-app-icon-gradient.png');
 
 const COUNTDOWN_SECONDS_TO_RESEND_CODE = 60;
 const NUM_OF_CODE_CHARACTERS = 5;
diff --git a/packages/app/src/ai/components/AIModeSelector.tsx b/packages/app/src/ai/components/AIModeSelector.tsx
index d48b22d10a..7a7dff0c94 100644
--- a/packages/app/src/ai/components/AIModeSelector.tsx
+++ b/packages/app/src/ai/components/AIModeSelector.tsx
@@ -1,9 +1,9 @@
 import type { BottomSheetModal } from '@gorhom/bottom-sheet';
 import { Icon } from '@packrat/app/components/Icon';
+import { featureFlags } from '@packrat/app/config';
 import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { ActivityIndicator, Text } from '@packrat/ui/nativewindui';
-import { featureFlags } from 'expo-app/config';
 import { useAtomValue } from 'jotai';
 import * as React from 'react';
 import { TouchableOpacity } from 'react-native';
diff --git a/apps/expo/assets/adaptive-icon.png b/packages/app/src/assets/adaptive-icon.png
similarity index 100%
rename from apps/expo/assets/adaptive-icon.png
rename to packages/app/src/assets/adaptive-icon.png
diff --git a/apps/expo/assets/packrat-app-icon-gradient.png b/packages/app/src/assets/packrat-app-icon-gradient.png
similarity index 100%
rename from apps/expo/assets/packrat-app-icon-gradient.png
rename to packages/app/src/assets/packrat-app-icon-gradient.png
diff --git a/apps/expo/config.ts b/packages/app/src/config.ts
similarity index 100%
rename from apps/expo/config.ts
rename to packages/app/src/config.ts
diff --git a/packages/app/src/lib/appAlert.ts b/packages/app/src/lib/appAlert.ts
new file mode 100644
index 0000000000..7bcdf9bec5
--- /dev/null
+++ b/packages/app/src/lib/appAlert.ts
@@ -0,0 +1,8 @@
+import type { AlertMethods } from '@packrat/ui/nativewindui';
+import type React from 'react';
+
+export let appAlert: React.RefObject<AlertMethods | null>;
+
+export function registerAppAlert(ref: React.RefObject<AlertMethods | null>): void {
+  appAlert = ref;
+}
diff --git a/packages/app/src/pack-templates/components/AddPackTemplateItemActions.tsx b/packages/app/src/pack-templates/components/AddPackTemplateItemActions.tsx
index 5b9c4b1a63..acb6dcf073 100644
--- a/packages/app/src/pack-templates/components/AddPackTemplateItemActions.tsx
+++ b/packages/app/src/pack-templates/components/AddPackTemplateItemActions.tsx
@@ -6,12 +6,12 @@ import type { CatalogItem } from '@packrat/app/catalog';
 import { CatalogBrowserModal } from '@packrat/app/catalog/components';
 import { useRecentlyUsedCatalogItems } from '@packrat/app/catalog/hooks/useRecentlyUsedCatalogItems';
 import { Icon } from '@packrat/app/components/Icon';
+import { appAlert } from '@packrat/app/lib/appAlert';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
 import { isFunction, nullToUndefined } from '@packrat/guards';
 import { Sheet, Text, useColorScheme } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
-import { appAlert } from 'expo-app/app/_layout';
 import { router } from 'expo-router';
 import React from 'react';
 import { TouchableOpacity, View } from 'react-native';
diff --git a/packages/app/src/pack-templates/components/AppTemplateBadge.tsx b/packages/app/src/pack-templates/components/AppTemplateBadge.tsx
index 1fbf9971ed..3759ba714b 100644
--- a/packages/app/src/pack-templates/components/AppTemplateBadge.tsx
+++ b/packages/app/src/pack-templates/components/AppTemplateBadge.tsx
@@ -2,7 +2,7 @@ import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { Text } from '@packrat/ui/nativewindui';
 import { Image, View } from 'react-native';
 
-const LOGO_SOURCE = require('expo-app/assets/adaptive-icon.png');
+const LOGO_SOURCE = require('@packrat/app/assets/adaptive-icon.png');
 
 export function AppTemplateBadge() {
   const { t } = useTranslation();
diff --git a/packages/app/src/pack-templates/components/PackTemplateCard.tsx b/packages/app/src/pack-templates/components/PackTemplateCard.tsx
index cf80788873..47ee32129d 100644
--- a/packages/app/src/pack-templates/components/PackTemplateCard.tsx
+++ b/packages/app/src/pack-templates/components/PackTemplateCard.tsx
@@ -1,12 +1,12 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import { Icon } from '@packrat/app/components/Icon';
 import { WeightBadge } from '@packrat/app/components/initial/WeightBadge';
+import { appAlert } from '@packrat/app/lib/appAlert';
 import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { PackTemplate } from '@packrat/app/pack-templates';
 import { isArray } from '@packrat/guards';
 import { Button, Text } from '@packrat/ui/nativewindui';
-import { appAlert } from 'expo-app/app/_layout';
 import { router } from 'expo-router';
 import { Image, Pressable, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
diff --git a/packages/app/src/pack-templates/components/PackTemplateItemCard.tsx b/packages/app/src/pack-templates/components/PackTemplateItemCard.tsx
index 9d94d746c6..2c8a6c208d 100644
--- a/packages/app/src/pack-templates/components/PackTemplateItemCard.tsx
+++ b/packages/app/src/pack-templates/components/PackTemplateItemCard.tsx
@@ -1,12 +1,12 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import { useUser } from '@packrat/app/auth/hooks/useUser';
 import { Icon } from '@packrat/app/components/Icon';
+import { appAlert } from '@packrat/app/lib/appAlert';
 import { cn } from '@packrat/app/lib/cn';
 import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { PackTemplateItem } from '@packrat/app/pack-templates';
 import { Text } from '@packrat/ui/nativewindui';
-import { appAlert } from 'expo-app/app/_layout';
 import { useRouter } from 'expo-router';
 import { Pressable, TouchableWithoutFeedback, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
diff --git a/packages/app/src/pack-templates/screens/ItemsScanScreen.tsx b/packages/app/src/pack-templates/screens/ItemsScanScreen.tsx
index 2d46c35e42..cc19909544 100644
--- a/packages/app/src/pack-templates/screens/ItemsScanScreen.tsx
+++ b/packages/app/src/pack-templates/screens/ItemsScanScreen.tsx
@@ -2,6 +2,7 @@ import { useActionSheet } from '@expo/react-native-action-sheet';
 import type { CatalogItem, CatalogItemWithPackItemFields } from '@packrat/app/catalog';
 import { ErrorState } from '@packrat/app/components/ErrorState';
 import { Icon } from '@packrat/app/components/Icon';
+import { appAlert } from '@packrat/app/lib/appAlert';
 import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { HorizontalCatalogItemCard } from '@packrat/app/packs/components/HorizontalCatalogItemCard';
@@ -10,7 +11,6 @@ import { type SelectedImage, useImagePicker } from '@packrat/app/packs/hooks/use
 import { assertNonNull } from '@packrat/guards';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
-import { appAlert } from 'expo-app/app/_layout';
 import { Stack, useLocalSearchParams, useRouter } from 'expo-router';
 import { useCallback, useEffect, useState } from 'react';
 import { Image, ScrollView, View } from 'react-native';
diff --git a/packages/app/src/packs/components/CurrentPackTile.tsx b/packages/app/src/packs/components/CurrentPackTile.tsx
index 8e465aa7eb..645ced6075 100644
--- a/packages/app/src/packs/components/CurrentPackTile.tsx
+++ b/packages/app/src/packs/components/CurrentPackTile.tsx
@@ -6,7 +6,7 @@ import { useRouter } from 'expo-router';
 import { Platform, View } from 'react-native';
 import { useCurrentPack } from '../hooks';
 
-const _LOGO_SOURCE = require('expo-app/assets/packrat-app-icon-gradient.png');
+const _LOGO_SOURCE = require('@packrat/app/assets/packrat-app-icon-gradient.png');
 
 export function CurrentPackTile() {
   const { t } = useTranslation();
diff --git a/packages/app/src/packs/screens/ItemsScanScreen.tsx b/packages/app/src/packs/screens/ItemsScanScreen.tsx
index 71b4f72e5a..9f705be0dd 100644
--- a/packages/app/src/packs/screens/ItemsScanScreen.tsx
+++ b/packages/app/src/packs/screens/ItemsScanScreen.tsx
@@ -2,13 +2,13 @@ import { useActionSheet } from '@expo/react-native-action-sheet';
 import type { CatalogItem, CatalogItemWithPackItemFields } from '@packrat/app/catalog';
 import { ErrorState } from '@packrat/app/components/ErrorState';
 import { Icon } from '@packrat/app/components/Icon';
+import { appAlert } from '@packrat/app/lib/appAlert';
 import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { type SelectedImage, useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
 import { assertNonNull } from '@packrat/guards';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
-import { appAlert } from 'expo-app/app/_layout';
 import { Stack, useLocalSearchParams, useRouter } from 'expo-router';
 import { useCallback, useEffect, useState } from 'react';
 import { Image, ScrollView, View } from 'react-native';
diff --git a/packages/app/src/packs/screens/PackDetailScreen.tsx b/packages/app/src/packs/screens/PackDetailScreen.tsx
index e100d01c14..ace2e33b5a 100644
--- a/packages/app/src/packs/screens/PackDetailScreen.tsx
+++ b/packages/app/src/packs/screens/PackDetailScreen.tsx
@@ -3,6 +3,7 @@ import { isAuthed } from '@packrat/app/auth/store';
 import { Icon } from '@packrat/app/components/Icon';
 import { Chip } from '@packrat/app/components/initial/Chip';
 import { WeightBadge } from '@packrat/app/components/initial/WeightBadge';
+import { appAlert } from '@packrat/app/lib/appAlert';
 import { cn } from '@packrat/app/lib/cn';
 import { useBottomSheetAction } from '@packrat/app/lib/hooks/useBottomSheetAction';
 import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
@@ -18,7 +19,6 @@ import type { WeatherLocation } from '@packrat/app/weather/types';
 import { isDefined } from '@packrat/guards';
 import { ActivityIndicator, Button, Sheet, Text, useSheetRef } from '@packrat/ui/nativewindui';
 import * as Burnt from 'burnt';
-import { appAlert } from 'expo-app/app/_layout';
 import { useLocalSearchParams, useRouter } from 'expo-router';
 import { useMemo, useState } from 'react';
 import { Image, ScrollView, Share, TouchableOpacity, View } from 'react-native';
diff --git a/packages/app/src/trips/components/TrailConditionsTile.tsx b/packages/app/src/trips/components/TrailConditionsTile.tsx
index f4aa32e62c..307b416f9e 100644
--- a/packages/app/src/trips/components/TrailConditionsTile.tsx
+++ b/packages/app/src/trips/components/TrailConditionsTile.tsx
@@ -1,9 +1,9 @@
 import { Icon } from '@packrat/app/components/Icon';
+import { featureFlags } from '@packrat/app/config';
 import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { Alert, ListItem } from '@packrat/ui/nativewindui';
-import { featureFlags } from 'expo-app/config';
 import { useRouter } from 'expo-router';
 import { useRef } from 'react';
 import { View } from 'react-native';
diff --git a/packages/app/src/trips/components/UpcomingTripsTile.tsx b/packages/app/src/trips/components/UpcomingTripsTile.tsx
index bf658c0df7..5b77d2dc0a 100644
--- a/packages/app/src/trips/components/UpcomingTripsTile.tsx
+++ b/packages/app/src/trips/components/UpcomingTripsTile.tsx
@@ -1,10 +1,10 @@
 import { Icon } from '@packrat/app/components/Icon';
+import { featureFlags } from '@packrat/app/config';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { parseLocalDate } from '@packrat/app/lib/utils/dateUtils';
 import { useTrips } from '@packrat/app/trips/hooks';
 import type { AlertMethods } from '@packrat/ui/nativewindui';
 import { Alert, ListItem, Text, useColorScheme } from '@packrat/ui/nativewindui';
-import { featureFlags } from 'expo-app/config';
 import { useRouter } from 'expo-router';
 import { useMemo, useRef, useState } from 'react';
 import { View } from 'react-native';
diff --git a/packages/app/src/trips/screens/TripDetailScreen.tsx b/packages/app/src/trips/screens/TripDetailScreen.tsx
index 23bf80b898..32cbbb5349 100644
--- a/packages/app/src/trips/screens/TripDetailScreen.tsx
+++ b/packages/app/src/trips/screens/TripDetailScreen.tsx
@@ -1,4 +1,5 @@
 import { Icon } from '@packrat/app/components/Icon';
+import { featureFlags } from '@packrat/app/config';
 import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { testIds } from '@packrat/app/lib/testIds';
@@ -6,7 +7,6 @@ import { SubmitConditionReportForm } from '@packrat/app/trail-conditions/compone
 import type { Trip } from '@packrat/app/trips';
 import { assertDefined } from '@packrat/guards';
 import { ActivityIndicator, Button, Card, Text } from '@packrat/ui/nativewindui';
-import { featureFlags } from 'expo-app/config';
 import { useLocalSearchParams, useRouter } from 'expo-router';
 import { useMemo, useState } from 'react';
 import { Modal, ScrollView, Share, View } from 'react-native';
diff --git a/packages/app/src/weather/components/WeatherAuthWall.tsx b/packages/app/src/weather/components/WeatherAuthWall.tsx
index 6b3ed45cea..f33f3ebb51 100644
--- a/packages/app/src/weather/components/WeatherAuthWall.tsx
+++ b/packages/app/src/weather/components/WeatherAuthWall.tsx
@@ -5,7 +5,7 @@ import { Stack, usePathname, useRouter } from 'expo-router';
 import { Image, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 
-const LOGO_SOURCE = require('expo-app/assets/packrat-app-icon-gradient.png');
+const LOGO_SOURCE = require('@packrat/app/assets/packrat-app-icon-gradient.png');
 
 export function WeatherAuthWall() {
   const router = useRouter();
diff --git a/packages/app/src/wildlife/screens/IdentificationScreen.tsx b/packages/app/src/wildlife/screens/IdentificationScreen.tsx
index b062b845d9..c9cfcb7faa 100644
--- a/packages/app/src/wildlife/screens/IdentificationScreen.tsx
+++ b/packages/app/src/wildlife/screens/IdentificationScreen.tsx
@@ -1,12 +1,12 @@
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import { Icon } from '@packrat/app/components/Icon';
 import { TextInput } from '@packrat/app/components/TextInput';
+import { appAlert } from '@packrat/app/lib/appAlert';
 import { useColorScheme } from '@packrat/app/lib/hooks/useColorScheme';
 import { useTranslation } from '@packrat/app/lib/hooks/useTranslation';
 import { useImagePicker } from '@packrat/app/packs/hooks/useImagePicker';
 import type { IdentificationResult } from '@packrat/app/wildlife';
 import { ActivityIndicator, Button, Text } from '@packrat/ui/nativewindui';
-import { appAlert } from 'expo-app/app/_layout';
 import { Stack, useRouter } from 'expo-router';
 import { useEffect, useRef, useState } from 'react';
 import { Image, ScrollView, View } from 'react-native';

From 8ba584e3c71a98dc88ee6ed2deae4e359b088b94 Mon Sep 17 00:00:00 2001
From: Andrew Bierman <abbierman101@gmail.com>
Date: Fri, 1 May 2026 19:05:23 -0600
Subject: [PATCH 9/9] chore(expo): remove stale I18N_SUMMARY.md

---
 apps/expo/I18N_SUMMARY.md | 182 --------------------------------------
 1 file changed, 182 deletions(-)
 delete mode 100644 apps/expo/I18N_SUMMARY.md

diff --git a/apps/expo/I18N_SUMMARY.md b/apps/expo/I18N_SUMMARY.md
deleted file mode 100644
index 3b56eaeb38..0000000000
--- a/apps/expo/I18N_SUMMARY.md
+++ /dev/null
@@ -1,182 +0,0 @@
-# i18n Implementation Summary
-
-## Overview
-
-The PackRat Expo app has been set up with internationalization (i18n) support following [Expo's best practices](https://docs.expo.dev/versions/latest/sdk/localization/).
-
-## What Was Implemented
-
-### 1. Core Infrastructure
-
-- **expo-localization** (v~16.1.6): Detects device locale
-- **i18next** (v^25.8.18): Core i18n library
-- **react-i18next** (v^16.5.6): React bindings (provides `useTranslation` hook)
-- **Configuration**: `apps/expo/lib/i18n/index.ts`
-- **TypeScript Types**: `apps/expo/lib/i18n/i18next.d.ts` (module augmentation)
-- **Translation Hook**: `apps/expo/lib/hooks/useTranslation.ts`
-
-### 2. English Translations
-
-Created comprehensive English translation file with 150+ keys organized into 15 categories:
-
-- `common` - UI elements (buttons, labels)
-- `errors` - Error messages
-- `auth` - Authentication
-- `profile` - User profile
-- `navigation` - Navigation labels
-- `packs` - Pack management
-- `items` - Item management
-- `trips` - Trip planning
-- `catalog` - Item catalog
-- `welcome` - Onboarding
-- `ai` - AI features
-- `weather` - Weather info
-- `location` - Location services
-- `shopping` - Shopping lists
-- `admin` - Admin panel
-- `seasons` - Season suggestions
-- `experience` - Experience levels
-
-### 3. Example Implementations
-
-Updated 7 files to demonstrate i18n usage:
-
-1. `components/ErrorState.tsx` - Error component
-2. `screens/ConsentWelcomeScreen.tsx` - Welcome/onboarding
-3. `screens/ProfileScreen.tsx` - Profile screen
-4. `app/(app)/(tabs)/_layout.tsx` - Tab navigation
-5. `app/(app)/(tabs)/profile/index.tsx` - Profile page
-6. `features/ai/components/ErrorState.tsx` - AI error state
-
-### 4. Documentation & Tools
-
-Created comprehensive developer resources:
-
-- **README.md** - Complete i18n documentation
-- **MIGRATION.md** - Step-by-step migration guide
-- **EXAMPLES.tsx** - Code examples (7 patterns)
-- **types.ts** - TypeScript type definitions
-- **extract-strings.js** - Helper script to find hardcoded strings
-
-## File Structure
-
-```
-apps/expo/
-├── lib/
-│   ├── i18n/
-│   │   ├── index.ts              # i18next configuration + resources
-│   │   ├── i18next.d.ts          # TypeScript module augmentation
-│   │   ├── types.ts              # TranslationKeys convenience type
-│   │   ├── locales/
-│   │   │   └── en.json           # English translations
-│   │   ├── README.md             # Documentation
-│   │   ├── MIGRATION.md          # Migration guide
-│   │   ├── EXAMPLES.tsx          # Code examples
-│   │   └── extract-strings.js   # Helper script
-│   └── hooks/
-│       └── useTranslation.ts     # Re-exports useTranslation from react-i18next
-└── package.json                  # Updated with dependencies
-```
-
-## Usage
-
-### In Components
-
-```tsx
-import { useTranslation } from 'expo-app/lib/hooks/useTranslation';
-
-function MyComponent() {
-  const { t } = useTranslation();
-  
-  return (
-    <View>
-      <Text>{t('common.welcome')}</Text>
-      <Button title={t('common.save')} />
-    </View>
-  );
-}
-```
-
-### With Variables
-
-```tsx
-// In en.json: "memberSince": "Member since {{date}}"
-const { t } = useTranslation();
-<Text>{t('profile.memberSince', { date: '2024' })}</Text>
-```
-
-### Outside Components
-
-```tsx
-import { t } from 'expo-app/lib/i18n';
-const message = t('errors.somethingWentWrong');
-```
-
-## Next Steps
-
-### For Developers
-
-1. **Find strings to migrate:**
-   ```bash
-   node apps/expo/lib/i18n/extract-strings.js
-   ```
-
-2. **Follow migration guide:**
-   - Read `apps/expo/lib/i18n/MIGRATION.md`
-   - Add translation keys to `en.json`
-   - Replace hardcoded strings with `t()` calls
-
-3. **Add new translations:**
-   - Add keys to appropriate section in `en.json`
-   - Use in components with `t('section.key')`
-
-### For Multi-Language Support
-
-When ready to add other languages:
-
-1. Create new locale file (e.g., `es.json`, `fr.json`)
-2. Copy structure from `en.json`
-3. Translate all values
-4. Import in `lib/i18n/index.ts`:
-   ```typescript
-   import es from './locales/es.json';
-
-   export const resources = {
-     en: { translation: en },
-     es: { translation: es },
-   } as const;
-   ```
-
-The app automatically uses the device language if available, falling back to English.
-
-## Benefits
-
-✅ **Maintainability** - All text in one place
-✅ **Scalability** - Easy to add languages
-✅ **Type Safety** - TypeScript support for translation keys
-✅ **Standards** - Follows Expo best practices
-✅ **Developer Experience** - Hook-based API, comprehensive docs
-✅ **Future-Ready** - Infrastructure for multi-language support
-
-## Migration Status
-
-- **Total TypeScript files**: 375+
-- **Files updated**: 7 (examples)
-- **Remaining files**: 368+ (can be gradually migrated)
-- **Translation keys ready**: 150+
-
-The infrastructure is complete. Developers can now gradually migrate remaining components following the provided documentation and examples.
-
-## Resources
-
-- [Expo Localization Docs](https://docs.expo.dev/versions/latest/sdk/localization/)
-- [i18next Documentation](https://www.i18next.com/)
-- [react-i18next Documentation](https://react.i18next.com/)
-- [i18next TypeScript Guide](https://www.i18next.com/overview/typescript)
-- Local docs: `apps/expo/lib/i18n/README.md`
-- Migration guide: `apps/expo/lib/i18n/MIGRATION.md`
-- Code examples: `apps/expo/lib/i18n/EXAMPLES.tsx`
-
-## Questions?
-
-See the comprehensive documentation in `apps/expo/lib/i18n/` or check the example implementations in the updated components.