diff --git a/.oxlintrc.json b/.oxlintrc.json
index 9bd4aca7..5dec186d 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -1,5 +1,389 @@
 {
   "plugins": ["typescript", "react", "oxc"],
+  "overrides": [
+    {
+      "files": ["packages/core/src/**/*.{ts,tsx,js,jsx}"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              { "name": "expo", "message": "@use-voltra/core must stay platform-agnostic." },
+              { "name": "react-native", "message": "@use-voltra/core must stay platform-agnostic." },
+              { "name": "voltra", "message": "@use-voltra/core cannot depend on facade packages." },
+              { "name": "@use-voltra/server", "message": "@use-voltra/core cannot depend on server packages." },
+              { "name": "@use-voltra/ios", "message": "@use-voltra/core cannot depend on platform packages." },
+              { "name": "@use-voltra/android", "message": "@use-voltra/core cannot depend on platform packages." },
+              { "name": "@use-voltra/ios-client", "message": "@use-voltra/core cannot depend on client packages." },
+              { "name": "@use-voltra/android-client", "message": "@use-voltra/core cannot depend on client packages." },
+              { "name": "@use-voltra/ios-server", "message": "@use-voltra/core cannot depend on server packages." },
+              { "name": "@use-voltra/android-server", "message": "@use-voltra/core cannot depend on server packages." },
+              { "name": "@use-voltra/expo-plugin", "message": "@use-voltra/core cannot depend on tooling packages." },
+              {
+                "name": "@use-voltra/ios/client",
+                "message": "Use @use-voltra/ios-client instead of legacy client subpaths."
+              },
+              {
+                "name": "@use-voltra/android/client",
+                "message": "Use @use-voltra/android-client instead of legacy client subpaths."
+              },
+              { "name": "@use-voltra/android/internal", "message": "Private internal APIs are not allowed here." }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["packages/server/src/**/*.{ts,tsx,js,jsx}"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              { "name": "expo", "message": "@use-voltra/server must stay server-safe." },
+              { "name": "react-native", "message": "@use-voltra/server must stay server-safe." },
+              { "name": "voltra", "message": "@use-voltra/server cannot depend on the facade package." },
+              { "name": "@use-voltra/ios-client", "message": "@use-voltra/server cannot depend on client packages." },
+              {
+                "name": "@use-voltra/android-client",
+                "message": "@use-voltra/server cannot depend on client packages."
+              },
+              {
+                "name": "@use-voltra/ios/client",
+                "message": "Use @use-voltra/ios-client instead of legacy client subpaths."
+              },
+              {
+                "name": "@use-voltra/android/client",
+                "message": "Use @use-voltra/android-client instead of legacy client subpaths."
+              },
+              { "name": "@use-voltra/android/internal", "message": "Private internal APIs are not allowed here." }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["packages/ios/src/**/*.{ts,tsx,js,jsx}"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              { "name": "expo", "message": "@use-voltra/ios must stay server-safe." },
+              { "name": "react-native", "message": "@use-voltra/ios must stay server-safe." },
+              { "name": "voltra", "message": "@use-voltra/ios cannot depend on the facade package." },
+              { "name": "@use-voltra/server", "message": "@use-voltra/ios cannot depend on server utilities." },
+              { "name": "@use-voltra/android", "message": "@use-voltra/ios cannot depend on Android packages." },
+              { "name": "@use-voltra/ios-client", "message": "@use-voltra/ios cannot depend on client packages." },
+              { "name": "@use-voltra/android-client", "message": "@use-voltra/ios cannot depend on client packages." },
+              {
+                "name": "@use-voltra/ios-server",
+                "message": "@use-voltra/ios cannot depend on server renderer packages."
+              },
+              {
+                "name": "@use-voltra/android-server",
+                "message": "@use-voltra/ios cannot depend on Android server packages."
+              },
+              { "name": "@use-voltra/expo-plugin", "message": "@use-voltra/ios cannot depend on tooling packages." },
+              {
+                "name": "@use-voltra/ios/client",
+                "message": "Use @use-voltra/ios-client instead of legacy client subpaths."
+              },
+              {
+                "name": "@use-voltra/android/client",
+                "message": "Use @use-voltra/android-client instead of legacy client subpaths."
+              },
+              {
+                "name": "@use-voltra/android/internal",
+                "message": "Private Android internals are only allowed through the facade."
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["packages/android/src/**/*.{ts,tsx,js,jsx}"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              { "name": "expo", "message": "@use-voltra/android must stay server-safe." },
+              { "name": "react-native", "message": "@use-voltra/android must stay server-safe." },
+              { "name": "voltra", "message": "@use-voltra/android cannot depend on the facade package." },
+              { "name": "@use-voltra/server", "message": "@use-voltra/android cannot depend on server utilities." },
+              { "name": "@use-voltra/ios", "message": "@use-voltra/android cannot depend on iOS packages." },
+              { "name": "@use-voltra/ios-client", "message": "@use-voltra/android cannot depend on client packages." },
+              {
+                "name": "@use-voltra/android-client",
+                "message": "@use-voltra/android cannot depend on client packages."
+              },
+              {
+                "name": "@use-voltra/ios-server",
+                "message": "@use-voltra/android cannot depend on iOS server packages."
+              },
+              {
+                "name": "@use-voltra/android-server",
+                "message": "@use-voltra/android cannot depend on server renderer packages."
+              },
+              {
+                "name": "@use-voltra/expo-plugin",
+                "message": "@use-voltra/android cannot depend on tooling packages."
+              },
+              {
+                "name": "@use-voltra/ios/client",
+                "message": "Use @use-voltra/ios-client instead of legacy client subpaths."
+              },
+              {
+                "name": "@use-voltra/android/client",
+                "message": "Use @use-voltra/android-client instead of legacy client subpaths."
+              },
+              {
+                "name": "@use-voltra/android/internal",
+                "message": "Private Android internals are only allowed through the facade."
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["packages/ios-client/src/**/*.{ts,tsx,js,jsx}"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              { "name": "voltra", "message": "@use-voltra/ios-client cannot depend on the facade package." },
+              {
+                "name": "@use-voltra/core",
+                "message": "@use-voltra/ios-client should consume the iOS package surface."
+              },
+              { "name": "@use-voltra/server", "message": "@use-voltra/ios-client cannot depend on server utilities." },
+              { "name": "@use-voltra/android", "message": "@use-voltra/ios-client cannot depend on Android packages." },
+              {
+                "name": "@use-voltra/android-client",
+                "message": "@use-voltra/ios-client cannot depend on Android client packages."
+              },
+              {
+                "name": "@use-voltra/ios-server",
+                "message": "@use-voltra/ios-client cannot depend on server renderer packages."
+              },
+              {
+                "name": "@use-voltra/android-server",
+                "message": "@use-voltra/ios-client cannot depend on Android server packages."
+              },
+              {
+                "name": "@use-voltra/expo-plugin",
+                "message": "@use-voltra/ios-client cannot depend on tooling packages."
+              },
+              {
+                "name": "@use-voltra/ios/client",
+                "message": "Use @use-voltra/ios-client directly instead of legacy client subpaths."
+              },
+              {
+                "name": "@use-voltra/android/client",
+                "message": "Use @use-voltra/android-client directly instead of legacy client subpaths."
+              },
+              { "name": "@use-voltra/android/internal", "message": "Private Android internals are not allowed here." }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["packages/android-client/src/**/*.{ts,tsx,js,jsx}"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              { "name": "voltra", "message": "@use-voltra/android-client cannot depend on the facade package." },
+              {
+                "name": "@use-voltra/core",
+                "message": "@use-voltra/android-client should consume the Android package surface."
+              },
+              {
+                "name": "@use-voltra/server",
+                "message": "@use-voltra/android-client cannot depend on server utilities."
+              },
+              { "name": "@use-voltra/ios", "message": "@use-voltra/android-client cannot depend on iOS packages." },
+              {
+                "name": "@use-voltra/ios-client",
+                "message": "@use-voltra/android-client cannot depend on iOS client packages."
+              },
+              {
+                "name": "@use-voltra/ios-server",
+                "message": "@use-voltra/android-client cannot depend on iOS server packages."
+              },
+              {
+                "name": "@use-voltra/android-server",
+                "message": "@use-voltra/android-client cannot depend on server renderer packages."
+              },
+              {
+                "name": "@use-voltra/expo-plugin",
+                "message": "@use-voltra/android-client cannot depend on tooling packages."
+              },
+              {
+                "name": "@use-voltra/ios/client",
+                "message": "Use @use-voltra/ios-client directly instead of legacy client subpaths."
+              },
+              {
+                "name": "@use-voltra/android/client",
+                "message": "Use @use-voltra/android-client directly instead of legacy client subpaths."
+              },
+              { "name": "@use-voltra/android/internal", "message": "Private Android internals are not allowed here." }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["packages/ios-server/src/**/*.{ts,tsx,js,jsx}"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              { "name": "expo", "message": "@use-voltra/ios-server must stay server-safe." },
+              { "name": "react-native", "message": "@use-voltra/ios-server must stay server-safe." },
+              { "name": "voltra", "message": "@use-voltra/ios-server cannot depend on the facade package." },
+              { "name": "@use-voltra/android", "message": "@use-voltra/ios-server cannot depend on Android packages." },
+              {
+                "name": "@use-voltra/ios-client",
+                "message": "@use-voltra/ios-server cannot depend on client packages."
+              },
+              {
+                "name": "@use-voltra/android-client",
+                "message": "@use-voltra/ios-server cannot depend on client packages."
+              },
+              {
+                "name": "@use-voltra/android-server",
+                "message": "@use-voltra/ios-server cannot depend on Android server packages."
+              },
+              {
+                "name": "@use-voltra/expo-plugin",
+                "message": "@use-voltra/ios-server cannot depend on tooling packages."
+              },
+              {
+                "name": "@use-voltra/ios/client",
+                "message": "Use @use-voltra/ios-client instead of legacy client subpaths."
+              },
+              {
+                "name": "@use-voltra/android/client",
+                "message": "Use @use-voltra/android-client instead of legacy client subpaths."
+              },
+              { "name": "@use-voltra/android/internal", "message": "Private Android internals are not allowed here." }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["packages/android-server/src/**/*.{ts,tsx,js,jsx}"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              { "name": "expo", "message": "@use-voltra/android-server must stay server-safe." },
+              { "name": "react-native", "message": "@use-voltra/android-server must stay server-safe." },
+              { "name": "voltra", "message": "@use-voltra/android-server cannot depend on the facade package." },
+              { "name": "@use-voltra/ios", "message": "@use-voltra/android-server cannot depend on iOS packages." },
+              {
+                "name": "@use-voltra/ios-client",
+                "message": "@use-voltra/android-server cannot depend on client packages."
+              },
+              {
+                "name": "@use-voltra/android-client",
+                "message": "@use-voltra/android-server cannot depend on client packages."
+              },
+              {
+                "name": "@use-voltra/ios-server",
+                "message": "@use-voltra/android-server cannot depend on iOS server packages."
+              },
+              {
+                "name": "@use-voltra/expo-plugin",
+                "message": "@use-voltra/android-server cannot depend on tooling packages."
+              },
+              {
+                "name": "@use-voltra/ios/client",
+                "message": "Use @use-voltra/ios-client instead of legacy client subpaths."
+              },
+              {
+                "name": "@use-voltra/android/client",
+                "message": "Use @use-voltra/android-client instead of legacy client subpaths."
+              },
+              { "name": "@use-voltra/android/internal", "message": "Private Android internals are not allowed here." }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["packages/expo-plugin/src/**/*.{ts,tsx,js,jsx}"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              { "name": "voltra", "message": "@use-voltra/expo-plugin must stay installation-time only." },
+              { "name": "@use-voltra/core", "message": "@use-voltra/expo-plugin must stay installation-time only." },
+              { "name": "@use-voltra/server", "message": "@use-voltra/expo-plugin must stay installation-time only." },
+              { "name": "@use-voltra/ios", "message": "@use-voltra/expo-plugin must stay installation-time only." },
+              { "name": "@use-voltra/android", "message": "@use-voltra/expo-plugin must stay installation-time only." },
+              {
+                "name": "@use-voltra/ios-client",
+                "message": "@use-voltra/expo-plugin must stay installation-time only."
+              },
+              {
+                "name": "@use-voltra/android-client",
+                "message": "@use-voltra/expo-plugin must stay installation-time only."
+              },
+              {
+                "name": "@use-voltra/ios-server",
+                "message": "@use-voltra/expo-plugin must stay installation-time only."
+              },
+              {
+                "name": "@use-voltra/android-server",
+                "message": "@use-voltra/expo-plugin must stay installation-time only."
+              },
+              {
+                "name": "@use-voltra/ios/client",
+                "message": "Use @use-voltra/ios-client instead of legacy client subpaths."
+              },
+              {
+                "name": "@use-voltra/android/client",
+                "message": "Use @use-voltra/android-client instead of legacy client subpaths."
+              },
+              { "name": "@use-voltra/android/internal", "message": "Private Android internals are not allowed here." }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["packages/voltra/src/**/*.{ts,tsx,js,jsx}", "packages/voltra/generator/**/*.{ts,tsx,js,jsx}"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              {
+                "name": "@use-voltra/ios/client",
+                "message": "Use @use-voltra/ios-client instead of legacy client subpaths."
+              },
+              {
+                "name": "@use-voltra/android/client",
+                "message": "Use @use-voltra/android-client instead of legacy client subpaths."
+              }
+            ]
+          }
+        ]
+      }
+    }
+  ],
   "ignorePatterns": [
     "build/**",
     "plugin/build/**",
diff --git a/package-lock.json b/package-lock.json
index 01b1172b..b92152dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8456,6 +8456,10 @@
       "resolved": "packages/android",
       "link": true
     },
+    "node_modules/@use-voltra/android-client": {
+      "resolved": "packages/android-client",
+      "link": true
+    },
     "node_modules/@use-voltra/android-server": {
       "resolved": "packages/android-server",
       "link": true
@@ -8472,6 +8476,10 @@
       "resolved": "packages/ios",
       "link": true
     },
+    "node_modules/@use-voltra/ios-client": {
+      "resolved": "packages/ios-client",
+      "link": true
+    },
     "node_modules/@use-voltra/ios-server": {
       "resolved": "packages/ios-server",
       "link": true
@@ -19968,6 +19976,17 @@
       "dependencies": {
         "@use-voltra/core": "1.3.1"
       },
+      "peerDependencies": {
+        "react": "*"
+      }
+    },
+    "packages/android-client": {
+      "name": "@use-voltra/android-client",
+      "version": "1.3.1",
+      "license": "MIT",
+      "dependencies": {
+        "@use-voltra/android": "1.3.1"
+      },
       "peerDependencies": {
         "expo": "*",
         "react": "*",
@@ -19995,8 +20014,7 @@
         "react-is": "^19.2.0"
       },
       "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+        "react": "*"
       }
     },
     "packages/expo-plugin": {
@@ -20024,6 +20042,17 @@
       "dependencies": {
         "@use-voltra/core": "1.3.1"
       },
+      "peerDependencies": {
+        "react": "*"
+      }
+    },
+    "packages/ios-client": {
+      "name": "@use-voltra/ios-client",
+      "version": "1.3.1",
+      "license": "MIT",
+      "dependencies": {
+        "@use-voltra/ios": "1.3.1"
+      },
       "peerDependencies": {
         "expo": "*",
         "react": "*",
@@ -20053,10 +20082,12 @@
       "license": "MIT",
       "dependencies": {
         "@use-voltra/android": "1.3.1",
+        "@use-voltra/android-client": "1.3.1",
         "@use-voltra/android-server": "1.3.1",
         "@use-voltra/core": "1.3.1",
         "@use-voltra/expo-plugin": "1.3.1",
         "@use-voltra/ios": "1.3.1",
+        "@use-voltra/ios-client": "1.3.1",
         "@use-voltra/ios-server": "1.3.1",
         "@use-voltra/server": "1.3.1",
         "react-is": "^19.2.0"
diff --git a/packages/android-client/package.json b/packages/android-client/package.json
new file mode 100644
index 00000000..c9382d8d
--- /dev/null
+++ b/packages/android-client/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "@use-voltra/android-client",
+  "version": "1.3.1",
+  "description": "Client-only Voltra APIs for Android",
+  "main": "build/cjs/index.js",
+  "module": "build/esm/index.js",
+  "types": "build/types/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./build/types/index.d.ts",
+      "require": "./build/cjs/index.js",
+      "import": "./build/esm/index.js",
+      "default": "./build/esm/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "build",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "node ../../scripts/build-package.mjs packages/android-client",
+    "clean": "rm -rf build",
+    "lint": "oxlint src",
+    "typecheck": "tsc -p tsconfig.typecheck.json --noEmit"
+  },
+  "dependencies": {
+    "@use-voltra/android": "1.3.1"
+  },
+  "keywords": [
+    "react-native",
+    "expo",
+    "voltra",
+    "android",
+    "widget"
+  ],
+  "author": "Saúl Sharma (https://x.com/saul_sharma), Szymon Chmal (https://x.com/chmalszymon)",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/callstackincubator/voltra.git",
+    "directory": "packages/android-client"
+  },
+  "bugs": {
+    "url": "https://github.com/callstackincubator/voltra/issues"
+  },
+  "license": "MIT",
+  "homepage": "https://use-voltra.dev",
+  "peerDependencies": {
+    "expo": "*",
+    "react": "*",
+    "react-native": "*"
+  }
+}
diff --git a/packages/android/src/VoltraModule.ts b/packages/android-client/src/VoltraModule.ts
similarity index 87%
rename from packages/android/src/VoltraModule.ts
rename to packages/android-client/src/VoltraModule.ts
index 4d749bc0..2e859e20 100644
--- a/packages/android/src/VoltraModule.ts
+++ b/packages/android-client/src/VoltraModule.ts
@@ -3,10 +3,15 @@ import { requireNativeModule } from 'expo'
 import type {
   StartAndroidOngoingNotificationOptions,
   UpdateAndroidOngoingNotificationOptions,
-} from './live-update/types.js'
+} from '@use-voltra/android'
 import type { EventSubscription, PreloadImageOptions, PreloadImagesResult, WidgetServerCredentials } from './types.js'
 
 export interface VoltraAndroidModuleSpec {
+  startAndroidLiveUpdate(payload: string, options: { updateName?: string; channelId?: string }): Promise<string>
+  updateAndroidLiveUpdate(notificationId: string, payload: string): Promise<void>
+  stopAndroidLiveUpdate(notificationId: string): Promise<void>
+  isAndroidLiveUpdateActive(updateName: string): boolean
+  endAllAndroidLiveUpdates(): Promise<void>
   startAndroidOngoingNotification(
     payload: string,
     options: StartAndroidOngoingNotificationOptions
diff --git a/packages/android/src/components/VoltraView.tsx b/packages/android-client/src/components/VoltraView.tsx
similarity index 53%
rename from packages/android/src/components/VoltraView.tsx
rename to packages/android-client/src/components/VoltraView.tsx
index f951b073..0e49b361 100644
--- a/packages/android/src/components/VoltraView.tsx
+++ b/packages/android-client/src/components/VoltraView.tsx
@@ -1,52 +1,31 @@
 import { requireNativeView } from 'expo'
-import React, { ReactNode, useEffect, useMemo } from 'react'
-import { StyleProp, ViewStyle } from 'react-native'
+import React, { type ReactNode, useEffect, useMemo } from 'react'
+import { type StyleProp, type ViewStyle } from 'react-native'
 
-import { addVoltraListener, VoltraInteractionEvent } from '../events.js'
-import { renderAndroidViewToJson } from '../widgets/renderer.js'
+import { renderAndroidViewToJson } from '@use-voltra/android'
+
+import { addVoltraListener, type VoltraInteractionEvent } from '../events.js'
 
 const NativeVoltraView = requireNativeView('VoltraModule')
 
-// Generate a unique ID for views that don't have one
 const generateViewId = () => `voltra-view-android-${Date.now()}-${Math.random().toString(36).substring(2, 9)}`
 
 export type VoltraViewProps = {
-  /**
-   * Unique identifier for this view instance.
-   * Used as 'source' in interaction events to identify which view triggered the event.
-   * If not provided, a unique ID will be generated automatically.
-   */
   id?: string
-  /**
-   * Voltra JSX components to render
-   */
   children: ReactNode
-  /**
-   * Style for the view container
-   */
   style?: StyleProp<ViewStyle>
-  /**
-   * Callback when user interacts with components in the view.
-   * Events are filtered by this view's id (source).
-   */
   onInteraction?: (event: VoltraInteractionEvent) => void
 }
 
-/**
- * A React Native component that renders Voltra UI for Android using Jetpack Compose.
- */
 export function VoltraView({ id, children, style, onInteraction }: VoltraViewProps) {
-  // Generate a stable ID if not provided
   const viewId = useMemo(() => id || generateViewId(), [id])
 
   const payload = useMemo(() => JSON.stringify(renderAndroidViewToJson(children)), [children])
 
-  // Subscribe to interaction events and filter by this view's ID
   useEffect(() => {
     if (!onInteraction) return
 
     const subscription = addVoltraListener('interaction', (event) => {
-      // Only forward events from this view
       if (event.source === viewId) {
         onInteraction({
           type: 'interaction',
diff --git a/packages/android/src/components/VoltraWidgetPreview.tsx b/packages/android-client/src/components/VoltraWidgetPreview.tsx
similarity index 73%
rename from packages/android/src/components/VoltraWidgetPreview.tsx
rename to packages/android-client/src/components/VoltraWidgetPreview.tsx
index 54baf59d..7f5760d9 100644
--- a/packages/android/src/components/VoltraWidgetPreview.tsx
+++ b/packages/android-client/src/components/VoltraWidgetPreview.tsx
@@ -1,11 +1,8 @@
 import React from 'react'
-import { StyleProp, ViewStyle } from 'react-native'
+import { type StyleProp, type ViewStyle } from 'react-native'
 
-import { VoltraView, VoltraViewProps } from './VoltraView.js'
+import { VoltraView, type VoltraViewProps } from './VoltraView.js'
 
-/**
- * Android-specific widget sizes in dp.
- */
 export type AndroidWidgetFamily = 'small' | 'mediumSquare' | 'mediumWide' | 'mediumTall' | 'large' | 'extraLarge'
 
 const WIDGET_DIMENSIONS: Record<AndroidWidgetFamily, { width: number; height: number }> = {
@@ -18,19 +15,10 @@ const WIDGET_DIMENSIONS: Record<AndroidWidgetFamily, { width: number; height: nu
 }
 
 export type VoltraWidgetPreviewProps = Omit<VoltraViewProps, 'style'> & {
-  /**
-   * Android widget size to preview
-   */
   family: AndroidWidgetFamily
-  /**
-   * Additional styles to apply on top of the widget dimensions
-   */
   style?: StyleProp<ViewStyle>
 }
 
-/**
- * A preview component that renders Voltra Android JSX content at specific dimensions.
- */
 export function VoltraWidgetPreview({ family, style, children, ...voltraViewProps }: VoltraWidgetPreviewProps) {
   const dimensions = WIDGET_DIMENSIONS[family]
   const previewStyle: StyleProp<ViewStyle> = [
diff --git a/packages/ios/src/events.ts b/packages/android-client/src/events.ts
similarity index 70%
rename from packages/ios/src/events.ts
rename to packages/android-client/src/events.ts
index eb84787f..db0f7c93 100644
--- a/packages/ios/src/events.ts
+++ b/packages/android-client/src/events.ts
@@ -41,22 +41,6 @@ export type VoltraEventMap = {
   interaction: VoltraInteractionEvent
 }
 
-/**
- * Add a listener for Voltra events.
- *
- * Supported events:
- * - `interaction`: User interactions with widgets (buttons, switches, checkboxes) (iOS only)
- * - `stateChange`: Live Activity state changes (iOS only)
- * - `activityTokenReceived`: Push token for Live Activity (iOS only)
- * - `activityPushToStartTokenReceived`: Push-to-start token (iOS only)
- *
- * Note: On Android, interactions open the app directly (optionally via deep links)
- * instead of emitting background events.
- *
- * @param event The event type to listen for
- * @param listener Callback function to handle the event
- * @returns EventSubscription with a remove() method to unsubscribe
- */
 export function addVoltraListener<K extends keyof VoltraEventMap>(
   event: K,
   listener: (event: VoltraEventMap[K]) => void
diff --git a/packages/android/src/client.ts b/packages/android-client/src/index.ts
similarity index 78%
rename from packages/android/src/client.ts
rename to packages/android-client/src/index.ts
index 8e7e1f40..8ae5a392 100644
--- a/packages/android/src/client.ts
+++ b/packages/android-client/src/index.ts
@@ -1,6 +1,21 @@
-export { AndroidOngoingNotification } from './live-update/components.js'
-
-// Android ongoing notification API and types
+export {
+  endAllAndroidLiveUpdates,
+  isAndroidLiveUpdateActive,
+  startAndroidLiveUpdate,
+  stopAndroidLiveUpdate,
+  updateAndroidLiveUpdate,
+  useAndroidLiveUpdate,
+} from './live-update/api.js'
+export type {
+  AndroidLiveUpdateJson,
+  AndroidLiveUpdateVariants,
+  AndroidLiveUpdateVariantsJson,
+  StartAndroidLiveUpdateOptions,
+  UpdateAndroidLiveUpdateOptions,
+  UseAndroidLiveUpdateOptions,
+  UseAndroidLiveUpdateResult,
+} from './live-update/types.js'
+export { AndroidOngoingNotification, renderAndroidOngoingNotificationPayload } from '@use-voltra/android'
 export {
   canPostPromotedAndroidNotifications,
   endAllAndroidOngoingNotifications,
@@ -9,14 +24,13 @@ export {
   hasAndroidNotificationPermission,
   isAndroidOngoingNotificationActive,
   openAndroidNotificationSettings,
-  renderAndroidOngoingNotificationPayload,
   requestAndroidNotificationPermission,
   startAndroidOngoingNotification,
   stopAndroidOngoingNotification,
   upsertAndroidOngoingNotification,
   updateAndroidOngoingNotification,
   useAndroidOngoingNotification,
-} from './live-update/api.js'
+} from './ongoing-notification/api.js'
 export type {
   AndroidOngoingNotificationActionPayload,
   AndroidOngoingNotificationActionProps,
@@ -41,9 +55,7 @@ export type {
   UpdateAndroidOngoingNotificationOptions,
   UseAndroidOngoingNotificationOptions,
   UseAndroidOngoingNotificationResult,
-} from './live-update/types.js'
-
-// Android Widget API and types
+} from '@use-voltra/android'
 export {
   clearAllAndroidWidgets,
   clearAndroidWidget,
@@ -58,19 +70,14 @@ export type {
   AndroidWidgetVariants,
   UpdateAndroidWidgetOptions,
   WidgetInfo,
-} from './widgets/types.js'
-
-// Android Widget Server Credentials API
+} from '@use-voltra/android'
 export {
   clearWidgetServerCredentials,
   setWidgetServerCredentials,
   type WidgetServerCredentials,
 } from './widgets/server-credentials.js'
-
-// Preload API
 export { clearPreloadedImages, preloadImages, reloadWidgets } from './preload.js'
-
-// Android Preview Components
+export * from './events.js'
 export { VoltraView, type VoltraViewProps } from './components/VoltraView.js'
 export {
   type AndroidWidgetFamily,
diff --git a/packages/android-client/src/live-update/api.ts b/packages/android-client/src/live-update/api.ts
new file mode 100644
index 00000000..ad9c77d6
--- /dev/null
+++ b/packages/android-client/src/live-update/api.ts
@@ -0,0 +1,125 @@
+import { useCallback, useEffect, useRef, useState } from 'react'
+
+import { renderAndroidLiveUpdateToString, type AndroidLiveUpdateVariants } from '@use-voltra/android'
+
+import VoltraModule from '../VoltraModule.js'
+import { useUpdateOnHMR } from '../utils/index.js'
+import type {
+  StartAndroidLiveUpdateOptions,
+  UpdateAndroidLiveUpdateOptions,
+  UseAndroidLiveUpdateOptions,
+  UseAndroidLiveUpdateResult,
+} from './types.js'
+
+export const useAndroidLiveUpdate = (
+  variants: AndroidLiveUpdateVariants,
+  options?: UseAndroidLiveUpdateOptions
+): UseAndroidLiveUpdateResult => {
+  const [targetId, setTargetId] = useState<string | null>(() => {
+    if (options?.updateName) {
+      return isAndroidLiveUpdateActive(options.updateName) ? options.updateName : null
+    }
+    return null
+  })
+
+  const isActive = targetId !== null
+  const optionsRef = useRef(options)
+  const variantsRef = useRef(variants)
+  const lastUpdateOptionsRef = useRef<UpdateAndroidLiveUpdateOptions | undefined>(undefined)
+
+  useEffect(() => {
+    optionsRef.current = options
+  }, [options])
+
+  useEffect(() => {
+    variantsRef.current = variants
+  }, [variants])
+
+  useUpdateOnHMR()
+
+  const start = useCallback(async (options?: StartAndroidLiveUpdateOptions) => {
+    const id = await startAndroidLiveUpdate(variantsRef.current, {
+      ...optionsRef.current,
+      ...options,
+    })
+    setTargetId(id)
+  }, [])
+
+  const update = useCallback(
+    async (options?: UpdateAndroidLiveUpdateOptions) => {
+      if (!targetId) {
+        return
+      }
+
+      const updateOptions = { ...optionsRef.current, ...options }
+      lastUpdateOptionsRef.current = updateOptions
+      await updateAndroidLiveUpdate(targetId, variantsRef.current, updateOptions)
+    },
+    [targetId]
+  )
+
+  const end = useCallback(async () => {
+    if (!targetId) {
+      return
+    }
+
+    await stopAndroidLiveUpdate(targetId)
+    setTargetId(null)
+  }, [targetId])
+
+  useEffect(() => {
+    if (!options?.autoStart) {
+      return
+    }
+
+    start()
+  }, [options?.autoStart, start])
+
+  useEffect(() => {
+    if (!options?.autoUpdate) return
+    update(lastUpdateOptionsRef.current)
+  }, [options?.autoUpdate, update, variants])
+
+  return {
+    start,
+    update,
+    end,
+    isActive,
+  }
+}
+
+export const startAndroidLiveUpdate = async (
+  variants: AndroidLiveUpdateVariants,
+  options?: StartAndroidLiveUpdateOptions
+): Promise<string> => {
+  const payload = renderAndroidLiveUpdateToString(variants)
+
+  const notificationId = await VoltraModule.startAndroidLiveUpdate(payload, {
+    updateName: options?.updateName,
+    channelId: options?.channelId || variants.channelId || 'voltra_live_updates',
+  })
+
+  return notificationId
+}
+
+export const updateAndroidLiveUpdate = async (
+  notificationId: string,
+  variants: AndroidLiveUpdateVariants,
+  _options?: UpdateAndroidLiveUpdateOptions
+): Promise<void> => {
+  const payload = renderAndroidLiveUpdateToString(variants)
+
+  return VoltraModule.updateAndroidLiveUpdate(notificationId, payload)
+}
+
+export const stopAndroidLiveUpdate = async (notificationId: string): Promise<void> => {
+  return VoltraModule.stopAndroidLiveUpdate(notificationId)
+}
+
+export const isAndroidLiveUpdateActive = (updateName: string): boolean => {
+  return VoltraModule.isAndroidLiveUpdateActive(updateName)
+}
+
+export async function endAllAndroidLiveUpdates(): Promise<void> {
+  return VoltraModule.endAllAndroidLiveUpdates()
+}
diff --git a/packages/android-client/src/live-update/types.ts b/packages/android-client/src/live-update/types.ts
new file mode 100644
index 00000000..106d3877
--- /dev/null
+++ b/packages/android-client/src/live-update/types.ts
@@ -0,0 +1,9 @@
+export type {
+  AndroidLiveUpdateJson,
+  AndroidLiveUpdateVariants,
+  AndroidLiveUpdateVariantsJson,
+  StartAndroidLiveUpdateOptions,
+  UpdateAndroidLiveUpdateOptions,
+  UseAndroidLiveUpdateOptions,
+  UseAndroidLiveUpdateResult,
+} from '@use-voltra/android'
diff --git a/packages/android/src/live-update/api.ts b/packages/android-client/src/ongoing-notification/api.ts
similarity index 65%
rename from packages/android/src/live-update/api.ts
rename to packages/android-client/src/ongoing-notification/api.ts
index 14ffa53a..06cddbe8 100644
--- a/packages/android/src/live-update/api.ts
+++ b/packages/android-client/src/ongoing-notification/api.ts
@@ -1,25 +1,26 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { PermissionsAndroid, Platform } from 'react-native'
 
+import {
+  renderAndroidOngoingNotificationPayload,
+  type AndroidOngoingNotificationCapabilities,
+  type AndroidOngoingNotificationContent,
+  type AndroidOngoingNotificationFallbackBehavior,
+  type AndroidOngoingNotificationInput,
+  type AndroidOngoingNotificationPayload,
+  type AndroidOngoingNotificationStartResult,
+  type AndroidOngoingNotificationStatus,
+  type AndroidOngoingNotificationStopResult,
+  type AndroidOngoingNotificationUpdateResult,
+  type AndroidOngoingNotificationUpsertResult,
+  type StartAndroidOngoingNotificationOptions,
+  type UpdateAndroidOngoingNotificationOptions,
+  type UseAndroidOngoingNotificationOptions,
+  type UseAndroidOngoingNotificationResult,
+} from '@use-voltra/android'
+
 import { useUpdateOnHMR } from '../utils/index.js'
 import VoltraModule from '../VoltraModule.js'
-import { renderAndroidOngoingNotificationContent } from './renderer.js'
-import type {
-  AndroidOngoingNotificationCapabilities,
-  AndroidOngoingNotificationContent,
-  AndroidOngoingNotificationFallbackBehavior,
-  AndroidOngoingNotificationInput,
-  AndroidOngoingNotificationPayload,
-  AndroidOngoingNotificationStartResult,
-  AndroidOngoingNotificationStatus,
-  AndroidOngoingNotificationStopResult,
-  AndroidOngoingNotificationUpdateResult,
-  AndroidOngoingNotificationUpsertResult,
-  StartAndroidOngoingNotificationOptions,
-  UpdateAndroidOngoingNotificationOptions,
-  UseAndroidOngoingNotificationOptions,
-  UseAndroidOngoingNotificationResult,
-} from './types.js'
 
 const NOTIFICATION_PERMISSION = PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS
 
@@ -40,7 +41,7 @@ const serializeAndroidOngoingNotificationInput = (input: AndroidOngoingNotificat
     return JSON.stringify(input)
   }
 
-  return renderAndroidOngoingNotificationContent(input)
+  return renderAndroidOngoingNotificationPayload(input)
 }
 
 const getFilteredAndroidOngoingNotificationUpdateOptions = (
@@ -101,40 +102,6 @@ const createNotFoundStopResult = (notificationId: string): AndroidOngoingNotific
   reason: 'not_found',
 })
 
-export { renderAndroidOngoingNotificationPayload } from './renderer.js'
-
-/**
- * @unstable This API is experimental and may change in future versions.
- *
- * React hook for managing Android ongoing notifications with automatic lifecycle handling.
- *
- * @param variants - The Android ongoing notification content variants to display
- * @param options - Configuration options for the hook
- * @returns Object with start, update, end methods and isActive state
- *
- * @example
- * ```tsx
- * import { AndroidOngoingNotification, useAndroidOngoingNotification } from 'voltra/android/client'
- *
- * const MyOngoingNotification = () => {
- *   const { start, update, end, isActive } = useAndroidOngoingNotification(
- *     <AndroidOngoingNotification.Progress title="Delivery arriving" value={1} max={4} />,
- *     {
- *       notificationId: 'my-ongoing-notification',
- *       channelId: 'delivery_updates',
- *       autoStart: true,
- *       autoUpdate: true,
- *     }
- *   )
- *
- *   return (
- *     <View>
- *       <Button title={isActive ? "Stop" : "Start"} onPress={isActive ? end : start} />
- *     </View>
- *   )
- * }
- * ```
- */
 export const useAndroidOngoingNotification = (
   content: AndroidOngoingNotificationContent,
   options: UseAndroidOngoingNotificationOptions
@@ -143,6 +110,7 @@ export const useAndroidOngoingNotification = (
     if (options.notificationId) {
       return isAndroidOngoingNotificationActive(options.notificationId) ? options.notificationId : null
     }
+
     return null
   })
 
@@ -151,7 +119,6 @@ export const useAndroidOngoingNotification = (
   const contentRef = useRef(content)
   const lastUpdateOptionsRef = useRef<UpdateAndroidOngoingNotificationOptions | undefined>(undefined)
 
-  // Update refs when values change
   useEffect(() => {
     optionsRef.current = options
   }, [options])
@@ -203,6 +170,7 @@ export const useAndroidOngoingNotification = (
     if (result.ok || result.reason === 'not_found') {
       setTargetId(null)
     }
+
     return result
   }, [targetId])
 
@@ -230,32 +198,6 @@ export const useAndroidOngoingNotification = (
   }
 }
 
-/**
- * @unstable This API is experimental and may change in future versions.
- *
- * Start a new Android ongoing notification with the provided content.
- *
- * @param content - The Android ongoing notification content to display
- * @param options - Configuration options for the ongoing notification
- * @returns Promise resolving to the start result
- *
- * @example
- * ```tsx
- * import { AndroidOngoingNotification, startAndroidOngoingNotification } from 'voltra/android/client'
- *
- * const result = await startAndroidOngoingNotification(
- *   <AndroidOngoingNotification.Progress title="Delivery arriving" value={1} max={4} />,
- *   {
- *     notificationId: 'my-ongoing-notification',
- *     channelId: 'delivery_updates',
- *   }
- * )
- *
- * if (result.ok) {
- *   console.log(result.notificationId)
- * }
- * ```
- */
 export const startAndroidOngoingNotification = async (
   input: AndroidOngoingNotificationInput,
   options: StartAndroidOngoingNotificationOptions
@@ -276,25 +218,6 @@ export const upsertAndroidOngoingNotification = async (
   )) as AndroidOngoingNotificationUpsertResult
 }
 
-/**
- * @unstable This API is experimental and may change in future versions.
- *
- * Update an existing Android ongoing notification with new content.
- *
- * @param notificationId - The ID of the notification to update
- * @param content - The new Android ongoing notification content
- * @param options - Update options
- *
- * @example
- * ```tsx
- * import { AndroidOngoingNotification, updateAndroidOngoingNotification } from 'voltra/android/client'
- *
- * await updateAndroidOngoingNotification(
- *   'notification-123',
- *   <AndroidOngoingNotification.Progress title="Updated delivery" value={2} max={4} />
- * )
- * ```
- */
 export const updateAndroidOngoingNotification = async (
   notificationId: string,
   input: AndroidOngoingNotificationInput,
@@ -340,43 +263,12 @@ export const openAndroidNotificationSettings = async (): Promise<void> => {
   return VoltraModule.openAndroidNotificationSettings()
 }
 
-/**
- * @unstable This API is experimental and may change in future versions.
- *
- * Stop an Android ongoing notification and dismiss it.
- *
- * @param notificationId - The ID of the notification to stop
- *
- * @example
- * ```tsx
- * import { stopAndroidOngoingNotification } from 'voltra'
- *
- * await stopAndroidOngoingNotification('notification-123')
- * ```
- */
 export const stopAndroidOngoingNotification = async (
   notificationId: string
 ): Promise<AndroidOngoingNotificationStopResult> => {
   return (await VoltraModule.stopAndroidOngoingNotification(notificationId)) as AndroidOngoingNotificationStopResult
 }
 
-/**
- * @unstable This API is experimental and may change in future versions.
- *
- * Check if an Android ongoing notification with the given identifier is currently active.
- *
- * @param notificationId - The identifier of the ongoing notification to check
- * @returns true if the update is active, false otherwise
- *
- * @example
- * ```tsx
- * import { isAndroidOngoingNotificationActive } from 'voltra'
- *
- * if (isAndroidOngoingNotificationActive('my-ongoing-notification')) {
- *   console.log('Update is running')
- * }
- * ```
- */
 export const isAndroidOngoingNotificationActive = (notificationId: string): boolean => {
   return VoltraModule.isAndroidOngoingNotificationActive(notificationId)
 }
@@ -385,20 +277,6 @@ export const getAndroidOngoingNotificationStatus = (notificationId: string): And
   return VoltraModule.getAndroidOngoingNotificationStatus(notificationId)
 }
 
-/**
- * @unstable This API is experimental and may change in future versions.
- *
- * End all active Android ongoing notifications.
- *
- * This function stops and dismisses all currently running ongoing notifications in the app.
- *
- * @example
- * ```tsx
- * import { endAllAndroidOngoingNotifications } from 'voltra'
- *
- * await endAllAndroidOngoingNotifications()
- * ```
- */
 export async function endAllAndroidOngoingNotifications(): Promise<void> {
   return VoltraModule.endAllAndroidOngoingNotifications()
 }
diff --git a/packages/android-client/src/preload.ts b/packages/android-client/src/preload.ts
new file mode 100644
index 00000000..bce01ce0
--- /dev/null
+++ b/packages/android-client/src/preload.ts
@@ -0,0 +1,32 @@
+import type { PreloadImageOptions, PreloadImagesResult } from './types.js'
+import VoltraModule from './VoltraModule.js'
+
+export async function preloadImages(images: PreloadImageOptions[]): Promise<PreloadImagesResult> {
+  try {
+    return await VoltraModule.preloadImages(images)
+  } catch (error) {
+    return {
+      succeeded: [],
+      failed: images.map((img) => ({
+        key: img.key,
+        error: error instanceof Error ? error.message : 'Unknown error',
+      })),
+    }
+  }
+}
+
+export async function clearPreloadedImages(keys?: string[]): Promise<void> {
+  try {
+    await VoltraModule.clearPreloadedImages(keys ?? null)
+  } catch (error) {
+    console.error('Failed to clear preloaded images:', error)
+  }
+}
+
+export async function reloadWidgets(widgetIds?: string[]): Promise<void> {
+  try {
+    await VoltraModule.reloadAndroidWidgets(widgetIds ?? null)
+  } catch (error) {
+    console.error('Failed to reload Android widgets:', error)
+  }
+}
diff --git a/packages/android-client/src/types.ts b/packages/android-client/src/types.ts
new file mode 100644
index 00000000..9b83ed51
--- /dev/null
+++ b/packages/android-client/src/types.ts
@@ -0,0 +1,23 @@
+export type {
+  AndroidLiveUpdateJson,
+  AndroidLiveUpdateVariants,
+  AndroidLiveUpdateVariantsJson,
+  AndroidWidgetSize,
+  AndroidWidgetSizeVariant,
+  AndroidWidgetVariants,
+  EventSubscription,
+  PreloadImageFailure,
+  PreloadImageOptions,
+  PreloadImagesResult,
+  StartAndroidLiveUpdateOptions,
+  UpdateAndroidLiveUpdateOptions,
+  UpdateAndroidWidgetOptions,
+  UseAndroidLiveUpdateOptions,
+  UseAndroidLiveUpdateResult,
+  VoltraElementJson,
+  VoltraElementRef,
+  VoltraNodeJson,
+  VoltraPropValue,
+  WidgetInfo,
+  WidgetServerCredentials,
+} from '@use-voltra/android'
diff --git a/packages/android-client/src/utils/index.ts b/packages/android-client/src/utils/index.ts
new file mode 100644
index 00000000..49f45673
--- /dev/null
+++ b/packages/android-client/src/utils/index.ts
@@ -0,0 +1 @@
+export * from './useUpdateOnHMR.js'
diff --git a/packages/android/src/utils/useUpdateOnHMR.ts b/packages/android-client/src/utils/useUpdateOnHMR.ts
similarity index 64%
rename from packages/android/src/utils/useUpdateOnHMR.ts
rename to packages/android-client/src/utils/useUpdateOnHMR.ts
index 74c86edb..2f04f968 100644
--- a/packages/android/src/utils/useUpdateOnHMR.ts
+++ b/packages/android-client/src/utils/useUpdateOnHMR.ts
@@ -1,14 +1,9 @@
 import { useEffect, useState } from 'react'
 
 declare global {
-  // HMR accept function
   var __accept: (...args: unknown[]) => void
 }
 
-/**
- * Taps into the HMR accept function to forcefully re-render the component when any module is updated.
- * Is only available in development mode.
- */
 export const useUpdateOnHMR = () => {
   const [, forceUpdate] = useState(0)
 
@@ -17,7 +12,6 @@ export const useUpdateOnHMR = () => {
       return
     }
 
-    // Override the accept function to forcefully re-render when any module is updated
     const oldAccept = global['__accept']
     global['__accept'] = (...args) => {
       forceUpdate((prev) => prev + 1)
diff --git a/packages/android-client/src/widgets/api.ts b/packages/android-client/src/widgets/api.ts
new file mode 100644
index 00000000..5118743e
--- /dev/null
+++ b/packages/android-client/src/widgets/api.ts
@@ -0,0 +1,51 @@
+import {
+  renderAndroidWidgetToString,
+  type AndroidWidgetVariants,
+  type UpdateAndroidWidgetOptions,
+  type WidgetInfo,
+} from '@use-voltra/android'
+
+import VoltraModule from '../VoltraModule.js'
+
+export type {
+  AndroidWidgetSize,
+  AndroidWidgetSizeVariant,
+  AndroidWidgetVariants,
+  UpdateAndroidWidgetOptions,
+  WidgetInfo,
+} from '@use-voltra/android'
+
+export const updateAndroidWidget = async (
+  widgetId: string,
+  variants: AndroidWidgetVariants,
+  options?: UpdateAndroidWidgetOptions
+): Promise<void> => {
+  const payload = renderAndroidWidgetToString(variants)
+
+  return VoltraModule.updateAndroidWidget(widgetId, payload, {
+    deepLinkUrl: options?.deepLinkUrl,
+  })
+}
+
+export const reloadAndroidWidgets = async (widgetIds?: string[]): Promise<void> => {
+  return VoltraModule.reloadAndroidWidgets(widgetIds ?? null)
+}
+
+export const clearAndroidWidget = async (widgetId: string): Promise<void> => {
+  return VoltraModule.clearAndroidWidget(widgetId)
+}
+
+export const clearAllAndroidWidgets = async (): Promise<void> => {
+  return VoltraModule.clearAllAndroidWidgets()
+}
+
+export const requestPinAndroidWidget = async (
+  widgetId: string,
+  options?: { previewWidth?: number; previewHeight?: number }
+): Promise<boolean> => {
+  return VoltraModule.requestPinGlanceAppWidget(widgetId, options)
+}
+
+export const getActiveWidgets = async (): Promise<WidgetInfo[]> => {
+  return VoltraModule.getActiveWidgets()
+}
diff --git a/packages/android/src/widgets/server-credentials.ts b/packages/android-client/src/widgets/server-credentials.ts
similarity index 53%
rename from packages/android/src/widgets/server-credentials.ts
rename to packages/android-client/src/widgets/server-credentials.ts
index c8313712..07a35f25 100644
--- a/packages/android/src/widgets/server-credentials.ts
+++ b/packages/android-client/src/widgets/server-credentials.ts
@@ -1,17 +1,8 @@
 import type { WidgetServerCredentials } from '../types.js'
 import VoltraModule from '../VoltraModule.js'
 
-// Re-export types for public API
 export type { WidgetServerCredentials } from '../types.js'
 
-/**
- * Store server credentials for Android widget server-driven updates.
- *
- * Credentials are stored in DataStore, which is
- * automatically accessible by the widget's WorkManager background worker.
- *
- * @param credentials - The server credentials to store
- */
 export async function setWidgetServerCredentials(credentials: WidgetServerCredentials): Promise<void> {
   if (!credentials.token) {
     throw new Error('[Voltra] [Android] setWidgetServerCredentials: token is required')
@@ -19,11 +10,6 @@ export async function setWidgetServerCredentials(credentials: WidgetServerCreden
   return VoltraModule.setWidgetServerCredentials(credentials)
 }
 
-/**
- * Clear stored server credentials for Android widget updates.
- * All widgets are automatically reloaded after clearing credentials so they
- * revert to their default/unauthenticated state.
- */
 export async function clearWidgetServerCredentials(): Promise<void> {
   return VoltraModule.clearWidgetServerCredentials()
 }
diff --git a/packages/android-client/tsconfig.base.json b/packages/android-client/tsconfig.base.json
new file mode 100644
index 00000000..49f9c30e
--- /dev/null
+++ b/packages/android-client/tsconfig.base.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "lib": ["ES2020"],
+    "rootDir": "./src",
+    "moduleResolution": "node",
+    "jsx": "react-jsx",
+    "strict": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true
+  },
+  "include": ["./src"],
+  "exclude": ["**/__mocks__/*", "**/__tests__/*", "**/__rsc_tests__/*"]
+}
diff --git a/packages/android-client/tsconfig.cjs.json b/packages/android-client/tsconfig.cjs.json
new file mode 100644
index 00000000..a6b3ca9c
--- /dev/null
+++ b/packages/android-client/tsconfig.cjs.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "module": "CommonJS",
+    "outDir": "./build/cjs",
+    "declaration": false,
+    "sourceMap": true
+  }
+}
diff --git a/packages/android-client/tsconfig.esm.json b/packages/android-client/tsconfig.esm.json
new file mode 100644
index 00000000..2bb18d33
--- /dev/null
+++ b/packages/android-client/tsconfig.esm.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "module": "ES2020",
+    "outDir": "./build/esm",
+    "declaration": false,
+    "sourceMap": true
+  }
+}
diff --git a/packages/android-client/tsconfig.typecheck.json b/packages/android-client/tsconfig.typecheck.json
new file mode 100644
index 00000000..477960f6
--- /dev/null
+++ b/packages/android-client/tsconfig.typecheck.json
@@ -0,0 +1,20 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "module": "ES2020",
+    "rootDir": "../..",
+    "baseUrl": "../..",
+    "paths": {
+      "voltra": ["packages/voltra/src/index.ts"],
+      "voltra/*": ["packages/voltra/src/*"],
+      "@use-voltra/android": ["packages/android/src/index.ts"],
+      "@use-voltra/android/client": ["packages/android-client/src/index.ts"],
+      "@use-voltra/android-server": ["packages/android-server/src/index.ts"],
+      "@use-voltra/core": ["packages/core/src/index.ts"],
+      "@use-voltra/ios": ["packages/ios/src/index.ts"],
+      "@use-voltra/ios/client": ["packages/ios-client/src/index.ts"],
+      "@use-voltra/ios-server": ["packages/ios-server/src/index.ts"],
+      "@use-voltra/server": ["packages/server/src/index.ts"]
+    }
+  }
+}
diff --git a/packages/android-client/tsconfig.types.json b/packages/android-client/tsconfig.types.json
new file mode 100644
index 00000000..8ec821ee
--- /dev/null
+++ b/packages/android-client/tsconfig.types.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "module": "ES2020",
+    "outDir": "./build/types",
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "declarationMap": true
+  }
+}
diff --git a/packages/android-server/tsconfig.typecheck.json b/packages/android-server/tsconfig.typecheck.json
index d5d9364f..0de799cd 100644
--- a/packages/android-server/tsconfig.typecheck.json
+++ b/packages/android-server/tsconfig.typecheck.json
@@ -8,13 +8,15 @@
       "voltra": ["packages/voltra/src/index.ts"],
       "voltra/*": ["packages/voltra/src/*"],
       "@use-voltra/android": ["packages/android/src/index.ts"],
-      "@use-voltra/android/client": ["packages/android/src/client.ts"],
+      "@use-voltra/android-client": ["packages/android-client/src/index.ts"],
+      "@use-voltra/android/client": ["packages/android-client/src/index.ts"],
       "@use-voltra/android/internal": ["packages/android/src/internal.ts"],
       "@use-voltra/android/server": ["packages/android/src/server.ts"],
       "@use-voltra/android-server": ["packages/android-server/src/index.ts"],
       "@use-voltra/core": ["packages/core/src/index.ts"],
       "@use-voltra/ios": ["packages/ios/src/index.ts"],
-      "@use-voltra/ios/client": ["packages/ios/src/client.ts"],
+      "@use-voltra/ios-client": ["packages/ios-client/src/index.ts"],
+      "@use-voltra/ios/client": ["packages/ios-client/src/index.ts"],
       "@use-voltra/ios/server": ["packages/ios/src/server.ts"],
       "@use-voltra/ios-server": ["packages/ios-server/src/index.ts"],
       "@use-voltra/server": ["packages/server/src/index.ts"]
diff --git a/packages/android/package.json b/packages/android/package.json
index 3d838fc2..c5a207e0 100644
--- a/packages/android/package.json
+++ b/packages/android/package.json
@@ -12,12 +12,6 @@
       "import": "./build/esm/index.js",
       "default": "./build/esm/index.js"
     },
-    "./client": {
-      "types": "./build/types/client.d.ts",
-      "require": "./build/cjs/client.js",
-      "import": "./build/esm/client.js",
-      "default": "./build/esm/client.js"
-    },
     "./server": {
       "types": "./build/types/server.d.ts",
       "require": "./build/cjs/server.js",
@@ -64,8 +58,6 @@
   "license": "MIT",
   "homepage": "https://use-voltra.dev",
   "peerDependencies": {
-    "expo": "*",
-    "react": "*",
-    "react-native": "*"
+    "react": "*"
   }
 }
diff --git a/packages/android/src/events.ts b/packages/android/src/events.ts
deleted file mode 100644
index dfd8dc1e..00000000
--- a/packages/android/src/events.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import type { EventSubscription } from './types.js'
-import VoltraModule from './VoltraModule.js'
-
-export type BasicVoltraEvent = {
-  source: string
-  timestamp: number
-}
-
-export type VoltraInteractionEvent = BasicVoltraEvent & {
-  type: 'interaction'
-  identifier: string
-  payload: string
-}
-
-export type VoltraEventMap = {
-  interaction: VoltraInteractionEvent
-}
-
-/**
- * Add a listener for Voltra events.
- *
- * Supported events:
- * - `interaction`: User interactions with widgets rendered inside a Voltra view.
- *
- * @param event The event type to listen for
- * @param listener Callback function to handle the event
- * @returns EventSubscription with a remove() method to unsubscribe
- */
-export function addVoltraListener<K extends keyof VoltraEventMap>(
-  event: K,
-  listener: (event: VoltraEventMap[K]) => void
-): EventSubscription {
-  return VoltraModule.addListener(event, listener)
-}
diff --git a/packages/android/src/index.ts b/packages/android/src/index.ts
index 53bfea06..2ce1363c 100644
--- a/packages/android/src/index.ts
+++ b/packages/android/src/index.ts
@@ -1,7 +1,10 @@
 // Android component namespace
 export * as VoltraAndroid from './jsx/primitives.js'
 export { AndroidDynamicColors } from './dynamic-colors.js'
-export { AndroidOngoingNotification } from './live-update/components.js'
+export { renderAndroidLiveUpdateToJson, renderAndroidLiveUpdateToString } from './live-update/renderer.js'
+export { AndroidOngoingNotification } from './ongoing-notification/components.js'
+export { renderAndroidOngoingNotificationPayload } from './ongoing-notification/renderer.js'
+export { renderAndroidViewToJson, renderAndroidWidgetToJson, renderAndroidWidgetToString } from './widgets/renderer.js'
 
 // Android types
 export type { VoltraAndroidBaseProps } from './jsx/baseProps.js'
@@ -12,6 +15,33 @@ export type {
   VoltraAndroidViewStyle,
 } from './styles/types.js'
 export type { AndroidColorValue, AndroidDynamicColorRole, AndroidDynamicColorToken } from './dynamic-colors.js'
+export type {
+  AndroidLiveUpdateJson,
+  AndroidLiveUpdateVariants,
+  AndroidLiveUpdateVariantsJson,
+  StartAndroidLiveUpdateOptions,
+  UpdateAndroidLiveUpdateOptions,
+  UseAndroidLiveUpdateOptions,
+  UseAndroidLiveUpdateResult,
+} from './live-update/types.js'
+export type {
+  EventSubscription,
+  PreloadImageFailure,
+  PreloadImageOptions,
+  PreloadImagesResult,
+  VoltraElementJson,
+  VoltraElementRef,
+  VoltraNodeJson,
+  VoltraPropValue,
+  WidgetServerCredentials,
+} from './types.js'
+export type {
+  AndroidWidgetSize,
+  AndroidWidgetSizeVariant,
+  AndroidWidgetVariants,
+  UpdateAndroidWidgetOptions,
+  WidgetInfo,
+} from './widgets/types.js'
 
 export type {
   AndroidOngoingNotificationActionPayload,
@@ -37,7 +67,7 @@ export type {
   UpdateAndroidOngoingNotificationOptions,
   UseAndroidOngoingNotificationOptions,
   UseAndroidOngoingNotificationResult,
-} from './live-update/types.js'
+} from './ongoing-notification/types.js'
 
 // Component prop types
 export type { BoxProps } from './jsx/Box.js'
diff --git a/packages/android/src/live-update/renderer.ts b/packages/android/src/live-update/renderer.ts
index eedce2f8..0dfd98f9 100644
--- a/packages/android/src/live-update/renderer.ts
+++ b/packages/android/src/live-update/renderer.ts
@@ -1,361 +1,36 @@
-import { Children, Fragment, isValidElement, type ReactElement, type ReactNode } from 'react'
-
 import { getAndroidComponentId } from '../payload/component-ids.js'
-import type {
-  AndroidOngoingNotificationActionPayload,
-  AndroidOngoingNotificationActionProps,
-  AndroidOngoingNotificationBigTextPayload,
-  AndroidOngoingNotificationBigTextProps,
-  AndroidOngoingNotificationContent,
-  AndroidOngoingNotificationPayload,
-  AndroidOngoingNotificationProgressPayload,
-  AndroidOngoingNotificationProgressPoint,
-  AndroidOngoingNotificationProgressProps,
-  AndroidOngoingNotificationProgressSegment,
-} from './types.js'
-
-import { ANDROID_ONGOING_NOTIFICATION_COMPONENT_TAG } from './components.js'
-import type { ImageSource } from '../jsx/Image.js'
-
-void getAndroidComponentId
-
-const PAYLOAD_VERSION = 1 as const
-
-const flattenChildren = (node: ReactNode): ReactNode[] => {
-  if (node === null || node === undefined || typeof node === 'boolean') {
-    return []
-  }
-
-  if (Array.isArray(node)) {
-    return node.flatMap((child) => flattenChildren(child))
-  }
+import type { ComponentRegistry } from '../renderer/index.js'
+import { createVoltraRenderer } from '../renderer/index.js'
+import type { AndroidLiveUpdateJson, AndroidLiveUpdateVariants } from './types.js'
 
-  return [node]
+const androidComponentRegistry: ComponentRegistry = {
+  getComponentId: (name: string) => getAndroidComponentId(name),
 }
 
-const getSingleRootElement = (content: ReactNode): ReactElement<Record<string, unknown>> => {
-  const children = flattenChildren(content)
+export const renderAndroidLiveUpdateToJson = (variants: AndroidLiveUpdateVariants): AndroidLiveUpdateJson => {
+  const renderer = createVoltraRenderer(androidComponentRegistry)
 
-  if (children.length !== 1) {
-    throw new Error('[Voltra] [Android] Ongoing notification content must contain exactly one root element.')
+  if (variants.collapsed) {
+    renderer.addRootNode('collapsed', variants.collapsed)
   }
 
-  const [root] = children
-
-  if (!isValidElement(root)) {
-    throw new Error(
-      '[Voltra] [Android] Ongoing notification content must be a valid AndroidOngoingNotification element.'
-    )
-  }
-
-  if (root.type === Fragment) {
-    return getSingleRootElement((root.props as { children?: ReactNode }).children)
+  if (variants.expanded) {
+    renderer.addRootNode('expanded', variants.expanded)
   }
 
-  return root as ReactElement<Record<string, unknown>>
-}
+  const result = renderer.render() as AndroidLiveUpdateJson
 
-const assertString = (value: unknown, propName: string): string => {
-  if (typeof value !== 'string' || value.length === 0) {
-    throw new Error(`[Voltra] [Android] Ongoing notification prop "${propName}" must be a non-empty string.`)
+  if (variants.smallIcon) {
+    result.smallIcon = variants.smallIcon
   }
 
-  return value
-}
-
-const assertOptionalNonEmptyString = (value: unknown, propName: string): string | undefined => {
-  if (value === undefined) {
-    return undefined
+  if (variants.channelId) {
+    result.channelId = variants.channelId
   }
 
-  if (typeof value !== 'string' || value.length === 0) {
-    throw new Error(
-      `[Voltra] [Android] Ongoing notification prop "${propName}" must be a non-empty string when provided.`
-    )
-  }
-
-  return value
-}
-
-const assertOptionalString = (value: unknown, propName: string): string | undefined => {
-  if (value === undefined) {
-    return undefined
-  }
-
-  if (typeof value !== 'string') {
-    throw new Error(`[Voltra] [Android] Ongoing notification prop "${propName}" must be a string.`)
-  }
-
-  return value
-}
-
-const isImageSource = (value: unknown): value is ImageSource => {
-  if (!value || typeof value !== 'object' || Array.isArray(value)) {
-    return false
-  }
-
-  const keys = Object.keys(value)
-  if (keys.length !== 1) {
-    return false
-  }
-
-  if ('assetName' in value) {
-    return typeof value.assetName === 'string' && value.assetName.length > 0
-  }
-
-  if ('base64' in value) {
-    return typeof value.base64 === 'string' && value.base64.length > 0
-  }
-
-  return false
-}
-
-const assertOptionalImageSource = (value: unknown, propName: string): ImageSource | undefined => {
-  if (value === undefined) {
-    return undefined
-  }
-
-  if (!isImageSource(value)) {
-    throw new Error(
-      `[Voltra] [Android] Ongoing notification prop "${propName}" must be an image source with either assetName or base64.`
-    )
-  }
-
-  return value
-}
-
-const assertBoolean = (value: unknown, propName: string): boolean | undefined => {
-  if (value === undefined) {
-    return undefined
-  }
-
-  if (typeof value !== 'boolean') {
-    throw new Error(`[Voltra] [Android] Ongoing notification prop "${propName}" must be a boolean.`)
-  }
-
-  return value
-}
-
-const assertFiniteNumber = (value: unknown, propName: string): number => {
-  if (typeof value !== 'number' || !Number.isFinite(value)) {
-    throw new Error(`[Voltra] [Android] Ongoing notification prop "${propName}" must be a finite number.`)
-  }
-
-  return value
-}
-
-const assertOptionalColorString = (value: unknown, propName: string): string | undefined => {
-  if (value === undefined) {
-    return undefined
-  }
-
-  if (typeof value !== 'string' || value.trim().length === 0) {
-    throw new Error(`[Voltra] [Android] Ongoing notification prop "${propName}" must be a non-empty color string.`)
-  }
-
-  return value
-}
-
-const normalizeProgressSegments = (value: unknown): AndroidOngoingNotificationProgressSegment[] | undefined => {
-  if (value === undefined) {
-    return undefined
-  }
-
-  if (!Array.isArray(value)) {
-    throw new Error('[Voltra] [Android] Ongoing notification prop "segments" must be an array.')
-  }
-
-  return value.map((segment, index) => {
-    if (!segment || typeof segment !== 'object' || Array.isArray(segment)) {
-      throw new Error(`[Voltra] [Android] Ongoing notification prop "segments[${index}]" must be an object.`)
-    }
-
-    const length = assertFiniteNumber((segment as { length?: unknown }).length, `segments[${index}].length`)
-    if (length <= 0) {
-      throw new Error(
-        `[Voltra] [Android] Ongoing notification prop "segments[${index}].length" must be greater than 0.`
-      )
-    }
-
-    return {
-      length,
-      color: assertOptionalColorString((segment as { color?: unknown }).color, `segments[${index}].color`),
-    }
-  })
-}
-
-const normalizeProgressPoints = (value: unknown): AndroidOngoingNotificationProgressPoint[] | undefined => {
-  if (value === undefined) {
-    return undefined
-  }
-
-  if (!Array.isArray(value)) {
-    throw new Error('[Voltra] [Android] Ongoing notification prop "points" must be an array.')
-  }
-
-  return value.map((point, index) => {
-    if (!point || typeof point !== 'object' || Array.isArray(point)) {
-      throw new Error(`[Voltra] [Android] Ongoing notification prop "points[${index}]" must be an object.`)
-    }
-
-    const position = assertFiniteNumber((point as { position?: unknown }).position, `points[${index}].position`)
-    if (position < 0) {
-      throw new Error(
-        `[Voltra] [Android] Ongoing notification prop "points[${index}].position" must be greater than or equal to 0.`
-      )
-    }
-
-    return {
-      position,
-      color: assertOptionalColorString((point as { color?: unknown }).color, `points[${index}].color`),
-    }
-  })
-}
-
-const normalizeWhen = (value: unknown): number | undefined => {
-  if (value === undefined) {
-    return undefined
-  }
-
-  if (value instanceof Date) {
-    const timestamp = value.getTime()
-    if (!Number.isFinite(timestamp)) {
-      throw new Error('[Voltra] [Android] Ongoing notification prop "when" must be a valid Date or timestamp.')
-    }
-
-    return timestamp
-  }
-
-  if (typeof value === 'number' && Number.isFinite(value)) {
-    return value
-  }
-
-  throw new Error('[Voltra] [Android] Ongoing notification prop "when" must be a valid Date or timestamp.')
-}
-
-const getElementKind = (element: ReactElement<Record<string, unknown>>) => {
-  const elementType = element.type as unknown
-
-  return typeof elementType === 'function' || (typeof elementType === 'object' && elementType !== null)
-    ? (elementType as Record<PropertyKey, unknown>)[ANDROID_ONGOING_NOTIFICATION_COMPONENT_TAG]
-    : undefined
-}
-
-const normalizeActionPayload = (
-  props: AndroidOngoingNotificationActionProps
-): AndroidOngoingNotificationActionPayload => {
-  return {
-    title: assertString(props.title, 'title'),
-    deepLinkUrl: assertString(props.deepLinkUrl, 'deepLinkUrl'),
-    icon: assertOptionalImageSource(props.icon, 'icon'),
-  }
-}
-
-const normalizeActions = (value: ReactNode): AndroidOngoingNotificationActionPayload[] | undefined => {
-  const actions: AndroidOngoingNotificationActionPayload[] = []
-
-  Children.forEach(value, (child) => {
-    if (!isValidElement(child)) {
-      return
-    }
-
-    if (child.type === Fragment) {
-      const fragmentChildren = normalizeActions((child.props as { children?: ReactNode }).children)
-      if (fragmentChildren) {
-        actions.push(...fragmentChildren)
-      }
-      return
-    }
-
-    if (getElementKind(child as ReactElement<Record<string, unknown>>) !== 'action') {
-      return
-    }
-
-    actions.push(normalizeActionPayload(child.props as AndroidOngoingNotificationActionProps))
-  })
-
-  return actions.length > 0 ? actions : undefined
-}
-
-const normalizeProgressPayload = (
-  props: AndroidOngoingNotificationProgressProps
-): AndroidOngoingNotificationProgressPayload => {
-  const value = assertFiniteNumber(props.value, 'value')
-  const max = assertFiniteNumber(props.max, 'max')
-
-  if (max <= 0) {
-    throw new Error('[Voltra] [Android] Ongoing notification prop "max" must be greater than 0.')
-  }
-
-  if (value < 0 || value > max) {
-    throw new Error('[Voltra] [Android] Ongoing notification prop "value" must be between 0 and max.')
-  }
-
-  return {
-    v: PAYLOAD_VERSION,
-    kind: 'progress',
-    title: assertOptionalNonEmptyString(props.title, 'title'),
-    subText: assertOptionalString(props.subText, 'subText'),
-    text: assertOptionalString(props.text, 'text'),
-    value,
-    max,
-    indeterminate: assertBoolean(props.indeterminate, 'indeterminate'),
-    shortCriticalText: assertOptionalString(props.shortCriticalText, 'shortCriticalText'),
-    when: normalizeWhen(props.when),
-    chronometer: assertBoolean(props.chronometer, 'chronometer'),
-    largeIcon: assertOptionalImageSource(props.largeIcon, 'largeIcon'),
-    progressTrackerIcon: assertOptionalImageSource(props.progressTrackerIcon, 'progressTrackerIcon'),
-    progressStartIcon: assertOptionalImageSource(props.progressStartIcon, 'progressStartIcon'),
-    progressEndIcon: assertOptionalImageSource(props.progressEndIcon, 'progressEndIcon'),
-    segments: normalizeProgressSegments(props.segments),
-    points: normalizeProgressPoints(props.points),
-    actions: normalizeActions(props.children),
-  }
-}
-
-const normalizeBigTextPayload = (
-  props: AndroidOngoingNotificationBigTextProps
-): AndroidOngoingNotificationBigTextPayload => {
-  const text = assertString(props.text, 'text')
-
-  return {
-    v: PAYLOAD_VERSION,
-    kind: 'bigText',
-    title: assertOptionalNonEmptyString(props.title, 'title'),
-    subText: assertOptionalString(props.subText, 'subText'),
-    text,
-    bigText: assertOptionalString(props.bigText, 'bigText') ?? text,
-    shortCriticalText: assertOptionalString(props.shortCriticalText, 'shortCriticalText'),
-    when: normalizeWhen(props.when),
-    chronometer: assertBoolean(props.chronometer, 'chronometer'),
-    largeIcon: assertOptionalImageSource(props.largeIcon, 'largeIcon'),
-    actions: normalizeActions(props.children),
-  }
-}
-
-export const renderAndroidOngoingNotificationPayloadToJson = (
-  content: ReactNode
-): AndroidOngoingNotificationPayload => {
-  const element = getSingleRootElement(content)
-  const kind = getElementKind(element)
-
-  if (kind === 'progress') {
-    return normalizeProgressPayload(element.props as AndroidOngoingNotificationProgressProps)
-  }
-
-  if (kind === 'bigText') {
-    return normalizeBigTextPayload(element.props as AndroidOngoingNotificationBigTextProps)
-  }
-
-  throw new Error(
-    '[Voltra] [Android] Ongoing notification content must use AndroidOngoingNotification.Progress or AndroidOngoingNotification.BigText.'
-  )
-}
-
-export const renderAndroidOngoingNotificationPayload = (content: ReactNode): string => {
-  return JSON.stringify(renderAndroidOngoingNotificationPayloadToJson(content))
+  return result
 }
 
-export const renderAndroidOngoingNotificationContent = (content: AndroidOngoingNotificationContent): string => {
-  return renderAndroidOngoingNotificationPayload(content)
+export const renderAndroidLiveUpdateToString = (variants: AndroidLiveUpdateVariants): string => {
+  return JSON.stringify(renderAndroidLiveUpdateToJson(variants))
 }
diff --git a/packages/android/src/live-update/types.ts b/packages/android/src/live-update/types.ts
index 415cd824..46f59d4b 100644
--- a/packages/android/src/live-update/types.ts
+++ b/packages/android/src/live-update/types.ts
@@ -1,244 +1,44 @@
 import type { ReactNode } from 'react'
 
-import type { ImageSource } from '../jsx/Image.js'
+import type { VoltraNodeJson } from '../types.js'
 
-export type AndroidOngoingNotificationFallbackBehavior = 'standard' | 'error'
-
-export type AndroidOngoingNotificationCommonDisplayProps = {
-  title?: string
-  subText?: string
-  shortCriticalText?: string
-  when?: Date | number
-  chronometer?: boolean
-}
-
-export type AndroidOngoingNotificationProgressSegment = {
-  length: number
-  color?: string
-}
-
-export type AndroidOngoingNotificationProgressPoint = {
-  position: number
-  color?: string
-}
-
-export type AndroidOngoingNotificationActionProps = {
-  title: string
-  deepLinkUrl: string
-  icon?: ImageSource
-}
-
-export type AndroidOngoingNotificationActionPayload = {
-  title: string
-  deepLinkUrl: string
-  icon?: ImageSource
-}
-
-export type AndroidOngoingNotificationProgressProps = AndroidOngoingNotificationCommonDisplayProps & {
-  text?: string
-  value: number
-  max: number
-  indeterminate?: boolean
-  largeIcon?: ImageSource
-  progressTrackerIcon?: ImageSource
-  progressStartIcon?: ImageSource
-  progressEndIcon?: ImageSource
-  segments?: AndroidOngoingNotificationProgressSegment[]
-  points?: AndroidOngoingNotificationProgressPoint[]
-  children?: ReactNode
+export type AndroidLiveUpdateVariants = {
+  collapsed?: ReactNode
+  expanded?: ReactNode
+  smallIcon?: string
+  channelId?: string
 }
 
-export type AndroidOngoingNotificationBigTextProps = AndroidOngoingNotificationCommonDisplayProps & {
-  text: string
-  bigText?: string
-  largeIcon?: ImageSource
-  children?: ReactNode
+export type AndroidLiveUpdateVariantsJson = {
+  v: number
+  s?: Record<string, unknown>[]
+  e?: VoltraNodeJson[]
+  collapsed?: VoltraNodeJson
+  expanded?: VoltraNodeJson
+  smallIcon?: string
+  channelId?: string
 }
 
-export type AndroidOngoingNotificationProgressPayload = {
-  v: 1
-  kind: 'progress'
-  title?: string
-  subText?: string
-  text?: string
-  value: number
-  max: number
-  indeterminate?: boolean
-  shortCriticalText?: string
-  when?: number
-  chronometer?: boolean
-  largeIcon?: ImageSource
-  progressTrackerIcon?: ImageSource
-  progressStartIcon?: ImageSource
-  progressEndIcon?: ImageSource
-  segments?: AndroidOngoingNotificationProgressSegment[]
-  points?: AndroidOngoingNotificationProgressPoint[]
-  actions?: AndroidOngoingNotificationActionPayload[]
-}
+export type AndroidLiveUpdateJson = AndroidLiveUpdateVariantsJson
 
-export type AndroidOngoingNotificationBigTextPayload = {
-  v: 1
-  kind: 'bigText'
-  title?: string
-  subText?: string
-  text: string
-  bigText?: string
-  shortCriticalText?: string
-  when?: number
-  chronometer?: boolean
-  largeIcon?: ImageSource
-  actions?: AndroidOngoingNotificationActionPayload[]
+export type StartAndroidLiveUpdateOptions = {
+  updateName?: string
+  channelId?: string
 }
 
-export type AndroidOngoingNotificationPayload =
-  | AndroidOngoingNotificationProgressPayload
-  | AndroidOngoingNotificationBigTextPayload
-
-export type AndroidOngoingNotificationContent = ReactNode
-
-export type AndroidOngoingNotificationInput =
-  | AndroidOngoingNotificationContent
-  | AndroidOngoingNotificationPayload
-  | string
-
-/**
- * Options for starting an Android ongoing notification.
- */
-export type StartAndroidOngoingNotificationOptions = {
-  /**
-   * A unique identifier for this ongoing notification.
-   * Allows you to rebind to the same notification on app restart.
-   */
-  notificationId?: string
-
-  /**
-   * The notification channel ID to use.
-   * The channel must already exist.
-   */
-  channelId: string
-
-  /**
-   * Small icon resource name for the notification.
-   * Overrides the smallIcon from variants if provided.
-   */
-  smallIcon?: string
-
-  /**
-   * Deep link URL to open when the notification is tapped.
-   */
-  deepLinkUrl?: string
-
-  /**
-   * Whether to request promoted ongoing presentation when supported.
-   */
-  requestPromotedOngoing?: boolean
-
-  /**
-   * Behavior when promotion is requested but unavailable.
-   */
-  fallbackBehavior?: AndroidOngoingNotificationFallbackBehavior
+export type UpdateAndroidLiveUpdateOptions = {
+  // Currently no additional options, but keeping for future extensibility
 }
 
-/**
- * Options for updating an Android ongoing notification.
- */
-export type UpdateAndroidOngoingNotificationOptions = Omit<
-  Partial<StartAndroidOngoingNotificationOptions>,
-  'notificationId'
->
-
-/**
- * Options for the useAndroidOngoingNotification hook.
- */
-export type UseAndroidOngoingNotificationOptions = StartAndroidOngoingNotificationOptions & {
-  /**
-   * Automatically start the ongoing notification when the component mounts.
-   */
+export type UseAndroidLiveUpdateOptions = {
+  updateName?: string
   autoStart?: boolean
-
-  /**
-   * Automatically update the ongoing notification when the component updates.
-   */
   autoUpdate?: boolean
 }
 
-export type AndroidOngoingNotificationCapabilities = {
-  apiLevel: number
-  notificationsEnabled: boolean
-  supportsPromotedNotifications: boolean
-  canPostPromotedNotifications: boolean
-  canRequestPromotedOngoing: boolean
-}
-
-export type AndroidOngoingNotificationStatus = {
-  isActive: boolean
-  isDismissed: boolean
-  isPromoted?: boolean
-  hasPromotableCharacteristics?: boolean
-}
-
-export type AndroidOngoingNotificationStartResult =
-  | {
-      ok: true
-      notificationId: string
-      action: 'started'
-      reason?: undefined
-    }
-  | {
-      ok: false
-      notificationId: string
-      action?: undefined
-      reason: 'already_exists'
-    }
-
-export type AndroidOngoingNotificationUpdateResult =
-  | {
-      ok: true
-      notificationId: string
-      action: 'updated'
-      reason?: undefined
-    }
-  | {
-      ok: false
-      notificationId: string
-      action?: undefined
-      reason: 'not_found' | 'dismissed'
-    }
-
-export type AndroidOngoingNotificationUpsertResult =
-  | {
-      ok: true
-      notificationId: string
-      action: 'started' | 'updated'
-      reason?: undefined
-    }
-  | {
-      ok: false
-      notificationId: string
-      action?: undefined
-      reason: 'already_exists' | 'dismissed'
-    }
-
-export type AndroidOngoingNotificationStopResult =
-  | {
-      ok: true
-      notificationId: string
-      action: 'stopped'
-      reason?: undefined
-    }
-  | {
-      ok: false
-      notificationId: string
-      action?: undefined
-      reason: 'not_found'
-    }
-
-/**
- * Result from the useAndroidOngoingNotification hook.
- */
-export type UseAndroidOngoingNotificationResult = {
-  start: (options?: Partial<StartAndroidOngoingNotificationOptions>) => Promise<AndroidOngoingNotificationStartResult>
-  update: (options?: UpdateAndroidOngoingNotificationOptions) => Promise<AndroidOngoingNotificationUpdateResult>
-  end: () => Promise<AndroidOngoingNotificationStopResult>
+export type UseAndroidLiveUpdateResult = {
+  start: (options?: StartAndroidLiveUpdateOptions) => Promise<void>
+  update: (options?: UpdateAndroidLiveUpdateOptions) => Promise<void>
+  end: () => Promise<void>
   isActive: boolean
 }
diff --git a/packages/android/src/live-update/components.tsx b/packages/android/src/ongoing-notification/components.tsx
similarity index 100%
rename from packages/android/src/live-update/components.tsx
rename to packages/android/src/ongoing-notification/components.tsx
diff --git a/packages/android/src/ongoing-notification/renderer.ts b/packages/android/src/ongoing-notification/renderer.ts
new file mode 100644
index 00000000..e354219a
--- /dev/null
+++ b/packages/android/src/ongoing-notification/renderer.ts
@@ -0,0 +1,360 @@
+import { Children, Fragment, isValidElement, type ReactElement, type ReactNode } from 'react'
+
+import type { ImageSource } from '../jsx/Image.js'
+import { getAndroidComponentId } from '../payload/component-ids.js'
+import { ANDROID_ONGOING_NOTIFICATION_COMPONENT_TAG } from './components.js'
+import type {
+  AndroidOngoingNotificationActionPayload,
+  AndroidOngoingNotificationActionProps,
+  AndroidOngoingNotificationBigTextPayload,
+  AndroidOngoingNotificationBigTextProps,
+  AndroidOngoingNotificationContent,
+  AndroidOngoingNotificationPayload,
+  AndroidOngoingNotificationProgressPayload,
+  AndroidOngoingNotificationProgressPoint,
+  AndroidOngoingNotificationProgressProps,
+  AndroidOngoingNotificationProgressSegment,
+} from './types.js'
+
+void getAndroidComponentId
+
+const PAYLOAD_VERSION = 1 as const
+
+const flattenChildren = (node: ReactNode): ReactNode[] => {
+  if (node === null || node === undefined || typeof node === 'boolean') {
+    return []
+  }
+
+  if (Array.isArray(node)) {
+    return node.flatMap((child) => flattenChildren(child))
+  }
+
+  return [node]
+}
+
+const getSingleRootElement = (content: ReactNode): ReactElement<Record<string, unknown>> => {
+  const children = flattenChildren(content)
+
+  if (children.length !== 1) {
+    throw new Error('[Voltra] [Android] Ongoing notification content must contain exactly one root element.')
+  }
+
+  const [root] = children
+
+  if (!isValidElement(root)) {
+    throw new Error(
+      '[Voltra] [Android] Ongoing notification content must be a valid AndroidOngoingNotification element.'
+    )
+  }
+
+  if (root.type === Fragment) {
+    return getSingleRootElement((root.props as { children?: ReactNode }).children)
+  }
+
+  return root as ReactElement<Record<string, unknown>>
+}
+
+const assertString = (value: unknown, propName: string): string => {
+  if (typeof value !== 'string' || value.length === 0) {
+    throw new Error(`[Voltra] [Android] Ongoing notification prop "${propName}" must be a non-empty string.`)
+  }
+
+  return value
+}
+
+const assertOptionalNonEmptyString = (value: unknown, propName: string): string | undefined => {
+  if (value === undefined) {
+    return undefined
+  }
+
+  if (typeof value !== 'string' || value.length === 0) {
+    throw new Error(
+      `[Voltra] [Android] Ongoing notification prop "${propName}" must be a non-empty string when provided.`
+    )
+  }
+
+  return value
+}
+
+const assertOptionalString = (value: unknown, propName: string): string | undefined => {
+  if (value === undefined) {
+    return undefined
+  }
+
+  if (typeof value !== 'string') {
+    throw new Error(`[Voltra] [Android] Ongoing notification prop "${propName}" must be a string.`)
+  }
+
+  return value
+}
+
+const isImageSource = (value: unknown): value is ImageSource => {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return false
+  }
+
+  const keys = Object.keys(value)
+  if (keys.length !== 1) {
+    return false
+  }
+
+  if ('assetName' in value) {
+    return typeof value.assetName === 'string' && value.assetName.length > 0
+  }
+
+  if ('base64' in value) {
+    return typeof value.base64 === 'string' && value.base64.length > 0
+  }
+
+  return false
+}
+
+const assertOptionalImageSource = (value: unknown, propName: string): ImageSource | undefined => {
+  if (value === undefined) {
+    return undefined
+  }
+
+  if (!isImageSource(value)) {
+    throw new Error(
+      `[Voltra] [Android] Ongoing notification prop "${propName}" must be an image source with either assetName or base64.`
+    )
+  }
+
+  return value
+}
+
+const assertBoolean = (value: unknown, propName: string): boolean | undefined => {
+  if (value === undefined) {
+    return undefined
+  }
+
+  if (typeof value !== 'boolean') {
+    throw new Error(`[Voltra] [Android] Ongoing notification prop "${propName}" must be a boolean.`)
+  }
+
+  return value
+}
+
+const assertFiniteNumber = (value: unknown, propName: string): number => {
+  if (typeof value !== 'number' || !Number.isFinite(value)) {
+    throw new Error(`[Voltra] [Android] Ongoing notification prop "${propName}" must be a finite number.`)
+  }
+
+  return value
+}
+
+const assertOptionalColorString = (value: unknown, propName: string): string | undefined => {
+  if (value === undefined) {
+    return undefined
+  }
+
+  if (typeof value !== 'string' || value.trim().length === 0) {
+    throw new Error(`[Voltra] [Android] Ongoing notification prop "${propName}" must be a non-empty color string.`)
+  }
+
+  return value
+}
+
+const normalizeProgressSegments = (value: unknown): AndroidOngoingNotificationProgressSegment[] | undefined => {
+  if (value === undefined) {
+    return undefined
+  }
+
+  if (!Array.isArray(value)) {
+    throw new Error('[Voltra] [Android] Ongoing notification prop "segments" must be an array.')
+  }
+
+  return value.map((segment, index) => {
+    if (!segment || typeof segment !== 'object' || Array.isArray(segment)) {
+      throw new Error(`[Voltra] [Android] Ongoing notification prop "segments[${index}]" must be an object.`)
+    }
+
+    const length = assertFiniteNumber((segment as { length?: unknown }).length, `segments[${index}].length`)
+    if (length <= 0) {
+      throw new Error(
+        `[Voltra] [Android] Ongoing notification prop "segments[${index}].length" must be greater than 0.`
+      )
+    }
+
+    return {
+      length,
+      color: assertOptionalColorString((segment as { color?: unknown }).color, `segments[${index}].color`),
+    }
+  })
+}
+
+const normalizeProgressPoints = (value: unknown): AndroidOngoingNotificationProgressPoint[] | undefined => {
+  if (value === undefined) {
+    return undefined
+  }
+
+  if (!Array.isArray(value)) {
+    throw new Error('[Voltra] [Android] Ongoing notification prop "points" must be an array.')
+  }
+
+  return value.map((point, index) => {
+    if (!point || typeof point !== 'object' || Array.isArray(point)) {
+      throw new Error(`[Voltra] [Android] Ongoing notification prop "points[${index}]" must be an object.`)
+    }
+
+    const position = assertFiniteNumber((point as { position?: unknown }).position, `points[${index}].position`)
+    if (position < 0) {
+      throw new Error(
+        `[Voltra] [Android] Ongoing notification prop "points[${index}].position" must be greater than or equal to 0.`
+      )
+    }
+
+    return {
+      position,
+      color: assertOptionalColorString((point as { color?: unknown }).color, `points[${index}].color`),
+    }
+  })
+}
+
+const normalizeWhen = (value: unknown): number | undefined => {
+  if (value === undefined) {
+    return undefined
+  }
+
+  if (value instanceof Date) {
+    const timestamp = value.getTime()
+    if (!Number.isFinite(timestamp)) {
+      throw new Error('[Voltra] [Android] Ongoing notification prop "when" must be a valid Date or timestamp.')
+    }
+
+    return timestamp
+  }
+
+  if (typeof value === 'number' && Number.isFinite(value)) {
+    return value
+  }
+
+  throw new Error('[Voltra] [Android] Ongoing notification prop "when" must be a valid Date or timestamp.')
+}
+
+const getElementKind = (element: ReactElement<Record<string, unknown>>) => {
+  const elementType = element.type as unknown
+
+  return typeof elementType === 'function' || (typeof elementType === 'object' && elementType !== null)
+    ? (elementType as Record<PropertyKey, unknown>)[ANDROID_ONGOING_NOTIFICATION_COMPONENT_TAG]
+    : undefined
+}
+
+const normalizeActionPayload = (
+  props: AndroidOngoingNotificationActionProps
+): AndroidOngoingNotificationActionPayload => {
+  return {
+    title: assertString(props.title, 'title'),
+    deepLinkUrl: assertString(props.deepLinkUrl, 'deepLinkUrl'),
+    icon: assertOptionalImageSource(props.icon, 'icon'),
+  }
+}
+
+const normalizeActions = (value: ReactNode): AndroidOngoingNotificationActionPayload[] | undefined => {
+  const actions: AndroidOngoingNotificationActionPayload[] = []
+
+  Children.forEach(value, (child) => {
+    if (!isValidElement(child)) {
+      return
+    }
+
+    if (child.type === Fragment) {
+      const fragmentChildren = normalizeActions((child.props as { children?: ReactNode }).children)
+      if (fragmentChildren) {
+        actions.push(...fragmentChildren)
+      }
+      return
+    }
+
+    if (getElementKind(child as ReactElement<Record<string, unknown>>) !== 'action') {
+      return
+    }
+
+    actions.push(normalizeActionPayload(child.props as AndroidOngoingNotificationActionProps))
+  })
+
+  return actions.length > 0 ? actions : undefined
+}
+
+const normalizeProgressPayload = (
+  props: AndroidOngoingNotificationProgressProps
+): AndroidOngoingNotificationProgressPayload => {
+  const value = assertFiniteNumber(props.value, 'value')
+  const max = assertFiniteNumber(props.max, 'max')
+
+  if (max <= 0) {
+    throw new Error('[Voltra] [Android] Ongoing notification prop "max" must be greater than 0.')
+  }
+
+  if (value < 0 || value > max) {
+    throw new Error('[Voltra] [Android] Ongoing notification prop "value" must be between 0 and max.')
+  }
+
+  return {
+    v: PAYLOAD_VERSION,
+    kind: 'progress',
+    title: assertOptionalNonEmptyString(props.title, 'title'),
+    subText: assertOptionalString(props.subText, 'subText'),
+    text: assertOptionalString(props.text, 'text'),
+    value,
+    max,
+    indeterminate: assertBoolean(props.indeterminate, 'indeterminate'),
+    shortCriticalText: assertOptionalString(props.shortCriticalText, 'shortCriticalText'),
+    when: normalizeWhen(props.when),
+    chronometer: assertBoolean(props.chronometer, 'chronometer'),
+    largeIcon: assertOptionalImageSource(props.largeIcon, 'largeIcon'),
+    progressTrackerIcon: assertOptionalImageSource(props.progressTrackerIcon, 'progressTrackerIcon'),
+    progressStartIcon: assertOptionalImageSource(props.progressStartIcon, 'progressStartIcon'),
+    progressEndIcon: assertOptionalImageSource(props.progressEndIcon, 'progressEndIcon'),
+    segments: normalizeProgressSegments(props.segments),
+    points: normalizeProgressPoints(props.points),
+    actions: normalizeActions(props.children),
+  }
+}
+
+const normalizeBigTextPayload = (
+  props: AndroidOngoingNotificationBigTextProps
+): AndroidOngoingNotificationBigTextPayload => {
+  const text = assertString(props.text, 'text')
+
+  return {
+    v: PAYLOAD_VERSION,
+    kind: 'bigText',
+    title: assertOptionalNonEmptyString(props.title, 'title'),
+    subText: assertOptionalString(props.subText, 'subText'),
+    text,
+    bigText: assertOptionalString(props.bigText, 'bigText') ?? text,
+    shortCriticalText: assertOptionalString(props.shortCriticalText, 'shortCriticalText'),
+    when: normalizeWhen(props.when),
+    chronometer: assertBoolean(props.chronometer, 'chronometer'),
+    largeIcon: assertOptionalImageSource(props.largeIcon, 'largeIcon'),
+    actions: normalizeActions(props.children),
+  }
+}
+
+export const renderAndroidOngoingNotificationPayloadToJson = (
+  content: ReactNode
+): AndroidOngoingNotificationPayload => {
+  const element = getSingleRootElement(content)
+  const kind = getElementKind(element)
+
+  if (kind === 'progress') {
+    return normalizeProgressPayload(element.props as AndroidOngoingNotificationProgressProps)
+  }
+
+  if (kind === 'bigText') {
+    return normalizeBigTextPayload(element.props as AndroidOngoingNotificationBigTextProps)
+  }
+
+  throw new Error(
+    '[Voltra] [Android] Ongoing notification content must use AndroidOngoingNotification.Progress or AndroidOngoingNotification.BigText.'
+  )
+}
+
+export const renderAndroidOngoingNotificationPayload = (content: ReactNode): string => {
+  return JSON.stringify(renderAndroidOngoingNotificationPayloadToJson(content))
+}
+
+export const renderAndroidOngoingNotificationContent = (content: AndroidOngoingNotificationContent): string => {
+  return renderAndroidOngoingNotificationPayload(content)
+}
diff --git a/packages/android/src/ongoing-notification/types.ts b/packages/android/src/ongoing-notification/types.ts
new file mode 100644
index 00000000..762fea8e
--- /dev/null
+++ b/packages/android/src/ongoing-notification/types.ts
@@ -0,0 +1,199 @@
+import type { ReactNode } from 'react'
+
+import type { ImageSource } from '../jsx/Image.js'
+
+export type AndroidOngoingNotificationFallbackBehavior = 'standard' | 'error'
+
+export type AndroidOngoingNotificationCommonDisplayProps = {
+  title?: string
+  subText?: string
+  shortCriticalText?: string
+  when?: Date | number
+  chronometer?: boolean
+}
+
+export type AndroidOngoingNotificationProgressSegment = {
+  length: number
+  color?: string
+}
+
+export type AndroidOngoingNotificationProgressPoint = {
+  position: number
+  color?: string
+}
+
+export type AndroidOngoingNotificationActionProps = {
+  title: string
+  deepLinkUrl: string
+  icon?: ImageSource
+}
+
+export type AndroidOngoingNotificationActionPayload = {
+  title: string
+  deepLinkUrl: string
+  icon?: ImageSource
+}
+
+export type AndroidOngoingNotificationProgressProps = AndroidOngoingNotificationCommonDisplayProps & {
+  text?: string
+  value: number
+  max: number
+  indeterminate?: boolean
+  largeIcon?: ImageSource
+  progressTrackerIcon?: ImageSource
+  progressStartIcon?: ImageSource
+  progressEndIcon?: ImageSource
+  segments?: AndroidOngoingNotificationProgressSegment[]
+  points?: AndroidOngoingNotificationProgressPoint[]
+  children?: ReactNode
+}
+
+export type AndroidOngoingNotificationBigTextProps = AndroidOngoingNotificationCommonDisplayProps & {
+  text: string
+  bigText?: string
+  largeIcon?: ImageSource
+  children?: ReactNode
+}
+
+export type AndroidOngoingNotificationProgressPayload = {
+  v: 1
+  kind: 'progress'
+  title?: string
+  subText?: string
+  text?: string
+  value: number
+  max: number
+  indeterminate?: boolean
+  shortCriticalText?: string
+  when?: number
+  chronometer?: boolean
+  largeIcon?: ImageSource
+  progressTrackerIcon?: ImageSource
+  progressStartIcon?: ImageSource
+  progressEndIcon?: ImageSource
+  segments?: AndroidOngoingNotificationProgressSegment[]
+  points?: AndroidOngoingNotificationProgressPoint[]
+  actions?: AndroidOngoingNotificationActionPayload[]
+}
+
+export type AndroidOngoingNotificationBigTextPayload = {
+  v: 1
+  kind: 'bigText'
+  title?: string
+  subText?: string
+  text: string
+  bigText?: string
+  shortCriticalText?: string
+  when?: number
+  chronometer?: boolean
+  largeIcon?: ImageSource
+  actions?: AndroidOngoingNotificationActionPayload[]
+}
+
+export type AndroidOngoingNotificationPayload =
+  | AndroidOngoingNotificationProgressPayload
+  | AndroidOngoingNotificationBigTextPayload
+
+export type AndroidOngoingNotificationContent = ReactNode
+
+export type AndroidOngoingNotificationInput =
+  | AndroidOngoingNotificationContent
+  | AndroidOngoingNotificationPayload
+  | string
+
+export type StartAndroidOngoingNotificationOptions = {
+  notificationId?: string
+  channelId: string
+  smallIcon?: string
+  deepLinkUrl?: string
+  requestPromotedOngoing?: boolean
+  fallbackBehavior?: AndroidOngoingNotificationFallbackBehavior
+}
+
+export type UpdateAndroidOngoingNotificationOptions = Omit<
+  Partial<StartAndroidOngoingNotificationOptions>,
+  'notificationId'
+>
+
+export type UseAndroidOngoingNotificationOptions = StartAndroidOngoingNotificationOptions & {
+  autoStart?: boolean
+  autoUpdate?: boolean
+}
+
+export type AndroidOngoingNotificationCapabilities = {
+  apiLevel: number
+  notificationsEnabled: boolean
+  supportsPromotedNotifications: boolean
+  canPostPromotedNotifications: boolean
+  canRequestPromotedOngoing: boolean
+}
+
+export type AndroidOngoingNotificationStatus = {
+  isActive: boolean
+  isDismissed: boolean
+  isPromoted?: boolean
+  hasPromotableCharacteristics?: boolean
+}
+
+export type AndroidOngoingNotificationStartResult =
+  | {
+      ok: true
+      notificationId: string
+      action: 'started'
+      reason?: undefined
+    }
+  | {
+      ok: false
+      notificationId: string
+      action?: undefined
+      reason: 'already_exists'
+    }
+
+export type AndroidOngoingNotificationUpdateResult =
+  | {
+      ok: true
+      notificationId: string
+      action: 'updated'
+      reason?: undefined
+    }
+  | {
+      ok: false
+      notificationId: string
+      action?: undefined
+      reason: 'not_found' | 'dismissed'
+    }
+
+export type AndroidOngoingNotificationUpsertResult =
+  | {
+      ok: true
+      notificationId: string
+      action: 'started' | 'updated'
+      reason?: undefined
+    }
+  | {
+      ok: false
+      notificationId: string
+      action?: undefined
+      reason: 'already_exists' | 'dismissed'
+    }
+
+export type AndroidOngoingNotificationStopResult =
+  | {
+      ok: true
+      notificationId: string
+      action: 'stopped'
+      reason?: undefined
+    }
+  | {
+      ok: false
+      notificationId: string
+      action?: undefined
+      reason: 'not_found'
+    }
+
+export type UseAndroidOngoingNotificationResult = {
+  start: (options?: Partial<StartAndroidOngoingNotificationOptions>) => Promise<AndroidOngoingNotificationStartResult>
+  update: (options?: UpdateAndroidOngoingNotificationOptions) => Promise<AndroidOngoingNotificationUpdateResult>
+  end: () => Promise<AndroidOngoingNotificationStopResult>
+  isActive: boolean
+}
diff --git a/packages/android/src/preload.ts b/packages/android/src/preload.ts
deleted file mode 100644
index f6d43c70..00000000
--- a/packages/android/src/preload.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import type { PreloadImageOptions, PreloadImagesResult } from './types.js'
-import VoltraModule from './VoltraModule.js'
-
-/**
- * Preload images to Android cache for use in Widgets.
- *
- * Downloaded images are stored in the app's cache directory and exposed via FileProvider.
- * Images can then be referenced using the `assetName` property in the Image component.
- *
- * @param images - Array of images to preload
- * @returns Result indicating which images succeeded or failed
- *
- * @example
- * ```typescript
- * const result = await preloadImages([
- *   {
- *     url: 'https://example.com/album-art.jpg',
- *     key: 'current-album',
- *     headers: { 'Authorization': 'Bearer token' }
- *   }
- * ])
- *
- * // Use in Android Widget
- * <VoltraAndroid.Image source={{ assetName: 'current-album' }} />
- * ```
- */
-export async function preloadImages(images: PreloadImageOptions[]): Promise<PreloadImagesResult> {
-  try {
-    return await VoltraModule.preloadImages(images)
-  } catch (error) {
-    return {
-      succeeded: [],
-      failed: images.map((img) => ({
-        key: img.key,
-        error: error instanceof Error ? error.message : 'Unknown error',
-      })),
-    }
-  }
-}
-
-/**
- * Clear preloaded images from Android cache.
- *
- * @param keys - Optional array of image keys to clear. If omitted, clears all preloaded images.
- *
- * @example
- * ```typescript
- * // Clear specific images
- * await clearPreloadedImages(['album-art', 'profile-pic'])
- *
- * // Clear all preloaded images
- * await clearPreloadedImages()
- * ```
- */
-export async function clearPreloadedImages(keys?: string[]): Promise<void> {
-  try {
-    await VoltraModule.clearPreloadedImages(keys ?? null)
-  } catch (error) {
-    console.error('Failed to clear preloaded images:', error)
-  }
-}
-
-/**
- * Reload Android Widgets. (Alias for reloadAndroidWidgets)
- */
-export async function reloadWidgets(widgetIds?: string[]): Promise<void> {
-  try {
-    await VoltraModule.reloadAndroidWidgets(widgetIds ?? null)
-  } catch (error) {
-    console.error('Failed to reload Android widgets:', error)
-  }
-}
diff --git a/packages/android/src/server.ts b/packages/android/src/server.ts
index f84c5da2..30b0151f 100644
--- a/packages/android/src/server.ts
+++ b/packages/android/src/server.ts
@@ -1,8 +1,8 @@
-export { AndroidOngoingNotification } from './live-update/components.js'
+export { AndroidOngoingNotification } from './ongoing-notification/components.js'
 export {
   renderAndroidOngoingNotificationPayload,
   renderAndroidOngoingNotificationPayloadToJson,
-} from './live-update/renderer.js'
+} from './ongoing-notification/renderer.js'
 export type {
   AndroidOngoingNotificationActionPayload,
   AndroidOngoingNotificationActionProps,
@@ -14,6 +14,6 @@ export type {
   AndroidOngoingNotificationProgressPoint,
   AndroidOngoingNotificationProgressProps,
   AndroidOngoingNotificationProgressSegment,
-} from './live-update/types.js'
+} from './ongoing-notification/types.js'
 export { renderAndroidWidgetToString } from './widgets/renderer.js'
 export type { AndroidColorValue, AndroidDynamicColorRole, AndroidDynamicColorToken } from './dynamic-colors.js'
diff --git a/packages/android/src/types.ts b/packages/android/src/types.ts
index b162b254..24c90dd9 100644
--- a/packages/android/src/types.ts
+++ b/packages/android/src/types.ts
@@ -1,12 +1,27 @@
-export type {
-  EventSubscription,
-  PreloadImageFailure,
-  PreloadImageOptions,
-  PreloadImagesResult,
-  UpdateWidgetOptions,
-  VoltraElementJson,
-  VoltraElementRef,
-  VoltraNodeJson,
-  VoltraPropValue,
-  WidgetServerCredentials,
-} from '@use-voltra/core'
+export type { VoltraElementJson, VoltraElementRef, VoltraNodeJson, VoltraPropValue } from '@use-voltra/core'
+
+export type EventSubscription = {
+  remove: () => void
+}
+
+export type PreloadImageOptions = {
+  url: string
+  key: string
+  method?: 'GET' | 'POST' | 'PUT'
+  headers?: Record<string, string>
+}
+
+export type PreloadImageFailure = {
+  key: string
+  error: string
+}
+
+export type PreloadImagesResult = {
+  succeeded: string[]
+  failed: PreloadImageFailure[]
+}
+
+export type WidgetServerCredentials = {
+  token: string
+  headers?: Record<string, string>
+}
diff --git a/packages/android/src/utils/index.ts b/packages/android/src/utils/index.ts
index 49f45673..e69de29b 100644
--- a/packages/android/src/utils/index.ts
+++ b/packages/android/src/utils/index.ts
@@ -1 +0,0 @@
-export * from './useUpdateOnHMR.js'
diff --git a/packages/android/src/widgets/api.ts b/packages/android/src/widgets/api.ts
deleted file mode 100644
index 7f70355c..00000000
--- a/packages/android/src/widgets/api.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import VoltraModule from '../VoltraModule.js'
-import { renderAndroidWidgetToString } from './renderer.js'
-import type { AndroidWidgetVariants, UpdateAndroidWidgetOptions, WidgetInfo } from './types.js'
-
-// Re-export types for public API
-export type {
-  AndroidWidgetSize,
-  AndroidWidgetSizeVariant,
-  AndroidWidgetVariants,
-  UpdateAndroidWidgetOptions,
-  WidgetInfo,
-} from './types.js'
-
-/**
- * Update an Android home screen widget with new content.
- *
- * The content will be stored in SharedPreferences and the widget
- * will be updated to display the new content.
- *
- * @param widgetId - The widget identifier
- * @param variants - An array of size variants with their breakpoints and content.
- *   Android will automatically select the best matching variant based on the
- *   actual widget dimensions.
- * @param options - Optional settings like deep link URL
- *
- * @example Different content per size
- * ```tsx
- * import { VoltraAndroid, updateAndroidWidget } from 'voltra'
- *
- * await updateAndroidWidget('weather', [
- *   {
- *     size: { width: 150, height: 100 },
- *     content: <VoltraAndroid.Text fontSize={32}>72°F</VoltraAndroid.Text>
- *   },
- *   {
- *     size: { width: 250, height: 150 },
- *     content: (
- *       <VoltraAndroid.Row>
- *         <VoltraAndroid.Text fontSize={32}>72°F</VoltraAndroid.Text>
- *         <VoltraAndroid.Column>
- *           <VoltraAndroid.Text>Sunny</VoltraAndroid.Text>
- *           <VoltraAndroid.Text>High: 78° Low: 65°</VoltraAndroid.Text>
- *         </VoltraAndroid.Column>
- *       </VoltraAndroid.Row>
- *     )
- *   }
- * ], { deepLinkUrl: '/weather' })
- * ```
- */
-export const updateAndroidWidget = async (
-  widgetId: string,
-  variants: AndroidWidgetVariants,
-  options?: UpdateAndroidWidgetOptions
-): Promise<void> => {
-  const payload = renderAndroidWidgetToString(variants)
-
-  return VoltraModule.updateAndroidWidget(widgetId, payload, {
-    deepLinkUrl: options?.deepLinkUrl,
-  })
-}
-
-/**
- * Reload widget timelines to refresh their content.
- *
- * Use this after updating data that widgets depend on (e.g., after preloading
- * new images) to force them to re-render.
- *
- * @param widgetIds - Optional array of widget IDs to reload. If omitted, reloads all widgets.
- *
- * @example
- * ```typescript
- * // Reload specific widgets
- * await reloadAndroidWidgets(['weather', 'calendar'])
- *
- * // Reload all widgets
- * await reloadAndroidWidgets()
- * ```
- */
-export const reloadAndroidWidgets = async (widgetIds?: string[]): Promise<void> => {
-  return VoltraModule.reloadAndroidWidgets(widgetIds ?? null)
-}
-
-/**
- * Clear a widget's stored data.
- *
- * This removes the JSON content and deep link URL for the specified widget,
- * causing it to show its placeholder state.
- *
- * @param widgetId - The widget identifier to clear
- *
- * @example
- * ```typescript
- * await clearAndroidWidget('weather')
- * ```
- */
-export const clearAndroidWidget = async (widgetId: string): Promise<void> => {
-  return VoltraModule.clearAndroidWidget(widgetId)
-}
-
-/**
- * Clear all widgets' stored data.
- *
- * This removes the JSON content and deep link URLs for all configured widgets,
- * causing them to show their placeholder states.
- *
- * @example
- * ```typescript
- * await clearAllAndroidWidgets()
- * ```
- */
-export const clearAllAndroidWidgets = async (): Promise<void> => {
-  return VoltraModule.clearAllAndroidWidgets()
-}
-
-/**
- * Request to pin a widget to the home screen.
- *
- * This will show the Android system pin widget dialog, allowing the user
- * to add the widget to their home screen. Optionally, you can provide
- * preview dimensions to show a preview of the widget in the pin dialog.
- *
- * See: https://developer.android.com/develop/ui/compose/glance/pin-in-app
- *
- * @param widgetId - The widget identifier to pin
- * @param options - Optional settings for the pin request
- * @param options.previewWidth - Optional preview width in dp (default: 245)
- * @param options.previewHeight - Optional preview height in dp (default: 115)
- * @returns Promise that resolves to true if the pin request was successful
- *
- * @example Basic usage
- * ```typescript
- * const success = await requestPinAndroidWidget('weather')
- * if (success) {
- *   console.log('Widget pin request sent')
- * }
- * ```
- *
- * @example With preview dimensions
- * ```typescript
- * const success = await requestPinAndroidWidget('weather', {
- *   previewWidth: 245,
- *   previewHeight: 115
- * })
- * ```
- */
-export const requestPinAndroidWidget = async (
-  widgetId: string,
-  options?: { previewWidth?: number; previewHeight?: number }
-): Promise<boolean> => {
-  return VoltraModule.requestPinGlanceAppWidget(widgetId, options)
-}
-
-/**
- * Fetches all active widget instances for the containing app on Android.
- *
- * @returns A promise that resolves to an array of active widget instances.
- *
- * @example
- * ```typescript
- * const widgets = await getActiveWidgets()
- * console.log('Active widgets:', widgets)
- * ```
- */
-export const getActiveWidgets = async (): Promise<WidgetInfo[]> => {
-  return VoltraModule.getActiveWidgets()
-}
diff --git a/packages/android/src/widgets/index.ts b/packages/android/src/widgets/index.ts
deleted file mode 100644
index 49457982..00000000
--- a/packages/android/src/widgets/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Android Widget API
-export {
-  clearAllAndroidWidgets,
-  clearAndroidWidget,
-  getActiveWidgets,
-  reloadAndroidWidgets,
-  requestPinAndroidWidget,
-  updateAndroidWidget,
-} from './api.js'
-
-// Android Widget Types
-export type {
-  AndroidWidgetSize,
-  AndroidWidgetSizeVariant,
-  AndroidWidgetVariants,
-  UpdateAndroidWidgetOptions,
-  WidgetInfo,
-} from './types.js'
diff --git a/packages/android/tsconfig.typecheck.json b/packages/android/tsconfig.typecheck.json
index f1b7e2fb..83a4c4cc 100644
--- a/packages/android/tsconfig.typecheck.json
+++ b/packages/android/tsconfig.typecheck.json
@@ -8,12 +8,14 @@
       "voltra": ["packages/voltra/src/index.ts"],
       "voltra/*": ["packages/voltra/src/*"],
       "@use-voltra/android": ["packages/android/src/index.ts"],
-      "@use-voltra/android/client": ["packages/android/src/client.ts"],
+      "@use-voltra/android-client": ["packages/android-client/src/index.ts"],
+      "@use-voltra/android/client": ["packages/android-client/src/index.ts"],
       "@use-voltra/android/server": ["packages/android/src/server.ts"],
       "@use-voltra/android-server": ["packages/android-server/src/index.ts"],
       "@use-voltra/core": ["packages/core/src/index.ts"],
       "@use-voltra/ios": ["packages/ios/src/index.ts"],
-      "@use-voltra/ios/client": ["packages/ios/src/client.ts"],
+      "@use-voltra/ios-client": ["packages/ios-client/src/index.ts"],
+      "@use-voltra/ios/client": ["packages/ios-client/src/index.ts"],
       "@use-voltra/ios/server": ["packages/ios/src/server.ts"],
       "@use-voltra/ios-server": ["packages/ios-server/src/index.ts"],
       "@use-voltra/server": ["packages/server/src/index.ts"]
diff --git a/packages/core/package.json b/packages/core/package.json
index de5e867d..800cf06b 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@use-voltra/core",
   "version": "1.3.1",
-  "description": "Shared renderer, types, and payload utilities for Voltra",
+  "description": "Generic renderer and payload utilities for Voltra",
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
@@ -46,7 +46,6 @@
   "license": "MIT",
   "homepage": "https://use-voltra.dev",
   "peerDependencies": {
-    "react": "*",
-    "react-native": "*"
+    "react": "*"
   }
 }
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 54b3a1ba..cf73c506 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -2,5 +2,4 @@ export * from './jsx/createVoltraComponent.js'
 export * from './payload.js'
 export * from './payload/short-names.js'
 export * from './renderer/index.js'
-export * from './styles/index.js'
 export * from './types.js'
diff --git a/packages/core/src/styles/index.ts b/packages/core/src/styles/index.ts
deleted file mode 100644
index a9fe3f9d..00000000
--- a/packages/core/src/styles/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { VoltraStyleProp, VoltraTextStyle, VoltraTextStyleProp, VoltraViewStyle } from './types.js'
diff --git a/packages/core/src/styles/types.ts b/packages/core/src/styles/types.ts
deleted file mode 100644
index 40a8549c..00000000
--- a/packages/core/src/styles/types.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import type { StyleProp, TextStyle as RNTextStyle, ViewStyle as RNViewStyle } from 'react-native'
-
-export type VoltraViewStyle = Pick<
-  RNViewStyle,
-  | 'flex'
-  | 'flexGrow'
-  | 'flexShrink'
-  | 'flexBasis'
-  | 'alignItems'
-  | 'alignSelf'
-  | 'justifyContent'
-  | 'flexDirection'
-  | 'gap'
-  | 'minWidth'
-  | 'maxWidth'
-  | 'width'
-  | 'minHeight'
-  | 'maxHeight'
-  | 'height'
-  | 'padding'
-  | 'paddingTop'
-  | 'paddingBottom'
-  | 'paddingLeft'
-  | 'paddingRight'
-  | 'paddingHorizontal'
-  | 'paddingVertical'
-  | 'margin'
-  | 'marginTop'
-  | 'marginBottom'
-  | 'marginLeft'
-  | 'marginRight'
-  | 'marginHorizontal'
-  | 'marginVertical'
-  | 'backgroundColor'
-  | 'opacity'
-  | 'borderRadius'
-  | 'borderWidth'
-  | 'borderColor'
-  | 'shadowColor'
-  | 'shadowOffset'
-  | 'shadowOpacity'
-  | 'shadowRadius'
-  | 'overflow'
-  | 'aspectRatio'
-  | 'left'
-  | 'top'
-  | 'position'
-  | 'zIndex'
-  | 'transform'
-> & {
-  glassEffect?: 'clear' | 'identity' | 'regular' | 'none'
-}
-
-export type VoltraTextStyle = VoltraViewStyle &
-  Pick<
-    RNTextStyle,
-    | 'fontSize'
-    | 'fontWeight'
-    | 'fontFamily'
-    | 'color'
-    | 'letterSpacing'
-    | 'fontVariant'
-    | 'textDecorationLine'
-    | 'lineHeight'
-    | 'textAlign'
-  >
-
-export type VoltraStyleProp = StyleProp<VoltraViewStyle>
-export type VoltraTextStyleProp = StyleProp<VoltraTextStyle>
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index d40dccca..7f9d2bac 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -12,33 +12,3 @@ export type VoltraElementRef = {
 }
 
 export type VoltraNodeJson = VoltraElementJson | VoltraElementJson[] | VoltraElementRef | string
-
-export type EventSubscription = {
-  remove: () => void
-}
-
-export type PreloadImageOptions = {
-  url: string
-  key: string
-  method?: 'GET' | 'POST' | 'PUT'
-  headers?: Record<string, string>
-}
-
-export type PreloadImageFailure = {
-  key: string
-  error: string
-}
-
-export type PreloadImagesResult = {
-  succeeded: string[]
-  failed: PreloadImageFailure[]
-}
-
-export type UpdateWidgetOptions = {
-  deepLinkUrl?: string
-}
-
-export type WidgetServerCredentials = {
-  token: string
-  headers?: Record<string, string>
-}
diff --git a/packages/core/tsconfig.typecheck.json b/packages/core/tsconfig.typecheck.json
index f1b7e2fb..83a4c4cc 100644
--- a/packages/core/tsconfig.typecheck.json
+++ b/packages/core/tsconfig.typecheck.json
@@ -8,12 +8,14 @@
       "voltra": ["packages/voltra/src/index.ts"],
       "voltra/*": ["packages/voltra/src/*"],
       "@use-voltra/android": ["packages/android/src/index.ts"],
-      "@use-voltra/android/client": ["packages/android/src/client.ts"],
+      "@use-voltra/android-client": ["packages/android-client/src/index.ts"],
+      "@use-voltra/android/client": ["packages/android-client/src/index.ts"],
       "@use-voltra/android/server": ["packages/android/src/server.ts"],
       "@use-voltra/android-server": ["packages/android-server/src/index.ts"],
       "@use-voltra/core": ["packages/core/src/index.ts"],
       "@use-voltra/ios": ["packages/ios/src/index.ts"],
-      "@use-voltra/ios/client": ["packages/ios/src/client.ts"],
+      "@use-voltra/ios-client": ["packages/ios-client/src/index.ts"],
+      "@use-voltra/ios/client": ["packages/ios-client/src/index.ts"],
       "@use-voltra/ios/server": ["packages/ios/src/server.ts"],
       "@use-voltra/ios-server": ["packages/ios-server/src/index.ts"],
       "@use-voltra/server": ["packages/server/src/index.ts"]
diff --git a/packages/expo-plugin/tsconfig.typecheck.json b/packages/expo-plugin/tsconfig.typecheck.json
index f1b7e2fb..83a4c4cc 100644
--- a/packages/expo-plugin/tsconfig.typecheck.json
+++ b/packages/expo-plugin/tsconfig.typecheck.json
@@ -8,12 +8,14 @@
       "voltra": ["packages/voltra/src/index.ts"],
       "voltra/*": ["packages/voltra/src/*"],
       "@use-voltra/android": ["packages/android/src/index.ts"],
-      "@use-voltra/android/client": ["packages/android/src/client.ts"],
+      "@use-voltra/android-client": ["packages/android-client/src/index.ts"],
+      "@use-voltra/android/client": ["packages/android-client/src/index.ts"],
       "@use-voltra/android/server": ["packages/android/src/server.ts"],
       "@use-voltra/android-server": ["packages/android-server/src/index.ts"],
       "@use-voltra/core": ["packages/core/src/index.ts"],
       "@use-voltra/ios": ["packages/ios/src/index.ts"],
-      "@use-voltra/ios/client": ["packages/ios/src/client.ts"],
+      "@use-voltra/ios-client": ["packages/ios-client/src/index.ts"],
+      "@use-voltra/ios/client": ["packages/ios-client/src/index.ts"],
       "@use-voltra/ios/server": ["packages/ios/src/server.ts"],
       "@use-voltra/ios-server": ["packages/ios-server/src/index.ts"],
       "@use-voltra/server": ["packages/server/src/index.ts"]
diff --git a/packages/ios-client/package.json b/packages/ios-client/package.json
new file mode 100644
index 00000000..0fa582d5
--- /dev/null
+++ b/packages/ios-client/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "@use-voltra/ios-client",
+  "version": "1.3.1",
+  "description": "Client-only Voltra APIs for iOS",
+  "main": "build/cjs/index.js",
+  "module": "build/esm/index.js",
+  "types": "build/types/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./build/types/index.d.ts",
+      "require": "./build/cjs/index.js",
+      "import": "./build/esm/index.js",
+      "default": "./build/esm/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "build",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "node ../../scripts/build-package.mjs packages/ios-client",
+    "clean": "rm -rf build",
+    "lint": "oxlint src",
+    "typecheck": "tsc -p tsconfig.typecheck.json --noEmit"
+  },
+  "dependencies": {
+    "@use-voltra/ios": "1.3.1"
+  },
+  "keywords": [
+    "react-native",
+    "expo",
+    "voltra",
+    "ios",
+    "live-activity"
+  ],
+  "author": "Saúl Sharma (https://x.com/saul_sharma), Szymon Chmal (https://x.com/chmalszymon)",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/callstackincubator/voltra.git",
+    "directory": "packages/ios-client"
+  },
+  "bugs": {
+    "url": "https://github.com/callstackincubator/voltra/issues"
+  },
+  "license": "MIT",
+  "homepage": "https://use-voltra.dev",
+  "peerDependencies": {
+    "expo": "*",
+    "react": "*",
+    "react-native": "*"
+  }
+}
diff --git a/packages/ios-client/src/VoltraModule.ts b/packages/ios-client/src/VoltraModule.ts
new file mode 100644
index 00000000..850d6190
--- /dev/null
+++ b/packages/ios-client/src/VoltraModule.ts
@@ -0,0 +1,57 @@
+import { requireNativeModule } from 'expo'
+
+import type {
+  EventSubscription,
+  PreloadImageOptions,
+  PreloadImagesResult,
+  UpdateWidgetOptions,
+  WidgetServerCredentials,
+} from './types.js'
+
+export type StartVoltraOptions = {
+  target?: string
+  deepLinkUrl?: string
+  activityId?: string
+  staleDate?: number
+  relevanceScore?: number
+  channelId?: string
+}
+
+export type UpdateVoltraOptions = {
+  staleDate?: number
+  relevanceScore?: number
+}
+
+export type EndVoltraOptions = {
+  dismissalPolicy?: {
+    type: 'immediate' | 'after'
+    date?: number
+  }
+}
+
+export interface VoltraIOSModuleSpec {
+  startLiveActivity(jsonString: string, options?: StartVoltraOptions): Promise<string>
+  updateLiveActivity(activityId: string, jsonString: string, options?: UpdateVoltraOptions): Promise<void>
+  endLiveActivity(activityId: string, options?: EndVoltraOptions): Promise<void>
+  endAllLiveActivities(): Promise<void>
+  getLatestVoltraActivityId(): Promise<string | null>
+  listVoltraActivityIds(): Promise<string[]>
+  isLiveActivityActive(activityName: string): boolean
+  isHeadless(): boolean
+  preloadImages(images: PreloadImageOptions[]): Promise<PreloadImagesResult>
+  reloadLiveActivities(activityNames?: string[] | null): Promise<void>
+  clearPreloadedImages(keys?: string[] | null): Promise<void>
+  updateWidget(widgetId: string, jsonString: string, options?: UpdateWidgetOptions): Promise<void>
+  scheduleWidget(widgetId: string, timelineJson: string): Promise<void>
+  reloadWidgets(widgetIds?: string[] | null): Promise<void>
+  clearWidget(widgetId: string): Promise<void>
+  clearAllWidgets(): Promise<void>
+  getActiveWidgets<T = any>(): Promise<T[]>
+  setWidgetServerCredentials(credentials: WidgetServerCredentials): Promise<void>
+  clearWidgetServerCredentials(): Promise<void>
+  addListener(event: string, listener: (event: any) => void): EventSubscription
+}
+
+const VoltraModule = requireNativeModule<VoltraIOSModuleSpec>('VoltraModule')
+
+export default VoltraModule
diff --git a/packages/ios-client/src/components/VoltraLiveActivityPreview.tsx b/packages/ios-client/src/components/VoltraLiveActivityPreview.tsx
new file mode 100644
index 00000000..7e25a550
--- /dev/null
+++ b/packages/ios-client/src/components/VoltraLiveActivityPreview.tsx
@@ -0,0 +1,29 @@
+import React from 'react'
+import { type StyleProp, type ViewStyle } from 'react-native'
+
+import { VoltraView, type VoltraViewProps } from './VoltraView.js'
+
+const LOCK_SCREEN_DIMENSIONS = {
+  width: 364,
+  height: 160,
+}
+
+export type VoltraLiveActivityPreviewProps = Omit<VoltraViewProps, 'style'> & {
+  style?: StyleProp<ViewStyle>
+}
+
+export function VoltraLiveActivityPreview({ style, children, ...voltraViewProps }: VoltraLiveActivityPreviewProps) {
+  const previewStyle: StyleProp<ViewStyle> = [
+    {
+      width: LOCK_SCREEN_DIMENSIONS.width,
+      height: LOCK_SCREEN_DIMENSIONS.height,
+    },
+    style,
+  ]
+
+  return (
+    <VoltraView {...voltraViewProps} style={previewStyle}>
+      {children}
+    </VoltraView>
+  )
+}
diff --git a/packages/ios-client/src/components/VoltraView.tsx b/packages/ios-client/src/components/VoltraView.tsx
new file mode 100644
index 00000000..228525bc
--- /dev/null
+++ b/packages/ios-client/src/components/VoltraView.tsx
@@ -0,0 +1,54 @@
+import { requireNativeView } from 'expo'
+import React, { type ReactNode, useEffect, useMemo } from 'react'
+import { type StyleProp, View, type ViewStyle } from 'react-native'
+
+import { renderVoltraVariantToJson } from '@use-voltra/ios'
+
+import { addVoltraListener, type VoltraInteractionEvent } from '../events.js'
+
+const NativeVoltraView = requireNativeView('VoltraModule')
+
+const generateViewId = () => `voltra-view-${Date.now()}-${Math.random().toString(36).substring(2, 9)}`
+
+const voltraViewStyle: ViewStyle = {
+  flex: 1,
+}
+
+export type VoltraViewProps = {
+  id?: string
+  children: ReactNode
+  style?: StyleProp<ViewStyle>
+  onInteraction?: (event: VoltraInteractionEvent) => void
+  testID?: string
+}
+
+export function VoltraView({ id, children, style, onInteraction, testID }: VoltraViewProps) {
+  const viewId = useMemo(() => id || generateViewId(), [id])
+
+  const json = renderVoltraVariantToJson(children)
+  const payload = JSON.stringify(json)
+
+  useEffect(() => {
+    if (!onInteraction) return
+
+    const subscription = addVoltraListener('interaction', (event) => {
+      if (event.source === viewId) {
+        onInteraction({
+          type: 'interaction',
+          source: event.source,
+          timestamp: event.timestamp,
+          identifier: event.identifier,
+          payload: event.payload,
+        })
+      }
+    })
+
+    return () => subscription.remove()
+  }, [viewId, onInteraction])
+
+  return (
+    <View testID={testID} style={style}>
+      <NativeVoltraView payload={payload} viewId={viewId} style={voltraViewStyle} />
+    </View>
+  )
+}
diff --git a/packages/ios-client/src/components/VoltraWidgetPreview.tsx b/packages/ios-client/src/components/VoltraWidgetPreview.tsx
new file mode 100644
index 00000000..5d1b7376
--- /dev/null
+++ b/packages/ios-client/src/components/VoltraWidgetPreview.tsx
@@ -0,0 +1,38 @@
+import React from 'react'
+import { type StyleProp, type ViewStyle } from 'react-native'
+
+import type { WidgetFamily } from '@use-voltra/ios'
+
+import { VoltraView, type VoltraViewProps } from './VoltraView.js'
+
+const WIDGET_DIMENSIONS: Record<WidgetFamily, { width: number; height: number }> = {
+  systemSmall: { width: 170, height: 170 },
+  systemMedium: { width: 364, height: 170 },
+  systemLarge: { width: 364, height: 382 },
+  systemExtraLarge: { width: 364, height: 768 },
+  accessoryCircular: { width: 76, height: 76 },
+  accessoryRectangular: { width: 172, height: 76 },
+  accessoryInline: { width: 172, height: 40 },
+}
+
+export type VoltraWidgetPreviewProps = Omit<VoltraViewProps, 'style'> & {
+  family: WidgetFamily
+  style?: StyleProp<ViewStyle>
+}
+
+export function VoltraWidgetPreview({ family, style, children, ...voltraViewProps }: VoltraWidgetPreviewProps) {
+  const dimensions = WIDGET_DIMENSIONS[family]
+  const previewStyle: StyleProp<ViewStyle> = [
+    {
+      width: dimensions.width,
+      height: dimensions.height,
+    },
+    style,
+  ]
+
+  return (
+    <VoltraView {...voltraViewProps} style={previewStyle}>
+      {children}
+    </VoltraView>
+  )
+}
diff --git a/packages/ios-client/src/events.ts b/packages/ios-client/src/events.ts
new file mode 100644
index 00000000..db0f7c93
--- /dev/null
+++ b/packages/ios-client/src/events.ts
@@ -0,0 +1,54 @@
+import { Platform } from 'react-native'
+
+import type { EventSubscription } from './types.js'
+import VoltraModule from './VoltraModule.js'
+
+export type BasicVoltraEvent = {
+  source: string
+  timestamp: number
+}
+
+export type VoltraActivityState = 'active' | 'dismissed' | 'pending' | 'stale' | 'ended' | string
+export type VoltraActivityTokenReceivedEvent = BasicVoltraEvent & {
+  type: 'activityTokenReceived'
+  activityName: string
+  pushToken: string
+}
+export type VoltraActivityPushToStartTokenReceivedEvent = BasicVoltraEvent & {
+  type: 'activityPushToStartTokenReceived'
+  pushToStartToken: string
+}
+export type VoltraActivityUpdateEvent = BasicVoltraEvent & {
+  type: 'stateChange'
+  activityName: string
+  activityState: VoltraActivityState
+}
+
+export type VoltraInteractionEvent = BasicVoltraEvent & {
+  type: 'interaction'
+  identifier: string
+  payload: string
+}
+
+const noopSubscription: EventSubscription = {
+  remove: () => {},
+}
+
+export type VoltraEventMap = {
+  activityTokenReceived: VoltraActivityTokenReceivedEvent
+  activityPushToStartTokenReceived: VoltraActivityPushToStartTokenReceivedEvent
+  stateChange: VoltraActivityUpdateEvent
+  interaction: VoltraInteractionEvent
+}
+
+export function addVoltraListener<K extends keyof VoltraEventMap>(
+  event: K,
+  listener: (event: VoltraEventMap[K]) => void
+): EventSubscription {
+  if (Platform.OS !== 'ios') {
+    console.warn(`[Voltra] Event '${event}' is only supported on iOS. Returning no-op subscription.`)
+    return noopSubscription
+  }
+
+  return VoltraModule.addListener(event, listener)
+}
diff --git a/packages/ios/src/helpers.ts b/packages/ios-client/src/helpers.ts
similarity index 61%
rename from packages/ios/src/helpers.ts
rename to packages/ios-client/src/helpers.ts
index 71366706..eefa16bf 100644
--- a/packages/ios/src/helpers.ts
+++ b/packages/ios-client/src/helpers.ts
@@ -2,10 +2,6 @@ import { Platform } from 'react-native'
 
 import VoltraModule from './VoltraModule.js'
 
-/**
- * Return whether Liquid Glass APIs are supported on this device (iOS 26+).
- * This is a convenience gate for authoring fallbacks in JS.
- */
 export function isGlassSupported(): boolean {
   if (Platform.OS !== 'ios') return false
   const v: any = Platform.Version
@@ -19,11 +15,6 @@ export function isGlassSupported(): boolean {
   return major >= 26
 }
 
-/**
- * Return whether the app was launched in the background (headless).
- * Returns true if the app was launched in background, false if launched in foreground.
- * Always returns false on non-iOS platforms.
- */
 export function isHeadless(): boolean {
   if (Platform.OS !== 'ios') return false
   return VoltraModule.isHeadless?.() ?? false
diff --git a/packages/ios/src/client.ts b/packages/ios-client/src/index.ts
similarity index 88%
rename from packages/ios/src/client.ts
rename to packages/ios-client/src/index.ts
index ad5d912d..99fd0bd0 100644
--- a/packages/ios/src/client.ts
+++ b/packages/ios-client/src/index.ts
@@ -20,7 +20,7 @@ export {
   type UseLiveActivityOptions,
   type UseLiveActivityResult,
 } from './live-activity/api.js'
-export type { DismissalPolicy, LiveActivityVariants } from './live-activity/types.js'
+export type { DismissalPolicy, LiveActivityVariants } from '@use-voltra/ios'
 export {
   clearPreloadedImages,
   type PreloadImageOptions,
@@ -34,7 +34,7 @@ export {
   setWidgetServerCredentials,
   type WidgetServerCredentials,
 } from './widgets/server-credentials.js'
-export type { WidgetFamily, WidgetInfo, WidgetVariants } from './widgets/types.js'
+export type { WidgetFamily, WidgetInfo, WidgetVariants } from '@use-voltra/ios'
 export {
   clearAllWidgets,
   clearWidget,
diff --git a/packages/ios/src/live-activity/api.ts b/packages/ios-client/src/live-activity/api.ts
similarity index 58%
rename from packages/ios/src/live-activity/api.ts
rename to packages/ios-client/src/live-activity/api.ts
index 9fca8a78..39f1bb94 100644
--- a/packages/ios/src/live-activity/api.ts
+++ b/packages/ios-client/src/live-activity/api.ts
@@ -1,44 +1,21 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
 
+import { renderLiveActivityToString, type DismissalPolicy, type LiveActivityVariants } from '@use-voltra/ios'
+
 import { addVoltraListener } from '../events.js'
 import { logger } from '../logger.js'
 import { assertRunningOnApple, useUpdateOnHMR } from '../utils/index.js'
 import VoltraModule from '../VoltraModule.js'
-import { renderLiveActivityToString } from './renderer.js'
-import type { DismissalPolicy, LiveActivityVariants } from './types.js'
 
 export type SharedLiveActivityOptions = {
-  /**
-   * Unix timestamp in milliseconds
-   */
   staleDate?: number
-  /**
-   * Double value between 0.0 and 1.0
-   * @default 0.0
-   */
   relevanceScore?: number
-  /**
-   * How the Live Activity should be dismissed after ending
-   * @default 'immediate'
-   */
   dismissalPolicy?: DismissalPolicy
 }
 
 export type StartLiveActivityOptions = {
-  /**
-   * The name of the Live Activity.
-   * Allows you to rebind to the same activity on app restart.
-   */
   activityName?: string
-  /**
-   * URL to open when the Live Activity is tapped.
-   */
   deepLinkUrl?: string
-  /**
-   * Channel ID for broadcast push notifications (iOS 18+).
-   * When provided, the Live Activity subscribes to broadcast updates on this channel
-   * instead of receiving individual push tokens.
-   */
   channelId?: string
 } & SharedLiveActivityOptions
 
@@ -49,26 +26,10 @@ export type EndLiveActivityOptions = {
 }
 
 export type UseLiveActivityOptions = {
-  /**
-   * The name of the Live Activity.
-   * Allows you to rebind to the same activity on app restart.
-   */
   activityName?: string
-  /**
-   * Automatically start the Live Activity when the component mounts.
-   */
   autoStart?: boolean
-  /**
-   * Automatically update the Live Activity when the component updates.
-   */
   autoUpdate?: boolean
-  /**
-   * URL to open when the Live Activity is tapped.
-   */
   deepLinkUrl?: string
-  /**
-   * Channel ID for broadcast push notifications (iOS 18+).
-   */
   channelId?: string
 }
 
@@ -94,7 +55,6 @@ const normalizeSharedLiveActivityOptions = (
     }
   }
 
-  // Always include relevanceScore, defaulting to 0.0 if not provided
   const relevanceScore = options.relevanceScore ?? 0.0
   if (relevanceScore < 0 || relevanceScore > 1) {
     logger.warn('Ignoring relevanceScore because it is out of range [0.0, 1.0], using default 0.0')
@@ -119,40 +79,9 @@ const normalizeEndLiveActivityOptions = (
     return { dismissalPolicy: { type: 'after', date: options.dismissalPolicy.after } }
   }
 
-  // Default to immediate if unrecognized
   return { dismissalPolicy: { type: 'immediate' } }
 }
 
-/**
- * React hook for managing Live Activities with automatic lifecycle handling.
- *
- * @param variants - The Live Activity content variants to display
- * @param options - Configuration options for the hook
- * @returns Object with start, update, end methods and isActive state
- *
- * @example
- * ```tsx
- * import { useLiveActivity, Voltra } from 'voltra'
- *
- * const MyLiveActivity = () => {
- *   const { start, update, end, isActive } = useLiveActivity({
- *     minimal: <Voltra.Text>Live Activity</Voltra.Text>,
- *     compact: <Voltra.HStack>...</Voltra.HStack>,
- *     expanded: <Voltra.VStack>...</Voltra.VStack>
- *   }, {
- *     activityName: 'my-activity',
- *     autoStart: true,
- *     autoUpdate: true
- *   })
- *
- *   return (
- *     <View>
- *       <Button title={isActive ? "Stop" : "Start"} onPress={isActive ? end : start} />
- *     </View>
- *   )
- * }
- * ```
- */
 export const useLiveActivity = (
   variants: LiveActivityVariants,
   options?: UseLiveActivityOptions
@@ -169,7 +98,6 @@ export const useLiveActivity = (
   const variantsRef = useRef(variants)
   const lastUpdateOptionsRef = useRef<UpdateLiveActivityOptions | undefined>(undefined)
 
-  // Update refs when values change
   useEffect(() => {
     optionsRef.current = options
   }, [options])
@@ -230,7 +158,6 @@ export const useLiveActivity = (
       if (event.activityName !== targetId) return
 
       if (event.activityState === 'dismissed' || event.activityState === 'ended') {
-        // Live Activity is no longer active.
         setTargetId(null)
       }
     })
@@ -246,28 +173,6 @@ export const useLiveActivity = (
   }
 }
 
-/**
- * Start a new Live Activity with the provided content variants.
- *
- * @param variants - The Live Activity content variants to display
- * @param options - Configuration options for the Live Activity
- * @returns Promise resolving to the activity ID
- *
- * @example
- * ```tsx
- * import { startLiveActivity, Voltra } from 'voltra'
- *
- * const activityId = await startLiveActivity({
- *   minimal: <Voltra.Text>Live Activity</Voltra.Text>,
- *   compact: <Voltra.HStack>...</Voltra.HStack>,
- *   expanded: <Voltra.VStack>...</Voltra.VStack>
- * }, {
- *   activityName: 'my-activity',
- *   deepLinkUrl: '/details',
- *   relevanceScore: 0.8
- * })
- * ```
- */
 export const startLiveActivity = async (
   variants: LiveActivityVariants,
   options?: StartLiveActivityOptions
@@ -287,26 +192,6 @@ export const startLiveActivity = async (
   return targetId
 }
 
-/**
- * Update an existing Live Activity with new content.
- *
- * @param targetId - The ID of the Live Activity to update
- * @param variants - The new Live Activity content variants
- * @param options - Update options like relevance score
- *
- * @example
- * ```tsx
- * import { updateLiveActivity, Voltra } from 'voltra'
- *
- * await updateLiveActivity('activity-123', {
- *   minimal: <Voltra.Text>Updated: Live Activity</Voltra.Text>,
- *   compact: <Voltra.HStack>...</Voltra.HStack>,
- *   expanded: <Voltra.VStack>...</Voltra.VStack>
- * }, {
- *   relevanceScore: 0.9
- * })
- * ```
- */
 export const updateLiveActivity = async (
   targetId: string,
   variants: LiveActivityVariants,
@@ -320,19 +205,6 @@ export const updateLiveActivity = async (
   return VoltraModule.updateLiveActivity(targetId, payload, normalizedSharedOptions)
 }
 
-/**
- * Stop a Live Activity.
- *
- * @param targetId - The ID of the Live Activity to stop
- * @param options - Options for how to end the activity
- *
- * @example
- * ```tsx
- * import { stopLiveActivity } from 'voltra'
- *
- * await stopLiveActivity('activity-123', { dismissalPolicy: 'immediate' })
- * ```
- */
 export const stopLiveActivity = async (targetId: string, options?: EndLiveActivityOptions): Promise<void> => {
   if (!assertRunningOnApple()) return Promise.resolve()
 
@@ -340,42 +212,12 @@ export const stopLiveActivity = async (targetId: string, options?: EndLiveActivi
   return VoltraModule.endLiveActivity(targetId, normalizedOptions)
 }
 
-/**
- * Check if a Live Activity with the given name is currently active.
- *
- * @param activityName - The name of the Live Activity to check
- * @returns true if the activity is active, false otherwise
- *
- * @example
- * ```tsx
- * import { isLiveActivityActive } from 'voltra'
- *
- * if (isLiveActivityActive('my-activity')) {
- *   console.log('Activity is running')
- * }
- * ```
- */
 export const isLiveActivityActive = (activityName: string): boolean => {
   if (!assertRunningOnApple()) return false
 
   return VoltraModule.isLiveActivityActive(activityName)
 }
 
-/**
- * End all active Live Activities.
- *
- * This function stops and dismisses all currently running Live Activities in the app.
- * It's useful for cleanup operations, such as when the app is being closed or
- * when you want to reset all Live Activity states.
- *
- * @example
- * ```typescript
- * import { endAllLiveActivities } from 'voltra'
- *
- * // End all active Live Activities
- * await endAllLiveActivities()
- * ```
- */
 export async function endAllLiveActivities(): Promise<void> {
   if (!assertRunningOnApple()) return Promise.resolve()
   return VoltraModule.endAllLiveActivities()
diff --git a/packages/ios/src/logger.ts b/packages/ios-client/src/logger.ts
similarity index 100%
rename from packages/ios/src/logger.ts
rename to packages/ios-client/src/logger.ts
diff --git a/packages/ios-client/src/preload.ts b/packages/ios-client/src/preload.ts
new file mode 100644
index 00000000..1c2d4bca
--- /dev/null
+++ b/packages/ios-client/src/preload.ts
@@ -0,0 +1,50 @@
+import { Platform } from 'react-native'
+
+import type { PreloadImageOptions, PreloadImagesResult } from './types.js'
+import VoltraModule from './VoltraModule.js'
+
+export type { PreloadImageOptions, PreloadImagesResult } from './types.js'
+
+function assertIOS(name: string): boolean {
+  const isIOS = Platform.OS === 'ios'
+  if (!isIOS) console.error(`${name} is only available on iOS`)
+  return isIOS
+}
+
+export async function preloadImages(images: PreloadImageOptions[]): Promise<PreloadImagesResult> {
+  if (!assertIOS('preloadImages')) {
+    return { succeeded: [], failed: images.map((img) => ({ key: img.key, error: 'Not available on this platform' })) }
+  }
+
+  try {
+    return await VoltraModule.preloadImages(images)
+  } catch (error) {
+    return {
+      succeeded: [],
+      failed: images.map((img) => ({
+        key: img.key,
+        error: error instanceof Error ? error.message : 'Unknown error',
+      })),
+    }
+  }
+}
+
+export async function reloadLiveActivities(activityNames?: string[]): Promise<void> {
+  if (!assertIOS('reloadLiveActivities')) return
+
+  try {
+    await VoltraModule.reloadLiveActivities(activityNames ?? null)
+  } catch (error) {
+    console.error('Failed to reload Live Activities:', error)
+  }
+}
+
+export async function clearPreloadedImages(keys?: string[]): Promise<void> {
+  if (!assertIOS('clearPreloadedImages')) return
+
+  try {
+    await VoltraModule.clearPreloadedImages(keys ?? null)
+  } catch (error) {
+    console.error('Failed to clear preloaded images:', error)
+  }
+}
diff --git a/packages/ios-client/src/types.ts b/packages/ios-client/src/types.ts
new file mode 100644
index 00000000..d979c59b
--- /dev/null
+++ b/packages/ios-client/src/types.ts
@@ -0,0 +1,12 @@
+export type {
+  EventSubscription,
+  PreloadImageFailure,
+  PreloadImageOptions,
+  PreloadImagesResult,
+  UpdateWidgetOptions,
+  VoltraElementJson,
+  VoltraElementRef,
+  VoltraNodeJson,
+  VoltraPropValue,
+  WidgetServerCredentials,
+} from '@use-voltra/ios'
diff --git a/packages/ios/src/utils/assertRunningOnApple.ts b/packages/ios-client/src/utils/assertRunningOnApple.ts
similarity index 100%
rename from packages/ios/src/utils/assertRunningOnApple.ts
rename to packages/ios-client/src/utils/assertRunningOnApple.ts
diff --git a/packages/ios-client/src/utils/helpers.ts b/packages/ios-client/src/utils/helpers.ts
new file mode 100644
index 00000000..8af9c1b8
--- /dev/null
+++ b/packages/ios-client/src/utils/helpers.ts
@@ -0,0 +1 @@
+export { isGlassSupported, isHeadless } from '../helpers.js'
diff --git a/packages/ios/src/utils/index.ts b/packages/ios-client/src/utils/index.ts
similarity index 100%
rename from packages/ios/src/utils/index.ts
rename to packages/ios-client/src/utils/index.ts
diff --git a/packages/ios/src/utils/useUpdateOnHMR.ts b/packages/ios-client/src/utils/useUpdateOnHMR.ts
similarity index 64%
rename from packages/ios/src/utils/useUpdateOnHMR.ts
rename to packages/ios-client/src/utils/useUpdateOnHMR.ts
index 74c86edb..2f04f968 100644
--- a/packages/ios/src/utils/useUpdateOnHMR.ts
+++ b/packages/ios-client/src/utils/useUpdateOnHMR.ts
@@ -1,14 +1,9 @@
 import { useEffect, useState } from 'react'
 
 declare global {
-  // HMR accept function
   var __accept: (...args: unknown[]) => void
 }
 
-/**
- * Taps into the HMR accept function to forcefully re-render the component when any module is updated.
- * Is only available in development mode.
- */
 export const useUpdateOnHMR = () => {
   const [, forceUpdate] = useState(0)
 
@@ -17,7 +12,6 @@ export const useUpdateOnHMR = () => {
       return
     }
 
-    // Override the accept function to forcefully re-render when any module is updated
     const oldAccept = global['__accept']
     global['__accept'] = (...args) => {
       forceUpdate((prev) => prev + 1)
diff --git a/packages/ios-client/src/widgets/server-credentials.ts b/packages/ios-client/src/widgets/server-credentials.ts
new file mode 100644
index 00000000..1120f2e2
--- /dev/null
+++ b/packages/ios-client/src/widgets/server-credentials.ts
@@ -0,0 +1,16 @@
+import type { WidgetServerCredentials } from '../types.js'
+import VoltraModule from '../VoltraModule.js'
+
+export type { WidgetServerCredentials } from '../types.js'
+
+export async function setWidgetServerCredentials(credentials: WidgetServerCredentials): Promise<void> {
+  if (!credentials.token) {
+    throw new Error('[Voltra][iOS] setWidgetServerCredentials: token is required')
+  }
+
+  return VoltraModule.setWidgetServerCredentials(credentials)
+}
+
+export async function clearWidgetServerCredentials(): Promise<void> {
+  return VoltraModule.clearWidgetServerCredentials()
+}
diff --git a/packages/ios-client/src/widgets/widget-api.ts b/packages/ios-client/src/widgets/widget-api.ts
new file mode 100644
index 00000000..775ba8bb
--- /dev/null
+++ b/packages/ios-client/src/widgets/widget-api.ts
@@ -0,0 +1,65 @@
+import { renderWidgetToString, type ScheduledWidgetEntry, type WidgetInfo, type WidgetVariants } from '@use-voltra/ios'
+
+import type { UpdateWidgetOptions } from '../types.js'
+import { assertRunningOnApple } from '../utils/assertRunningOnApple.js'
+import VoltraModule from '../VoltraModule.js'
+
+export type { UpdateWidgetOptions } from '../types.js'
+export type { ScheduledWidgetEntry, WidgetInfo } from '@use-voltra/ios'
+
+export const updateWidget = async (
+  widgetId: string,
+  variants: WidgetVariants,
+  options?: UpdateWidgetOptions
+): Promise<void> => {
+  if (!assertRunningOnApple()) return Promise.resolve()
+
+  const payload = renderWidgetToString(variants)
+
+  return VoltraModule.updateWidget(widgetId, payload, {
+    deepLinkUrl: options?.deepLinkUrl,
+  })
+}
+
+export const reloadWidgets = async (widgetIds?: string[]): Promise<void> => {
+  if (!assertRunningOnApple()) return Promise.resolve()
+
+  return VoltraModule.reloadWidgets(widgetIds ?? null)
+}
+
+export const clearWidget = async (widgetId: string): Promise<void> => {
+  if (!assertRunningOnApple()) return Promise.resolve()
+
+  return VoltraModule.clearWidget(widgetId)
+}
+
+export const clearAllWidgets = async (): Promise<void> => {
+  if (!assertRunningOnApple()) return Promise.resolve()
+
+  return VoltraModule.clearAllWidgets()
+}
+
+export const scheduleWidget = async (widgetId: string, entries: ScheduledWidgetEntry[]): Promise<void> => {
+  if (!assertRunningOnApple()) return Promise.resolve()
+
+  const renderedEntries = entries.map((entry) => ({
+    date: entry.date.getTime(),
+    json: renderWidgetToString(entry.variants),
+    deepLinkUrl: entry.deepLinkUrl,
+  }))
+
+  const timelineData = {
+    entries: renderedEntries,
+    policy: { type: 'never' },
+  }
+
+  const timelineJson = JSON.stringify(timelineData)
+
+  return VoltraModule.scheduleWidget(widgetId, timelineJson)
+}
+
+export const getActiveWidgets = async (): Promise<WidgetInfo[]> => {
+  if (!assertRunningOnApple()) return []
+
+  return VoltraModule.getActiveWidgets()
+}
diff --git a/packages/ios-client/tsconfig.base.json b/packages/ios-client/tsconfig.base.json
new file mode 100644
index 00000000..49f9c30e
--- /dev/null
+++ b/packages/ios-client/tsconfig.base.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "lib": ["ES2020"],
+    "rootDir": "./src",
+    "moduleResolution": "node",
+    "jsx": "react-jsx",
+    "strict": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true
+  },
+  "include": ["./src"],
+  "exclude": ["**/__mocks__/*", "**/__tests__/*", "**/__rsc_tests__/*"]
+}
diff --git a/packages/ios-client/tsconfig.cjs.json b/packages/ios-client/tsconfig.cjs.json
new file mode 100644
index 00000000..a6b3ca9c
--- /dev/null
+++ b/packages/ios-client/tsconfig.cjs.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "module": "CommonJS",
+    "outDir": "./build/cjs",
+    "declaration": false,
+    "sourceMap": true
+  }
+}
diff --git a/packages/ios-client/tsconfig.esm.json b/packages/ios-client/tsconfig.esm.json
new file mode 100644
index 00000000..2bb18d33
--- /dev/null
+++ b/packages/ios-client/tsconfig.esm.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "module": "ES2020",
+    "outDir": "./build/esm",
+    "declaration": false,
+    "sourceMap": true
+  }
+}
diff --git a/packages/ios-client/tsconfig.typecheck.json b/packages/ios-client/tsconfig.typecheck.json
new file mode 100644
index 00000000..477960f6
--- /dev/null
+++ b/packages/ios-client/tsconfig.typecheck.json
@@ -0,0 +1,20 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "module": "ES2020",
+    "rootDir": "../..",
+    "baseUrl": "../..",
+    "paths": {
+      "voltra": ["packages/voltra/src/index.ts"],
+      "voltra/*": ["packages/voltra/src/*"],
+      "@use-voltra/android": ["packages/android/src/index.ts"],
+      "@use-voltra/android/client": ["packages/android-client/src/index.ts"],
+      "@use-voltra/android-server": ["packages/android-server/src/index.ts"],
+      "@use-voltra/core": ["packages/core/src/index.ts"],
+      "@use-voltra/ios": ["packages/ios/src/index.ts"],
+      "@use-voltra/ios/client": ["packages/ios-client/src/index.ts"],
+      "@use-voltra/ios-server": ["packages/ios-server/src/index.ts"],
+      "@use-voltra/server": ["packages/server/src/index.ts"]
+    }
+  }
+}
diff --git a/packages/ios-client/tsconfig.types.json b/packages/ios-client/tsconfig.types.json
new file mode 100644
index 00000000..8ec821ee
--- /dev/null
+++ b/packages/ios-client/tsconfig.types.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "module": "ES2020",
+    "outDir": "./build/types",
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "declarationMap": true
+  }
+}
diff --git a/packages/ios-server/tsconfig.typecheck.json b/packages/ios-server/tsconfig.typecheck.json
index f1b7e2fb..83a4c4cc 100644
--- a/packages/ios-server/tsconfig.typecheck.json
+++ b/packages/ios-server/tsconfig.typecheck.json
@@ -8,12 +8,14 @@
       "voltra": ["packages/voltra/src/index.ts"],
       "voltra/*": ["packages/voltra/src/*"],
       "@use-voltra/android": ["packages/android/src/index.ts"],
-      "@use-voltra/android/client": ["packages/android/src/client.ts"],
+      "@use-voltra/android-client": ["packages/android-client/src/index.ts"],
+      "@use-voltra/android/client": ["packages/android-client/src/index.ts"],
       "@use-voltra/android/server": ["packages/android/src/server.ts"],
       "@use-voltra/android-server": ["packages/android-server/src/index.ts"],
       "@use-voltra/core": ["packages/core/src/index.ts"],
       "@use-voltra/ios": ["packages/ios/src/index.ts"],
-      "@use-voltra/ios/client": ["packages/ios/src/client.ts"],
+      "@use-voltra/ios-client": ["packages/ios-client/src/index.ts"],
+      "@use-voltra/ios/client": ["packages/ios-client/src/index.ts"],
       "@use-voltra/ios/server": ["packages/ios/src/server.ts"],
       "@use-voltra/ios-server": ["packages/ios-server/src/index.ts"],
       "@use-voltra/server": ["packages/server/src/index.ts"]
diff --git a/packages/ios/package.json b/packages/ios/package.json
index 9be386ba..9636cb57 100644
--- a/packages/ios/package.json
+++ b/packages/ios/package.json
@@ -12,12 +12,6 @@
       "import": "./build/esm/index.js",
       "default": "./build/esm/index.js"
     },
-    "./client": {
-      "types": "./build/types/client.d.ts",
-      "require": "./build/cjs/client.js",
-      "import": "./build/esm/client.js",
-      "default": "./build/esm/client.js"
-    },
     "./server": {
       "types": "./build/types/server.d.ts",
       "require": "./build/cjs/server.js",
@@ -58,8 +52,6 @@
   "license": "MIT",
   "homepage": "https://use-voltra.dev",
   "peerDependencies": {
-    "expo": "*",
-    "react": "*",
-    "react-native": "*"
+    "react": "*"
   }
 }
diff --git a/packages/ios/src/VoltraModule.ts b/packages/ios/src/VoltraModule.ts
deleted file mode 100644
index b8266ef3..00000000
--- a/packages/ios/src/VoltraModule.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-import { requireNativeModule } from 'expo'
-
-import type {
-  EventSubscription,
-  PreloadImageOptions,
-  PreloadImagesResult,
-  UpdateWidgetOptions,
-  WidgetServerCredentials,
-} from './types.js'
-
-/**
- * Options for starting a Live Activity
- */
-export type StartVoltraOptions = {
-  /**
-   * Target type for the activity (used internally)
-   */
-  target?: string
-  /**
-   * URL to open when the Live Activity is tapped.
-   */
-  deepLinkUrl?: string
-  /**
-   * The ID/name of the Live Activity.
-   * Allows you to rebind to the same activity on app restart.
-   */
-  activityId?: string
-  /**
-   * Unix timestamp in milliseconds
-   */
-  staleDate?: number
-  /**
-   * Double value between 0.0 and 1.0, defaults to 0.0
-   */
-  relevanceScore?: number
-  /**
-   * Channel ID for broadcast push notifications (iOS 18+).
-   * When provided, the Live Activity subscribes to broadcast updates on this channel.
-   */
-  channelId?: string
-}
-
-/**
- * Options for updating a Live Activity
- */
-export type UpdateVoltraOptions = {
-  /**
-   * Unix timestamp in milliseconds
-   */
-  staleDate?: number
-  /**
-   * Double value between 0.0 and 1.0, defaults to 0.0
-   */
-  relevanceScore?: number
-}
-
-/**
- * Options for ending a Live Activity
- */
-export type EndVoltraOptions = {
-  dismissalPolicy?: {
-    type: 'immediate' | 'after'
-    date?: number
-  }
-}
-
-/**
- * Voltra iOS native module interface
- */
-export interface VoltraIOSModuleSpec {
-  /**
-   * Start a new Live Activity
-   */
-  startLiveActivity(jsonString: string, options?: StartVoltraOptions): Promise<string>
-
-  /**
-   * Update an existing Live Activity
-   */
-  updateLiveActivity(activityId: string, jsonString: string, options?: UpdateVoltraOptions): Promise<void>
-
-  /**
-   * End a Live Activity
-   */
-  endLiveActivity(activityId: string, options?: EndVoltraOptions): Promise<void>
-
-  /**
-   * End all active Live Activities
-   */
-  endAllLiveActivities(): Promise<void>
-
-  /**
-   * Get the latest (most recently created) Voltra Live Activity ID, if any
-   */
-  getLatestVoltraActivityId(): Promise<string | null>
-
-  /**
-   * List all running Voltra Live Activity IDs
-   */
-  listVoltraActivityIds(): Promise<string[]>
-
-  /**
-   * Check if a Live Activity with the given name is currently active
-   */
-  isLiveActivityActive(activityName: string): boolean
-
-  /**
-   * Check if the app was launched in the background (headless)
-   */
-  isHeadless(): boolean
-
-  /**
-   * Preload images to App Group storage for use in Live Activities
-   */
-  preloadImages(images: PreloadImageOptions[]): Promise<PreloadImagesResult>
-
-  /**
-   * Reload Live Activities to pick up preloaded images
-   */
-  reloadLiveActivities(activityNames?: string[] | null): Promise<void>
-
-  /**
-   * Clear preloaded images from App Group storage
-   */
-  clearPreloadedImages(keys?: string[] | null): Promise<void>
-
-  /**
-   * Update a home screen widget with new content
-   */
-  updateWidget(widgetId: string, jsonString: string, options?: UpdateWidgetOptions): Promise<void>
-
-  /**
-   * Schedule a widget timeline with multiple entries to be displayed at future times
-   */
-  scheduleWidget(widgetId: string, timelineJson: string): Promise<void>
-
-  /**
-   * Reload widget timelines to refresh their content
-   */
-  reloadWidgets(widgetIds?: string[] | null): Promise<void>
-
-  /**
-   * Clear a widget's stored data
-   */
-  clearWidget(widgetId: string): Promise<void>
-
-  /**
-   * Clear all widgets' stored data
-   */
-  clearAllWidgets(): Promise<void>
-
-  /**
-   * Fetches all active widget configurations/instances
-   */
-  getActiveWidgets<T = any>(): Promise<T[]>
-
-  /**
-   * Set server credentials for widget server-driven updates.
-   * Stored securely in Keychain.
-   */
-  setWidgetServerCredentials(credentials: WidgetServerCredentials): Promise<void>
-
-  /**
-   * Clear server credentials for widget server-driven updates.
-   */
-  clearWidgetServerCredentials(): Promise<void>
-
-  /**
-   * Add an event listener
-   */
-  addListener(event: string, listener: (event: any) => void): EventSubscription
-}
-
-const VoltraModule = requireNativeModule<VoltraIOSModuleSpec>('VoltraModule')
-
-export default VoltraModule
diff --git a/packages/ios/src/components/VoltraLiveActivityPreview.tsx b/packages/ios/src/components/VoltraLiveActivityPreview.tsx
deleted file mode 100644
index 0f74cf24..00000000
--- a/packages/ios/src/components/VoltraLiveActivityPreview.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import React from 'react'
-import { StyleProp, ViewStyle } from 'react-native'
-
-import { VoltraView, VoltraViewProps } from './VoltraView.js'
-
-/**
- * Dimensions for iOS lock screen Live Activity in points (approximate)
- * Based on iPhone 14 Pro/15 Pro dimensions
- */
-const LOCK_SCREEN_DIMENSIONS = {
-  width: 364,
-  height: 160,
-}
-
-export type VoltraLiveActivityPreviewProps = Omit<VoltraViewProps, 'style'> & {
-  /**
-   * Additional styles to apply on top of the lock screen dimensions
-   */
-  style?: StyleProp<ViewStyle>
-}
-
-/**
- * A preview component that renders Voltra JSX lock screen Live Activity content
- * at the exact dimensions of a lock screen Live Activity. Useful for testing
- * Live Activity layouts.
- *
- * This component extends VoltraView but automatically sets the width and height
- * to match the lock screen Live Activity dimensions. Live Activities cannot be
- * fully emulated, so this provides a close approximation for development.
- *
- * @example
- * ```tsx
- * <VoltraLiveActivityPreview
- *   style={{ backgroundColor: 'lightgray' }}
- * >
- *   <Voltra.Text>Hello Live Activity!</Voltra.Text>
- * </VoltraLiveActivityPreview>
- * ```
- */
-export function VoltraLiveActivityPreview({ style, children, ...voltraViewProps }: VoltraLiveActivityPreviewProps) {
-  const previewStyle: StyleProp<ViewStyle> = [
-    {
-      width: LOCK_SCREEN_DIMENSIONS.width,
-      height: LOCK_SCREEN_DIMENSIONS.height,
-    },
-    style,
-  ]
-
-  return (
-    <VoltraView {...voltraViewProps} style={previewStyle}>
-      {children}
-    </VoltraView>
-  )
-}
diff --git a/packages/ios/src/components/VoltraView.tsx b/packages/ios/src/components/VoltraView.tsx
deleted file mode 100644
index 30e78394..00000000
--- a/packages/ios/src/components/VoltraView.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import { requireNativeView } from 'expo'
-import React, { ReactNode, useEffect, useMemo } from 'react'
-import { StyleProp, View, ViewStyle } from 'react-native'
-
-import { addVoltraListener, VoltraInteractionEvent } from '../events.js'
-import { renderVoltraVariantToJson } from '../renderer/index.js'
-
-const NativeVoltraView = requireNativeView('VoltraModule')
-
-// Generate a unique ID for views that don't have one
-const generateViewId = () => `voltra-view-${Date.now()}-${Math.random().toString(36).substring(2, 9)}`
-
-const voltraViewStyle: ViewStyle = {
-  flex: 1,
-}
-
-export type VoltraViewProps = {
-  /**
-   * Unique identifier for this view instance.
-   * Used as 'source' in interaction events to identify which view triggered the event.
-   * If not provided, a unique ID will be generated automatically.
-   */
-  id?: string
-  /**
-   * Voltra JSX components to render
-   */
-  children: ReactNode
-  /**
-   * Style for the view container
-   */
-  style?: StyleProp<ViewStyle>
-  /**
-   * Callback when user interacts with components in the view.
-   * Events are filtered by this view's id (source).
-   */
-  onInteraction?: (event: VoltraInteractionEvent) => void
-  /**
-   * Test ID for the view
-   */
-  testID?: string
-}
-
-/**
- * A React Native component that renders Voltra UI using SwiftUI in the native layer.
- * This component accepts Voltra JSX components as children and renders them as SwiftUI components.
- *
- * @example
- * ```tsx
- * <VoltraView id="my-view" style={{ width: 200, height: 100 }}>
- *   <Voltra.VStack>
- *     <Voltra.Text>Hello World</Voltra.Text>
- *   </Voltra.VStack>
- * </VoltraView>
- * ```
- */
-export function VoltraView({ id, children, style, onInteraction, testID }: VoltraViewProps) {
-  // Generate a stable ID if not provided
-  const viewId = useMemo(() => id || generateViewId(), [id])
-
-  const json = renderVoltraVariantToJson(children)
-  const payload = JSON.stringify(json)
-
-  // Subscribe to interaction events and filter by this view's ID
-  useEffect(() => {
-    if (!onInteraction) return
-
-    const subscription = addVoltraListener('interaction', (event) => {
-      // Only forward events from this view
-      if (event.source === viewId) {
-        onInteraction({
-          type: 'interaction',
-          source: event.source,
-          timestamp: event.timestamp,
-          identifier: event.identifier,
-          payload: event.payload,
-        })
-      }
-    })
-
-    return () => subscription.remove()
-  }, [viewId, onInteraction])
-
-  return (
-    <View testID={testID} style={style}>
-      <NativeVoltraView payload={payload} viewId={viewId} style={voltraViewStyle} />
-    </View>
-  )
-}
diff --git a/packages/ios/src/components/VoltraWidgetPreview.tsx b/packages/ios/src/components/VoltraWidgetPreview.tsx
deleted file mode 100644
index 8c0deb68..00000000
--- a/packages/ios/src/components/VoltraWidgetPreview.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import React from 'react'
-import { StyleProp, ViewStyle } from 'react-native'
-
-import { WidgetFamily } from '../widgets/types.js'
-import { VoltraView, VoltraViewProps } from './VoltraView.js'
-
-/**
- * Dimensions for iOS widget families in points (approximate)
- * Based on iPhone 14 Pro/15 Pro dimensions
- */
-const WIDGET_DIMENSIONS: Record<WidgetFamily, { width: number; height: number }> = {
-  systemSmall: { width: 170, height: 170 },
-  systemMedium: { width: 364, height: 170 },
-  systemLarge: { width: 364, height: 382 },
-  systemExtraLarge: { width: 364, height: 768 }, // Approximate for iPad
-  accessoryCircular: { width: 76, height: 76 },
-  accessoryRectangular: { width: 172, height: 76 },
-  accessoryInline: { width: 172, height: 40 }, // Approximate
-}
-
-export type VoltraWidgetPreviewProps = Omit<VoltraViewProps, 'style'> & {
-  /**
-   * Widget family size to preview
-   */
-  family: WidgetFamily
-  /**
-   * Additional styles to apply on top of the widget dimensions
-   */
-  style?: StyleProp<ViewStyle>
-}
-
-/**
- * A preview component that renders Voltra JSX content at the exact dimensions
- * of a specific iOS widget family. Useful for testing widget layouts.
- *
- * This component extends VoltraView but automatically sets the width and height
- * to match the specified widget family's dimensions.
- *
- * @example
- * ```tsx
- * <VoltraWidgetPreview
- *   family="systemSmall"
- *   style={{ backgroundColor: 'lightgray' }}
- * >
- *   <Voltra.Text>Hello Widget!</Voltra.Text>
- * </VoltraWidgetPreview>
- * ```
- */
-export function VoltraWidgetPreview({ family, style, children, ...voltraViewProps }: VoltraWidgetPreviewProps) {
-  const dimensions = WIDGET_DIMENSIONS[family]
-  const previewStyle: StyleProp<ViewStyle> = [
-    {
-      width: dimensions.width,
-      height: dimensions.height,
-    },
-    style,
-  ]
-
-  return (
-    <VoltraView {...voltraViewProps} style={previewStyle}>
-      {children}
-    </VoltraView>
-  )
-}
diff --git a/packages/ios/src/index.ts b/packages/ios/src/index.ts
index 17d20970..e6a07b9d 100644
--- a/packages/ios/src/index.ts
+++ b/packages/ios/src/index.ts
@@ -1,3 +1,24 @@
 export * as Voltra from './jsx/primitives.js'
-export type { LiveActivityVariants } from './live-activity/types.js'
-export type { WidgetVariants } from './widgets/types.js'
+export { renderLiveActivityToJson, renderLiveActivityToString } from './live-activity/renderer.js'
+export type {
+  DismissalPolicy,
+  LiveActivityJson,
+  LiveActivityVariants,
+  LiveActivityVariantsJson,
+} from './live-activity/types.js'
+export { renderVoltraVariantToJson } from './renderer/index.js'
+export type { VoltraStyleProp, VoltraTextStyle, VoltraTextStyleProp, VoltraViewStyle } from './styles/index.js'
+export type {
+  EventSubscription,
+  PreloadImageFailure,
+  PreloadImageOptions,
+  PreloadImagesResult,
+  UpdateWidgetOptions,
+  VoltraElementJson,
+  VoltraElementRef,
+  VoltraNodeJson,
+  VoltraPropValue,
+  WidgetServerCredentials,
+} from './types.js'
+export { renderWidgetToJson, renderWidgetToString } from './widgets/renderer.js'
+export type { ScheduledWidgetEntry, WidgetFamily, WidgetInfo, WidgetVariants } from './widgets/types.js'
diff --git a/packages/ios/src/preload.ts b/packages/ios/src/preload.ts
deleted file mode 100644
index cc598848..00000000
--- a/packages/ios/src/preload.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { Platform } from 'react-native'
-
-import type { PreloadImageOptions, PreloadImagesResult } from './types.js'
-import VoltraModule from './VoltraModule.js'
-
-// Re-export types for public API
-export type { PreloadImageOptions, PreloadImagesResult } from './types.js'
-
-function assertIOS(name: string): boolean {
-  const isIOS = Platform.OS === 'ios'
-  if (!isIOS) console.error(`${name} is only available on iOS`)
-  return isIOS
-}
-
-/**
- * Preload images to App Group storage for use in Live Activities.
- *
- * Downloaded images are stored in shared storage accessible by both the app
- * and the Live Activity widget extension. Images can then be referenced using
- * the `assetName` property in the Image component.
- *
- * Images must be less than 4KB to comply with ActivityKit limits.
- *
- * @param images - Array of images to preload
- * @returns Result indicating which images succeeded or failed
- *
- * @example
- * ```typescript
- * const result = await preloadImages([
- *   {
- *     url: 'https://example.com/album-art.jpg',
- *     key: 'current-album',
- *     headers: { 'Authorization': 'Bearer token' }
- *   }
- * ])
- *
- * // Use in Live Activity
- * <Voltra.Image source={{ assetName: 'current-album' }} />
- * ```
- */
-export async function preloadImages(images: PreloadImageOptions[]): Promise<PreloadImagesResult> {
-  if (!assertIOS('preloadImages')) {
-    return { succeeded: [], failed: images.map((img) => ({ key: img.key, error: 'Not available on this platform' })) }
-  }
-
-  try {
-    return await (VoltraModule as any).preloadImages(images)
-  } catch (error) {
-    return {
-      succeeded: [],
-      failed: images.map((img) => ({
-        key: img.key,
-        error: error instanceof Error ? error.message : 'Unknown error',
-      })),
-    }
-  }
-}
-
-/**
- * Reload Live Activities to pick up newly preloaded images.
- *
- * This triggers an update on the specified Live Activities (or all if none specified)
- * with their current content state, forcing SwiftUI to re-render and load the
- * newly preloaded images from App Group storage.
- *
- * @param activityNames - Optional array of activity names to reload. If omitted, reloads all.
- *
- * @example
- * ```typescript
- * // Preload new image
- * await preloadImages([{ url: 'https://example.com/new-art.jpg', key: 'album-art' }])
- *
- * // Reload specific activity to pick up the new image
- * await reloadLiveActivities(['music-player'])
- *
- * // Or reload all activities
- * await reloadLiveActivities()
- * ```
- */
-export async function reloadLiveActivities(activityNames?: string[]): Promise<void> {
-  if (!assertIOS('reloadLiveActivities')) return
-
-  try {
-    await (VoltraModule as any).reloadLiveActivities(activityNames ?? null)
-  } catch (error) {
-    console.error('Failed to reload Live Activities:', error)
-  }
-}
-
-/**
- * Clear preloaded images from App Group storage.
- *
- * @param keys - Optional array of image keys to clear. If omitted, clears all preloaded images.
- *
- * @example
- * ```typescript
- * // Clear specific images
- * await clearPreloadedImages(['album-art', 'profile-pic'])
- *
- * // Clear all preloaded images
- * await clearPreloadedImages()
- * ```
- */
-export async function clearPreloadedImages(keys?: string[]): Promise<void> {
-  if (!assertIOS('clearPreloadedImages')) return
-
-  try {
-    await (VoltraModule as any).clearPreloadedImages(keys ?? null)
-  } catch (error) {
-    console.error('Failed to clear preloaded images:', error)
-  }
-}
diff --git a/packages/ios/src/styles/index.ts b/packages/ios/src/styles/index.ts
index 1fd2f53e..a9fe3f9d 100644
--- a/packages/ios/src/styles/index.ts
+++ b/packages/ios/src/styles/index.ts
@@ -1 +1 @@
-export type { VoltraStyleProp, VoltraTextStyle, VoltraTextStyleProp, VoltraViewStyle } from '@use-voltra/core'
+export type { VoltraStyleProp, VoltraTextStyle, VoltraTextStyleProp, VoltraViewStyle } from './types.js'
diff --git a/packages/ios/src/styles/types.ts b/packages/ios/src/styles/types.ts
index 1fd2f53e..2e0257b6 100644
--- a/packages/ios/src/styles/types.ts
+++ b/packages/ios/src/styles/types.ts
@@ -1 +1,78 @@
-export type { VoltraStyleProp, VoltraTextStyle, VoltraTextStyleProp, VoltraViewStyle } from '@use-voltra/core'
+type StyleProp<T> = T | T[] | null | undefined | false
+
+type VoltraTransform =
+  | { rotate: string }
+  | { rotateX: string }
+  | { rotateY: string }
+  | { rotateZ: string }
+  | { scale: number }
+  | { scaleX: number }
+  | { scaleY: number }
+  | { translateX: number }
+  | { translateY: number }
+  | { skewX: string }
+  | { skewY: string }
+
+export type VoltraViewStyle = {
+  flex?: number
+  flexGrow?: number
+  flexShrink?: number
+  flexBasis?: number | string
+  alignItems?: 'flex-start' | 'flex-end' | 'center' | 'stretch' | 'baseline'
+  alignSelf?: 'auto' | 'flex-start' | 'flex-end' | 'center' | 'stretch' | 'baseline'
+  justifyContent?: 'flex-start' | 'flex-end' | 'center' | 'space-between' | 'space-around' | 'space-evenly'
+  flexDirection?: 'row' | 'column' | 'row-reverse' | 'column-reverse'
+  gap?: number | string
+  minWidth?: number | string
+  maxWidth?: number | string
+  width?: number | string
+  minHeight?: number | string
+  maxHeight?: number | string
+  height?: number | string
+  padding?: number | string
+  paddingTop?: number | string
+  paddingBottom?: number | string
+  paddingLeft?: number | string
+  paddingRight?: number | string
+  paddingHorizontal?: number | string
+  paddingVertical?: number | string
+  margin?: number | string
+  marginTop?: number | string
+  marginBottom?: number | string
+  marginLeft?: number | string
+  marginRight?: number | string
+  marginHorizontal?: number | string
+  marginVertical?: number | string
+  backgroundColor?: string
+  opacity?: number
+  borderRadius?: number | string
+  borderWidth?: number
+  borderColor?: string
+  shadowColor?: string
+  shadowOffset?: { width: number; height: number }
+  shadowOpacity?: number
+  shadowRadius?: number
+  overflow?: 'visible' | 'hidden' | 'scroll'
+  aspectRatio?: number | string
+  left?: number | string
+  top?: number | string
+  position?: 'absolute' | 'relative' | 'static'
+  zIndex?: number
+  transform?: VoltraTransform[]
+  glassEffect?: 'clear' | 'identity' | 'regular' | 'none'
+}
+
+export type VoltraTextStyle = VoltraViewStyle & {
+  fontSize?: number
+  fontWeight?: 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900'
+  fontFamily?: string
+  color?: string
+  letterSpacing?: number
+  fontVariant?: ('small-caps' | 'tabular-nums' | 'oldstyle-nums' | 'lining-nums' | 'proportional-nums')[]
+  textDecorationLine?: 'none' | 'underline' | 'line-through' | 'underline line-through'
+  lineHeight?: number
+  textAlign?: 'auto' | 'left' | 'right' | 'center' | 'justify'
+}
+
+export type VoltraStyleProp = StyleProp<VoltraViewStyle>
+export type VoltraTextStyleProp = StyleProp<VoltraTextStyle>
diff --git a/packages/ios/src/types.ts b/packages/ios/src/types.ts
index b162b254..c4d08470 100644
--- a/packages/ios/src/types.ts
+++ b/packages/ios/src/types.ts
@@ -1,12 +1,31 @@
-export type {
-  EventSubscription,
-  PreloadImageFailure,
-  PreloadImageOptions,
-  PreloadImagesResult,
-  UpdateWidgetOptions,
-  VoltraElementJson,
-  VoltraElementRef,
-  VoltraNodeJson,
-  VoltraPropValue,
-  WidgetServerCredentials,
-} from '@use-voltra/core'
+export type { VoltraElementJson, VoltraElementRef, VoltraNodeJson, VoltraPropValue } from '@use-voltra/core'
+
+export type EventSubscription = {
+  remove: () => void
+}
+
+export type PreloadImageOptions = {
+  url: string
+  key: string
+  method?: 'GET' | 'POST' | 'PUT'
+  headers?: Record<string, string>
+}
+
+export type PreloadImageFailure = {
+  key: string
+  error: string
+}
+
+export type PreloadImagesResult = {
+  succeeded: string[]
+  failed: PreloadImageFailure[]
+}
+
+export type UpdateWidgetOptions = {
+  deepLinkUrl?: string
+}
+
+export type WidgetServerCredentials = {
+  token: string
+  headers?: Record<string, string>
+}
diff --git a/packages/ios/src/utils/helpers.ts b/packages/ios/src/utils/helpers.ts
deleted file mode 100644
index 9bbe25b5..00000000
--- a/packages/ios/src/utils/helpers.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Platform } from 'react-native'
-
-import VoltraModule from '../VoltraModule.js'
-
-/**
- * Return whether Liquid Glass APIs are supported on this device (iOS 26+).
- * This is a convenience gate for authoring fallbacks in JS.
- */
-export function isGlassSupported(): boolean {
-  if (Platform.OS !== 'ios') return false
-  const v: any = Platform.Version
-  let major = 0
-  if (typeof v === 'string') {
-    const m = parseInt(v.split('.')[0] || '0', 10)
-    if (!Number.isNaN(m)) major = m
-  } else if (typeof v === 'number') {
-    major = Math.floor(v)
-  }
-  return major >= 26
-}
-
-/**
- * Return whether the app was launched in the background (headless).
- * Returns true if the app was launched in background, false if launched in foreground.
- * Always returns false on non-iOS platforms.
- */
-export function isHeadless(): boolean {
-  if (Platform.OS !== 'ios') return false
-  return VoltraModule.isHeadless?.() ?? false
-}
diff --git a/packages/ios/src/widgets/server-credentials.ts b/packages/ios/src/widgets/server-credentials.ts
deleted file mode 100644
index 332bc763..00000000
--- a/packages/ios/src/widgets/server-credentials.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import type { WidgetServerCredentials } from '../types.js'
-import VoltraModule from '../VoltraModule.js'
-
-// Re-export types for public API
-export type { WidgetServerCredentials } from '../types.js'
-
-/**
- * Store server credentials for widget server-driven updates.
- *
- * On iOS, credentials are stored in the Shared Keychain (accessible by both the
- * main app and widget extension) with `kSecAttrAccessibleAfterFirstUnlock` to allow
- * background access.
- *
- * On Android, credentials are encrypted via Google Tink (AES-256-GCM) and
- * persisted in Jetpack DataStore. The encryption key is managed by the Android
- * Keystore. The WorkManager background worker can access this storage directly
- * since widgets are part of the main app binary.
- *
- * Call this after the user logs in to enable authenticated widget updates.
- *
- * @param credentials - The server credentials to store
- *
- * @example
- * ```typescript
- * import { setWidgetServerCredentials } from 'voltra'
- *
- * // After user login
- * await setWidgetServerCredentials({
- *   token: userAccessToken,
- *   headers: {
- *     'X-App-Version': '1.0.0',
- *   }
- * })
- * ```
- */
-export async function setWidgetServerCredentials(credentials: WidgetServerCredentials): Promise<void> {
-  if (!credentials.token) {
-    throw new Error('[Voltra][iOS] setWidgetServerCredentials: token is required')
-  }
-
-  return VoltraModule.setWidgetServerCredentials(credentials)
-}
-
-/**
- * Clear stored server credentials for widget updates.
- *
- * Call this when the user logs out to stop authenticated widget updates.
- * All widgets are automatically reloaded after clearing credentials so they
- * revert to their default/unauthenticated state.
- *
- * @example
- * ```typescript
- * import { clearWidgetServerCredentials } from 'voltra'
- *
- * // On user logout
- * await clearWidgetServerCredentials()
- * ```
- */
-export async function clearWidgetServerCredentials(): Promise<void> {
-  return VoltraModule.clearWidgetServerCredentials()
-}
diff --git a/packages/ios/src/widgets/widget-api.ts b/packages/ios/src/widgets/widget-api.ts
deleted file mode 100644
index baad42a7..00000000
--- a/packages/ios/src/widgets/widget-api.ts
+++ /dev/null
@@ -1,203 +0,0 @@
-import type { UpdateWidgetOptions } from '../types.js'
-import { assertRunningOnApple } from '../utils/assertRunningOnApple.js'
-import VoltraModule from '../VoltraModule.js'
-import { renderWidgetToString } from './renderer.js'
-import { ScheduledWidgetEntry, WidgetInfo, WidgetVariants } from './types.js'
-
-// Re-export types for public API
-export type { UpdateWidgetOptions } from '../types.js'
-export type { ScheduledWidgetEntry, WidgetInfo } from './types.js'
-
-/**
- * Update a home screen widget with new content.
- *
- * The content will be stored in App Group storage and the widget timeline
- * will be reloaded to display the new content.
- *
- * @param widgetId - The widget identifier (as defined in your config plugin)
- * @param variants - An object mapping widget families to specific content.
- *   Each key corresponds to a widget size family.
- * @param options - Optional settings like deep link URL
- *
- * @example Different content per size
- * ```tsx
- * import { updateWidget, Voltra } from 'voltra'
- *
- * await updateWidget('weather', {
- *   systemSmall: <Voltra.Text fontSize={32}>72°F</Voltra.Text>,
- *   systemMedium: (
- *     <Voltra.HStack>
- *       <Voltra.Text fontSize={32}>72°F</Voltra.Text>
- *       <Voltra.VStack>
- *         <Voltra.Text>Sunny</Voltra.Text>
- *         <Voltra.Text>High: 78° Low: 65°</Voltra.Text>
- *       </Voltra.VStack>
- *     </Voltra.HStack>
- *   ),
- * }, { deepLinkUrl: '/weather' })
- * ```
- */
-export const updateWidget = async (
-  widgetId: string,
-  variants: WidgetVariants,
-  options?: UpdateWidgetOptions
-): Promise<void> => {
-  if (!assertRunningOnApple()) return Promise.resolve()
-
-  const payload = renderWidgetToString(variants)
-
-  return VoltraModule.updateWidget(widgetId, payload, {
-    deepLinkUrl: options?.deepLinkUrl,
-  })
-}
-
-/**
- * Reload widget timelines to refresh their content.
- *
- * Use this after updating data that widgets depend on (e.g., after preloading
- * new images) to force them to re-render.
- *
- * @param widgetIds - Optional array of widget IDs to reload. If omitted, reloads all widgets.
- *
- * @example
- * ```typescript
- * // Reload specific widgets
- * await reloadWidgets(['weather', 'calendar'])
- *
- * // Reload all widgets
- * await reloadWidgets()
- * ```
- */
-export const reloadWidgets = async (widgetIds?: string[]): Promise<void> => {
-  if (!assertRunningOnApple()) return Promise.resolve()
-
-  return VoltraModule.reloadWidgets(widgetIds ?? null)
-}
-
-/**
- * Clear a widget's stored data.
- *
- * This removes the JSON content and deep link URL for the specified widget,
- * causing it to show its placeholder state.
- *
- * @param widgetId - The widget identifier to clear
- *
- * @example
- * ```typescript
- * await clearWidget('weather')
- * ```
- */
-export const clearWidget = async (widgetId: string): Promise<void> => {
-  if (!assertRunningOnApple()) return Promise.resolve()
-
-  return VoltraModule.clearWidget(widgetId)
-}
-
-/**
- * Clear all widgets' stored data.
- *
- * This removes the JSON content and deep link URLs for all configured widgets,
- * causing them to show their placeholder states.
- *
- * @example
- * ```typescript
- * await clearAllWidgets()
- * ```
- */
-export const clearAllWidgets = async (): Promise<void> => {
-  if (!assertRunningOnApple()) return Promise.resolve()
-
-  return VoltraModule.clearAllWidgets()
-}
-
-/**
- * Schedule a widget timeline with multiple entries to be displayed at future times.
- *
- * iOS will automatically display each entry at its scheduled time, even when your
- * app is not running. This allows you to batch widget updates in advance.
- *
- * @param widgetId - The widget identifier (as defined in your config plugin)
- * @param entries - Array of scheduled entries, each with a date and content variants
- * @param options - Optional settings like reload policy
- *
- * @example Schedule weather updates throughout the day
- * ```tsx
- * import { scheduleWidget, Voltra } from 'voltra'
- *
- * await scheduleWidget('weather', [
- *   {
- *     date: new Date('2026-01-16T09:00:00'),
- *     variants: {
- *       systemSmall: <Voltra.Text>Morning: 65°F</Voltra.Text>
- *     }
- *   },
- *   {
- *     date: new Date('2026-01-16T15:00:00'),
- *     variants: {
- *       systemSmall: <Voltra.Text>Afternoon: 72°F</Voltra.Text>
- *     }
- *   },
- *   {
- *     date: new Date('2026-01-16T21:00:00'),
- *     variants: {
- *       systemSmall: <Voltra.Text>Evening: 68°F</Voltra.Text>
- *     }
- *   }
- * ], {
- *   policy: { type: 'atEnd' } // Request new timeline when last entry expires
- * })
- * ```
- *
- * @example With deep links per entry
- * ```tsx
- * await scheduleWidget('news', [
- *   {
- *     date: new Date('2026-01-16T08:00:00'),
- *     variants: { systemSmall: <Voltra.Text>Morning News</Voltra.Text> },
- *     deepLinkUrl: '/news/morning'
- *   },
- *   {
- *     date: new Date('2026-01-16T20:00:00'),
- *     variants: { systemSmall: <Voltra.Text>Evening News</Voltra.Text> },
- *     deepLinkUrl: '/news/evening'
- *   }
- * ])
- * ```
- */
-export const scheduleWidget = async (widgetId: string, entries: ScheduledWidgetEntry[]): Promise<void> => {
-  if (!assertRunningOnApple()) return Promise.resolve()
-
-  // Render each entry's variants to JSON
-  const renderedEntries = entries.map((entry) => ({
-    date: entry.date.getTime(), // Convert to milliseconds timestamp
-    json: renderWidgetToString(entry.variants),
-    deepLinkUrl: entry.deepLinkUrl,
-  }))
-
-  // Prepare timeline data (always use 'never' policy since widget extension can't regenerate content)
-  const timelineData = {
-    entries: renderedEntries,
-    policy: { type: 'never' },
-  }
-
-  const timelineJson = JSON.stringify(timelineData)
-
-  return VoltraModule.scheduleWidget(widgetId, timelineJson)
-}
-
-/**
- * Fetches all active widget configurations for the containing app on iOS.
- *
- * @returns A promise that resolves to an array of active widget configurations.
- *
- * @example
- * ```typescript
- * const widgets = await getActiveWidgets()
- * console.log('Active widgets:', widgets)
- * ```
- */
-export const getActiveWidgets = async (): Promise<WidgetInfo[]> => {
-  if (!assertRunningOnApple()) return []
-
-  return VoltraModule.getActiveWidgets()
-}
diff --git a/packages/ios/tsconfig.typecheck.json b/packages/ios/tsconfig.typecheck.json
index f1b7e2fb..83a4c4cc 100644
--- a/packages/ios/tsconfig.typecheck.json
+++ b/packages/ios/tsconfig.typecheck.json
@@ -8,12 +8,14 @@
       "voltra": ["packages/voltra/src/index.ts"],
       "voltra/*": ["packages/voltra/src/*"],
       "@use-voltra/android": ["packages/android/src/index.ts"],
-      "@use-voltra/android/client": ["packages/android/src/client.ts"],
+      "@use-voltra/android-client": ["packages/android-client/src/index.ts"],
+      "@use-voltra/android/client": ["packages/android-client/src/index.ts"],
       "@use-voltra/android/server": ["packages/android/src/server.ts"],
       "@use-voltra/android-server": ["packages/android-server/src/index.ts"],
       "@use-voltra/core": ["packages/core/src/index.ts"],
       "@use-voltra/ios": ["packages/ios/src/index.ts"],
-      "@use-voltra/ios/client": ["packages/ios/src/client.ts"],
+      "@use-voltra/ios-client": ["packages/ios-client/src/index.ts"],
+      "@use-voltra/ios/client": ["packages/ios-client/src/index.ts"],
       "@use-voltra/ios/server": ["packages/ios/src/server.ts"],
       "@use-voltra/ios-server": ["packages/ios-server/src/index.ts"],
       "@use-voltra/server": ["packages/server/src/index.ts"]
diff --git a/packages/server/tsconfig.typecheck.json b/packages/server/tsconfig.typecheck.json
index f1b7e2fb..83a4c4cc 100644
--- a/packages/server/tsconfig.typecheck.json
+++ b/packages/server/tsconfig.typecheck.json
@@ -8,12 +8,14 @@
       "voltra": ["packages/voltra/src/index.ts"],
       "voltra/*": ["packages/voltra/src/*"],
       "@use-voltra/android": ["packages/android/src/index.ts"],
-      "@use-voltra/android/client": ["packages/android/src/client.ts"],
+      "@use-voltra/android-client": ["packages/android-client/src/index.ts"],
+      "@use-voltra/android/client": ["packages/android-client/src/index.ts"],
       "@use-voltra/android/server": ["packages/android/src/server.ts"],
       "@use-voltra/android-server": ["packages/android-server/src/index.ts"],
       "@use-voltra/core": ["packages/core/src/index.ts"],
       "@use-voltra/ios": ["packages/ios/src/index.ts"],
-      "@use-voltra/ios/client": ["packages/ios/src/client.ts"],
+      "@use-voltra/ios-client": ["packages/ios-client/src/index.ts"],
+      "@use-voltra/ios/client": ["packages/ios-client/src/index.ts"],
       "@use-voltra/ios/server": ["packages/ios/src/server.ts"],
       "@use-voltra/ios-server": ["packages/ios-server/src/index.ts"],
       "@use-voltra/server": ["packages/server/src/index.ts"]
diff --git a/packages/voltra/jest.config.js b/packages/voltra/jest.config.js
index 108c0d19..572a0f81 100644
--- a/packages/voltra/jest.config.js
+++ b/packages/voltra/jest.config.js
@@ -9,14 +9,16 @@ module.exports = {
       ],
       moduleNameMapper: {
         '^@use-voltra/android$': '<rootDir>/../android/src/index.ts',
-        '^@use-voltra/android/client$': '<rootDir>/../android/src/client.ts',
+        '^@use-voltra/android-client$': '<rootDir>/../android-client/src/index.ts',
+        '^@use-voltra/android/client$': '<rootDir>/../android-client/src/index.ts',
         '^@use-voltra/android/internal$': '<rootDir>/../android/src/internal.ts',
         '^@use-voltra/android/server$': '<rootDir>/../android/src/server.ts',
         '^@use-voltra/android-server$': '<rootDir>/../android-server/src/index.ts',
         '^@use-voltra/core$': '<rootDir>/../core/src/index.ts',
         '^@use-voltra-example/(.*)$': '<rootDir>/../../example/$1',
         '^@use-voltra/ios$': '<rootDir>/../ios/src/index.ts',
-        '^@use-voltra/ios/client$': '<rootDir>/../ios/src/client.ts',
+        '^@use-voltra/ios-client$': '<rootDir>/../ios-client/src/index.ts',
+        '^@use-voltra/ios/client$': '<rootDir>/../ios-client/src/index.ts',
         '^@use-voltra/ios/server$': '<rootDir>/../ios/src/server.ts',
         '^@use-voltra/ios-server$': '<rootDir>/../ios-server/src/index.ts',
         '^@use-voltra/server$': '<rootDir>/../server/src/index.ts',
@@ -33,14 +35,16 @@ module.exports = {
       testMatch: ['<rootDir>/src/**/*.node.test.ts?(x)'],
       moduleNameMapper: {
         '^@use-voltra/android$': '<rootDir>/../android/src/index.ts',
-        '^@use-voltra/android/client$': '<rootDir>/../android/src/client.ts',
+        '^@use-voltra/android-client$': '<rootDir>/../android-client/src/index.ts',
+        '^@use-voltra/android/client$': '<rootDir>/../android-client/src/index.ts',
         '^@use-voltra/android/internal$': '<rootDir>/../android/src/internal.ts',
         '^@use-voltra/android/server$': '<rootDir>/../android/src/server.ts',
         '^@use-voltra/android-server$': '<rootDir>/../android-server/src/index.ts',
         '^@use-voltra/core$': '<rootDir>/../core/src/index.ts',
         '^@use-voltra-example/(.*)$': '<rootDir>/../../example/$1',
         '^@use-voltra/ios$': '<rootDir>/../ios/src/index.ts',
-        '^@use-voltra/ios/client$': '<rootDir>/../ios/src/client.ts',
+        '^@use-voltra/ios-client$': '<rootDir>/../ios-client/src/index.ts',
+        '^@use-voltra/ios/client$': '<rootDir>/../ios-client/src/index.ts',
         '^@use-voltra/ios/server$': '<rootDir>/../ios/src/server.ts',
         '^@use-voltra/ios-server$': '<rootDir>/../ios-server/src/index.ts',
         '^@use-voltra/server$': '<rootDir>/../server/src/index.ts',
diff --git a/packages/voltra/package.json b/packages/voltra/package.json
index f408eacd..51b3868b 100644
--- a/packages/voltra/package.json
+++ b/packages/voltra/package.json
@@ -88,10 +88,12 @@
   "homepage": "https://use-voltra.dev",
   "dependencies": {
     "@use-voltra/android": "1.3.1",
+    "@use-voltra/android-client": "1.3.1",
     "@use-voltra/android-server": "1.3.1",
     "@use-voltra/core": "1.3.1",
     "@use-voltra/expo-plugin": "1.3.1",
     "@use-voltra/ios": "1.3.1",
+    "@use-voltra/ios-client": "1.3.1",
     "@use-voltra/ios-server": "1.3.1",
     "@use-voltra/server": "1.3.1",
     "react-is": "^19.2.0"
diff --git a/packages/voltra/src/android/client.ts b/packages/voltra/src/android/client.ts
index 520e189c..48ba3dc9 100644
--- a/packages/voltra/src/android/client.ts
+++ b/packages/voltra/src/android/client.ts
@@ -1,73 +1 @@
-export {
-  AndroidOngoingNotification,
-  canPostPromotedAndroidNotifications,
-  endAllAndroidOngoingNotifications,
-  getAndroidOngoingNotificationCapabilities,
-  getAndroidOngoingNotificationStatus,
-  hasAndroidNotificationPermission,
-  isAndroidOngoingNotificationActive,
-  openAndroidNotificationSettings,
-  renderAndroidOngoingNotificationPayload,
-  requestAndroidNotificationPermission,
-  startAndroidOngoingNotification,
-  stopAndroidOngoingNotification,
-  upsertAndroidOngoingNotification,
-  updateAndroidOngoingNotification,
-  useAndroidOngoingNotification,
-} from '@use-voltra/android/client'
-export type {
-  AndroidOngoingNotificationActionPayload,
-  AndroidOngoingNotificationActionProps,
-  AndroidOngoingNotificationBigTextPayload,
-  AndroidOngoingNotificationBigTextProps,
-  AndroidOngoingNotificationCapabilities,
-  AndroidOngoingNotificationCommonDisplayProps,
-  AndroidOngoingNotificationContent,
-  AndroidOngoingNotificationFallbackBehavior,
-  AndroidOngoingNotificationInput,
-  AndroidOngoingNotificationPayload,
-  AndroidOngoingNotificationProgressPoint,
-  AndroidOngoingNotificationProgressPayload,
-  AndroidOngoingNotificationProgressProps,
-  AndroidOngoingNotificationProgressSegment,
-  AndroidOngoingNotificationStartResult,
-  AndroidOngoingNotificationStatus,
-  AndroidOngoingNotificationStopResult,
-  AndroidOngoingNotificationUpdateResult,
-  AndroidOngoingNotificationUpsertResult,
-  StartAndroidOngoingNotificationOptions,
-  UpdateAndroidOngoingNotificationOptions,
-  UseAndroidOngoingNotificationOptions,
-  UseAndroidOngoingNotificationResult,
-} from '@use-voltra/android/client'
-
-export {
-  clearAllAndroidWidgets,
-  clearAndroidWidget,
-  getActiveWidgets,
-  reloadAndroidWidgets,
-  requestPinAndroidWidget,
-  updateAndroidWidget,
-} from './widgets/api.js'
-export type {
-  AndroidWidgetSize,
-  AndroidWidgetSizeVariant,
-  AndroidWidgetVariants,
-  UpdateAndroidWidgetOptions,
-  WidgetInfo,
-} from './widgets/types.js'
-
-export {
-  clearWidgetServerCredentials,
-  setWidgetServerCredentials,
-  type WidgetServerCredentials,
-} from './widgets/server-credentials.js'
-
-export { clearPreloadedImages, preloadImages, reloadWidgets } from './preload.js'
-
-export { VoltraView, type VoltraViewProps } from './components/VoltraView.js'
-export {
-  type AndroidWidgetFamily,
-  VoltraWidgetPreview,
-  type VoltraWidgetPreviewProps,
-} from './components/VoltraWidgetPreview.js'
+export * from '@use-voltra/android-client'
diff --git a/packages/voltra/src/android/components/VoltraView.tsx b/packages/voltra/src/android/components/VoltraView.tsx
index b58d95c4..da487c1a 100644
--- a/packages/voltra/src/android/components/VoltraView.tsx
+++ b/packages/voltra/src/android/components/VoltraView.tsx
@@ -1 +1 @@
-export { VoltraView, type VoltraViewProps } from '@use-voltra/android/client'
+export { VoltraView, type VoltraViewProps } from '@use-voltra/android-client'
diff --git a/packages/voltra/src/android/components/VoltraWidgetPreview.tsx b/packages/voltra/src/android/components/VoltraWidgetPreview.tsx
index e560451f..b6835968 100644
--- a/packages/voltra/src/android/components/VoltraWidgetPreview.tsx
+++ b/packages/voltra/src/android/components/VoltraWidgetPreview.tsx
@@ -1,5 +1 @@
-export {
-  VoltraWidgetPreview,
-  type AndroidWidgetFamily,
-  type VoltraWidgetPreviewProps,
-} from '@use-voltra/android/client'
+export { VoltraWidgetPreview, type VoltraWidgetPreviewProps } from '@use-voltra/android-client'
diff --git a/packages/voltra/src/android/widgets/api.ts b/packages/voltra/src/android/widgets/api.ts
index 31cc1b5d..b9b3fec6 100644
--- a/packages/voltra/src/android/widgets/api.ts
+++ b/packages/voltra/src/android/widgets/api.ts
@@ -5,4 +5,4 @@ export {
   reloadAndroidWidgets,
   requestPinAndroidWidget,
   updateAndroidWidget,
-} from '@use-voltra/android/client'
+} from '@use-voltra/android-client'
diff --git a/packages/voltra/src/client.ts b/packages/voltra/src/client.ts
index 0ff97b78..39dccb37 100644
--- a/packages/voltra/src/client.ts
+++ b/packages/voltra/src/client.ts
@@ -22,7 +22,7 @@ export {
   updateLiveActivity,
   updateWidget,
   useLiveActivity,
-} from '@use-voltra/ios/client'
+} from '@use-voltra/ios-client'
 export type {
   BasicVoltraEvent,
   DismissalPolicy,
@@ -52,4 +52,4 @@ export type {
   WidgetInfo,
   WidgetServerCredentials,
   WidgetVariants,
-} from '@use-voltra/ios/client'
+} from '@use-voltra/ios-client'
diff --git a/packages/voltra/src/renderer/__tests__/hooks.node.test.tsx b/packages/voltra/src/renderer/__tests__/hooks.node.test.tsx
index 4481ff88..19a40e03 100644
--- a/packages/voltra/src/renderer/__tests__/hooks.node.test.tsx
+++ b/packages/voltra/src/renderer/__tests__/hooks.node.test.tsx
@@ -83,7 +83,7 @@ describe('Hooks', () => {
 
   test('5. useReducer basic', () => {
     // Call useReducer(reducer, { count: 0 }). Verify returns [{ count: 0 }, dispatch] where dispatch is a function.
-    const reducer = (state, action) => state
+    const reducer = (state: { count: number }, _action: unknown) => state
     const initial = { count: 0 }
     let stateVal, dispatch
     const Component = () => {
@@ -97,8 +97,8 @@ describe('Hooks', () => {
 
   test('6. useReducer with init', () => {
     // Call useReducer(reducer, 5, (n) => ({ count: n * 2 })). Verify returns [{ count: 10 }, dispatch].
-    const reducer = (state, action) => state
-    const initFn = (n) => ({ count: n * 2 })
+    const reducer = (state: { count: number }, _action: unknown) => state
+    const initFn = (n: number) => ({ count: n * 2 })
     let stateVal
     const Component = () => {
       ;[stateVal] = useReducer(reducer, 5, initFn)
@@ -124,7 +124,9 @@ describe('Hooks', () => {
   test('8. useMemo with deps', () => {
     // Call useMemo(() => value, [dep1, dep2]). Verify deps array is accepted (no error) but doesn't affect static render behavior.
     const Component = () => {
-      useMemo(() => 'val', ['dep1', 'dep2'])
+      const dep1 = 'dep1'
+      const dep2 = 'dep2'
+      useMemo(() => `${dep1}:${dep2}`, [dep1, dep2])
       return <Text>test</Text>
     }
     expect(() => renderVoltraVariantToJson(<Component />)).not.toThrow()
diff --git a/packages/voltra/src/renderer/__tests__/renderVoltraToString.node.test.tsx b/packages/voltra/src/renderer/__tests__/renderVoltraToString.node.test.tsx
index 1741ee2d..e514d6e2 100644
--- a/packages/voltra/src/renderer/__tests__/renderVoltraToString.node.test.tsx
+++ b/packages/voltra/src/renderer/__tests__/renderVoltraToString.node.test.tsx
@@ -171,10 +171,11 @@ describe('renderVoltraVariantToJson', () => {
 
   describe('Conditional rendering (optional JSX)', () => {
     test('false && Component renders nothing', () => {
+      const shouldRender = false
       const element = (
         <Voltra.VStack>
           <Voltra.Text>Start</Voltra.Text>
-          {false && <Voltra.Text>Hidden</Voltra.Text>}
+          {shouldRender && <Voltra.Text>Hidden</Voltra.Text>}
           <Voltra.Text>End</Voltra.Text>
         </Voltra.VStack>
       )
@@ -189,10 +190,11 @@ describe('renderVoltraVariantToJson', () => {
     })
 
     test('true && Component renders the component', () => {
+      const shouldRender = true
       const element = (
         <Voltra.VStack>
           <Voltra.Text>Start</Voltra.Text>
-          {true && <Voltra.Text>Visible</Voltra.Text>}
+          {shouldRender && <Voltra.Text>Visible</Voltra.Text>}
           <Voltra.Text>End</Voltra.Text>
         </Voltra.VStack>
       )
@@ -270,10 +272,12 @@ describe('renderVoltraVariantToJson', () => {
     })
 
     test('Conditional with null/undefined', () => {
+      const nullable: null = null
+      const maybeUndefined: undefined = undefined
       const element = (
         <Voltra.VStack>
-          {null && <Voltra.Text>Hidden</Voltra.Text>}
-          {undefined && <Voltra.Text>Hidden</Voltra.Text>}
+          {nullable && <Voltra.Text>Hidden</Voltra.Text>}
+          {maybeUndefined && <Voltra.Text>Hidden</Voltra.Text>}
           <Voltra.Text>Visible</Voltra.Text>
         </Voltra.VStack>
       )
diff --git a/packages/voltra/src/styles/index.ts b/packages/voltra/src/styles/index.ts
index d426a771..6932954b 100644
--- a/packages/voltra/src/styles/index.ts
+++ b/packages/voltra/src/styles/index.ts
@@ -1 +1 @@
-export { VoltraStyleProp, VoltraTextStyle, VoltraTextStyleProp, VoltraViewStyle } from '@use-voltra/core'
+export { VoltraStyleProp, VoltraTextStyle, VoltraTextStyleProp, VoltraViewStyle } from '@use-voltra/ios'
diff --git a/packages/voltra/src/styles/types.ts b/packages/voltra/src/styles/types.ts
index 1fd2f53e..be7cc14a 100644
--- a/packages/voltra/src/styles/types.ts
+++ b/packages/voltra/src/styles/types.ts
@@ -1 +1 @@
-export type { VoltraStyleProp, VoltraTextStyle, VoltraTextStyleProp, VoltraViewStyle } from '@use-voltra/core'
+export type { VoltraStyleProp, VoltraTextStyle, VoltraTextStyleProp, VoltraViewStyle } from '@use-voltra/ios'
diff --git a/packages/voltra/src/types.ts b/packages/voltra/src/types.ts
index b162b254..3375e7fe 100644
--- a/packages/voltra/src/types.ts
+++ b/packages/voltra/src/types.ts
@@ -1,12 +1,10 @@
+export type { VoltraElementJson, VoltraElementRef, VoltraNodeJson, VoltraPropValue } from '@use-voltra/core'
+
 export type {
   EventSubscription,
   PreloadImageFailure,
   PreloadImageOptions,
   PreloadImagesResult,
   UpdateWidgetOptions,
-  VoltraElementJson,
-  VoltraElementRef,
-  VoltraNodeJson,
-  VoltraPropValue,
   WidgetServerCredentials,
-} from '@use-voltra/core'
+} from '@use-voltra/ios'
diff --git a/packages/voltra/tsconfig.base.json b/packages/voltra/tsconfig.base.json
index cc3ea9e7..bb9d05da 100644
--- a/packages/voltra/tsconfig.base.json
+++ b/packages/voltra/tsconfig.base.json
@@ -6,13 +6,15 @@
     "moduleResolution": "node",
     "paths": {
       "@use-voltra/android": ["../android/build/types/index.d.ts"],
-      "@use-voltra/android/client": ["../android/build/types/client.d.ts"],
+      "@use-voltra/android-client": ["../android-client/build/types/index.d.ts"],
+      "@use-voltra/android/client": ["../android-client/build/types/index.d.ts"],
       "@use-voltra/android/internal": ["../android/build/types/internal.d.ts"],
       "@use-voltra/android/server": ["../android/build/types/server.d.ts"],
       "@use-voltra/android-server": ["../android-server/build/types/index.d.ts"],
       "@use-voltra/core": ["../core/build/types/index.d.ts"],
       "@use-voltra/ios": ["../ios/build/types/index.d.ts"],
-      "@use-voltra/ios/client": ["../ios/build/types/client.d.ts"],
+      "@use-voltra/ios-client": ["../ios-client/build/types/index.d.ts"],
+      "@use-voltra/ios/client": ["../ios-client/build/types/index.d.ts"],
       "@use-voltra/ios/server": ["../ios/build/types/server.d.ts"],
       "@use-voltra/ios-server": ["../ios-server/build/types/index.d.ts"],
       "@use-voltra/server": ["../server/build/types/index.d.ts"]
diff --git a/packages/voltra/tsconfig.typecheck.json b/packages/voltra/tsconfig.typecheck.json
index d5d9364f..0de799cd 100644
--- a/packages/voltra/tsconfig.typecheck.json
+++ b/packages/voltra/tsconfig.typecheck.json
@@ -8,13 +8,15 @@
       "voltra": ["packages/voltra/src/index.ts"],
       "voltra/*": ["packages/voltra/src/*"],
       "@use-voltra/android": ["packages/android/src/index.ts"],
-      "@use-voltra/android/client": ["packages/android/src/client.ts"],
+      "@use-voltra/android-client": ["packages/android-client/src/index.ts"],
+      "@use-voltra/android/client": ["packages/android-client/src/index.ts"],
       "@use-voltra/android/internal": ["packages/android/src/internal.ts"],
       "@use-voltra/android/server": ["packages/android/src/server.ts"],
       "@use-voltra/android-server": ["packages/android-server/src/index.ts"],
       "@use-voltra/core": ["packages/core/src/index.ts"],
       "@use-voltra/ios": ["packages/ios/src/index.ts"],
-      "@use-voltra/ios/client": ["packages/ios/src/client.ts"],
+      "@use-voltra/ios-client": ["packages/ios-client/src/index.ts"],
+      "@use-voltra/ios/client": ["packages/ios-client/src/index.ts"],
       "@use-voltra/ios/server": ["packages/ios/src/server.ts"],
       "@use-voltra/ios-server": ["packages/ios-server/src/index.ts"],
       "@use-voltra/server": ["packages/server/src/index.ts"]
diff --git a/tsconfig.json b/tsconfig.json
index c03070f9..8b432513 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,13 +6,15 @@
       "voltra": ["./packages/voltra/src/index.ts"],
       "voltra/*": ["./packages/voltra/src/*"],
       "@use-voltra/android": ["./packages/android/src/index.ts"],
-      "@use-voltra/android/client": ["./packages/android/src/client.ts"],
+      "@use-voltra/android-client": ["./packages/android-client/src/index.ts"],
+      "@use-voltra/android/client": ["./packages/android-client/src/index.ts"],
       "@use-voltra/android/internal": ["./packages/android/src/internal.ts"],
       "@use-voltra/android/server": ["./packages/android/src/server.ts"],
       "@use-voltra/android-server": ["./packages/android-server/src/index.ts"],
       "@use-voltra/core": ["./packages/core/src/index.ts"],
       "@use-voltra/ios": ["./packages/ios/src/index.ts"],
-      "@use-voltra/ios/client": ["./packages/ios/src/client.ts"],
+      "@use-voltra/ios-client": ["./packages/ios-client/src/index.ts"],
+      "@use-voltra/ios/client": ["./packages/ios-client/src/index.ts"],
       "@use-voltra/ios/server": ["./packages/ios/src/server.ts"],
       "@use-voltra/ios-server": ["./packages/ios-server/src/index.ts"],
       "@use-voltra/server": ["./packages/server/src/index.ts"]