diff --git a/src/components/Post/Embed/ImageEmbed.tsx b/src/components/Post/Embed/ImageEmbed.tsx
index 605feb5d49..f96049f014 100644
--- a/src/components/Post/Embed/ImageEmbed.tsx
+++ b/src/components/Post/Embed/ImageEmbed.tsx
@@ -2,7 +2,6 @@ import {InteractionManager, View} from 'react-native'
 import {type AnimatedRef} from 'react-native-reanimated'
 import {Image} from 'expo-image'
 
-import {type Dimensions} from '#/view/com/lightbox/ImageViewing/@types'
 import {atoms as a, tokens} from '#/alf'
 import {AutoSizedImage} from '#/components/images/AutoSizedImage'
 import {Gallery} from '#/components/images/Gallery'
@@ -10,6 +9,7 @@ import {ImageLayoutGrid} from '#/components/images/ImageLayoutGrid'
 import {PostEmbedViewContext} from '#/components/Post/Embed/types'
 import {useAnalytics} from '#/analytics'
 import {useLightboxControls} from '#/features/lightbox/state'
+import {type Dimensions} from '#/features/lightbox/types'
 import {type EmbedType} from '#/types/bsky/post'
 import {type CommonProps} from './types'
 
diff --git a/src/components/images/ImageLayoutGrid.tsx b/src/components/images/ImageLayoutGrid.tsx
index 320dba70a5..2951e4c50a 100644
--- a/src/components/images/ImageLayoutGrid.tsx
+++ b/src/components/images/ImageLayoutGrid.tsx
@@ -3,9 +3,9 @@ import {type StyleProp, View, type ViewStyle} from 'react-native'
 import {type AnimatedRef, useAnimatedRef} from 'react-native-reanimated'
 import {type AppBskyEmbedImages} from '@atproto/api'
 
-import {type Dimensions} from '#/view/com/lightbox/ImageViewing/@types'
 import {atoms as a, useBreakpoints} from '#/alf'
 import {PostEmbedViewContext} from '#/components/Post/Embed/types'
+import {type Dimensions} from '#/features/lightbox/types'
 import {GalleryItem} from './ImageLayoutGridItem'
 
 interface ImageLayoutGridProps {
diff --git a/src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.android.tsx b/src/features/lightbox/pager/ImageItem/ImageItem.android.tsx
similarity index 99%
rename from src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.android.tsx
rename to src/features/lightbox/pager/ImageItem/ImageItem.android.tsx
index 9d128a41cf..931a12bd13 100644
--- a/src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.android.tsx
+++ b/src/features/lightbox/pager/ImageItem/ImageItem.android.tsx
@@ -20,7 +20,7 @@ import {
   type Dimensions as ImageDimensions,
   type ImageSource,
   type LightboxTransforms,
-} from '../../@types'
+} from '../../types'
 import {
   applyRounding,
   createTransform,
@@ -29,7 +29,7 @@ import {
   prependTransform,
   readTransform,
   type TransformMatrix,
-} from '../../transforms'
+} from '../transforms'
 
 const MIN_SCREEN_ZOOM = 2
 const MAX_ORIGINAL_IMAGE_ZOOM = 2
diff --git a/src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.ios.tsx b/src/features/lightbox/pager/ImageItem/ImageItem.ios.tsx
similarity index 99%
rename from src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.ios.tsx
rename to src/features/lightbox/pager/ImageItem/ImageItem.ios.tsx
index 52173e057a..c0bb99c89e 100644
--- a/src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.ios.tsx
+++ b/src/features/lightbox/pager/ImageItem/ImageItem.ios.tsx
@@ -30,7 +30,7 @@ import {
   type Dimensions as ImageDimensions,
   type ImageSource,
   type LightboxTransforms,
-} from '../../@types'
+} from '../../types'
 
 const MAX_ORIGINAL_IMAGE_ZOOM = 2
 const MIN_SCREEN_ZOOM = 2
diff --git a/src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.tsx b/src/features/lightbox/pager/ImageItem/ImageItem.tsx
similarity index 97%
rename from src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.tsx
rename to src/features/lightbox/pager/ImageItem/ImageItem.tsx
index cd0e45d3c5..513c20f6af 100644
--- a/src/view/com/lightbox/ImageViewing/components/ImageItem/ImageItem.tsx
+++ b/src/features/lightbox/pager/ImageItem/ImageItem.tsx
@@ -10,7 +10,7 @@ import {
   type Dimensions as ImageDimensions,
   type ImageSource,
   type LightboxTransforms,
-} from '../../@types'
+} from '../../types'
 
 type Props = {
   imageSrc: ImageSource
diff --git a/src/view/com/lightbox/ImageViewing/index.tsx b/src/features/lightbox/pager/ImagePager.tsx
similarity index 99%
rename from src/view/com/lightbox/ImageViewing/index.tsx
rename to src/features/lightbox/pager/ImagePager.tsx
index 8115baa618..5dd5d614b2 100644
--- a/src/view/com/lightbox/ImageViewing/index.tsx
+++ b/src/features/lightbox/pager/ImagePager.tsx
@@ -51,14 +51,14 @@ import {useTheme} from '#/alf'
 import {setSystemUITheme} from '#/alf/util/systemUI'
 import {IS_IOS} from '#/env'
 import {type Lightbox} from '#/features/lightbox/state'
-import {PlatformInfo} from '../../../../../modules/expo-bluesky-swiss-army'
+import {PlatformInfo} from '../../../../modules/expo-bluesky-swiss-army'
+import ImageDefaultHeader from '../../../view/com/lightbox/ImageViewing/components/ImageDefaultHeader'
 import {
   type ImageSource,
   type LightboxTransforms,
   type Transform,
-} from './@types'
-import ImageDefaultHeader from './components/ImageDefaultHeader'
-import ImageItem from './components/ImageItem/ImageItem'
+} from '../types'
+import ImageItem from './ImageItem/ImageItem'
 
 type Rect = {x: number; y: number; width: number; height: number}
 
diff --git a/src/view/com/lightbox/ImageViewing/transforms.ts b/src/features/lightbox/pager/transforms.ts
similarity index 98%
rename from src/view/com/lightbox/ImageViewing/transforms.ts
rename to src/features/lightbox/pager/transforms.ts
index ae6e4aed80..25b826995f 100644
--- a/src/view/com/lightbox/ImageViewing/transforms.ts
+++ b/src/features/lightbox/pager/transforms.ts
@@ -1,4 +1,4 @@
-import {type Position} from './@types'
+import {type Position} from '../types'
 
 export type TransformMatrix = [
   number,
diff --git a/src/features/lightbox/state.tsx b/src/features/lightbox/state.tsx
index 7d688dab20..db2ada1c83 100644
--- a/src/features/lightbox/state.tsx
+++ b/src/features/lightbox/state.tsx
@@ -9,7 +9,7 @@ import {nanoid} from 'nanoid/non-secure'
 
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
 import {useHotkeysContext} from '#/lib/hotkeys'
-import {type ImageSource} from '#/view/com/lightbox/ImageViewing/@types'
+import {type ImageSource} from '#/features/lightbox/types'
 
 export type Lightbox = {
   id: string
diff --git a/src/view/com/lightbox/ImageViewing/@types/index.ts b/src/features/lightbox/types.ts
similarity index 100%
rename from src/view/com/lightbox/ImageViewing/@types/index.ts
rename to src/features/lightbox/types.ts
diff --git a/src/view/com/lightbox/Lightbox.tsx b/src/view/com/lightbox/Lightbox.tsx
index 6dbc139461..ae46832fcd 100644
--- a/src/view/com/lightbox/Lightbox.tsx
+++ b/src/view/com/lightbox/Lightbox.tsx
@@ -2,8 +2,8 @@ import {useCallback} from 'react'
 
 import {shareImageModal} from '#/lib/media/manip'
 import {useSaveImageToMediaLibrary} from '#/lib/media/save-image'
+import ImageView from '#/features/lightbox/pager/ImagePager'
 import {useLightbox, useLightboxControls} from '#/features/lightbox/state'
-import ImageView from './ImageViewing'
 
 export function Lightbox() {
   const {activeLightbox} = useLightbox()
diff --git a/src/view/com/lightbox/Lightbox.web.tsx b/src/view/com/lightbox/Lightbox.web.tsx
index 229d52a43a..9dda275e09 100644
--- a/src/view/com/lightbox/Lightbox.web.tsx
+++ b/src/view/com/lightbox/Lightbox.web.tsx
@@ -30,7 +30,7 @@ import * as Menu from '#/components/Menu'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
 import {useLightbox, useLightboxControls} from '#/features/lightbox/state'
-import {type ImageSource} from './ImageViewing/@types'
+import {type ImageSource} from '#/features/lightbox/types'
 
 export function Lightbox() {
   const {activeLightbox} = useLightbox()