diff --git a/model/masonry-dimensions/src/index.ts b/model/masonry-dimensions/src/index.ts
index b6803940..d3265831 100644
--- a/model/masonry-dimensions/src/index.ts
+++ b/model/masonry-dimensions/src/index.ts
@@ -1 +1,2 @@
 export { default as MasonryDimensions } from './MasonryDimensions';
+export * from './types';
diff --git a/model/masonry-dimensions/src/types/masonry.types.ts b/model/masonry-dimensions/src/types/masonry.types.ts
index 40cad099..5cd02666 100644
--- a/model/masonry-dimensions/src/types/masonry.types.ts
+++ b/model/masonry-dimensions/src/types/masonry.types.ts
@@ -1,11 +1,8 @@
 import { ListDimensionsModelProps } from '@infinite-list/dimensions-model';
 
 import { GenericItemT } from './generic.types';
-// import { ListDimensionsModelProps } from './ListDimensionsModel.types';
-// import { ListStateResult } from './ListBaseDimensions.types';
 import MasonryDimensionsModel from '../MasonryDimensionsModel';
 import { ListIndexInfo } from '@infinite-list/item-meta';
-// import { ListBaseDimensionsProps } from './ListBaseDimensions.types';
 
 import {
   ListStateResult,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b222d925..5117f2b3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -665,9 +665,6 @@ importers:
 
   ui/masonry:
     dependencies:
-      '@infinite-list/data-model':
-        specifier: workspace:*
-        version: link:../../packages/data-model
       '@infinite-list/scroller':
         specifier: workspace:*
         version: link:../scroller
diff --git a/ui/masonry/package.json b/ui/masonry/package.json
index 1789ef8f..51cbc4fa 100644
--- a/ui/masonry/package.json
+++ b/ui/masonry/package.json
@@ -16,7 +16,6 @@
     }
   },
   "dependencies": {
-    "@infinite-list/data-model": "workspace:*",
     "@infinite-list/scroller": "workspace:*"
   },
   "publishConfig": {
diff --git a/ui/masonry/src/react-native/ColumnStateRender.tsx b/ui/masonry/src/react-native/ColumnStateRender.tsx
index 2af0d70e..9dc103d0 100644
--- a/ui/masonry/src/react-native/ColumnStateRender.tsx
+++ b/ui/masonry/src/react-native/ColumnStateRender.tsx
@@ -1,6 +1,6 @@
 import { Fragment } from 'react';
 
-import { GenericItemT, RecycleStateResult } from '@infinite-list/data-model';
+import { GenericItemT, RecycleStateResult } from '@infinite-list/strategies';
 import { ColumnStateRendererProps } from './types';
 
 import RecycleItem from './RecycleItem';
diff --git a/ui/masonry/src/react-native/MasonryList.tsx b/ui/masonry/src/react-native/MasonryList.tsx
index 623bd42a..a7384363 100644
--- a/ui/masonry/src/react-native/MasonryList.tsx
+++ b/ui/masonry/src/react-native/MasonryList.tsx
@@ -17,9 +17,9 @@ import {
 } from 'react-native';
 import {
   GenericItemT,
-  MasonryDimension,
+  MasonryDimensions as MasonryDimension,
   MasonryStateResults,
-} from '@infinite-list/data-model';
+} from '@infinite-list/masonry-dimensions';
 import { ColumnDimensionInfo, MasonryListProps } from './types';
 import ColumnStateRenderer from './ColumnStateRender';
 import { ScrollViewContext } from '@infinite-list/scroller/react-native';
diff --git a/ui/masonry/src/react-native/RecycleItem.tsx b/ui/masonry/src/react-native/RecycleItem.tsx
index bb0e4b5f..59fb1c9b 100644
--- a/ui/masonry/src/react-native/RecycleItem.tsx
+++ b/ui/masonry/src/react-native/RecycleItem.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useRef } from 'react';
-import { GenericItemT } from '@infinite-list/data-model';
+import { GenericItemT } from '@infinite-list/item-meta';
 import { RecycleItemProps } from './types';
 import { View, ViewStyle } from 'react-native';
 
diff --git a/ui/masonry/src/react-native/SpaceItem.tsx b/ui/masonry/src/react-native/SpaceItem.tsx
index c0be246e..6c5d96f3 100644
--- a/ui/masonry/src/react-native/SpaceItem.tsx
+++ b/ui/masonry/src/react-native/SpaceItem.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useRef } from 'react';
 import { View } from 'react-native';
-import { GenericItemT } from '@infinite-list/data-model';
+import { GenericItemT } from '@infinite-list/item-meta';
 import { SpaceItemProps } from './types';
 
 const Item = <ItemT extends GenericItemT>(props: SpaceItemProps<ItemT>) => {
diff --git a/ui/masonry/src/react-native/types/list.ts b/ui/masonry/src/react-native/types/list.ts
index f37f517c..2b86ea97 100644
--- a/ui/masonry/src/react-native/types/list.ts
+++ b/ui/masonry/src/react-native/types/list.ts
@@ -1,4 +1,4 @@
-import { ItemMeta, GenericItemT } from '@infinite-list/data-model';
+import { ItemMeta, GenericItemT } from '@infinite-list/item-meta';
 
 export type RenderItemInfo<ItemT extends GenericItemT = GenericItemT> = {
   item: ItemT;
diff --git a/ui/masonry/src/react-native/types/masonryList.ts b/ui/masonry/src/react-native/types/masonryList.ts
index a13bab4e..4f09bc99 100644
--- a/ui/masonry/src/react-native/types/masonryList.ts
+++ b/ui/masonry/src/react-native/types/masonryList.ts
@@ -1,11 +1,10 @@
 import {
-  GenericItemT,
-  RecycleStateToken,
-  SpaceStateToken,
-  MasonryDimension,
+  MasonryDimensions as MasonryDimension,
   MasonryColumnStateResults,
   MasonryDimensionsModelProps,
-} from '@infinite-list/data-model';
+} from '@infinite-list/masonry-dimensions';
+import { RecycleStateToken, SpaceStateToken } from '@infinite-list/strategies';
+import { GenericItemT } from '@infinite-list/item-meta';
 import { ScrollView, View } from 'react-native';
 import { RefObject } from 'react';
 import { RenderItem } from './list';
diff --git a/ui/masonry/src/react/ColumnStateRender.tsx b/ui/masonry/src/react/ColumnStateRender.tsx
index 2af0d70e..9dc103d0 100644
--- a/ui/masonry/src/react/ColumnStateRender.tsx
+++ b/ui/masonry/src/react/ColumnStateRender.tsx
@@ -1,6 +1,6 @@
 import { Fragment } from 'react';
 
-import { GenericItemT, RecycleStateResult } from '@infinite-list/data-model';
+import { GenericItemT, RecycleStateResult } from '@infinite-list/strategies';
 import { ColumnStateRendererProps } from './types';
 
 import RecycleItem from './RecycleItem';
diff --git a/ui/masonry/src/react/MasonryList.tsx b/ui/masonry/src/react/MasonryList.tsx
index 2e7911c8..40fd623f 100644
--- a/ui/masonry/src/react/MasonryList.tsx
+++ b/ui/masonry/src/react/MasonryList.tsx
@@ -10,9 +10,9 @@ import {
 } from 'react';
 import {
   GenericItemT,
-  MasonryDimension,
+  MasonryDimensions as MasonryDimension,
   MasonryStateResults,
-} from '@infinite-list/data-model';
+} from '@infinite-list/masonry-dimensions';
 import { ColumnDimensionInfo, MasonryListProps } from './types';
 import ColumnStateRenderer from './ColumnStateRender';
 import { ScrollTracker } from '@infinite-list/scroller/web';
diff --git a/ui/masonry/src/react/RecycleItem.tsx b/ui/masonry/src/react/RecycleItem.tsx
index af5153dc..20997505 100644
--- a/ui/masonry/src/react/RecycleItem.tsx
+++ b/ui/masonry/src/react/RecycleItem.tsx
@@ -1,5 +1,5 @@
 import { CSSProperties, useEffect, useMemo, useRef } from 'react';
-import { GenericItemT } from '@infinite-list/data-model';
+import { GenericItemT } from '@infinite-list/types';
 import { RecycleItemProps } from './types';
 
 const RecycleItem = <ItemT extends GenericItemT>(
diff --git a/ui/masonry/src/react/SpaceItem.tsx b/ui/masonry/src/react/SpaceItem.tsx
index 45e6605e..dd9da09a 100644
--- a/ui/masonry/src/react/SpaceItem.tsx
+++ b/ui/masonry/src/react/SpaceItem.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useRef } from 'react';
-import { GenericItemT } from '@infinite-list/data-model';
+import { GenericItemT } from '@infinite-list/types';
 import { SpaceItemProps } from './types';
 
 const Item = <ItemT extends GenericItemT>(props: SpaceItemProps<ItemT>) => {
diff --git a/ui/masonry/src/react/types/list.ts b/ui/masonry/src/react/types/list.ts
index f37f517c..2b86ea97 100644
--- a/ui/masonry/src/react/types/list.ts
+++ b/ui/masonry/src/react/types/list.ts
@@ -1,4 +1,4 @@
-import { ItemMeta, GenericItemT } from '@infinite-list/data-model';
+import { ItemMeta, GenericItemT } from '@infinite-list/item-meta';
 
 export type RenderItemInfo<ItemT extends GenericItemT = GenericItemT> = {
   item: ItemT;
diff --git a/ui/masonry/src/react/types/masonryList.ts b/ui/masonry/src/react/types/masonryList.ts
index d3c49c93..a6fcd7c6 100644
--- a/ui/masonry/src/react/types/masonryList.ts
+++ b/ui/masonry/src/react/types/masonryList.ts
@@ -1,11 +1,10 @@
 import {
-  GenericItemT,
-  RecycleStateToken,
-  SpaceStateToken,
-  MasonryDimension,
+  MasonryDimensions as MasonryDimension,
   MasonryColumnStateResults,
   MasonryDimensionsModelProps,
-} from '@infinite-list/data-model';
+} from '@infinite-list/masonry-dimensions';
+import { RecycleStateToken, SpaceStateToken } from '@infinite-list/strategies';
+import { GenericItemT } from '@infinite-list/item-meta';
 import { RenderItem } from './list';
 import { ForwardedRef } from 'react';