From 043fb3f736a356f3197f38a1d3028db90d099d94 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 6 Jan 2026 13:58:38 -0500
Subject: [PATCH 01/68] Use source field from package.json exports in tests

---
 lib/jestResolver.js                           | 27 ++++++++++++++++++-
 packages/@adobe/react-spectrum/package.json   |  1 +
 packages/@react-aria/utils/src/index.ts       |  6 ++---
 packages/@react-aria/utils/src/openLink.tsx   |  4 +--
 packages/@react-aria/utils/src/useId.ts       |  2 +-
 packages/@react-aria/utils/src/useSyncRef.ts  |  2 +-
 .../@react-aria/utils/src/useValueEffect.ts   |  2 +-
 .../table/test/TableSizing.test.tsx           |  3 ++-
 .../src/s1-to-s2/src/getComponents.ts         |  2 +-
 .../react-aria-components/test/Table.test.js  |  2 +-
 tsconfig.json                                 |  2 ++
 11 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/lib/jestResolver.js b/lib/jestResolver.js
index 9f5f9a85170..43d03afbb60 100644
--- a/lib/jestResolver.js
+++ b/lib/jestResolver.js
@@ -44,6 +44,19 @@ module.exports = (request, options) => {
     ...options,
     // https://github.com/microsoft/accessibility-insights-web/pull/5421#issuecomment-1109168149
     packageFilter: pkg => {
+      if (/(react-aria|react-spectrum|react-stately)/.test(pkg.name) && pkg.exports) {
+        processExports(pkg.exports);
+        if (!pkg.exports['.']) {
+          pkg.exports = {
+            '.': pkg.exports,
+            './src/*': ['./src/*.ts', './src/*.tsx'],
+            './test/*.tsx': './test/*.tsx',
+            './test/*': './test/*.js'
+          };
+        }
+        return pkg;
+      }
+
       if (!pkg.name?.startsWith('@tailwind') && pkg.name !== 'tailwindcss' && !pkg.name?.startsWith('storybook') && !pkg.name?.startsWith('@storybook')) {
         delete pkg['exports'];
         delete pkg['module'];
@@ -51,7 +64,7 @@ module.exports = (request, options) => {
       return pkg;
     }
   });
-  if (/packages[\/\\].*[\/\\].*[\/\\]intl[\/\\].*\.json$/.test(resolved)) {
+  if (/packages[\/\\].*[\/\\]intl[\/\\].*\.json$/.test(resolved)) {
     let sourceText = fs.readFileSync(resolved, 'utf8');
     let json = JSON.parse(sourceText);
     let res = compileStrings(json);
@@ -77,3 +90,15 @@ function writeCacheFile(cacheFile, res) {
   fs.renameSync(tmpFile, cacheFile);
   return cacheFile;
 }
+
+function processExports(exports) {
+  for (let key in exports) {
+    if (typeof exports[key] === 'object') {
+      processExports(exports[key]);
+    } else if (key === 'import' || key === 'types' || key === 'require') {
+      delete exports[key];
+    } else if (key === 'source') {
+      exports.default = exports.source;
+    }
+  }
+}
diff --git a/packages/@adobe/react-spectrum/package.json b/packages/@adobe/react-spectrum/package.json
index a9bd6cf13c6..932a91e8787 100644
--- a/packages/@adobe/react-spectrum/package.json
+++ b/packages/@adobe/react-spectrum/package.json
@@ -7,6 +7,7 @@
   "module": "dist/module.js",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": [
         "./dist/types.d.ts",
         "./src/index.ts"
diff --git a/packages/@react-aria/utils/src/index.ts b/packages/@react-aria/utils/src/index.ts
index 9da3461dd5b..8b41ba17410 100644
--- a/packages/@react-aria/utils/src/index.ts
+++ b/packages/@react-aria/utils/src/index.ts
@@ -9,6 +9,9 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+export {CLEAR_FOCUS_EVENT, FOCUS_EVENT} from './constants';
+export {isMac, isIPhone, isIPad, isIOS, isAppleDevice, isWebKit, isChrome, isAndroid, isFirefox} from './platform';
+export {openLink, getSyntheticLinkProps, useSyntheticLinkProps, RouterProvider, shouldClientNavigate, useRouter, useLinkProps, handleLinkClick} from './openLink';
 export {useId, mergeIds, useSlotId} from './useId';
 export {chain} from './chain';
 export {createShadowTreeWalker, ShadowTreeWalker} from './shadowdom/ShadowTreeWalker';
@@ -19,7 +22,6 @@ export {mergeRefs} from './mergeRefs';
 export {filterDOMProps} from './filterDOMProps';
 export {focusWithoutScrolling} from './focusWithoutScrolling';
 export {getOffset} from './getOffset';
-export {openLink, getSyntheticLinkProps, useSyntheticLinkProps, RouterProvider, shouldClientNavigate, useRouter, useLinkProps, handleLinkClick} from './openLink';
 export {runAfterTransition} from './runAfterTransition';
 export {useDrag1D} from './useDrag1D';
 export {useGlobalListeners} from './useGlobalListeners';
@@ -35,7 +37,6 @@ export {getScrollParents} from './getScrollParents';
 export {isScrollable} from './isScrollable';
 export {useViewportSize} from './useViewportSize';
 export {useDescription} from './useDescription';
-export {isMac, isIPhone, isIPad, isIOS, isAppleDevice, isWebKit, isChrome, isAndroid, isFirefox} from './platform';
 export {useEvent} from './useEvent';
 export {useValueEffect} from './useValueEffect';
 export {scrollIntoView, scrollIntoViewport} from './scrollIntoView';
@@ -47,7 +48,6 @@ export {useFormReset} from './useFormReset';
 export {useLoadMore} from './useLoadMore';
 export {useLoadMoreSentinel, useLoadMoreSentinel as UNSTABLE_useLoadMoreSentinel} from './useLoadMoreSentinel';
 export {inertValue} from './inertValue';
-export {CLEAR_FOCUS_EVENT, FOCUS_EVENT} from './constants';
 export {isCtrlKeyPressed, willOpenKeyboard} from './keyboard';
 export {useEnterAnimation, useExitAnimation} from './animation';
 export {isFocusable, isTabbable} from './isFocusable';
diff --git a/packages/@react-aria/utils/src/openLink.tsx b/packages/@react-aria/utils/src/openLink.tsx
index 25836692576..d38980d2396 100644
--- a/packages/@react-aria/utils/src/openLink.tsx
+++ b/packages/@react-aria/utils/src/openLink.tsx
@@ -10,9 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {focusWithoutScrolling, isMac, isWebKit} from './index';
+import {focusWithoutScrolling} from './focusWithoutScrolling';
 import {Href, LinkDOMProps, RouterOptions} from '@react-types/shared';
-import {isFirefox, isIPad} from './platform';
+import {isFirefox, isIPad, isMac, isWebKit} from './platform';
 import React, {createContext, DOMAttributes, JSX, MouseEvent as ReactMouseEvent, ReactNode, useContext, useMemo} from 'react';
 
 interface Router {
diff --git a/packages/@react-aria/utils/src/useId.ts b/packages/@react-aria/utils/src/useId.ts
index cbe8bfaee0d..cbca0f41387 100644
--- a/packages/@react-aria/utils/src/useId.ts
+++ b/packages/@react-aria/utils/src/useId.ts
@@ -13,7 +13,7 @@
 import {useCallback, useEffect, useRef, useState} from 'react';
 import {useLayoutEffect} from './useLayoutEffect';
 import {useSSRSafeId} from '@react-aria/ssr';
-import {useValueEffect} from './';
+import {useValueEffect} from './useValueEffect';
 
 // copied from SSRProvider.tsx to reduce exports, if needed again, consider sharing
 let canUseDOM = Boolean(
diff --git a/packages/@react-aria/utils/src/useSyncRef.ts b/packages/@react-aria/utils/src/useSyncRef.ts
index 5bbc2389325..63b115c6c31 100644
--- a/packages/@react-aria/utils/src/useSyncRef.ts
+++ b/packages/@react-aria/utils/src/useSyncRef.ts
@@ -12,7 +12,7 @@
 
 import {MutableRefObject} from 'react';
 import {RefObject} from '@react-types/shared';
-import {useLayoutEffect} from './';
+import {useLayoutEffect} from './useLayoutEffect';
 
 interface ContextValue<T> {
   ref?: MutableRefObject<T | null>
diff --git a/packages/@react-aria/utils/src/useValueEffect.ts b/packages/@react-aria/utils/src/useValueEffect.ts
index f22ee14fb05..aeb1c95314f 100644
--- a/packages/@react-aria/utils/src/useValueEffect.ts
+++ b/packages/@react-aria/utils/src/useValueEffect.ts
@@ -11,7 +11,7 @@
  */
 
 import {Dispatch, RefObject, useCallback, useRef, useState} from 'react';
-import {useLayoutEffect} from './';
+import {useLayoutEffect} from './useLayoutEffect';
 
 type SetValueAction<S> = (prev: S) => Generator<any, void, unknown>;
 
diff --git a/packages/@react-spectrum/table/test/TableSizing.test.tsx b/packages/@react-spectrum/table/test/TableSizing.test.tsx
index 3c82d3a3223..c5e5b57ac6a 100644
--- a/packages/@react-spectrum/table/test/TableSizing.test.tsx
+++ b/packages/@react-spectrum/table/test/TableSizing.test.tsx
@@ -22,7 +22,8 @@ import {HidingColumns} from '../stories/HidingColumns';
 import {Key} from '@react-types/shared';
 import {Provider} from '@react-spectrum/provider';
 import React, {useRef} from 'react';
-import {resizingTests} from '../../../@react-aria/table/test/tableResizingTests';
+// @ts-ignore
+import {resizingTests} from '@react-aria/table/test/tableResizingTests.tsx';
 import {Scale} from '@react-types/provider';
 import {setInteractionModality} from '@react-aria/interactions';
 import {theme} from '@react-spectrum/theme-default';
diff --git a/packages/dev/codemods/src/s1-to-s2/src/getComponents.ts b/packages/dev/codemods/src/s1-to-s2/src/getComponents.ts
index 7398553633a..ee0987182c6 100644
--- a/packages/dev/codemods/src/s1-to-s2/src/getComponents.ts
+++ b/packages/dev/codemods/src/s1-to-s2/src/getComponents.ts
@@ -16,7 +16,7 @@ export function getComponents(): Set<string> {
   // Determine list of available components in S2 from index.ts
   let availableComponents = new Set<string>();
   const packagePath = require.resolve('@react-spectrum/s2');
-  const indexPath = path.join(path.dirname(packagePath), process.env.NODE_ENV === 'test' ? 'src/index.ts' : '../src/index.ts');
+  const indexPath = path.join(path.dirname(packagePath), '../src/index.ts');
   let index = parse(readFileSync(indexPath, 'utf8'), {sourceType: 'module', plugins: ['typescript']});
   traverse(index, {
     ExportNamedDeclaration(path) {
diff --git a/packages/react-aria-components/test/Table.test.js b/packages/react-aria-components/test/Table.test.js
index 127e9b21222..859696aad72 100644
--- a/packages/react-aria-components/test/Table.test.js
+++ b/packages/react-aria-components/test/Table.test.js
@@ -15,7 +15,7 @@ import {Button, Cell, Checkbox, Collection, Column, ColumnResizer, Dialog, Dialo
 import {composeStories} from '@storybook/react';
 import {DataTransfer, DragEvent} from '@react-aria/dnd/test/mocks';
 import React, {useMemo, useState} from 'react';
-import {resizingTests} from '@react-aria/table/test/tableResizingTests';
+import {resizingTests} from '@react-aria/table/test/tableResizingTests.tsx';
 import {setInteractionModality} from '@react-aria/interactions';
 import * as stories from '../stories/Table.stories';
 import {User} from '@react-aria/test-utils';
diff --git a/tsconfig.json b/tsconfig.json
index f2c0426473a..27a6a752728 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,7 +17,9 @@
     "resolveJsonModule": true,
     // Search under node_modules for non-relative imports.
     "moduleResolution": "bundler",
+    "customConditions": ["source"],
     "module": "esnext",
+    "allowImportingTsExtensions": true,
     // Process & infer types from .js files.
     "allowJs": true,
     // Don't emit; allow Babel to transform files.

From 1911751d407081c2d18be382253312d8946c7629 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 6 Jan 2026 14:46:26 -0500
Subject: [PATCH 02/68] Support resolving glob imports from npm packages in
 jest

---
 lib/jestResolver.js                              | 16 ++++++++++++----
 .../number/test/NumberParser.test.js             |  2 +-
 .../numberfield/test/NumberField.test.js         |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/jestResolver.js b/lib/jestResolver.js
index 43d03afbb60..87e23d12f96 100644
--- a/lib/jestResolver.js
+++ b/lib/jestResolver.js
@@ -29,6 +29,12 @@ try {
 module.exports = (request, options) => {
   // Handle glob imports.
   if (request.endsWith('*.json')) {
+    if (!request.startsWith('.')) {
+      let pkg = request.startsWith('@') ? request.split('/').slice(0, 2).join('/') : request.split('/')[0];
+      let resolved = options.defaultResolver(pkg, options);
+      let relative = path.relative(options.basedir, path.dirname(path.dirname(resolved)));
+      request = path.join(relative, request.startsWith('@') ? request.split('/').slice(2).join('/') : request.split('/').slice(1).join('/'));
+    }
     let files = glob.sync(request, {cwd: options.basedir});
     let source = '';
     for (let file of files) {
@@ -48,12 +54,14 @@ module.exports = (request, options) => {
         processExports(pkg.exports);
         if (!pkg.exports['.']) {
           pkg.exports = {
-            '.': pkg.exports,
-            './src/*': ['./src/*.ts', './src/*.tsx'],
-            './test/*.tsx': './test/*.tsx',
-            './test/*': './test/*.js'
+            '.': pkg.exports
           };
         }
+        Object.assign(pkg.exports, {
+          './src/*': ['./src/*.ts', './src/*.tsx'],
+          './test/*.tsx': './test/*.tsx',
+          './test/*': './test/*.js'
+        });
         return pkg;
       }
 
diff --git a/packages/@internationalized/number/test/NumberParser.test.js b/packages/@internationalized/number/test/NumberParser.test.js
index a9266d997cf..c3599da5b97 100644
--- a/packages/@internationalized/number/test/NumberParser.test.js
+++ b/packages/@internationalized/number/test/NumberParser.test.js
@@ -11,7 +11,7 @@
  */
 
 import fc from 'fast-check';
-import messages from '../../../@react-aria/numberfield/intl/*.json';
+import messages from '@react-aria/numberfield/intl/*.json';
 import {NumberParser} from '../src/NumberParser';
 
 // for some reason hu-HU isn't supported in jsdom/node
diff --git a/packages/@react-spectrum/numberfield/test/NumberField.test.js b/packages/@react-spectrum/numberfield/test/NumberField.test.js
index c5574309aec..a695ce3bc8f 100644
--- a/packages/@react-spectrum/numberfield/test/NumberField.test.js
+++ b/packages/@react-spectrum/numberfield/test/NumberField.test.js
@@ -16,7 +16,7 @@ import {announce} from '@react-aria/live-announcer';
 import {Button} from '@react-spectrum/button';
 import {chain} from '@react-aria/utils';
 import {Form} from '@react-spectrum/form';
-import messages from '../../../@react-aria/numberfield/intl/*.json';
+import messages from '@react-aria/numberfield/intl/*.json';
 import {NumberField} from '../';
 import {Provider} from '@react-spectrum/provider';
 import React, {useState} from 'react';

From 64d39b89e26a93937bbfab3ff4196c54124b886c Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 6 Jan 2026 17:00:43 -0500
Subject: [PATCH 03/68] setup paths for migration

---
 .parcelrc-storybook                                  |  7 -------
 .storybook/.parcelrc                                 |  2 +-
 .storybook/main.js                                   |  3 +++
 package.json                                         |  2 ++
 .../calendar/stories/Calendar.stories.tsx            |  2 +-
 .../calendar/stories/RangeCalendar.stories.tsx       |  2 +-
 .../datepicker/stories/DatePicker.stories.tsx        |  2 +-
 .../datepicker/stories/DateRangePicker.stories.tsx   |  2 +-
 packages/@react-spectrum/dnd/docs/dnd.mdx            | 12 ++++++------
 .../dropzone/stories/DropZone.stories.tsx            |  2 +-
 .../list/stories/ListViewDnD.stories.tsx             |  2 +-
 .../list/stories/ListViewDnDUtil.stories.tsx         |  2 +-
 .../s2/chromatic/Calendar.stories.tsx                |  2 +-
 .../s2/chromatic/RangeCalendar.stories.tsx           |  2 +-
 .../@react-spectrum/s2/stories/Calendar.stories.tsx  |  2 +-
 .../s2/stories/RangeCalendar.stories.tsx             |  2 +-
 .../table/stories/TableDnD.stories.tsx               |  2 +-
 .../table/stories/TableDnDUtil.stories.tsx           |  2 +-
 .../@react-spectrum/toast/src/toastContainer.css     |  2 +-
 tsconfig.json                                        |  3 ++-
 20 files changed, 28 insertions(+), 29 deletions(-)
 delete mode 100644 .parcelrc-storybook

diff --git a/.parcelrc-storybook b/.parcelrc-storybook
deleted file mode 100644
index 2ff3823ae26..00000000000
--- a/.parcelrc-storybook
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": "@parcel/config-storybook",
-  "resolvers": ["@parcel/resolver-glob", "..."],
-  "transformers": {
-    "packages/*/*/intl/*.json": ["parcel-transformer-intl"]
-  }
-}
diff --git a/.storybook/.parcelrc b/.storybook/.parcelrc
index c2544f2aec3..f725210d16d 100644
--- a/.storybook/.parcelrc
+++ b/.storybook/.parcelrc
@@ -2,7 +2,7 @@
   "extends": "@parcel/config-storybook",
   "resolvers": ["@parcel/resolver-glob", "..."],
   "transformers": {
-    "packages/*/*/intl/*.json": ["parcel-transformer-intl"],
+    "packages/**/intl/**/*.json": ["parcel-transformer-intl"],
     "raw:*": ["@parcel/transformer-raw"]
   }
 }
diff --git a/.storybook/main.js b/.storybook/main.js
index e9986a2e7a6..7643f509282 100644
--- a/.storybook/main.js
+++ b/.storybook/main.js
@@ -3,6 +3,9 @@ module.exports = {
   stories: [
     '../packages/@{react-aria,react-stately,spectrum-icons}/*/stories/*.stories.{js,jsx,ts,tsx}',
     '../packages/@react-spectrum/!(s2)/stories/*.stories.{js,jsx,ts,tsx}',
+    '../packages/@adobe/react-spectrum/stories/*/*.stories.{js,jsx,ts,tsx}',
+    '../packages/react-aria/stories/*/*.stories.{js,jsx,ts,tsx}',
+    '../packages/react-stately/stories/*/*.stories.{js,jsx,ts,tsx}',
     '../packages/react-aria-components/stories/*.stories.{js,jsx,ts,tsx}'
   ],
 
diff --git a/package.json b/package.json
index d770a0ddc96..95d48ae0bd5 100644
--- a/package.json
+++ b/package.json
@@ -250,6 +250,8 @@
         "packages/@react-spectrum/style-macro-s1/**",
         "packages/@react-spectrum/tree/**",
         "packages/@react-spectrum/color/src/*.tsx",
+        "packages/@adobe/react-spectrum/src/tree/**",
+        "packages/@adobe/react-spectrum/src/color/*.tsx",
         "packages/@react-spectrum/s2/**/*.{js,ts,tsx}",
         "packages/@react-spectrum/s2/stories/**",
         ".storybook-s2/**",
diff --git a/packages/@react-spectrum/calendar/stories/Calendar.stories.tsx b/packages/@react-spectrum/calendar/stories/Calendar.stories.tsx
index 341afa93dda..b4a55586297 100644
--- a/packages/@react-spectrum/calendar/stories/Calendar.stories.tsx
+++ b/packages/@react-spectrum/calendar/stories/Calendar.stories.tsx
@@ -13,7 +13,7 @@ import {action} from '@storybook/addon-actions';
 import {ActionButton} from '@react-spectrum/button';
 import {Calendar} from '../';
 import {CalendarDate, CalendarDateTime, getLocalTimeZone, parseZonedDateTime, today, ZonedDateTime} from '@internationalized/date';
-import {Custom454Calendar} from '../../../@internationalized/date/tests/customCalendarImpl';
+import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
 import {DateValue} from '@react-types/calendar';
 import {Flex} from '@react-spectrum/layout';
 import {Item, Picker, Section} from '@react-spectrum/picker';
diff --git a/packages/@react-spectrum/calendar/stories/RangeCalendar.stories.tsx b/packages/@react-spectrum/calendar/stories/RangeCalendar.stories.tsx
index 80c54f6553e..880b2fd336f 100644
--- a/packages/@react-spectrum/calendar/stories/RangeCalendar.stories.tsx
+++ b/packages/@react-spectrum/calendar/stories/RangeCalendar.stories.tsx
@@ -12,7 +12,7 @@
 
 import {action} from '@storybook/addon-actions';
 import {CalendarDate, CalendarDateTime, getLocalTimeZone, isWeekend, parseZonedDateTime, today} from '@internationalized/date';
-import {Custom454Calendar} from '../../../@internationalized/date/tests/customCalendarImpl';
+import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
 import {DateValue} from '@react-types/calendar';
 import {Flex} from '@react-spectrum/layout';
 import {Meta, StoryObj} from '@storybook/react';
diff --git a/packages/@react-spectrum/datepicker/stories/DatePicker.stories.tsx b/packages/@react-spectrum/datepicker/stories/DatePicker.stories.tsx
index 8bbf74979de..236f99a0c2f 100644
--- a/packages/@react-spectrum/datepicker/stories/DatePicker.stories.tsx
+++ b/packages/@react-spectrum/datepicker/stories/DatePicker.stories.tsx
@@ -16,7 +16,7 @@ import {CalendarDate, CalendarDateTime, getLocalTimeZone, parseAbsolute, parseAb
 import {chain} from '@react-aria/utils';
 import {Content} from '@react-spectrum/view';
 import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Custom454Calendar} from '../../../@internationalized/date/tests/customCalendarImpl';
+import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
 import {DatePicker} from '../';
 import {DateValue} from '@react-types/calendar';
 import {Flex} from '@react-spectrum/layout';
diff --git a/packages/@react-spectrum/datepicker/stories/DateRangePicker.stories.tsx b/packages/@react-spectrum/datepicker/stories/DateRangePicker.stories.tsx
index e89d49ea9be..35029d6d2f3 100644
--- a/packages/@react-spectrum/datepicker/stories/DateRangePicker.stories.tsx
+++ b/packages/@react-spectrum/datepicker/stories/DateRangePicker.stories.tsx
@@ -14,7 +14,7 @@ import {action} from '@storybook/addon-actions';
 import {ActionButton} from '@react-spectrum/button';
 import {CalendarDate, getLocalTimeZone, isWeekend, parseDate, today, toZoned} from '@internationalized/date';
 import {chain} from '@react-aria/utils';
-import {Custom454Calendar} from '../../../@internationalized/date/tests/customCalendarImpl';
+import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
 import {DateRange} from '@react-types/datepicker';
 import {DateRangePicker} from '../';
 import {DateValue} from '@react-types/calendar';
diff --git a/packages/@react-spectrum/dnd/docs/dnd.mdx b/packages/@react-spectrum/dnd/docs/dnd.mdx
index a9c87f59f7e..1806afd7766 100644
--- a/packages/@react-spectrum/dnd/docs/dnd.mdx
+++ b/packages/@react-spectrum/dnd/docs/dnd.mdx
@@ -15,12 +15,12 @@ import docs from 'docs:@react-spectrum/dnd';
 import dndDocs from 'docs:@react-types/shared/src/dnd.d.ts';
 import {FunctionAPI, PageDescription, TypeContext, InterfaceType} from '@react-spectrum/docs';
 import {Keyboard} from '@react-spectrum/text';
-import DragPreview from '../../../@react-aria/dnd/docs/DragPreview.svg';
-import BetweenDropPosition from '../../../@react-aria/dnd/docs/BetweenDropPosition.svg';
-import OnDropPosition from '../../../@react-aria/dnd/docs/OnDropPosition.svg';
-import RootDropPosition from '../../../@react-aria/dnd/docs/RootDropPosition.svg';
-import DragAffordance from '../../../@react-aria/dnd/docs/DragAffordance.svg';
-import Anatomy from '../../../@react-aria/dnd/docs/Anatomy.svg';
+import DragPreview from '/packages/@react-aria/dnd/docs/DragPreview.svg';
+import BetweenDropPosition from '/packages/@react-aria/dnd/docs/BetweenDropPosition.svg';
+import OnDropPosition from '/packages/@react-aria/dnd/docs/OnDropPosition.svg';
+import RootDropPosition from '/packages/@react-aria/dnd/docs/RootDropPosition.svg';
+import DragAffordance from '/packages/@react-aria/dnd/docs/DragAffordance.svg';
+import Anatomy from '/packages/@react-aria/dnd/docs/Anatomy.svg';
 
 ---
 category: Concepts
diff --git a/packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx b/packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx
index 413331d4990..de54b927090 100644
--- a/packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx
+++ b/packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx
@@ -15,7 +15,7 @@ import {Button} from '@react-spectrum/button';
 import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@react-spectrum/table';
 import {classNames} from '@react-spectrum/utils';
 import {Content} from '@react-spectrum/view';
-import {Draggable} from '../../../@react-aria/dnd/stories/dnd.stories';
+import {Draggable} from '/packages/@react-aria/dnd/stories/dnd.stories';
 import {DropEvent, FileDropItem, TextDropItem, useDrag} from 'react-aria';
 import {DropZone} from '../';
 import File from '@spectrum-icons/illustrations/File';
diff --git a/packages/@react-spectrum/list/stories/ListViewDnD.stories.tsx b/packages/@react-spectrum/list/stories/ListViewDnD.stories.tsx
index c1144e5149b..86066059072 100644
--- a/packages/@react-spectrum/list/stories/ListViewDnD.stories.tsx
+++ b/packages/@react-spectrum/list/stories/ListViewDnD.stories.tsx
@@ -1,6 +1,6 @@
 import {action} from '@storybook/addon-actions';
 import {DragBetweenListsExample, DragBetweenListsRootOnlyExample, DragExample, DragIntoItemExample, ReorderExample} from './ListViewDnDExamples';
-import {Droppable} from '../../../@react-aria/dnd/stories/dnd.stories';
+import {Droppable} from '/packages/@react-aria/dnd/stories/dnd.stories';
 import {Flex} from '@react-spectrum/layout';
 import {ListView} from '../';
 import {Meta, StoryObj} from '@storybook/react';
diff --git a/packages/@react-spectrum/list/stories/ListViewDnDUtil.stories.tsx b/packages/@react-spectrum/list/stories/ListViewDnDUtil.stories.tsx
index b478800e0a0..9ffdab2fa2b 100644
--- a/packages/@react-spectrum/list/stories/ListViewDnDUtil.stories.tsx
+++ b/packages/@react-spectrum/list/stories/ListViewDnDUtil.stories.tsx
@@ -1,6 +1,6 @@
 import {action} from '@storybook/addon-actions';
 import {DragBetweenListsComplex, DragBetweenListsOverride, DragExampleUtilHandlers, FinderDropUtilHandlers, InsertExampleUtilHandlers, ItemDropExampleUtilHandlers, ReorderExampleUtilHandlers, RootDropExampleUtilHandlers} from './ListViewDnDUtilExamples';
-import {Droppable} from '../../../@react-aria/dnd/stories/dnd.stories';
+import {Droppable} from '/packages/@react-aria/dnd/stories/dnd.stories';
 import {Flex} from '@react-spectrum/layout';
 import {ListView} from '../';
 import {Meta, StoryObj} from '@storybook/react';
diff --git a/packages/@react-spectrum/s2/chromatic/Calendar.stories.tsx b/packages/@react-spectrum/s2/chromatic/Calendar.stories.tsx
index d8c42ec9940..0e2640f185e 100644
--- a/packages/@react-spectrum/s2/chromatic/Calendar.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Calendar.stories.tsx
@@ -12,7 +12,7 @@
 
 import {Calendar} from '../src';
 import {CalendarDate} from '@internationalized/date';
-import {Custom454Calendar} from '../../../@internationalized/date/tests/customCalendarImpl';
+import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
 import {DateValue} from 'react-aria';
 import type {Meta, StoryObj} from '@storybook/react';
 import {screen, userEvent, within} from '@storybook/test';
diff --git a/packages/@react-spectrum/s2/chromatic/RangeCalendar.stories.tsx b/packages/@react-spectrum/s2/chromatic/RangeCalendar.stories.tsx
index 2f7530c3873..186717a2e60 100644
--- a/packages/@react-spectrum/s2/chromatic/RangeCalendar.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/RangeCalendar.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {CalendarDate} from '@internationalized/date';
-import {Custom454Calendar} from '../../../@internationalized/date/tests/customCalendarImpl';
+import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
 import {DateValue} from 'react-aria';
 import type {Meta, StoryObj} from '@storybook/react';
 import {RangeCalendar} from '../src';
diff --git a/packages/@react-spectrum/s2/stories/Calendar.stories.tsx b/packages/@react-spectrum/s2/stories/Calendar.stories.tsx
index fba3277b275..a469e8bbfa7 100644
--- a/packages/@react-spectrum/s2/stories/Calendar.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Calendar.stories.tsx
@@ -13,7 +13,7 @@
 import {ActionButton, Calendar, CalendarProps} from '../src';
 import {CalendarDate, getLocalTimeZone, today} from '@internationalized/date';
 import {CalendarSwitcher, categorizeArgTypes, getActionArgs} from './utils';
-import {Custom454Calendar} from '../../../@internationalized/date/tests/customCalendarImpl';
+import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
 import {DateValue} from 'react-aria';
 import type {Meta, StoryObj} from '@storybook/react';
 import {ReactElement, useState} from 'react';
diff --git a/packages/@react-spectrum/s2/stories/RangeCalendar.stories.tsx b/packages/@react-spectrum/s2/stories/RangeCalendar.stories.tsx
index 6b4fee6c37e..0003e6e0aa3 100644
--- a/packages/@react-spectrum/s2/stories/RangeCalendar.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/RangeCalendar.stories.tsx
@@ -13,7 +13,7 @@
 import {ActionButton, RangeCalendar, RangeCalendarProps} from '../src';
 import {CalendarDate, getLocalTimeZone, isWeekend, today} from '@internationalized/date';
 import {CalendarSwitcher, categorizeArgTypes, getActionArgs} from './utils';
-import {Custom454Calendar} from '../../../@internationalized/date/tests/customCalendarImpl';
+import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
 import {DateValue} from 'react-aria';
 import type {Meta, StoryObj} from '@storybook/react';
 import {ReactElement, useState} from 'react';
diff --git a/packages/@react-spectrum/table/stories/TableDnD.stories.tsx b/packages/@react-spectrum/table/stories/TableDnD.stories.tsx
index f8f3beb8440..22285b993c7 100644
--- a/packages/@react-spectrum/table/stories/TableDnD.stories.tsx
+++ b/packages/@react-spectrum/table/stories/TableDnD.stories.tsx
@@ -14,7 +14,7 @@ import {action} from '@storybook/addon-actions';
 import defaultConfig, {TableStory} from './Table.stories';
 import {Divider} from '@react-spectrum/divider';
 import {DragBetweenTablesExample, DragBetweenTablesRootOnlyExample, DragExample, DragOntoRowExample, DragWithoutRowHeaderExample, items, ReorderExample} from './TableDnDExamples';
-import {Droppable} from '../../../@react-aria/dnd/stories/dnd.stories';
+import {Droppable} from '/packages/@react-aria/dnd/stories/dnd.stories';
 import {Flex} from '@react-spectrum/layout';
 import {Meta} from '@storybook/react';
 import React from 'react';
diff --git a/packages/@react-spectrum/table/stories/TableDnDUtil.stories.tsx b/packages/@react-spectrum/table/stories/TableDnDUtil.stories.tsx
index 03d65b615b9..3b16d524891 100644
--- a/packages/@react-spectrum/table/stories/TableDnDUtil.stories.tsx
+++ b/packages/@react-spectrum/table/stories/TableDnDUtil.stories.tsx
@@ -13,7 +13,7 @@
 import {action} from '@storybook/addon-actions';
 import defaultConfig, {TableStory} from './Table.stories';
 import {DragBetweenTablesComplex, DragBetweenTablesOverride, DragExampleUtilHandlers, FinderDropUtilHandlers, InsertExampleUtilHandlers, ItemDropExampleUtilHandlers, ReorderExampleUtilHandlers, RootDropExampleUtilHandlers} from './TableDnDUtilExamples';
-import {Droppable} from '../../../@react-aria/dnd/stories/dnd.stories';
+import {Droppable} from '/packages/@react-aria/dnd/stories/dnd.stories';
 import {Flex} from '@react-spectrum/layout';
 import {Meta} from '@storybook/react';
 import React from 'react';
diff --git a/packages/@react-spectrum/toast/src/toastContainer.css b/packages/@react-spectrum/toast/src/toastContainer.css
index 368a4500acb..e18b6b7546b 100644
--- a/packages/@react-spectrum/toast/src/toastContainer.css
+++ b/packages/@react-spectrum/toast/src/toastContainer.css
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-@import "../../../@adobe/spectrum-css-temp/components/commons/focus-ring.css";
+@import "@adobe/spectrum-css-temp/components/commons/focus-ring.css";
 
 .react-spectrum-ToastContainer {
   composes: spectrum-FocusRing;
diff --git a/tsconfig.json b/tsconfig.json
index 27a6a752728..39a758dd341 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -43,7 +43,8 @@
     ],
     "paths": {
       "vanilla-starter/*": ["./starters/docs/src/*"],
-      "tailwind-starter/*": ["./starters/tailwind/src/*"]
+      "tailwind-starter/*": ["./starters/tailwind/src/*"],
+      "/*": ["./*"]
     }
   },
   "include": [

From b96284c6d82d914b7b1ab3ea38d8022151f5e900 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 6 Jan 2026 20:26:12 -0500
Subject: [PATCH 04/68] migration script

---
 bin/useLayoutEffectRule.js |   2 +-
 eslint.config.mjs          |  10 --
 scripts/migrateDeps.mjs    | 315 +++++++++++++++++++++++++++++++++++++
 3 files changed, 316 insertions(+), 11 deletions(-)
 create mode 100644 scripts/migrateDeps.mjs

diff --git a/bin/useLayoutEffectRule.js b/bin/useLayoutEffectRule.js
index fe2b47b04fe..b725e563a95 100644
--- a/bin/useLayoutEffectRule.js
+++ b/bin/useLayoutEffectRule.js
@@ -15,7 +15,7 @@ module.exports = {
     return {
       ImportDeclaration(node) {
         const source = node.source.value;
-        if (source === '@react-aria/utils' || source === './useLayoutEffect' || source === './') {
+        if (source !== 'react') {
           return;
         }
         const importSpecifiers = node.specifiers.filter(specifier => specifier.type === 'ImportSpecifier');
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 26fc3bde7b9..3ca76903acd 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -333,16 +333,6 @@ export default [{
         "jsx-a11y/scope": ERROR,
         "jsx-a11y/tabindex-no-positive": ERROR,
 
-        "monorepo/no-internal-import": [ERROR, {
-            ignore: [
-                "@adobe/spectrum-css-temp",
-                "@spectrum-icons/ui",
-                "@spectrum-icons/workflow",
-                "@spectrum-icons/illustrations",
-                "@react-spectrum/s2/icons"
-            ],
-        }],
-
         "monorepo/no-relative-import": ERROR,
     },
 }, {
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
new file mode 100644
index 00000000000..f05153a79d8
--- /dev/null
+++ b/scripts/migrateDeps.mjs
@@ -0,0 +1,315 @@
+import fs from 'fs';
+import path from 'path';
+import * as recast from 'recast';
+import * as t from '@babel/types';
+import {parse} from '@babel/parser';
+
+const skipped = ['example-theme', 'test-utils', 'story-utils', 's2', 'style-macro-s1'];
+const importMap = {
+  'react-aria': buildImportMap('packages/react-aria/src/index.ts'),
+  'react-stately': buildImportMap('packages/react-stately/src/index.ts'),
+  'react-aria-components': buildImportMap('packages/react-aria-components/src/index.ts'),
+  '@react-spectrum/s2': buildImportMap('packages/@react-spectrum/s2/src/index.ts')
+};
+
+migrateScope('@react-aria', 'react-aria');
+migrateScope('@react-stately', 'react-stately');
+migrateScope('@react-spectrum', '@adobe/react-spectrum');
+migrateToMonopackage('react-aria-components');
+migrateToMonopackage('@react-spectrum/s2');
+migrateToMonopackage('@internationalized/number');
+
+function migrateScope(scope, monopackage) {
+  prepareMonopackage(monopackage);
+
+  for (let pkg of fs.globSync(`packages/${scope}/*`).sort()) {
+    if (fs.statSync(pkg).isDirectory()) {
+      let name = path.basename(pkg);
+      if (skipped.includes(name)) {
+        continue;
+      }
+
+      migratePackage(scope, name, monopackage);
+    }
+  }
+
+  rewriteIndex(`packages/${monopackage}/src/index.ts`, scope);
+}
+
+function prepareMonopackage(monopackage) {
+  let monopackageJSON = JSON.parse(fs.readFileSync(`packages/${monopackage}/package.json`, 'utf8'));
+  monopackageJSON.source = ['src/index.ts', 'src/*/index.ts'];
+  if (!monopackageJSON.exports['.']) {
+    monopackageJSON.exports = {
+      '.': monopackageJSON.exports
+    };
+  } else {
+    // TODO
+    monopackageJSON.exports = {
+      '.': monopackageJSON.exports['.']
+    };
+  }
+
+  for (let dep in monopackageJSON.dependencies || {}) {
+    let depScope = dep.match(/@(react-aria|react-spectrum|react-stately)/);
+    if (depScope) {
+      let p = depScope[1] === 'react-spectrum' ? '@adobe/react-spectrum' : depScope[1];
+      if (!monopackageJSON.dependencies[p]) {
+        monopackageJSON.dependencies[p] = JSON.parse(fs.readFileSync(`packages/${p}/package.json`, 'utf8')).version;
+      }
+      delete monopackageJSON.dependencies[dep];
+    }
+  }
+
+  fs.writeFileSync(`packages/${monopackage}/package.json`, JSON.stringify(monopackageJSON, false, 2) + '\n');
+}
+
+function migratePackage(scope, name, monopackage) {
+  let packageJSON = JSON.parse(fs.readFileSync(`packages/${scope}/${name}/package.json`, 'utf8'));
+  let monopackageJSON = JSON.parse(fs.readFileSync(`packages/${monopackage}/package.json`, 'utf8'));
+
+  // Move files
+  moveTree(scope, name, 'src', monopackage);
+  moveTree(scope, name, 'test', monopackage);
+  moveTree(scope, name, 'stories', monopackage);
+  moveTree(scope, name, 'chromatic', monopackage);
+  moveTree(scope, name, 'chromatic-fc', monopackage);
+  moveTree(scope, name, 'docs', monopackage);
+  moveTree(scope, name, 'intl', monopackage);
+  
+  let exports = packageJSON.exports || {source: './' + packageJSON.source};
+  if (exports['.']) {
+    exports = exports['.'];
+    // TODO: add others
+  }
+
+  monopackageJSON.exports[`./${name}`] = remapExports(exports, name);
+  for (let dep in packageJSON.dependencies || {}) {
+    let depScope = dep.match(/@(react-aria|react-spectrum|react-stately)/);
+    if (!depScope && !monopackageJSON.dependencies[dep]) {
+      monopackageJSON.dependencies[dep] = packageJSON.dependencies[dep];
+    } else if (depScope && depScope[0] !== scope && !monopackageJSON.dependencies[depScope[1]]) {
+      monopackageJSON.dependencies[depScope[1]] = JSON.parse(fs.readFileSync(`packages/${depScope[1]}/package.json`, 'utf8')).version;
+    }
+  }
+
+  fs.writeFileSync(`packages/${monopackage}/package.json`, JSON.stringify(monopackageJSON, false, 2) + '\n');
+
+  let index = fs.readFileSync(`packages/${scope}/${name}/index.ts`, 'utf8');
+  index = index.replace('./src', `${monopackage}/${name}`);
+  fs.writeFileSync(`packages/${scope}/${name}/index.ts`, index);
+
+  packageJSON.source = 'index.ts';
+  delete packageJSON.exports; // TODO
+  packageJSON.dependencies = {
+    [monopackage]: '^' + monopackageJSON.version
+  };
+  fs.writeFileSync(`packages/${scope}/${name}/package.json`, JSON.stringify(packageJSON, false, 2) + '\n');
+}
+
+function remapExports(exports, name) {
+  exports = {...exports};
+  for (let key in exports) {
+    if (typeof exports[key] === 'string') {
+      exports[key] = exports[key].replace(/\.\/(src|dist)/, `./$1/${name}`);
+    } else if (Array.isArray(exports[key])) {
+      exports[key] = exports[key].map(v => v.replace(/\.\/(src|dist)/, `./$1/${name}`));
+    } else if (typeof exports[key] === 'object') {
+      exports[key] = remapExports(exports[key], name);
+    }
+  }
+  return exports;
+}
+
+function moveTree(scope, name, tree, monopackage) {
+  if (fs.existsSync(`packages/${scope}/${name}/${tree}`)) {
+    fs.rmSync(`packages/${monopackage}/${tree}/${name}`, {recursive: true, force: true});
+    fs.mkdirSync(`packages/${monopackage}/${tree}`, {recursive: true});
+    fs.renameSync(`packages/${scope}/${name}/${tree}`, `packages/${monopackage}/${tree}/${name}`);
+
+    for (let file of fs.globSync(`packages/${monopackage}/${tree}/${name}/**/*.{ts,tsx,js,jsx,mdx}`)) {
+      rewriteImports(file, scope, name);
+    }
+  }
+}
+
+function rewriteImports(file, scope, name) {
+  let contents = fs.readFileSync(file, 'utf8');
+  contents = contents.replace(/@(react-aria|react-spectrum|react-stately)\/([^/'"]+)\/(src|test|stories|chromatic|intl)/g, (m, importedScope, pkg, dir) => {
+    if (skipped.some(s => pkg.includes(s))) {
+      return m;
+    }
+
+    if (importedScope === 'react-spectrum') {
+      return pkg === 's2' ? `@react-spectrum/s2/${dir}` : `@adobe/react-spectrum/${dir}/${pkg}`;
+    }
+    return `${importedScope}/${dir}/${pkg}`;
+  });
+
+  contents = contents.replace(/@(react-aria|react-spectrum|react-stately)\/([^/'"]+)/g, (m, importedScope, pkg) => {
+    if (skipped.some(s => pkg.includes(s))) {
+      return m;
+    }
+    
+    if (scope && importedScope === scope.slice(1) && file.includes('src')) {
+      return `../${pkg}`;
+    }
+
+    if (importedScope === 'react-spectrum') {
+      return pkg === 's2' ? '@react-spectrum/s2' : `@adobe/react-spectrum/${pkg}`;
+    }
+    return `${importedScope}/${pkg}`;
+  });
+
+  if (scope) {
+    contents = contents.replaceAll('../src', `../../src/${name}`);
+    contents = contents.replaceAll('../stories', `../../stories/${name}`);
+    contents = contents.replaceAll('../chromatic', `../../chromatic/${name}`);
+    contents = contents.replaceAll('../index', `../../src/${name}`);
+    contents = contents.replaceAll("'../'", `'../../src/${name}'`);
+    contents = contents.replaceAll("'..'", `'../../src/${name}'`);
+    contents = contents.replaceAll('../intl', `../../intl/${name}`);
+    contents = contents.replaceAll('../package.json', '../../package.json');
+  }
+
+  fs.writeFileSync(file, contents);
+}
+
+function rewriteIndex(file, scope) {
+  let contents = fs.readFileSync(file, 'utf8');
+  contents = contents.replace(/@(react-aria|react-spectrum|react-stately)\/([^/'"]+)/g, (m, importedScope, pkg) => {
+    if (skipped.some(s => pkg.includes(s))) {
+      return m;
+    }
+
+    if (importedScope === scope.slice(1)) {
+      return `./${pkg}`;
+    }
+
+    if (importedScope === 'react-spectrum') {
+      return pkg === 's2' ? '@react-spectrum/s2' : `@adobe/react-spectrum/${pkg}`;
+    }
+    return `${importedScope}/${pkg}`;
+  });
+
+  fs.writeFileSync(file, contents);
+}
+
+function migrateToMonopackage(pkg) {
+  for (let file of fs.globSync(`packages/${pkg}/**/*.{ts,tsx,js,jsx,mdx}`)) {
+    rewriteMonopackageImports(file); // TODO: only src?
+    rewriteImports(file);
+  }
+
+  let packageJSON = JSON.parse(fs.readFileSync(`packages/${pkg}/package.json`, 'utf8'));
+  for (let dep in packageJSON.dependencies || {}) {
+    let depScope = dep.match(/@(react-aria|react-spectrum|react-stately)/);
+    if (depScope) {
+      let p = depScope[1] === 'react-spectrum' ? '@adobe/react-spectrum' : depScope[1];
+      if (!packageJSON.dependencies[p]) {
+        packageJSON.dependencies[p] = JSON.parse(fs.readFileSync(`packages/${p}/package.json`, 'utf8')).version;
+      }
+      delete packageJSON.dependencies[dep];
+    }
+  }
+
+  if (!packageJSON.exports['.']) {
+    packageJSON.exports = {
+      '.': packageJSON.exports
+    };
+  }
+
+  for (let specifier in importMap[pkg]) {
+    let [source] = importMap[pkg][specifier];
+    if (source.startsWith('./') && !packageJSON.exports[source]) {
+      let ext = ['ts', 'tsx', 'js'].find(e => fs.existsSync(`packages/${pkg}/src/${source.slice(2)}.${e}`));
+      packageJSON.exports[source] = {
+        source: `./src/${source.slice(2)}.${ext}`,
+        types: [`./dist/${source.slice(2)}.d.ts`, `./src/${source.slice(2)}.${ext}`],
+        import: `./dist/${source.slice(2)}.mjs`,
+        require: `./dist/${source.slice(2)}.cjs`
+      };
+    }
+  }
+
+  fs.writeFileSync(`packages/${pkg}/package.json`, JSON.stringify(packageJSON, false, 2) + '\n');
+}
+
+function buildImportMap(file) {
+  let content = fs.readFileSync(file, 'utf8');
+  let ast = parse(content, {
+    sourceType: 'module',
+    plugins: ['typescript', 'jsx', 'importAttributes'],
+    sourceFilename: file,
+    tokens: true,
+    errorRecovery: true
+  });
+
+  let map = {};
+  for (let node of ast.program.body) {
+    if (node.type === 'ExportNamedDeclaration' && node.source) {
+      for (let specifier of node.specifiers) {
+        let name = specifier.exported.type === 'Identifier' ? specifier.exported.name : specifier.exported.value;
+        map[name] = [node.source.value, specifier.local.name];
+      }
+    }
+  }
+
+  return map;
+}
+
+function rewriteMonopackageImports(file) {
+  if (path.extname(file) === '.mdx') {
+    return;
+  }
+
+  let content = fs.readFileSync(file, 'utf8');
+  let ast = recast.parse(content, {
+    parser: {
+      parse() {
+        return parse(content, {
+          sourceType: 'module',
+          plugins: ['typescript', 'jsx', 'importAttributes'],
+          sourceFilename: file,
+          tokens: true,
+          errorRecovery: true
+        });
+      }
+    }
+  });
+
+  let hadImports = false;
+  ast.program.body = ast.program.body.flatMap(node => {
+    if (node.type === 'ImportDeclaration' && importMap[node.source.value]) {
+      hadImports = true;
+
+      let groups = {};
+      for (let specifier of node.specifiers) {
+        let [source, imported] = importMap[node.source.value][specifier.imported.name];
+        if (source.startsWith('./')) {
+          source = `${node.source.value}/${source.slice(2)}`;
+        }
+        groups[source] ||= [];
+        groups[source].push(t.importSpecifier(specifier.local, t.identifier(imported)));
+      }
+      
+      let res = Object.entries(groups).map(([source, specifiers]) => {
+        let decl = t.importDeclaration(specifiers, t.stringLiteral(source));
+        decl.importKind = node.importKind;
+        return decl;
+      });
+
+      res[0].comments = node.leadingComments;
+      return res;
+    }
+
+    return [node];
+  });
+
+  if (!hadImports) {
+    return;
+  }
+
+  content = recast.print(ast, {objectCurlySpacing: false, quote: 'single'}).code;
+  fs.writeFileSync(file, content);
+}

From ad6954e73fbea1e8fb62e5da35dfa3d41aa85dab Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Fri, 9 Jan 2026 19:21:58 -0500
Subject: [PATCH 05/68] Add some missing exports

---
 packages/@react-aria/button/src/index.ts     | 3 ++-
 packages/@react-aria/datepicker/src/index.ts | 2 +-
 packages/@react-aria/gridlist/src/index.ts   | 1 +
 packages/@react-aria/landmark/src/index.ts   | 2 +-
 packages/@react-aria/select/src/index.ts     | 2 +-
 packages/@react-aria/tag/src/index.ts        | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/@react-aria/button/src/index.ts b/packages/@react-aria/button/src/index.ts
index dbae2a493f6..0c9845ea155 100644
--- a/packages/@react-aria/button/src/index.ts
+++ b/packages/@react-aria/button/src/index.ts
@@ -14,4 +14,5 @@ export {useToggleButton} from './useToggleButton';
 export {useToggleButtonGroup, useToggleButtonGroupItem} from './useToggleButtonGroup';
 export type {AriaButtonOptions, ButtonAria} from './useButton';
 export type {AriaButtonProps, AriaToggleButtonProps} from '@react-types/button';
-export type {AriaToggleButtonGroupProps, ToggleButtonGroupAria, AriaToggleButtonGroupItemProps} from './useToggleButtonGroup';
+export type {AriaToggleButtonOptions, ToggleButtonAria} from './useToggleButton';
+export type {AriaToggleButtonGroupProps, ToggleButtonGroupAria, AriaToggleButtonGroupItemProps, AriaToggleButtonGroupItemOptions} from './useToggleButtonGroup';
diff --git a/packages/@react-aria/datepicker/src/index.ts b/packages/@react-aria/datepicker/src/index.ts
index 5db0fc7368a..3d4c6ba44c6 100644
--- a/packages/@react-aria/datepicker/src/index.ts
+++ b/packages/@react-aria/datepicker/src/index.ts
@@ -17,7 +17,7 @@ export {useDateRangePicker} from './useDateRangePicker';
 export {useDisplayNames} from './useDisplayNames';
 
 export type {AriaDateFieldProps, AriaDatePickerProps, AriaDateRangePickerProps, DateRange, DateValue, TimeValue} from '@react-types/datepicker';
-export type {AriaDateFieldOptions, DateFieldAria} from './useDateField';
+export type {AriaDateFieldOptions, DateFieldAria, AriaTimeFieldOptions} from './useDateField';
 export type {DatePickerAria} from './useDatePicker';
 export type {DateRangePickerAria} from './useDateRangePicker';
 export type {DateSegmentAria} from './useDateSegment';
diff --git a/packages/@react-aria/gridlist/src/index.ts b/packages/@react-aria/gridlist/src/index.ts
index 0e52ce29d6a..b41d1bbfa32 100644
--- a/packages/@react-aria/gridlist/src/index.ts
+++ b/packages/@react-aria/gridlist/src/index.ts
@@ -17,4 +17,5 @@ export {useGridListSection} from './useGridListSection';
 
 export type {AriaGridListOptions, AriaGridListProps, GridListAria, GridListProps} from './useGridList';
 export type {AriaGridListItemOptions, GridListItemAria} from './useGridListItem';
+export type {AriaGridListSectionProps, GridListSectionAria} from './useGridListSection';
 export type {AriaGridSelectionCheckboxProps, GridSelectionCheckboxAria} from '@react-aria/grid';
diff --git a/packages/@react-aria/landmark/src/index.ts b/packages/@react-aria/landmark/src/index.ts
index 3779ad611bf..fe1b74043e6 100644
--- a/packages/@react-aria/landmark/src/index.ts
+++ b/packages/@react-aria/landmark/src/index.ts
@@ -10,5 +10,5 @@
  * governing permissions and limitations under the License.
  */
 
-export type {AriaLandmarkRole, AriaLandmarkProps, LandmarkAria, LandmarkController} from './useLandmark';
+export type {AriaLandmarkRole, AriaLandmarkProps, LandmarkAria, LandmarkController, LandmarkControllerOptions} from './useLandmark';
 export {useLandmark, UNSTABLE_createLandmarkController} from './useLandmark';
diff --git a/packages/@react-aria/select/src/index.ts b/packages/@react-aria/select/src/index.ts
index 3b130c526af..a13dccd4b04 100644
--- a/packages/@react-aria/select/src/index.ts
+++ b/packages/@react-aria/select/src/index.ts
@@ -12,5 +12,5 @@
 export {useSelect} from './useSelect';
 export {useHiddenSelect, HiddenSelect} from './HiddenSelect';
 export type {AriaSelectOptions, SelectAria} from './useSelect';
-export type {AriaHiddenSelectProps, HiddenSelectProps} from './HiddenSelect';
+export type {AriaHiddenSelectProps, AriaHiddenSelectOptions, HiddenSelectProps, HiddenSelectAria} from './HiddenSelect';
 export type {AriaSelectProps} from '@react-types/select';
diff --git a/packages/@react-aria/tag/src/index.ts b/packages/@react-aria/tag/src/index.ts
index 8d7152d6110..ba6b79fa279 100644
--- a/packages/@react-aria/tag/src/index.ts
+++ b/packages/@react-aria/tag/src/index.ts
@@ -13,5 +13,5 @@
 export {useTag} from './useTag';
 export {useTagGroup} from './useTagGroup';
 
-export type {TagGroupAria, AriaTagGroupProps} from './useTagGroup';
+export type {TagGroupAria, AriaTagGroupProps, AriaTagGroupOptions} from './useTagGroup';
 export type {AriaTagProps, TagAria} from './useTag';

From 404432b5c9ff7d2e9b7fc9ecaf6676cee19b2c81 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Fri, 9 Jan 2026 19:22:25 -0500
Subject: [PATCH 06/68] Rename I18nProvider and reorganize Locale type

---
 .../i18n/src/{context.tsx => I18nProvider.tsx}         | 10 +++++++++-
 packages/@react-aria/i18n/src/index.ts                 |  5 ++---
 packages/@react-aria/i18n/src/useCollator.ts           |  2 +-
 packages/@react-aria/i18n/src/useDateFormatter.ts      |  2 +-
 packages/@react-aria/i18n/src/useDefaultLocale.ts      |  9 +--------
 packages/@react-aria/i18n/src/useListFormatter.tsx     |  2 +-
 .../i18n/src/useLocalizedStringFormatter.ts            |  2 +-
 packages/@react-aria/i18n/src/useMessageFormatter.ts   |  2 +-
 packages/@react-aria/i18n/src/useNumberFormatter.ts    |  2 +-
 9 files changed, 18 insertions(+), 18 deletions(-)
 rename packages/@react-aria/i18n/src/{context.tsx => I18nProvider.tsx} (89%)

diff --git a/packages/@react-aria/i18n/src/context.tsx b/packages/@react-aria/i18n/src/I18nProvider.tsx
similarity index 89%
rename from packages/@react-aria/i18n/src/context.tsx
rename to packages/@react-aria/i18n/src/I18nProvider.tsx
index d7d8f1a6d0b..0273607ae76 100644
--- a/packages/@react-aria/i18n/src/context.tsx
+++ b/packages/@react-aria/i18n/src/I18nProvider.tsx
@@ -10,9 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
+import {Direction} from '@react-types/shared';
 import {isRTL} from './utils';
-import {Locale, useDefaultLocale} from './useDefaultLocale';
 import React, {JSX, ReactNode, useContext} from 'react';
+import {useDefaultLocale} from './useDefaultLocale';
+
+export interface Locale {
+  /** The [BCP47](https://www.ietf.org/rfc/bcp/bcp47.txt) language code for the locale. */
+  locale: string,
+  /** The writing direction for the locale. */
+  direction: Direction
+}
 
 export interface I18nProviderProps {
   /** Contents that should have the locale applied. */
diff --git a/packages/@react-aria/i18n/src/index.ts b/packages/@react-aria/i18n/src/index.ts
index 6b9dd22080d..faf3e8a0c98 100644
--- a/packages/@react-aria/i18n/src/index.ts
+++ b/packages/@react-aria/i18n/src/index.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-export {I18nProvider, useLocale} from './context';
+export {I18nProvider, useLocale} from './I18nProvider';
 export {useMessageFormatter} from './useMessageFormatter';
 export {useLocalizedStringFormatter, useLocalizedStringDictionary} from './useLocalizedStringFormatter';
 export {useListFormatter} from './useListFormatter';
@@ -22,8 +22,7 @@ export {isRTL} from './utils';
 
 export type {FormatMessage} from './useMessageFormatter';
 export type {LocalizedStringFormatter} from '@internationalized/string';
-export type {I18nProviderProps} from './context';
-export type {Locale} from './useDefaultLocale';
+export type {I18nProviderProps, Locale} from './I18nProvider';
 export type {LocalizedStrings} from '@internationalized/message';
 export type {DateFormatterOptions} from './useDateFormatter';
 export type {DateFormatter} from '@internationalized/date';
diff --git a/packages/@react-aria/i18n/src/useCollator.ts b/packages/@react-aria/i18n/src/useCollator.ts
index 80f19355b5f..c0f23562705 100644
--- a/packages/@react-aria/i18n/src/useCollator.ts
+++ b/packages/@react-aria/i18n/src/useCollator.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {useLocale} from './context';
+import {useLocale} from './I18nProvider';
 
 let cache = new Map<string, Intl.Collator>();
 
diff --git a/packages/@react-aria/i18n/src/useDateFormatter.ts b/packages/@react-aria/i18n/src/useDateFormatter.ts
index 482ea626dbc..96110bd9a2f 100644
--- a/packages/@react-aria/i18n/src/useDateFormatter.ts
+++ b/packages/@react-aria/i18n/src/useDateFormatter.ts
@@ -12,7 +12,7 @@
 
 import {DateFormatter} from '@internationalized/date';
 import {useDeepMemo} from '@react-aria/utils';
-import {useLocale} from './context';
+import {useLocale} from './I18nProvider';
 import {useMemo} from 'react';
 
 export interface DateFormatterOptions extends Intl.DateTimeFormatOptions {
diff --git a/packages/@react-aria/i18n/src/useDefaultLocale.ts b/packages/@react-aria/i18n/src/useDefaultLocale.ts
index 092e76de732..69d53efe9f1 100644
--- a/packages/@react-aria/i18n/src/useDefaultLocale.ts
+++ b/packages/@react-aria/i18n/src/useDefaultLocale.ts
@@ -10,18 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {Direction} from '@react-types/shared';
 import {isRTL} from './utils';
+import {Locale} from './I18nProvider';
 import {useEffect, useState} from 'react';
 import {useIsSSR} from '@react-aria/ssr';
 
-export interface Locale {
-  /** The [BCP47](https://www.ietf.org/rfc/bcp/bcp47.txt) language code for the locale. */
-  locale: string,
-  /** The writing direction for the locale. */
-  direction: Direction
-}
-
 // Locale passed from server by PackageLocalizationProvider.
 const localeSymbol = Symbol.for('react-aria.i18n.locale');
 
diff --git a/packages/@react-aria/i18n/src/useListFormatter.tsx b/packages/@react-aria/i18n/src/useListFormatter.tsx
index 4465b73d6b8..ca0fd8f2918 100644
--- a/packages/@react-aria/i18n/src/useListFormatter.tsx
+++ b/packages/@react-aria/i18n/src/useListFormatter.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {useLocale} from './context';
+import {useLocale} from './I18nProvider';
 import {useMemo} from 'react';
 
 /**
diff --git a/packages/@react-aria/i18n/src/useLocalizedStringFormatter.ts b/packages/@react-aria/i18n/src/useLocalizedStringFormatter.ts
index 1722c1f7f66..0c5e1a4edca 100644
--- a/packages/@react-aria/i18n/src/useLocalizedStringFormatter.ts
+++ b/packages/@react-aria/i18n/src/useLocalizedStringFormatter.ts
@@ -11,7 +11,7 @@
  */
 
 import {LocalizedString, LocalizedStringDictionary, LocalizedStringFormatter, LocalizedStrings} from '@internationalized/string';
-import {useLocale} from './context';
+import {useLocale} from './I18nProvider';
 import {useMemo} from 'react';
 
 const cache = new WeakMap();
diff --git a/packages/@react-aria/i18n/src/useMessageFormatter.ts b/packages/@react-aria/i18n/src/useMessageFormatter.ts
index 89bf6700f54..cd97d426971 100644
--- a/packages/@react-aria/i18n/src/useMessageFormatter.ts
+++ b/packages/@react-aria/i18n/src/useMessageFormatter.ts
@@ -12,7 +12,7 @@
 
 import {LocalizedStrings, MessageDictionary, MessageFormatter} from '@internationalized/message';
 import {useCallback, useMemo} from 'react';
-import {useLocale} from './context';
+import {useLocale} from './I18nProvider';
 
 export type FormatMessage = (key: string, variables?: {[key: string]: any}) => string;
 
diff --git a/packages/@react-aria/i18n/src/useNumberFormatter.ts b/packages/@react-aria/i18n/src/useNumberFormatter.ts
index 9a1749ab9f2..571b3bd5f29 100644
--- a/packages/@react-aria/i18n/src/useNumberFormatter.ts
+++ b/packages/@react-aria/i18n/src/useNumberFormatter.ts
@@ -11,7 +11,7 @@
  */
 
 import {NumberFormatOptions, NumberFormatter} from '@internationalized/number';
-import {useLocale} from './context';
+import {useLocale} from './I18nProvider';
 import {useMemo} from 'react';
 
 /**

From 5ecde69783e4e1b4d5e2c66d67d92d3f11c870bf Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Mon, 12 Jan 2026 12:16:49 -0500
Subject: [PATCH 07/68] refactor test

---
 .../interactions/test/focusSafely.test.js            | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/@react-aria/interactions/test/focusSafely.test.js b/packages/@react-aria/interactions/test/focusSafely.test.js
index c07fd86a265..0edba860cd8 100644
--- a/packages/@react-aria/interactions/test/focusSafely.test.js
+++ b/packages/@react-aria/interactions/test/focusSafely.test.js
@@ -13,8 +13,8 @@
 
 import {act, createShadowRoot, render} from '@react-spectrum/test-utils-internal';
 import {focusSafely} from '../';
+import {focusWithoutScrolling} from '@react-aria/utils';
 import React from 'react';
-import * as ReactAriaUtils from '@react-aria/utils';
 import ReactDOM from 'react-dom';
 import {setInteractionModality} from '@react-aria/interactions';
 
@@ -47,7 +47,7 @@ describe('focusSafely', () => {
       jest.runAllTimers();
     });
 
-    expect(ReactAriaUtils.focusWithoutScrolling).toBeCalledTimes(0);
+    expect(focusWithoutScrolling).toBeCalledTimes(0);
   });
 
   it("should focus on the element if it's connected", async function () {
@@ -65,12 +65,10 @@ describe('focusSafely', () => {
       jest.runAllTimers();
     });
 
-    expect(ReactAriaUtils.focusWithoutScrolling).toBeCalledTimes(1);
+    expect(focusWithoutScrolling).toBeCalledTimes(1);
   });
 
   describe('focusSafely with Shadow DOM', function () {
-    const focusWithoutScrollingSpy = jest.spyOn(ReactAriaUtils, 'focusWithoutScrolling').mockImplementation(() => {});
-
     it("should not focus on the element if it's no longer connected within shadow DOM", async function () {
       const {shadowRoot, shadowHost} = createShadowRoot();
       setInteractionModality('virtual');
@@ -92,7 +90,7 @@ describe('focusSafely', () => {
         jest.runAllTimers();
       });
 
-      expect(focusWithoutScrollingSpy).toBeCalledTimes(0);
+      expect(focusWithoutScrolling).toBeCalledTimes(0);
     });
 
     it("should focus on the element if it's connected within shadow DOM", async function () {
@@ -112,7 +110,7 @@ describe('focusSafely', () => {
         jest.runAllTimers();
       });
 
-      expect(focusWithoutScrollingSpy).toBeCalledTimes(1);
+      expect(focusWithoutScrolling).toBeCalledTimes(1);
 
       unmount();
       shadowRoot.host.remove();

From 7325f24e029e96801a1d8afa0b86002f0114dd3e Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Mon, 12 Jan 2026 17:08:04 -0500
Subject: [PATCH 08/68] Move Column definition

---
 packages/@react-spectrum/table/src/TableViewWrapper.tsx | 7 ++++++-
 packages/@react-spectrum/table/src/index.ts             | 9 +--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/@react-spectrum/table/src/TableViewWrapper.tsx b/packages/@react-spectrum/table/src/TableViewWrapper.tsx
index 2787307ecfe..431fbbadf51 100644
--- a/packages/@react-spectrum/table/src/TableViewWrapper.tsx
+++ b/packages/@react-spectrum/table/src/TableViewWrapper.tsx
@@ -11,7 +11,8 @@
  */
 
 import type {AriaLabelingProps, DisabledBehavior, DOMProps, DOMRef, Key, SpectrumSelectionProps, StyleProps} from '@react-types/shared';
-import type {ColumnSize, TableProps} from '@react-types/table';
+import {Column} from '@react-stately/table';
+import type {ColumnSize, SpectrumColumnProps, TableProps} from '@react-types/table';
 import type {DragAndDropHooks} from '@react-spectrum/dnd';
 import React, {JSX, ReactElement} from 'react';
 import {tableNestedRows} from '@react-stately/flags';
@@ -101,3 +102,7 @@ const TableViewWrapper = React.forwardRef(function TableViewWrapper<T extends ob
   }
 }) as <T>(props: SpectrumTableProps<T> & {ref?: DOMRef<HTMLDivElement>}) => ReactElement;
 export {TableViewWrapper as TableView};
+
+// Override TS for Column to support spectrum specific props.
+const SpectrumColumn = Column as <T>(props: SpectrumColumnProps<T>) => JSX.Element;
+export {SpectrumColumn as Column};
diff --git a/packages/@react-spectrum/table/src/index.ts b/packages/@react-spectrum/table/src/index.ts
index e365c1368a6..07f96704ebb 100644
--- a/packages/@react-spectrum/table/src/index.ts
+++ b/packages/@react-spectrum/table/src/index.ts
@@ -12,14 +12,7 @@
 
 /// <reference types="css-module-types" />
 
-export {TableView} from './TableViewWrapper';
-import {Column} from '@react-stately/table';
-import {JSX} from 'react';
-import {SpectrumColumnProps} from '@react-types/table';
-
-// Override TS for Column to support spectrum specific props.
-const SpectrumColumn = Column as <T>(props: SpectrumColumnProps<T>) => JSX.Element;
-export {SpectrumColumn as Column};
+export {TableView, Column} from './TableViewWrapper';
 
 export {
   TableHeader,

From ca6b18cbd369dd87c2440da5eba6d272a6aac354 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Wed, 14 Jan 2026 11:27:36 -0500
Subject: [PATCH 09/68] Fix

---
 packages/@react-aria/table/src/index.ts          |  7 +------
 .../@react-aria/table/src/useTableRowGroup.ts    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 packages/@react-aria/table/src/useTableRowGroup.ts

diff --git a/packages/@react-aria/table/src/index.ts b/packages/@react-aria/table/src/index.ts
index 2898c3b9a44..6317607551e 100644
--- a/packages/@react-aria/table/src/index.ts
+++ b/packages/@react-aria/table/src/index.ts
@@ -18,12 +18,7 @@ export {useTableCell} from './useTableCell';
 export {useTableSelectionCheckbox, useTableSelectAllCheckbox} from './useTableSelectionCheckbox';
 export {useTableColumnResize} from './useTableColumnResize';
 
-// Workaround for a Parcel bug where re-exports don't work in the CommonJS output format...
-// export {useGridRowGroup as useTableRowGroup} from '@react-aria/grid';
-import {GridRowGroupAria, useGridRowGroup} from '@react-aria/grid';
-export function useTableRowGroup(): GridRowGroupAria {
-  return useGridRowGroup();
-}
+export {useTableRowGroup} from './useTableRowGroup';
 
 export type {AriaTableProps} from './useTable';
 export type {GridAria, GridRowAria, GridRowProps} from '@react-aria/grid';
diff --git a/packages/@react-aria/table/src/useTableRowGroup.ts b/packages/@react-aria/table/src/useTableRowGroup.ts
new file mode 100644
index 00000000000..05554de20a3
--- /dev/null
+++ b/packages/@react-aria/table/src/useTableRowGroup.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2026 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+import {GridRowGroupAria, useGridRowGroup} from '@react-aria/grid';
+
+export function useTableRowGroup(): GridRowGroupAria {
+  return useGridRowGroup();
+}

From a97a28c6341f36a7ee9ecdb1702a554bed69047d Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Wed, 14 Jan 2026 12:14:24 -0500
Subject: [PATCH 10/68] fix intl

---
 packages/@react-spectrum/steplist/intl/index.js        | 5 -----
 packages/@react-spectrum/steplist/src/StepListItem.tsx | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 packages/@react-spectrum/steplist/intl/index.js

diff --git a/packages/@react-spectrum/steplist/intl/index.js b/packages/@react-spectrum/steplist/intl/index.js
deleted file mode 100644
index eb8677cfc49..00000000000
--- a/packages/@react-spectrum/steplist/intl/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import enUS from './en-US.json';
-
-export default {
-  'en-US': enUS
-};
diff --git a/packages/@react-spectrum/steplist/src/StepListItem.tsx b/packages/@react-spectrum/steplist/src/StepListItem.tsx
index 5858614b7cf..5e5c5c81774 100644
--- a/packages/@react-spectrum/steplist/src/StepListItem.tsx
+++ b/packages/@react-spectrum/steplist/src/StepListItem.tsx
@@ -12,7 +12,8 @@
 import ChevronRightMedium from '@spectrum-icons/ui/ChevronRightMedium';
 import {classNames} from '@react-spectrum/utils';
 import {FocusRing} from '@react-aria/focus';
-import intlMessages from '../intl';
+// @ts-ignore
+import intlMessages from '../intl/*.json';
 import {mergeProps, useId} from '@react-aria/utils';
 import {Node} from '@react-types/shared';
 import React, {ReactNode, useContext, useRef} from 'react';

From b0348ee8eb9d4c3404908f54b58b08e92840ab49 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Wed, 14 Jan 2026 13:19:52 -0500
Subject: [PATCH 11/68] working

---
 scripts/migrateDeps.mjs | 553 +++++++++++++++++++++++++++++++++-------
 1 file changed, 458 insertions(+), 95 deletions(-)

diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index f05153a79d8..59300270e87 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -9,9 +9,145 @@ const importMap = {
   'react-aria': buildImportMap('packages/react-aria/src/index.ts'),
   'react-stately': buildImportMap('packages/react-stately/src/index.ts'),
   'react-aria-components': buildImportMap('packages/react-aria-components/src/index.ts'),
-  '@react-spectrum/s2': buildImportMap('packages/@react-spectrum/s2/src/index.ts')
+  '@react-spectrum/s2': buildImportMap('packages/@react-spectrum/s2/src/index.ts'),
+  '@adobe/react-spectrum': buildImportMap('packages/@adobe/react-spectrum/src/index.ts')
 };
 
+for (let pkg of fs.globSync(['packages/@react-aria/*', 'packages/@react-spectrum/*', 'packages/@react-stately/*']).sort()) {
+  if (fs.statSync(pkg).isDirectory()) {
+    let name = pkg.split('/').slice(1).join('/');
+    if (skipped.includes(path.basename(pkg))) {
+      continue;
+    }
+
+    importMap[name] = buildImportMap(`${pkg}/src/index.ts`);
+  }
+}
+
+let standalone = new Set();
+for (let f of fs.globSync('packages/**/*.mdx')) {
+  standalone.add(path.basename(f, path.extname(f)));
+}
+
+// Public but current doesn't have docs.
+standalone.add('DragPreview');
+standalone.add('useListFormatter');
+standalone.add('useLocalizedStringFormatter');
+standalone.add('Overlay');
+standalone.add('useDragAndDrop');
+standalone.add('Icon');
+standalone.add('Item');
+standalone.add('Section');
+standalone.add('Color');
+// standalone.add('GridLayout');
+// standalone.add('ListLayout');
+// standalone.add('WaterfallLayout');
+standalone.add('ListKeyboardDelegate');
+standalone.add('ListDropTargetDelegate');
+standalone.add('Cell');
+standalone.add('Row');
+standalone.add('Column');
+standalone.add('TableBody');
+standalone.add('TableHeader');
+standalone.add('useToggleGroupState');
+
+// Documented but not in the monopackage.
+standalone.delete('useAutocomplete');
+standalone.delete('useAutocompleteState');
+
+// Public but grouped with a parent component/hook.
+let parentFile = {
+  'useBreadcrumbItem': 'useBreadcrumbs',
+  'useCalendarCell': 'useCalendar',
+  'useCalendarGrid': 'useCalendar',
+  'useCheckboxGroupItem': 'useCheckboxGroup',
+  // 'CollectionBuilder': '',
+  'useColorChannelField': 'useColorField',
+  'useDateSegment': 'useDateField',
+  'useDraggableItem': 'useDraggableCollection',
+  'useDropIndicator': 'useDroppableCollection',
+  'useDroppableItem': 'useDroppableCollection',
+  // 'utils': '',
+  'useGridListItem': 'useGridList',
+  'useGridListSelectionCheckbox': 'useGridList',
+  // 'useFocusable': '',
+  // 'useInteractOutside': '',
+  // 'useScrollWheel': '',
+  'useListBoxSection': 'useListBox',
+  'useOption': 'useListBox',
+  'useMenuItem': 'useMenu',
+  'useMenuSection': 'useMenu',
+  'useMenuTrigger': 'useMenu',
+  'useSubmenuTrigger': 'useMenu',
+  'DismissButton': 'Overlay',
+  // 'useModal': '',
+  // 'useOverlay': '',
+  // 'useOverlayPosition': '',
+  // 'useOverlayTrigger': '',
+  // 'usePreventScroll': '',
+  'useRadio': 'useRadioGroup',
+  'HiddenSelect': 'useSelect',
+  'useSliderThumb': 'useSlider',
+  'useTableCell': 'useTable',
+  'useTableColumnHeader': 'useTable',
+  'useTableColumnResize': 'useTable',
+  'useTableHeaderRow': 'useTable',
+  'useTableRow': 'useTable',
+  'useTableSelectionCheckbox': 'useTable',
+  'useTab': 'useTabList',
+  'useTabPanel': 'useTabList',
+  'useTag': 'useTagGroup',
+  'useToastRegion': 'useToast',
+  'useTooltip': 'useTooltipTrigger',
+  // 'useTree': '',
+  // 'chain': '',
+  // 'openLink': '',
+  'ActionBarContainer': 'ActionBar',
+  'useDialogContainer': 'DialogContainer',
+  'Radio': 'RadioGroup',
+  // 'TableViewWrapper': '',
+  'TooltipTrigger': 'Tooltip',
+  // 'types': '',
+  // 'useCollection': '',
+  'useColorChannelFieldState': 'useColorFieldState',
+  // 'useFormValidationState': '',
+  'useSubmenuTriggerState': 'useMenuTriggerState',
+  // 'types': '',
+  'useTableColumnResizeState': 'useTableState',
+  // 'Layout': 'useVirtualizerState',
+  // 'LayoutInfo': 'useVirtualizerState',
+  // 'Point': 'useVirtualizerState',
+  // 'Rect': 'useVirtualizerState',
+  // 'Size': 'useVirtualizerState',
+  'DateSegmentType': 'useDateFieldState'
+};
+
+// Names that are included in public files but not exported by monopackages.
+const privateNames = new Set([
+  'setInteractionModality',
+  'getInteractionModality',
+  'useSlotId',
+  'createFocusManager',
+  'isFocusVisible',
+  'UNSTABLE_createLandmarkController'
+]);
+
+let publicFiles = new Set();
+for (let pkg of ['react-aria', 'react-stately', 'react-aria-components', '@react-spectrum/s2', '@adobe/react-spectrum']) {
+  for (let exp in importMap[pkg]) {
+    let [specifier, imported] = importMap[pkg][exp];
+    if (!importMap[specifier] || !importMap[specifier][imported]) {
+      continue;
+    }
+    let [s] = importMap[specifier][imported];
+    if (!s.startsWith('.')) {
+      continue;
+    }
+    let p = `${specifier}/${s.slice(2)}`;
+    publicFiles.add(p);    
+  }
+}
+
 migrateScope('@react-aria', 'react-aria');
 migrateScope('@react-stately', 'react-stately');
 migrateScope('@react-spectrum', '@adobe/react-spectrum');
@@ -33,7 +169,8 @@ function migrateScope(scope, monopackage) {
     }
   }
 
-  rewriteIndex(`packages/${monopackage}/src/index.ts`, scope);
+  // rewriteIndex(`packages/${monopackage}/src/index.ts`, scope);
+  rewriteMonopackageImports(`packages/${monopackage}/src/index.ts`);
 }
 
 function prepareMonopackage(monopackage) {
@@ -41,12 +178,24 @@ function prepareMonopackage(monopackage) {
   monopackageJSON.source = ['src/index.ts', 'src/*/index.ts'];
   if (!monopackageJSON.exports['.']) {
     monopackageJSON.exports = {
-      '.': monopackageJSON.exports
+      '.': monopackageJSON.exports,
+      './*': {
+        source: ['./src/*.ts', './src/*.tsx', './src/*/index.ts'],
+        types: ['./dist/*.d.ts', './src/*.ts', './src/*.tsx'],
+        import: './dist/*.mjs',
+        require: './dist/*.js'
+      }
     };
   } else {
     // TODO
     monopackageJSON.exports = {
-      '.': monopackageJSON.exports['.']
+      '.': monopackageJSON.exports['.'],
+      './*': {
+        source: ['./src/*.ts', './src/*.tsx', './src/*/index.ts'],
+        types: ['./dist/*.d.ts', './src/*.ts', './src/*.tsx'],
+        import: './dist/*.mjs',
+        require: './dist/*.js'
+      }
     };
   }
 
@@ -83,7 +232,7 @@ function migratePackage(scope, name, monopackage) {
     // TODO: add others
   }
 
-  monopackageJSON.exports[`./${name}`] = remapExports(exports, name);
+  // monopackageJSON.exports[`./${name}`] = remapExports(exports, name);
   for (let dep in packageJSON.dependencies || {}) {
     let depScope = dep.match(/@(react-aria|react-spectrum|react-stately)/);
     if (!depScope && !monopackageJSON.dependencies[dep]) {
@@ -96,7 +245,7 @@ function migratePackage(scope, name, monopackage) {
   fs.writeFileSync(`packages/${monopackage}/package.json`, JSON.stringify(monopackageJSON, false, 2) + '\n');
 
   let index = fs.readFileSync(`packages/${scope}/${name}/index.ts`, 'utf8');
-  index = index.replace('./src', `${monopackage}/${name}`);
+  index = index.replace('./src', `${monopackage}/private/${name}/index`);
   fs.writeFileSync(`packages/${scope}/${name}/index.ts`, index);
 
   packageJSON.source = 'index.ts';
@@ -105,6 +254,8 @@ function migratePackage(scope, name, monopackage) {
     [monopackage]: '^' + monopackageJSON.version
   };
   fs.writeFileSync(`packages/${scope}/${name}/package.json`, JSON.stringify(packageJSON, false, 2) + '\n');
+
+  createPublicExports(monopackage, name);
 }
 
 function remapExports(exports, name) {
@@ -123,82 +274,84 @@ function remapExports(exports, name) {
 
 function moveTree(scope, name, tree, monopackage) {
   if (fs.existsSync(`packages/${scope}/${name}/${tree}`)) {
-    fs.rmSync(`packages/${monopackage}/${tree}/${name}`, {recursive: true, force: true});
-    fs.mkdirSync(`packages/${monopackage}/${tree}`, {recursive: true});
-    fs.renameSync(`packages/${scope}/${name}/${tree}`, `packages/${monopackage}/${tree}/${name}`);
-
-    for (let file of fs.globSync(`packages/${monopackage}/${tree}/${name}/**/*.{ts,tsx,js,jsx,mdx}`)) {
-      rewriteImports(file, scope, name);
+    let monopackageTree = tree === 'src' ? 'src/private' : tree;
+    fs.rmSync(`packages/${monopackage}/${monopackageTree}/${name}`, {recursive: true, force: true});
+    fs.mkdirSync(`packages/${monopackage}/${monopackageTree}`, {recursive: true});
+    fs.renameSync(`packages/${scope}/${name}/${tree}`, `packages/${monopackage}/${monopackageTree}/${name}`);
+
+    for (let file of fs.globSync(`packages/${monopackage}/${monopackageTree}/${name}/**/*.{ts,tsx,js,jsx,mdx}`)) {
+      // rewriteImports(file, scope, name);
+      rewriteMonopackageImports(file, name);
     }
   }
 }
 
-function rewriteImports(file, scope, name) {
-  let contents = fs.readFileSync(file, 'utf8');
-  contents = contents.replace(/@(react-aria|react-spectrum|react-stately)\/([^/'"]+)\/(src|test|stories|chromatic|intl)/g, (m, importedScope, pkg, dir) => {
-    if (skipped.some(s => pkg.includes(s))) {
-      return m;
-    }
-
-    if (importedScope === 'react-spectrum') {
-      return pkg === 's2' ? `@react-spectrum/s2/${dir}` : `@adobe/react-spectrum/${dir}/${pkg}`;
-    }
-    return `${importedScope}/${dir}/${pkg}`;
-  });
-
-  contents = contents.replace(/@(react-aria|react-spectrum|react-stately)\/([^/'"]+)/g, (m, importedScope, pkg) => {
-    if (skipped.some(s => pkg.includes(s))) {
-      return m;
-    }
+// function rewriteImports(file, scope, name) {
+//   let contents = fs.readFileSync(file, 'utf8');
+//   contents = contents.replace(/@(react-aria|react-spectrum|react-stately)\/([^/'"]+)\/(src|test|stories|chromatic|intl)/g, (m, importedScope, pkg, dir) => {
+//     if (skipped.some(s => pkg.includes(s))) {
+//       return m;
+//     }
+
+//     if (importedScope === 'react-spectrum') {
+//       return pkg === 's2' ? `@react-spectrum/s2/${dir}` : `@adobe/react-spectrum/${dir}/${pkg}`;
+//     }
+//     return `${importedScope}/${dir}/${pkg}`;
+//   });
+
+//   contents = contents.replace(/@(react-aria|react-spectrum|react-stately)\/([^/'"]+)/g, (m, importedScope, pkg) => {
+//     if (skipped.some(s => pkg.includes(s))) {
+//       return m;
+//     }
     
-    if (scope && importedScope === scope.slice(1) && file.includes('src')) {
-      return `../${pkg}`;
-    }
-
-    if (importedScope === 'react-spectrum') {
-      return pkg === 's2' ? '@react-spectrum/s2' : `@adobe/react-spectrum/${pkg}`;
-    }
-    return `${importedScope}/${pkg}`;
-  });
-
-  if (scope) {
-    contents = contents.replaceAll('../src', `../../src/${name}`);
-    contents = contents.replaceAll('../stories', `../../stories/${name}`);
-    contents = contents.replaceAll('../chromatic', `../../chromatic/${name}`);
-    contents = contents.replaceAll('../index', `../../src/${name}`);
-    contents = contents.replaceAll("'../'", `'../../src/${name}'`);
-    contents = contents.replaceAll("'..'", `'../../src/${name}'`);
-    contents = contents.replaceAll('../intl', `../../intl/${name}`);
-    contents = contents.replaceAll('../package.json', '../../package.json');
-  }
-
-  fs.writeFileSync(file, contents);
-}
-
-function rewriteIndex(file, scope) {
-  let contents = fs.readFileSync(file, 'utf8');
-  contents = contents.replace(/@(react-aria|react-spectrum|react-stately)\/([^/'"]+)/g, (m, importedScope, pkg) => {
-    if (skipped.some(s => pkg.includes(s))) {
-      return m;
-    }
-
-    if (importedScope === scope.slice(1)) {
-      return `./${pkg}`;
-    }
-
-    if (importedScope === 'react-spectrum') {
-      return pkg === 's2' ? '@react-spectrum/s2' : `@adobe/react-spectrum/${pkg}`;
-    }
-    return `${importedScope}/${pkg}`;
-  });
-
-  fs.writeFileSync(file, contents);
-}
+//     if (scope && importedScope === scope.slice(1) && file.includes('src')) {
+//       return `../${pkg}`;
+//     }
+
+//     if (importedScope === 'react-spectrum') {
+//       return pkg === 's2' ? '@react-spectrum/s2' : `@adobe/react-spectrum/${pkg}`;
+//     }
+//     return `${importedScope}/${pkg}`;
+//   });
+
+//   if (scope) {
+//     contents = contents.replaceAll('../src', `../../src/${name}`);
+//     contents = contents.replaceAll('../stories', `../../stories/${name}`);
+//     contents = contents.replaceAll('../chromatic', `../../chromatic/${name}`);
+//     contents = contents.replaceAll('../index', `../../src/${name}`);
+//     contents = contents.replaceAll("'../'", `'../../src/${name}'`);
+//     contents = contents.replaceAll("'..'", `'../../src/${name}'`);
+//     contents = contents.replaceAll('../intl', `../../intl/${name}`);
+//     contents = contents.replaceAll('../package.json', '../../package.json');
+//   }
+
+//   fs.writeFileSync(file, contents);
+// }
+
+// function rewriteIndex(file, scope) {
+//   let contents = fs.readFileSync(file, 'utf8');
+//   contents = contents.replace(/@(react-aria|react-spectrum|react-stately)\/([^/'"]+)/g, (m, importedScope, pkg) => {
+//     if (skipped.some(s => pkg.includes(s))) {
+//       return m;
+//     }
+
+//     if (importedScope === scope.slice(1)) {
+//       return `./${pkg}`;
+//     }
+
+//     if (importedScope === 'react-spectrum') {
+//       return pkg === 's2' ? '@react-spectrum/s2' : `@adobe/react-spectrum/${pkg}`;
+//     }
+//     return `${importedScope}/${pkg}`;
+//   });
+
+//   fs.writeFileSync(file, contents);
+// }
 
 function migrateToMonopackage(pkg) {
   for (let file of fs.globSync(`packages/${pkg}/**/*.{ts,tsx,js,jsx,mdx}`)) {
     rewriteMonopackageImports(file); // TODO: only src?
-    rewriteImports(file);
+    // rewriteImports(file);
   }
 
   let packageJSON = JSON.parse(fs.readFileSync(`packages/${pkg}/package.json`, 'utf8'));
@@ -219,18 +372,22 @@ function migrateToMonopackage(pkg) {
     };
   }
 
-  for (let specifier in importMap[pkg]) {
-    let [source] = importMap[pkg][specifier];
-    if (source.startsWith('./') && !packageJSON.exports[source]) {
-      let ext = ['ts', 'tsx', 'js'].find(e => fs.existsSync(`packages/${pkg}/src/${source.slice(2)}.${e}`));
-      packageJSON.exports[source] = {
-        source: `./src/${source.slice(2)}.${ext}`,
-        types: [`./dist/${source.slice(2)}.d.ts`, `./src/${source.slice(2)}.${ext}`],
-        import: `./dist/${source.slice(2)}.mjs`,
-        require: `./dist/${source.slice(2)}.cjs`
-      };
-    }
-  }
+  // for (let specifier in importMap[pkg]) {
+  //   let [source] = importMap[pkg][specifier];
+  //   if (source.startsWith('./') && !packageJSON.exports[source]) {
+  //     let ext = ['ts', 'tsx', 'js'].find(e => fs.existsSync(`packages/${pkg}/src/${source.slice(2)}.${e}`));
+  //     packageJSON.exports[source] = {
+  //       source: `./src/${source.slice(2)}.${ext}`,
+  //       types: [`./dist/${source.slice(2)}.d.ts`, `./src/${source.slice(2)}.${ext}`],
+  //       import: `./dist/${source.slice(2)}.mjs`,
+  //       require: `./dist/${source.slice(2)}.cjs`
+  //     };
+  //   }
+  // }
+
+  packageJSON.exports['./*'] = {
+    source: ['./src/*.ts', './src/*.tsx']
+  };
 
   fs.writeFileSync(`packages/${pkg}/package.json`, JSON.stringify(packageJSON, false, 2) + '\n');
 }
@@ -258,7 +415,7 @@ function buildImportMap(file) {
   return map;
 }
 
-function rewriteMonopackageImports(file) {
+function rewriteMonopackageImports(file, name) {
   if (path.extname(file) === '.mdx') {
     return;
   }
@@ -280,27 +437,116 @@ function rewriteMonopackageImports(file) {
 
   let hadImports = false;
   ast.program.body = ast.program.body.flatMap(node => {
-    if (node.type === 'ImportDeclaration' && importMap[node.source.value]) {
+    if (!((node.type === 'ImportDeclaration' || node.type === 'ExportNamedDeclaration') && node.source)) {
+      return [node];
+    }
+
+    let source; 
+    if (node.source) {
+      source = node.source.value;
+      // if (/\.\/?$/.test(source)) {
+      //   if (!source.endsWith('/')) {
+      //     source += '/';
+      //   }
+      //   source += 'src/index';
+      // } else if (source.endsWith('/src')) {
+      //   source += '/index';
+      // }
+      // if (source.endsWith('/src/index')) {
+      //   let f = path.relative('.', path.resolve(path.dirname(file), source));
+      //   let [pkg] = parsePackage(f);
+      //   console.log('HERE', f, pkg)
+      //   if (importMap[pkg]) {
+      //     source = pkg;
+      //   }
+      // }
+    }
+
+
+    if (importMap[source]) {
       hadImports = true;
 
       let groups = {};
       for (let specifier of node.specifiers) {
-        let [source, imported] = importMap[node.source.value][specifier.imported.name];
-        if (source.startsWith('./')) {
-          source = `${node.source.value}/${source.slice(2)}`;
+        let importedName = specifier.type === 'ImportSpecifier' ? specifier.imported.name : specifier.local.name;
+        if (!importedName || !importMap[source][importedName]) {
+          continue;
+        }
+        let importSource = source;
+        let [src, imported] = importMap[source][importedName];
+        if (importMap[src] && importMap[src][imported]) {
+          importSource = src;
+          [src, imported] = importMap[src][imported];
+        }
+
+        if (src.startsWith('./')) {
+          src = `${importSource}/${src.slice(2)}`;
+          src = getRenamedSpecifier(src, file, importedName);
+        }
+        groups[src] ||= [];
+        if (node.type === 'ImportDeclaration') {
+          groups[src].push(t.importSpecifier(specifier.local, t.identifier(imported)));
+        } else if (node.type === 'ExportNamedDeclaration') {
+          groups[src].push(t.exportSpecifier(t.identifier(imported), specifier.exported));
         }
-        groups[source] ||= [];
-        groups[source].push(t.importSpecifier(specifier.local, t.identifier(imported)));
       }
       
       let res = Object.entries(groups).map(([source, specifiers]) => {
-        let decl = t.importDeclaration(specifiers, t.stringLiteral(source));
-        decl.importKind = node.importKind;
-        return decl;
+        if (node.type === 'ImportDeclaration') {
+          let decl = t.importDeclaration(specifiers, t.stringLiteral(source));
+          decl.importKind = node.importKind;
+          return decl;
+        } else if (node.type === 'ExportNamedDeclaration') {
+          let decl = t.exportNamedDeclaration(null, specifiers, t.stringLiteral(source));
+          decl.exportKind = node.exportKind;
+          return decl;
+        }
       });
 
+      if (res.length === 0) {
+        return [node];
+      }
+
       res[0].comments = node.leadingComments;
       return res;
+    } else if (source.startsWith('.') && name) {
+      hadImports = true;
+      // source = path.relative(file, path.resolve(path.dirname(file), source));
+      if (source === '../' || source === '..' || source === '../index' || source === '../src') {
+        source = `../../src/private/${name}`;
+      } else if (source === '../package.json') {
+        source = '../../package.json';
+      } else {
+        source = source.replace(/\.\.\/(src|stories|chromatic|intl)/, (_, tree) => `../../${tree}/${tree === 'src' ? 'private/' : ''}${name}`);
+      }
+      node.source = t.stringLiteral(source);
+    } else if (source.startsWith('/packages/') && !source.startsWith('/packages/@internationalized/')) {
+      hadImports = true;
+      let parts = source.slice('/packages/'.length).split('/');
+      let scope = parts.shift();
+      let monopackage;
+      if (scope === '@react-spectrum') {
+        monopackage = '@adobe/react-spectrum';
+      } else if (scope.startsWith('@')) {
+        monopackage = scope.slice(1);
+      } else {
+        monopackage = scope;
+      }
+
+      let pkg = scope;
+      if (pkg.startsWith('@')) {
+        pkg = parts.shift();
+      }
+
+      let tree = parts.shift();
+
+      source = `packages/${monopackage}/${tree}/${tree === 'src' ? 'private/' : ''}${pkg}/${parts.join('/')}`;
+      source = path.relative(path.dirname(file), source);
+      if (!source.startsWith('.')) {
+        source = './' + source;
+      }
+
+      node.source = t.stringLiteral(source);
     }
 
     return [node];
@@ -313,3 +559,120 @@ function rewriteMonopackageImports(file) {
   content = recast.print(ast, {objectCurlySpacing: false, quote: 'single'}).code;
   fs.writeFileSync(file, content);
 }
+
+function parsePackage(file) {
+  return file.match(/packages\/((?:@[^/]+\/)?[^/]+)\/([^/]+)/).slice(1);
+}
+
+function getRenamedSpecifier(specifier, from, importedName) {
+  if (skipped.some(s => specifier.includes(s))) {
+    return specifier;
+  }
+
+  let parts = specifier.split('/');
+  let scope = parts.shift();
+  let fullPkg = scope;
+  let pkg = scope;
+  let monopackage;
+  if (scope === '@react-spectrum') {
+    monopackage = '@adobe/react-spectrum';
+  } else if (scope.startsWith('@')) {
+    monopackage = scope.slice(1);
+  } else {
+    monopackage = scope;
+  }
+
+  if (pkg.startsWith('@')) {
+    pkg = parts.shift();
+    fullPkg += '/' + pkg;
+  }
+
+  let name = parts.join('/');
+
+  let [fromPkg] = parsePackage(from);
+  if (fromPkg === monopackage) {
+    let subpath = pkg === monopackage ? name : `${pkg}/${name}`;
+    let fullPath = monopackage === 'react-aria-components' || monopackage === '@react-spectrum/s2'
+      ? `packages/${monopackage}/src/${subpath}`
+      : `packages/${monopackage}/src/private/${subpath}`;
+    let relative = path.relative(path.dirname(from), fullPath);
+    if (!relative.startsWith('.')) {
+      relative = './' + relative;
+    }
+    return relative;
+  }
+
+  if (monopackage === 'react-aria-components' || monopackage === '@react-spectrum/s2') {
+    return `${monopackage}/${name}`;
+  }
+
+  let isPrivate = privateNames.has(importedName);
+  if (monopackage === 'react-aria' && name === 'Virtualizer') {
+    isPrivate = true;
+  }
+
+  let subpath = name;
+  if (standalone.has(name) && !isPrivate) {
+    subpath = name;
+  } else if (parentFile[name] && !isPrivate) {
+    subpath = parentFile[name];
+  } else if (pkg === monopackage) {
+    subpath = `private/${name}`;
+  } else {
+    subpath = `private/${pkg}/${name}`;
+  }
+
+  return `${monopackage}/${subpath}`;
+}
+
+function createPublicExports(monopackage, pkg) {
+  let file = `packages/${monopackage}/src/private/${pkg}/index.ts`;
+  let content = fs.readFileSync(file, 'utf8');
+  let ast = recast.parse(content, {
+    parser: {
+      parse() {
+        return parse(content, {
+          sourceType: 'module',
+          plugins: ['typescript', 'jsx', 'importAttributes'],
+          sourceFilename: file,
+          tokens: true,
+          errorRecovery: true
+        });
+      }
+    }
+  });
+
+  let groups = {};
+  let unmatched = [];
+  for (let node of ast.program.body) {
+    if (node.type === 'ExportNamedDeclaration' && node.source) {
+      node.specifiers = node.specifiers.filter(s => importMap[monopackage][s.exported.name]);
+      if (node.source.value.startsWith('./') && node.specifiers.length > 0) {
+        let source = node.source.value.slice(2);
+        node.source.value = `./private/${pkg}/${source}`;
+        if (standalone.has(source)) {
+          groups[source] ||= [];
+          groups[source].push(node);
+        } else if (parentFile[source]) {
+          groups[parentFile[source]] ||= [];
+          groups[parentFile[source]].push(node);
+        } else {
+          console.log('unmatched', source);
+          // unmatched.push(node);
+        }
+      } else if (node.specifiers.length > 0) {
+        // unmatched.push(node);
+        console.log('unmatched', node.source.value);
+      }
+    }
+  }
+
+  for (let source in groups) {
+    groups[source][0].comments = ast.program.body[0].leadingComments;
+    let content = recast.print({
+      type: 'Program',
+      body: groups[source].concat(unmatched)
+    }, {objectCurlySpacing: false, quote: 'single'}).code;
+    fs.writeFileSync(`packages/${monopackage}/src/${path.basename(source)}.ts`, content);
+  }
+}

From eff71d597007a2a34f8c9e6fcaf2a94adac7c538 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 15 Jan 2026 13:23:14 -0500
Subject: [PATCH 12/68] prepare themes

---
 .../@react-spectrum/theme-dark/src/index.ts   | 16 +--------
 .../@react-spectrum/theme-dark/src/theme.ts   | 28 ++++++++++++++++
 .../theme-default/src/index.ts                | 16 +--------
 .../theme-default/src/theme.ts                | 28 ++++++++++++++++
 .../theme-express/src/index.ts                | 21 +-----------
 .../theme-express/src/theme.ts                | 33 +++++++++++++++++++
 .../@react-spectrum/theme-light/src/index.ts  | 16 +--------
 .../@react-spectrum/theme-light/src/theme.ts  | 28 ++++++++++++++++
 8 files changed, 121 insertions(+), 65 deletions(-)
 create mode 100644 packages/@react-spectrum/theme-dark/src/theme.ts
 create mode 100644 packages/@react-spectrum/theme-default/src/theme.ts
 create mode 100644 packages/@react-spectrum/theme-express/src/theme.ts
 create mode 100644 packages/@react-spectrum/theme-light/src/theme.ts

diff --git a/packages/@react-spectrum/theme-dark/src/index.ts b/packages/@react-spectrum/theme-dark/src/index.ts
index 6013c41b012..8c298606749 100644
--- a/packages/@react-spectrum/theme-dark/src/index.ts
+++ b/packages/@react-spectrum/theme-dark/src/index.ts
@@ -11,18 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-
-import dark from '@adobe/spectrum-css-temp/vars/spectrum-dark.css';
-import darkest from '@adobe/spectrum-css-temp/vars/spectrum-darkest.css';
-import global from '@adobe/spectrum-css-temp/vars/spectrum-global.css';
-import large from '@adobe/spectrum-css-temp/vars/spectrum-large.css';
-import medium from '@adobe/spectrum-css-temp/vars/spectrum-medium.css';
-import {Theme} from '@react-types/provider';
-
-export let theme: Theme = {
-  global,
-  light: dark,
-  dark: darkest,
-  medium,
-  large
-};
+export {theme} from './theme';
diff --git a/packages/@react-spectrum/theme-dark/src/theme.ts b/packages/@react-spectrum/theme-dark/src/theme.ts
new file mode 100644
index 00000000000..6013c41b012
--- /dev/null
+++ b/packages/@react-spectrum/theme-dark/src/theme.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+import dark from '@adobe/spectrum-css-temp/vars/spectrum-dark.css';
+import darkest from '@adobe/spectrum-css-temp/vars/spectrum-darkest.css';
+import global from '@adobe/spectrum-css-temp/vars/spectrum-global.css';
+import large from '@adobe/spectrum-css-temp/vars/spectrum-large.css';
+import medium from '@adobe/spectrum-css-temp/vars/spectrum-medium.css';
+import {Theme} from '@react-types/provider';
+
+export let theme: Theme = {
+  global,
+  light: dark,
+  dark: darkest,
+  medium,
+  large
+};
diff --git a/packages/@react-spectrum/theme-default/src/index.ts b/packages/@react-spectrum/theme-default/src/index.ts
index 39ce13f51ff..8c298606749 100644
--- a/packages/@react-spectrum/theme-default/src/index.ts
+++ b/packages/@react-spectrum/theme-default/src/index.ts
@@ -11,18 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-
-import darkest from '@adobe/spectrum-css-temp/vars/spectrum-darkest.css';
-import global from '@adobe/spectrum-css-temp/vars/spectrum-global.css';
-import large from '@adobe/spectrum-css-temp/vars/spectrum-large.css';
-import light from '@adobe/spectrum-css-temp/vars/spectrum-light.css';
-import medium from '@adobe/spectrum-css-temp/vars/spectrum-medium.css';
-import {Theme} from '@react-types/provider';
-
-export let theme: Theme = {
-  global,
-  light,
-  dark: darkest,
-  medium,
-  large
-};
+export {theme} from './theme';
diff --git a/packages/@react-spectrum/theme-default/src/theme.ts b/packages/@react-spectrum/theme-default/src/theme.ts
new file mode 100644
index 00000000000..39ce13f51ff
--- /dev/null
+++ b/packages/@react-spectrum/theme-default/src/theme.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+import darkest from '@adobe/spectrum-css-temp/vars/spectrum-darkest.css';
+import global from '@adobe/spectrum-css-temp/vars/spectrum-global.css';
+import large from '@adobe/spectrum-css-temp/vars/spectrum-large.css';
+import light from '@adobe/spectrum-css-temp/vars/spectrum-light.css';
+import medium from '@adobe/spectrum-css-temp/vars/spectrum-medium.css';
+import {Theme} from '@react-types/provider';
+
+export let theme: Theme = {
+  global,
+  light,
+  dark: darkest,
+  medium,
+  large
+};
diff --git a/packages/@react-spectrum/theme-express/src/index.ts b/packages/@react-spectrum/theme-express/src/index.ts
index 4c73b931185..8c298606749 100644
--- a/packages/@react-spectrum/theme-express/src/index.ts
+++ b/packages/@react-spectrum/theme-express/src/index.ts
@@ -11,23 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-
-import {theme as defaultTheme} from '@react-spectrum/theme-default';
-import express from '@adobe/spectrum-css-temp/vars/express.css';
-import {Theme} from '@react-types/provider';
-
-export let theme: Theme = {
-  ...defaultTheme,
-  global: {
-    ...defaultTheme.global,
-    express: express.express
-  },
-  medium: {
-    ...defaultTheme.medium,
-    express: express.medium
-  },
-  large: {
-    ...defaultTheme.large,
-    express: express.large
-  }
-};
+export {theme} from './theme';
diff --git a/packages/@react-spectrum/theme-express/src/theme.ts b/packages/@react-spectrum/theme-express/src/theme.ts
new file mode 100644
index 00000000000..4c73b931185
--- /dev/null
+++ b/packages/@react-spectrum/theme-express/src/theme.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+import {theme as defaultTheme} from '@react-spectrum/theme-default';
+import express from '@adobe/spectrum-css-temp/vars/express.css';
+import {Theme} from '@react-types/provider';
+
+export let theme: Theme = {
+  ...defaultTheme,
+  global: {
+    ...defaultTheme.global,
+    express: express.express
+  },
+  medium: {
+    ...defaultTheme.medium,
+    express: express.medium
+  },
+  large: {
+    ...defaultTheme.large,
+    express: express.large
+  }
+};
diff --git a/packages/@react-spectrum/theme-light/src/index.ts b/packages/@react-spectrum/theme-light/src/index.ts
index e745342da6c..8c298606749 100644
--- a/packages/@react-spectrum/theme-light/src/index.ts
+++ b/packages/@react-spectrum/theme-light/src/index.ts
@@ -11,18 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-
-import darkest from '@adobe/spectrum-css-temp/vars/spectrum-darkest.css';
-import global from '@adobe/spectrum-css-temp/vars/spectrum-global.css';
-import large from '@adobe/spectrum-css-temp/vars/spectrum-large.css';
-import lightest from '@adobe/spectrum-css-temp/vars/spectrum-lightest.css';
-import medium from '@adobe/spectrum-css-temp/vars/spectrum-medium.css';
-import {Theme} from '@react-types/provider';
-
-export let theme: Theme = {
-  global,
-  light: lightest,
-  dark: darkest,
-  medium,
-  large
-};
+export {theme} from './theme';
diff --git a/packages/@react-spectrum/theme-light/src/theme.ts b/packages/@react-spectrum/theme-light/src/theme.ts
new file mode 100644
index 00000000000..e745342da6c
--- /dev/null
+++ b/packages/@react-spectrum/theme-light/src/theme.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+import darkest from '@adobe/spectrum-css-temp/vars/spectrum-darkest.css';
+import global from '@adobe/spectrum-css-temp/vars/spectrum-global.css';
+import large from '@adobe/spectrum-css-temp/vars/spectrum-large.css';
+import lightest from '@adobe/spectrum-css-temp/vars/spectrum-lightest.css';
+import medium from '@adobe/spectrum-css-temp/vars/spectrum-medium.css';
+import {Theme} from '@react-types/provider';
+
+export let theme: Theme = {
+  global,
+  light: lightest,
+  dark: darkest,
+  medium,
+  large
+};

From dbe22fdc674b9e321df115818913743a25a5aee5 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 15 Jan 2026 13:45:57 -0500
Subject: [PATCH 13/68] Missing exports

---
 packages/react-aria/src/index.ts    | 10 +++++-----
 packages/react-stately/src/index.ts |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/react-aria/src/index.ts b/packages/react-aria/src/index.ts
index 5a9339044d4..ccac80004e5 100644
--- a/packages/react-aria/src/index.ts
+++ b/packages/react-aria/src/index.ts
@@ -52,12 +52,12 @@ export {chain, mergeProps, useId, useObjectRef, RouterProvider} from '@react-ari
 export {VisuallyHidden, useVisuallyHidden} from '@react-aria/visually-hidden';
 
 export type {AriaBreadcrumbItemProps, AriaBreadcrumbsProps, BreadcrumbItemAria, BreadcrumbsAria} from '@react-aria/breadcrumbs';
-export type {AriaButtonOptions, AriaButtonProps, AriaToggleButtonProps, ButtonAria, AriaToggleButtonGroupProps, ToggleButtonGroupAria} from '@react-aria/button';
+export type {AriaButtonOptions, AriaButtonProps, AriaToggleButtonProps, ToggleButtonAria, ButtonAria, AriaToggleButtonGroupProps, ToggleButtonGroupAria} from '@react-aria/button';
 export type {AriaCalendarCellProps, AriaCalendarGridProps, AriaCalendarProps, AriaRangeCalendarProps, CalendarAria, CalendarCellAria, CalendarGridAria, CalendarProps, RangeCalendarProps} from '@react-aria/calendar';
 export type {AriaCheckboxGroupItemProps, AriaCheckboxGroupProps, AriaCheckboxProps, CheckboxAria, CheckboxGroupAria} from '@react-aria/checkbox';
 export type {AriaColorAreaOptions, AriaColorAreaProps, AriaColorChannelFieldProps, AriaColorFieldProps, AriaColorSliderOptions, AriaColorSliderProps, AriaColorSwatchProps, AriaColorWheelOptions, ColorAreaAria, ColorChannelFieldAria, ColorFieldAria, ColorSliderAria, ColorSwatchAria, ColorWheelAria} from '@react-aria/color';
 export type {AriaComboBoxOptions, AriaComboBoxProps, ComboBoxAria} from '@react-aria/combobox';
-export type {AriaDateFieldProps, AriaDatePickerProps, AriaDateRangePickerProps, AriaTimeFieldProps, DateFieldAria, DatePickerAria, DateRangePickerAria, DateSegmentAria, DateRange, DateValue, TimeValue} from '@react-aria/datepicker';
+export type {AriaDateFieldProps, AriaDateFieldOptions, AriaDatePickerProps, AriaDateRangePickerProps, AriaTimeFieldProps, AriaTimeFieldOptions, DateFieldAria, DatePickerAria, DateRangePickerAria, DateSegmentAria, DateRange, DateValue, TimeValue} from '@react-aria/datepicker';
 export type {AriaDialogProps, DialogAria} from '@react-aria/dialog';
 export type {DisclosureAria, AriaDisclosureProps} from '@react-aria/disclosure';
 export type {AriaFocusRingProps, FocusableAria, FocusableOptions, FocusManager, FocusManagerOptions, FocusRingAria, FocusRingProps, FocusScopeProps} from '@react-aria/focus';
@@ -72,18 +72,18 @@ export type {AriaGridListOptions, AriaGridListProps, GridListAria, AriaGridListI
 export type {AriaMenuProps, AriaMenuItemProps, AriaMenuOptions, AriaMenuSectionProps, AriaMenuTriggerProps, MenuAria, MenuItemAria, MenuSectionAria, MenuTriggerAria, SubmenuTriggerAria, AriaSubmenuTriggerProps} from '@react-aria/menu';
 export type {AriaMeterProps, MeterAria} from '@react-aria/meter';
 export type {AriaNumberFieldProps, NumberFieldAria} from '@react-aria/numberfield';
-export type {AriaModalOptions, AriaModalOverlayProps, AriaOverlayProps, AriaPopoverProps, AriaPositionProps, DismissButtonProps, ModalAria, ModalOverlayAria, ModalProviderAria, ModalProviderProps, OverlayAria, OverlayContainerProps, OverlayProps, OverlayTriggerAria, OverlayTriggerProps, PopoverAria, PositionAria, Placement, PlacementAxis, PositionProps} from '@react-aria/overlays';
+export type {AriaModalOptions, AriaModalOverlayProps, AriaOverlayProps, AriaPopoverProps, AriaPositionProps, DismissButtonProps, ModalAria, ModalOverlayAria, ModalProviderAria, ModalProviderProps, OverlayAria, OverlayContainerProps, OverlayProps, OverlayTriggerAria, OverlayTriggerProps, PopoverAria, PositionAria, Placement, PlacementAxis, PositionProps, PortalProviderProps, PortalProviderContextValue} from '@react-aria/overlays';
 export type {AriaProgressBarProps, ProgressBarAria} from '@react-aria/progress';
 export type {AriaRadioGroupProps, AriaRadioProps, RadioAria, RadioGroupAria} from '@react-aria/radio';
 export type {AriaSearchFieldProps, SearchFieldAria} from '@react-aria/searchfield';
-export type {AriaHiddenSelectProps, AriaSelectProps, AriaSelectOptions, HiddenSelectProps, SelectAria} from '@react-aria/select';
+export type {AriaHiddenSelectProps, AriaHiddenSelectOptions, HiddenSelectAria, AriaSelectProps, AriaSelectOptions, HiddenSelectProps, SelectAria} from '@react-aria/select';
 export type {SeparatorAria, SeparatorProps} from '@react-aria/separator';
 export type {SSRProviderProps} from '@react-aria/ssr';
 export type {AriaSliderProps, AriaSliderThumbProps, AriaSliderThumbOptions, SliderAria, SliderThumbAria} from '@react-aria/slider';
 export type {AriaSwitchProps, SwitchAria} from '@react-aria/switch';
 export type {AriaTableCellProps, AriaTableColumnHeaderProps, AriaTableColumnResizeProps, AriaTableProps, AriaTableSelectionCheckboxProps, GridAria, GridRowAria, GridRowProps, TableCellAria, TableColumnHeaderAria, TableColumnResizeAria, TableHeaderRowAria, TableSelectAllCheckboxAria, TableSelectionCheckboxAria} from '@react-aria/table';
 export type {AriaTabListProps, AriaTabListOptions, AriaTabPanelProps, AriaTabProps, TabAria, TabListAria, TabPanelAria} from '@react-aria/tabs';
-export type {AriaTagGroupProps, AriaTagProps, TagAria, TagGroupAria} from '@react-aria/tag';
+export type {AriaTagGroupProps, AriaTagGroupOptions, AriaTagProps, TagAria, TagGroupAria} from '@react-aria/tag';
 export type {AriaTextFieldOptions, AriaTextFieldProps, TextFieldAria} from '@react-aria/textfield';
 export type {AriaToastRegionProps, AriaToastProps, ToastAria, ToastRegionAria} from '@react-aria/toast';
 export type {AriaTooltipProps, TooltipAria, TooltipTriggerAria, TooltipTriggerProps} from '@react-aria/tooltip';
diff --git a/packages/react-stately/src/index.ts b/packages/react-stately/src/index.ts
index cfffea50e21..6ed4f72eb0e 100644
--- a/packages/react-stately/src/index.ts
+++ b/packages/react-stately/src/index.ts
@@ -25,12 +25,12 @@ export type {RadioGroupProps, RadioGroupState} from '@react-stately/radio';
 export type {SearchFieldProps, SearchFieldState} from '@react-stately/searchfield';
 export type {SelectProps, SelectState, SelectStateOptions} from '@react-stately/select';
 export type {SliderState, SliderStateOptions} from '@react-stately/slider';
-export type {MultipleSelectionManager, MultipleSelectionState, SingleSelectionState} from '@react-stately/selection';
+export type {MultipleSelectionManager, MultipleSelectionState, MultipleSelectionStateProps, SingleSelectionState} from '@react-stately/selection';
 export type {NumberFieldState, NumberFieldStateOptions} from '@react-stately/numberfield';
 export type {TableState, TableStateProps, TableHeaderProps, TableBodyProps, ColumnProps, RowProps, CellProps, TableColumnResizeState, TableColumnResizeStateProps} from '@react-stately/table';
-export type {TabListProps, TabListState} from '@react-stately/tabs';
+export type {TabListProps, TabListStateOptions, TabListState} from '@react-stately/tabs';
 export type {ToastState, QueuedToast, ToastStateProps, ToastOptions} from '@react-stately/toast';
-export type {ToggleProps, ToggleState, ToggleGroupProps, ToggleGroupState} from '@react-stately/toggle';
+export type {ToggleProps, ToggleState, ToggleStateOptions, ToggleGroupProps, ToggleGroupState} from '@react-stately/toggle';
 export type {TooltipTriggerProps, TooltipTriggerState} from '@react-stately/tooltip';
 export type {TreeProps, TreeState} from '@react-stately/tree';
 export type {ItemProps, Key, SectionProps, Collection, Node, Orientation, DisabledBehavior, Selection, SelectionBehavior, SelectionMode, SortDescriptor, SortDirection, ValidationState} from '@react-types/shared';

From 62e7348f40fc4a273dd82c1f50c10f49a7209459 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 15 Jan 2026 14:10:37 -0500
Subject: [PATCH 14/68] flags

---
 packages/@react-stately/flags/src/flags.ts | 30 ++++++++++++++++++++++
 packages/@react-stately/flags/src/index.ts | 19 +-------------
 2 files changed, 31 insertions(+), 18 deletions(-)
 create mode 100644 packages/@react-stately/flags/src/flags.ts

diff --git a/packages/@react-stately/flags/src/flags.ts b/packages/@react-stately/flags/src/flags.ts
new file mode 100644
index 00000000000..fb683fa5842
--- /dev/null
+++ b/packages/@react-stately/flags/src/flags.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2023 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+let _tableNestedRows = false;
+let _shadowDOM = false;
+
+export function enableTableNestedRows(): void {
+  _tableNestedRows = true;
+}
+
+export function tableNestedRows(): boolean {
+  return _tableNestedRows;
+}
+
+export function enableShadowDOM(): void {
+  _shadowDOM = true;
+}
+
+export function shadowDOM(): boolean {
+  return _shadowDOM;
+}
diff --git a/packages/@react-stately/flags/src/index.ts b/packages/@react-stately/flags/src/index.ts
index fb683fa5842..d7cbfb40991 100644
--- a/packages/@react-stately/flags/src/index.ts
+++ b/packages/@react-stately/flags/src/index.ts
@@ -10,21 +10,4 @@
  * governing permissions and limitations under the License.
  */
 
-let _tableNestedRows = false;
-let _shadowDOM = false;
-
-export function enableTableNestedRows(): void {
-  _tableNestedRows = true;
-}
-
-export function tableNestedRows(): boolean {
-  return _tableNestedRows;
-}
-
-export function enableShadowDOM(): void {
-  _shadowDOM = true;
-}
-
-export function shadowDOM(): boolean {
-  return _shadowDOM;
-}
+export {enableTableNestedRows, tableNestedRows, enableShadowDOM, shadowDOM} from './flags';

From ee108184d0e846336c566403fb0d4e7746075805 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 15 Jan 2026 14:36:12 -0500
Subject: [PATCH 15/68] more exports

---
 .../src/ariaModalPolyfill.ts                  | 76 +++++++++++++++++++
 .../aria-modal-polyfill/src/index.ts          | 65 +---------------
 packages/@react-aria/toolbar/src/index.ts     |  3 +-
 .../@react-stately/datepicker/src/index.ts    |  2 +-
 .../datepicker/src/useDateFieldState.ts       | 16 ++--
 packages/react-aria/src/index.ts              |  4 +-
 packages/react-stately/src/index.ts           |  2 +-
 7 files changed, 91 insertions(+), 77 deletions(-)
 create mode 100644 packages/@react-aria/aria-modal-polyfill/src/ariaModalPolyfill.ts

diff --git a/packages/@react-aria/aria-modal-polyfill/src/ariaModalPolyfill.ts b/packages/@react-aria/aria-modal-polyfill/src/ariaModalPolyfill.ts
new file mode 100644
index 00000000000..d8d09157936
--- /dev/null
+++ b/packages/@react-aria/aria-modal-polyfill/src/ariaModalPolyfill.ts
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+import {hideOthers} from 'aria-hidden';
+
+type Revert = () => void;
+
+const currentDocument = typeof document !== 'undefined' ? document : undefined;
+
+/**
+ * Acts as a polyfill for `aria-modal` by watching for added modals and hiding any surrounding DOM elements with `aria-hidden`.
+ */
+export function watchModals(selector:string = 'body', {document = currentDocument}: {document?: Document} = {}): Revert {
+  /**
+   * Listen for additions to the child list of the selected element (defaults to body). This is where providers render modal portals.
+   * When one is added, see if there is a modal inside it, if there is, then hide everything else from screen readers.
+   * If there was already a modal open and a new one was added, undo everything that the previous modal had hidden and hide based on the new one.
+   *
+   * If a modal container is removed, then undo the hiding based on the last hide others. Check if there are any other modals still around, and
+   * hide based on the last one added.
+   */
+  if (!document) {
+    return () => {};
+  }
+  let target = document.querySelector(selector);
+  if (!target) {
+    return () => {};
+  }
+  let config = {childList: true};
+  let modalContainers: Array<Element> = [];
+  let undo: Revert | undefined;
+
+  let observer = new MutationObserver((mutationRecord) => {
+    const liveAnnouncer =  document.querySelector('[data-live-announcer="true"]');
+    for (let mutation of mutationRecord) {
+      if (mutation.type === 'childList' && mutation.addedNodes.length > 0) {
+        let addNode: Element = (Array.from(mutation.addedNodes).find((node: any) => node.querySelector?.('[aria-modal="true"], [data-ismodal="true"]')) as HTMLElement);
+        if (addNode) {
+          modalContainers.push(addNode);
+          let modal = addNode.querySelector('[aria-modal="true"], [data-ismodal="true"]') as HTMLElement;
+          undo?.();
+          let others = [modal, ... liveAnnouncer ? [liveAnnouncer as HTMLElement] : []];
+          undo = hideOthers(others);
+        }
+      } else if (mutation.type === 'childList' && mutation.removedNodes.length > 0) {
+        let removedNodes = Array.from(mutation.removedNodes);
+        let nodeIndexRemove = modalContainers.findIndex(container => removedNodes.includes(container));
+        if (nodeIndexRemove >= 0) {
+          undo?.();
+          modalContainers = modalContainers.filter((val, i) => i !== nodeIndexRemove);
+          if (modalContainers.length > 0) {
+            let modal = modalContainers[modalContainers.length - 1].querySelector('[aria-modal="true"], [data-ismodal="true"]') as HTMLElement;
+            let others = [modal, ... liveAnnouncer ? [liveAnnouncer as HTMLElement] : []];
+            undo = hideOthers(others);
+          } else {
+            undo = undefined;
+          }
+        }
+      }
+    }
+  });
+  observer.observe(target, config);
+  return () => {
+    undo?.();
+    observer.disconnect();
+  };
+}
diff --git a/packages/@react-aria/aria-modal-polyfill/src/index.ts b/packages/@react-aria/aria-modal-polyfill/src/index.ts
index d8d09157936..377a84749ba 100644
--- a/packages/@react-aria/aria-modal-polyfill/src/index.ts
+++ b/packages/@react-aria/aria-modal-polyfill/src/index.ts
@@ -10,67 +10,4 @@
  * governing permissions and limitations under the License.
  */
 
-import {hideOthers} from 'aria-hidden';
-
-type Revert = () => void;
-
-const currentDocument = typeof document !== 'undefined' ? document : undefined;
-
-/**
- * Acts as a polyfill for `aria-modal` by watching for added modals and hiding any surrounding DOM elements with `aria-hidden`.
- */
-export function watchModals(selector:string = 'body', {document = currentDocument}: {document?: Document} = {}): Revert {
-  /**
-   * Listen for additions to the child list of the selected element (defaults to body). This is where providers render modal portals.
-   * When one is added, see if there is a modal inside it, if there is, then hide everything else from screen readers.
-   * If there was already a modal open and a new one was added, undo everything that the previous modal had hidden and hide based on the new one.
-   *
-   * If a modal container is removed, then undo the hiding based on the last hide others. Check if there are any other modals still around, and
-   * hide based on the last one added.
-   */
-  if (!document) {
-    return () => {};
-  }
-  let target = document.querySelector(selector);
-  if (!target) {
-    return () => {};
-  }
-  let config = {childList: true};
-  let modalContainers: Array<Element> = [];
-  let undo: Revert | undefined;
-
-  let observer = new MutationObserver((mutationRecord) => {
-    const liveAnnouncer =  document.querySelector('[data-live-announcer="true"]');
-    for (let mutation of mutationRecord) {
-      if (mutation.type === 'childList' && mutation.addedNodes.length > 0) {
-        let addNode: Element = (Array.from(mutation.addedNodes).find((node: any) => node.querySelector?.('[aria-modal="true"], [data-ismodal="true"]')) as HTMLElement);
-        if (addNode) {
-          modalContainers.push(addNode);
-          let modal = addNode.querySelector('[aria-modal="true"], [data-ismodal="true"]') as HTMLElement;
-          undo?.();
-          let others = [modal, ... liveAnnouncer ? [liveAnnouncer as HTMLElement] : []];
-          undo = hideOthers(others);
-        }
-      } else if (mutation.type === 'childList' && mutation.removedNodes.length > 0) {
-        let removedNodes = Array.from(mutation.removedNodes);
-        let nodeIndexRemove = modalContainers.findIndex(container => removedNodes.includes(container));
-        if (nodeIndexRemove >= 0) {
-          undo?.();
-          modalContainers = modalContainers.filter((val, i) => i !== nodeIndexRemove);
-          if (modalContainers.length > 0) {
-            let modal = modalContainers[modalContainers.length - 1].querySelector('[aria-modal="true"], [data-ismodal="true"]') as HTMLElement;
-            let others = [modal, ... liveAnnouncer ? [liveAnnouncer as HTMLElement] : []];
-            undo = hideOthers(others);
-          } else {
-            undo = undefined;
-          }
-        }
-      }
-    }
-  });
-  observer.observe(target, config);
-  return () => {
-    undo?.();
-    observer.disconnect();
-  };
-}
+export {watchModals} from './ariaModalPolyfill';
diff --git a/packages/@react-aria/toolbar/src/index.ts b/packages/@react-aria/toolbar/src/index.ts
index 9b419d04d4c..f44c7261f07 100644
--- a/packages/@react-aria/toolbar/src/index.ts
+++ b/packages/@react-aria/toolbar/src/index.ts
@@ -10,4 +10,5 @@
  * governing permissions and limitations under the License.
  */
 
-export * from './useToolbar';
+export {useToolbar} from './useToolbar';
+export type {AriaToolbarProps, ToolbarAria} from './useToolbar';
diff --git a/packages/@react-stately/datepicker/src/index.ts b/packages/@react-stately/datepicker/src/index.ts
index 73547827b59..854fc5cee88 100644
--- a/packages/@react-stately/datepicker/src/index.ts
+++ b/packages/@react-stately/datepicker/src/index.ts
@@ -15,7 +15,7 @@ export {useDateFieldState} from './useDateFieldState';
 export {useDateRangePickerState} from './useDateRangePickerState';
 export {useTimeFieldState} from './useTimeFieldState';
 
-export type {DateFieldStateOptions, DateFieldState, DateSegment, SegmentType} from './useDateFieldState';
+export type {DateFieldStateOptions, DateFieldState, DateSegment, DateSegmentType, DateSegmentType as SegmentType} from './useDateFieldState';
 export type {DatePickerStateOptions, DatePickerState} from './useDatePickerState';
 export type {DateRangePickerStateOptions, DateRangePickerState} from './useDateRangePickerState';
 export type {TimeFieldStateOptions, TimeFieldState} from './useTimeFieldState';
diff --git a/packages/@react-stately/datepicker/src/useDateFieldState.ts b/packages/@react-stately/datepicker/src/useDateFieldState.ts
index 2bf28053575..e8c3ac2e79b 100644
--- a/packages/@react-stately/datepicker/src/useDateFieldState.ts
+++ b/packages/@react-stately/datepicker/src/useDateFieldState.ts
@@ -19,10 +19,10 @@ import {useControlledState} from '@react-stately/utils';
 import {useEffect, useMemo, useRef, useState} from 'react';
 import {ValidationState} from '@react-types/shared';
 
-export type SegmentType = 'era' | 'year' | 'month' | 'day' |  'hour' | 'minute' | 'second' | 'dayPeriod' | 'literal' | 'timeZoneName';
+export type DateSegmentType = 'era' | 'year' | 'month' | 'day' |  'hour' | 'minute' | 'second' | 'dayPeriod' | 'literal' | 'timeZoneName';
 export interface DateSegment {
   /** The type of segment. */
-  type: SegmentType,
+  type: DateSegmentType,
   /** The formatted text for the segment. */
   text: string,
   /** The numeric value for the segment, if applicable. */
@@ -72,28 +72,28 @@ export interface DateFieldState extends FormValidationState {
   /** Whether the field is required. */
   isRequired: boolean,
   /** Increments the given segment. Upon reaching the minimum or maximum value, the value wraps around to the opposite limit. */
-  increment(type: SegmentType): void,
+  increment(type: DateSegmentType): void,
   /** Decrements the given segment. Upon reaching the minimum or maximum value, the value wraps around to the opposite limit. */
-  decrement(type: SegmentType): void,
+  decrement(type: DateSegmentType): void,
   /**
    * Increments the given segment by a larger amount, rounding it to the nearest increment.
    * The amount to increment by depends on the field, for example 15 minutes, 7 days, and 5 years.
    * Upon reaching the minimum or maximum value, the value wraps around to the opposite limit.
    */
-  incrementPage(type: SegmentType): void,
+  incrementPage(type: DateSegmentType): void,
   /**
    * Decrements the given segment by a larger amount, rounding it to the nearest increment.
    * The amount to decrement by depends on the field, for example 15 minutes, 7 days, and 5 years.
    * Upon reaching the minimum or maximum value, the value wraps around to the opposite limit.
    */
-  decrementPage(type: SegmentType): void,
+  decrementPage(type: DateSegmentType): void,
   /** Sets the value of the given segment. */
   setSegment(type: 'era', value: string): void,
-  setSegment(type: SegmentType, value: number): void,
+  setSegment(type: DateSegmentType, value: number): void,
   /** Updates the remaining unfilled segments with the placeholder value. */
   confirmPlaceholder(): void,
   /** Clears the value of the given segment, reverting it to the placeholder. */
-  clearSegment(type: SegmentType): void,
+  clearSegment(type: DateSegmentType): void,
   /** Formats the current date value using the given options. */
   formatValue(fieldOptions: FieldOptions): string,
   /** Gets a formatter based on state's props. */
diff --git a/packages/react-aria/src/index.ts b/packages/react-aria/src/index.ts
index ccac80004e5..12613688517 100644
--- a/packages/react-aria/src/index.ts
+++ b/packages/react-aria/src/index.ts
@@ -52,7 +52,7 @@ export {chain, mergeProps, useId, useObjectRef, RouterProvider} from '@react-ari
 export {VisuallyHidden, useVisuallyHidden} from '@react-aria/visually-hidden';
 
 export type {AriaBreadcrumbItemProps, AriaBreadcrumbsProps, BreadcrumbItemAria, BreadcrumbsAria} from '@react-aria/breadcrumbs';
-export type {AriaButtonOptions, AriaButtonProps, AriaToggleButtonProps, ToggleButtonAria, ButtonAria, AriaToggleButtonGroupProps, ToggleButtonGroupAria} from '@react-aria/button';
+export type {AriaButtonOptions, AriaButtonProps, AriaToggleButtonProps, AriaToggleButtonOptions, ToggleButtonAria, ButtonAria, AriaToggleButtonGroupProps, ToggleButtonGroupAria, AriaToggleButtonGroupItemProps, AriaToggleButtonGroupItemOptions} from '@react-aria/button';
 export type {AriaCalendarCellProps, AriaCalendarGridProps, AriaCalendarProps, AriaRangeCalendarProps, CalendarAria, CalendarCellAria, CalendarGridAria, CalendarProps, RangeCalendarProps} from '@react-aria/calendar';
 export type {AriaCheckboxGroupItemProps, AriaCheckboxGroupProps, AriaCheckboxProps, CheckboxAria, CheckboxGroupAria} from '@react-aria/checkbox';
 export type {AriaColorAreaOptions, AriaColorAreaProps, AriaColorChannelFieldProps, AriaColorFieldProps, AriaColorSliderOptions, AriaColorSliderProps, AriaColorSwatchProps, AriaColorWheelOptions, ColorAreaAria, ColorChannelFieldAria, ColorFieldAria, ColorSliderAria, ColorSwatchAria, ColorWheelAria} from '@react-aria/color';
@@ -68,7 +68,7 @@ export type {AriaFieldProps, FieldAria, LabelAria, LabelAriaProps} from '@react-
 export type {AriaLandmarkRole, AriaLandmarkProps, LandmarkAria, LandmarkController} from '@react-aria/landmark';
 export type {AriaLinkOptions, LinkAria} from '@react-aria/link';
 export type {AriaListBoxOptions, AriaListBoxProps, AriaListBoxSectionProps, AriaOptionProps, ListBoxAria, ListBoxSectionAria, OptionAria} from '@react-aria/listbox';
-export type {AriaGridListOptions, AriaGridListProps, GridListAria, AriaGridListItemOptions, GridListItemAria, AriaGridSelectionCheckboxProps, GridSelectionCheckboxAria} from '@react-aria/gridlist';
+export type {AriaGridListOptions, GridListProps, AriaGridListProps, GridListAria, AriaGridListItemOptions, GridListItemAria, AriaGridSelectionCheckboxProps, GridSelectionCheckboxAria} from '@react-aria/gridlist';
 export type {AriaMenuProps, AriaMenuItemProps, AriaMenuOptions, AriaMenuSectionProps, AriaMenuTriggerProps, MenuAria, MenuItemAria, MenuSectionAria, MenuTriggerAria, SubmenuTriggerAria, AriaSubmenuTriggerProps} from '@react-aria/menu';
 export type {AriaMeterProps, MeterAria} from '@react-aria/meter';
 export type {AriaNumberFieldProps, NumberFieldAria} from '@react-aria/numberfield';
diff --git a/packages/react-stately/src/index.ts b/packages/react-stately/src/index.ts
index 6ed4f72eb0e..2226dc2d0cb 100644
--- a/packages/react-stately/src/index.ts
+++ b/packages/react-stately/src/index.ts
@@ -14,7 +14,7 @@ export type {CalendarState, CalendarStateOptions, RangeCalendarState, RangeCalen
 export type {CheckboxGroupProps, CheckboxGroupState} from '@react-stately/checkbox';
 export type {Color, ColorChannel, ColorFormat, ColorSpace, ColorAreaProps, ColorAreaState, ColorChannelFieldProps, ColorChannelFieldState, ColorChannelFieldStateOptions, ColorFieldProps, ColorFieldState, ColorPickerProps, ColorPickerState, ColorSliderState, ColorSliderStateOptions, ColorWheelProps, ColorWheelState} from '@react-stately/color';
 export type {ComboBoxState, ComboBoxStateOptions} from '@react-stately/combobox';
-export type {DateFieldState, DateFieldStateOptions, DatePickerState, DatePickerStateOptions, DateRangePickerState, DateRangePickerStateOptions, DateSegment, SegmentType as DateSegmentType, TimeFieldStateOptions, TimeFieldState} from '@react-stately/datepicker';
+export type {DateFieldState, DateFieldStateOptions, DatePickerState, DatePickerStateOptions, DateRangePickerState, DateRangePickerStateOptions, DateSegment, DateSegmentType, DateSegmentType as SegmentType, TimeFieldStateOptions, TimeFieldState} from '@react-stately/datepicker';
 export type {DisclosureState, DisclosureProps, DisclosureGroupState, DisclosureGroupProps} from '@react-stately/disclosure';
 export type {DraggableCollectionStateOptions, DraggableCollectionState, DroppableCollectionStateOptions, DroppableCollectionState} from '@react-stately/dnd';
 export type {AsyncListData, AsyncListOptions, ListData, ListOptions, TreeData, TreeOptions} from '@react-stately/data';

From 0eaedde0de3405876f476c71b435d96eeffa9f41 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 15 Jan 2026 14:54:42 -0500
Subject: [PATCH 16/68] working

---
 scripts/migrateDeps.mjs | 183 ++++++++++++++++++++++++++--------------
 1 file changed, 118 insertions(+), 65 deletions(-)

diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index 59300270e87..d4db4207a8c 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -50,10 +50,12 @@ standalone.add('Column');
 standalone.add('TableBody');
 standalone.add('TableHeader');
 standalone.add('useToggleGroupState');
+standalone.add('useColorPickerState');
 
 // Documented but not in the monopackage.
 standalone.delete('useAutocomplete');
 standalone.delete('useAutocompleteState');
+standalone.delete('useToolbar');
 
 // Public but grouped with a parent component/hook.
 let parentFile = {
@@ -129,7 +131,24 @@ const privateNames = new Set([
   'useSlotId',
   'createFocusManager',
   'isFocusVisible',
-  'UNSTABLE_createLandmarkController'
+  'UNSTABLE_createLandmarkController',
+  'isElementInChildOfActiveScope',
+  'getFocusableTreeWalker',
+  'getPointerType',
+  'addWindowFocusTracking',
+  'useInteractionModality',
+  'useFocusVisibleListener',
+  'FocusVisibleHandler',
+  'Modality',
+  'LandmarkControllerOptions',
+  'useOverlayFocusContain',
+  'useSSRSafeId',
+  'mergeIds',
+  'useFormProps',
+  'IconPropsWithoutChildren',
+  'useProviderProps',
+  'CollectionBuilderContext',
+  'useLocalizedStringDictionary'
 ]);
 
 let publicFiles = new Set();
@@ -244,10 +263,6 @@ function migratePackage(scope, name, monopackage) {
 
   fs.writeFileSync(`packages/${monopackage}/package.json`, JSON.stringify(monopackageJSON, false, 2) + '\n');
 
-  let index = fs.readFileSync(`packages/${scope}/${name}/index.ts`, 'utf8');
-  index = index.replace('./src', `${monopackage}/private/${name}/index`);
-  fs.writeFileSync(`packages/${scope}/${name}/index.ts`, index);
-
   packageJSON.source = 'index.ts';
   delete packageJSON.exports; // TODO
   packageJSON.dependencies = {
@@ -255,7 +270,7 @@ function migratePackage(scope, name, monopackage) {
   };
   fs.writeFileSync(`packages/${scope}/${name}/package.json`, JSON.stringify(packageJSON, false, 2) + '\n');
 
-  createPublicExports(monopackage, name);
+  createPublicExports(monopackage, scope, name);
 }
 
 function remapExports(exports, name) {
@@ -281,7 +296,7 @@ function moveTree(scope, name, tree, monopackage) {
 
     for (let file of fs.globSync(`packages/${monopackage}/${monopackageTree}/${name}/**/*.{ts,tsx,js,jsx,mdx}`)) {
       // rewriteImports(file, scope, name);
-      rewriteMonopackageImports(file, name);
+      rewriteMonopackageImports(file, name, scope);
     }
   }
 }
@@ -415,7 +430,7 @@ function buildImportMap(file) {
   return map;
 }
 
-function rewriteMonopackageImports(file, name) {
+function rewriteMonopackageImports(file, name, scope) {
   if (path.extname(file) === '.mdx') {
     return;
   }
@@ -465,55 +480,12 @@ function rewriteMonopackageImports(file, name) {
 
     if (importMap[source]) {
       hadImports = true;
-
-      let groups = {};
-      for (let specifier of node.specifiers) {
-        let importedName = specifier.type === 'ImportSpecifier' ? specifier.imported.name : specifier.local.name;
-        if (!importedName || !importMap[source][importedName]) {
-          continue;
-        }
-        let importSource = source;
-        let [src, imported] = importMap[source][importedName];
-        if (importMap[src] && importMap[src][imported]) {
-          importSource = src;
-          [src, imported] = importMap[src][imported];
-        }
-
-        if (src.startsWith('./')) {
-          src = `${importSource}/${src.slice(2)}`;
-          src = getRenamedSpecifier(src, file, importedName);
-        }
-        groups[src] ||= [];
-        if (node.type === 'ImportDeclaration') {
-          groups[src].push(t.importSpecifier(specifier.local, t.identifier(imported)));
-        } else if (node.type === 'ExportNamedDeclaration') {
-          groups[src].push(t.exportSpecifier(t.identifier(imported), specifier.exported));
-        }
-      }
-      
-      let res = Object.entries(groups).map(([source, specifiers]) => {
-        if (node.type === 'ImportDeclaration') {
-          let decl = t.importDeclaration(specifiers, t.stringLiteral(source));
-          decl.importKind = node.importKind;
-          return decl;
-        } else if (node.type === 'ExportNamedDeclaration') {
-          let decl = t.exportNamedDeclaration(null, specifiers, t.stringLiteral(source));
-          decl.exportKind = node.exportKind;
-          return decl;
-        }
-      });
-
-      if (res.length === 0) {
-        return [node];
-      }
-
-      res[0].comments = node.leadingComments;
-      return res;
+      return getImportStatements(node, file);
     } else if (source.startsWith('.') && name) {
       hadImports = true;
-      // source = path.relative(file, path.resolve(path.dirname(file), source));
-      if (source === '../' || source === '..' || source === '../index' || source === '../src') {
-        source = `../../src/private/${name}`;
+      if (source === '.' || source === './' || source === './index' || source === '../' || source === '..' || source === '../index' || source === '../src') {
+        node.source = t.stringLiteral(`${scope}/${name}`);
+        return getImportStatements(node, file);
       } else if (source === '../package.json') {
         source = '../../package.json';
       } else {
@@ -560,11 +532,58 @@ function rewriteMonopackageImports(file, name) {
   fs.writeFileSync(file, content);
 }
 
+function getImportStatements(node, file, relative = true) {
+  let source = node.source.value;
+  let groups = {};
+  for (let specifier of node.specifiers) {
+    let importedName = specifier.type === 'ImportSpecifier' ? specifier.imported.name : specifier.local.name;
+    if (!importedName || !importMap[source][importedName]) {
+      continue;
+    }
+    let importSource = source;
+    let [src, imported] = importMap[source][importedName];
+    if (importMap[src] && importMap[src][imported]) {
+      importSource = src;
+      [src, imported] = importMap[src][imported];
+    }
+
+    if (src.startsWith('./')) {
+      src = `${importSource}/${src.slice(2)}`;
+      src = getRenamedSpecifier(src, file, importedName, relative);
+    }
+    groups[src] ||= [];
+    if (node.type === 'ImportDeclaration') {
+      groups[src].push(t.importSpecifier(specifier.local, t.identifier(imported)));
+    } else if (node.type === 'ExportNamedDeclaration') {
+      groups[src].push(t.exportSpecifier(t.identifier(imported), specifier.exported));
+    }
+  }
+  
+  let res = Object.entries(groups).map(([source, specifiers]) => {
+    if (node.type === 'ImportDeclaration') {
+      let decl = t.importDeclaration(specifiers, t.stringLiteral(source));
+      decl.importKind = node.importKind;
+      return decl;
+    } else if (node.type === 'ExportNamedDeclaration') {
+      let decl = t.exportNamedDeclaration(null, specifiers, t.stringLiteral(source));
+      decl.exportKind = node.exportKind;
+      return decl;
+    }
+  });
+
+  if (res.length === 0) {
+    return [node];
+  }
+
+  res[0].comments = node.leadingComments;
+  return res;
+}
+
 function parsePackage(file) {
   return file.match(/packages\/((?:@[^/]+\/)?[^/]+)\/([^/]+)/).slice(1);
 }
 
-function getRenamedSpecifier(specifier, from, importedName) {
+function getRenamedSpecifier(specifier, from, importedName, relative = true) {
   if (skipped.some(s => specifier.includes(s))) {
     return specifier;
   }
@@ -590,7 +609,7 @@ function getRenamedSpecifier(specifier, from, importedName) {
   let name = parts.join('/');
 
   let [fromPkg] = parsePackage(from);
-  if (fromPkg === monopackage) {
+  if (relative && fromPkg === monopackage) {
     let subpath = pkg === monopackage ? name : `${pkg}/${name}`;
     let fullPath = monopackage === 'react-aria-components' || monopackage === '@react-spectrum/s2'
       ? `packages/${monopackage}/src/${subpath}`
@@ -607,7 +626,10 @@ function getRenamedSpecifier(specifier, from, importedName) {
   }
 
   let isPrivate = privateNames.has(importedName);
-  if (monopackage === 'react-aria' && name === 'Virtualizer') {
+  if (
+    (monopackage === 'react-aria' && name === 'Virtualizer') ||
+    (monopackage === '@adobe/react-spectrum' && (name === 'CardView' || name === 'Card' || name === 'Overlay' || name === 'Popover' || name === 'Modal' || name === 'StepList' || name === 'SearchAutocomplete'))
+  ) {
     isPrivate = true;
   }
 
@@ -625,7 +647,7 @@ function getRenamedSpecifier(specifier, from, importedName) {
   return `${monopackage}/${subpath}`;
 }
 
-function createPublicExports(monopackage, pkg) {
+function createPublicExports(monopackage, scope, pkg) {
   let file = `packages/${monopackage}/src/private/${pkg}/index.ts`;
   let content = fs.readFileSync(file, 'utf8');
   let ast = recast.parse(content, {
@@ -644,8 +666,24 @@ function createPublicExports(monopackage, pkg) {
 
   let groups = {};
   let unmatched = [];
+  let specifiers = [];
+  let typeSpecifiers = [];
   for (let node of ast.program.body) {
     if (node.type === 'ExportNamedDeclaration' && node.source) {
+      if (node.source.value.startsWith('./')) {
+        if (node.exportKind === 'type') {
+          typeSpecifiers.push(...node.specifiers);
+        } else {
+          specifiers.push(...node.specifiers);
+        }
+      } else {
+        let n = t.cloneNode(node, true);
+        if (n.source.value.startsWith('../')) {
+          n.source.value = `${monopackage}/private/${n.source.value.slice(3)}`;
+        }
+        unmatched.push(n);
+      }
+
       node.specifiers = node.specifiers.filter(s => importMap[monopackage][s.exported.name]);
       if (node.source.value.startsWith('./') && node.specifiers.length > 0) {
         let source = node.source.value.slice(2);
@@ -656,13 +694,7 @@ function createPublicExports(monopackage, pkg) {
         } else if (parentFile[source]) {
           groups[parentFile[source]] ||= [];
           groups[parentFile[source]].push(node);
-        } else {
-          console.log('unmatched', source);
-          // unmatched.push(node);
         }
-      } else if (node.specifiers.length > 0) {
-        // unmatched.push(node);
-        console.log('unmatched', node.source.value);
       }
     }
   }
@@ -675,4 +707,25 @@ function createPublicExports(monopackage, pkg) {
     }, {objectCurlySpacing: false, quote: 'single'}).code;
     fs.writeFileSync(`packages/${monopackage}/src/${path.basename(source)}.ts`, content);
   }
+
+  fs.rmSync(file);
+  
+  let imports = [];
+  if (specifiers.length) {
+    imports.push(...getImportStatements(t.exportNamedDeclaration(null, specifiers, t.stringLiteral(`${scope}/${pkg}`)), `packages/${scope}/${pkg}/src/index.ts`, false));
+  }
+  if (typeSpecifiers.length) {
+    let decl = t.exportNamedDeclaration(null, typeSpecifiers, t.stringLiteral(`${scope}/${pkg}`));
+    decl.exportKind = 'type';
+    imports.push(...getImportStatements(decl, `packages/${scope}/${pkg}/src/index.ts`, false));
+  }
+  imports.push(...unmatched);
+
+  imports[0].comments = ast.program.body[0].leadingComments;
+  let index = recast.print({
+    type: 'Program',
+    body: imports
+  }, {objectCurlySpacing: false, quote: 'single'}).code;
+  fs.mkdirSync(`packages/${scope}/${pkg}/src`);
+  fs.writeFileSync(`packages/${scope}/${pkg}/src/index.ts`, index);
 }

From 63e366a55d53f739d8e134bc1e3ecea64f638ef4 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 15 Jan 2026 15:13:29 -0500
Subject: [PATCH 17/68] move exports to their own folder

---
 .../react-spectrum/test/ActionGroup.test.tsx  |  2 +-
 scripts/migrateDeps.mjs                       | 62 ++++++++++++++-----
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/packages/@adobe/react-spectrum/test/ActionGroup.test.tsx b/packages/@adobe/react-spectrum/test/ActionGroup.test.tsx
index ec16114c8fc..414c4f1c4f1 100644
--- a/packages/@adobe/react-spectrum/test/ActionGroup.test.tsx
+++ b/packages/@adobe/react-spectrum/test/ActionGroup.test.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionGroup, Item} from '../';
+import {ActionGroup, Item} from '@adobe/react-spectrum';
 import {Provider} from '@react-spectrum/provider';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index d4db4207a8c..b1bfda06227 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -188,32 +188,54 @@ function migrateScope(scope, monopackage) {
     }
   }
 
-  // rewriteIndex(`packages/${monopackage}/src/index.ts`, scope);
-  rewriteMonopackageImports(`packages/${monopackage}/src/index.ts`);
+  fs.renameSync(`packages/${monopackage}/src/index.ts`, `packages/${monopackage}/exports/index.ts`);
+  rewriteMonopackageImports(`packages/${monopackage}/exports/index.ts`);
 }
 
 function prepareMonopackage(monopackage) {
   let monopackageJSON = JSON.parse(fs.readFileSync(`packages/${monopackage}/package.json`, 'utf8'));
-  monopackageJSON.source = ['src/index.ts', 'src/*/index.ts'];
+  monopackageJSON.source = 'exports/*.ts';
   if (!monopackageJSON.exports['.']) {
     monopackageJSON.exports = {
-      '.': monopackageJSON.exports,
-      './*': {
+      '.': {
+        source: './exports/index.ts',
+        types: './exports/index.ts',
+        import: './dist/import.mjs',
+        require: './dist/module.js'
+      },
+      './private/*': {
         source: ['./src/*.ts', './src/*.tsx', './src/*/index.ts'],
         types: ['./dist/*.d.ts', './src/*.ts', './src/*.tsx'],
         import: './dist/*.mjs',
         require: './dist/*.js'
+      },
+      './*': {
+        source: ['./exports/*.ts'],
+        types: ['./dist/*.d.ts', './exports/*.ts', './exports/*.tsx'],
+        import: './dist/*.mjs',
+        require: './dist/*.js'
       }
     };
   } else {
     // TODO
     monopackageJSON.exports = {
-      '.': monopackageJSON.exports['.'],
-      './*': {
+      '.': {
+        source: './exports/index.ts',
+        types: './exports/index.ts',
+        import: './dist/import.mjs',
+        require: './dist/module.js'
+      },
+      './private/*': {
         source: ['./src/*.ts', './src/*.tsx', './src/*/index.ts'],
         types: ['./dist/*.d.ts', './src/*.ts', './src/*.tsx'],
         import: './dist/*.mjs',
         require: './dist/*.js'
+      },
+      './*': {
+        source: ['./exports/*.ts'],
+        types: ['./dist/*.d.ts', './exports/*.ts', './exports/*.tsx'],
+        import: './dist/*.mjs',
+        require: './dist/*.js'
       }
     };
   }
@@ -229,7 +251,9 @@ function prepareMonopackage(monopackage) {
     }
   }
 
+  fs.mkdirSync(`packages/${monopackage}/exports`, {recursive: true});
   fs.writeFileSync(`packages/${monopackage}/package.json`, JSON.stringify(monopackageJSON, false, 2) + '\n');
+  fs.rmSync(`packages/${monopackage}/index.ts`);
 }
 
 function migratePackage(scope, name, monopackage) {
@@ -263,12 +287,18 @@ function migratePackage(scope, name, monopackage) {
 
   fs.writeFileSync(`packages/${monopackage}/package.json`, JSON.stringify(monopackageJSON, false, 2) + '\n');
 
-  packageJSON.source = 'index.ts';
-  delete packageJSON.exports; // TODO
+  packageJSON.source = 'src/index.ts';
+  // delete packageJSON.exports; // TODO
+  packageJSON.exports = {
+    source: './src/index.ts',
+    types: './src/index.ts',
+    // TODO
+  };
   packageJSON.dependencies = {
     [monopackage]: '^' + monopackageJSON.version
   };
   fs.writeFileSync(`packages/${scope}/${name}/package.json`, JSON.stringify(packageJSON, false, 2) + '\n');
+  fs.rmSync(`packages/${scope}/${name}/index.ts`);
 
   createPublicExports(monopackage, scope, name);
 }
@@ -289,7 +319,7 @@ function remapExports(exports, name) {
 
 function moveTree(scope, name, tree, monopackage) {
   if (fs.existsSync(`packages/${scope}/${name}/${tree}`)) {
-    let monopackageTree = tree === 'src' ? 'src/private' : tree;
+    let monopackageTree = tree;
     fs.rmSync(`packages/${monopackage}/${monopackageTree}/${name}`, {recursive: true, force: true});
     fs.mkdirSync(`packages/${monopackage}/${monopackageTree}`, {recursive: true});
     fs.renameSync(`packages/${scope}/${name}/${tree}`, `packages/${monopackage}/${monopackageTree}/${name}`);
@@ -489,7 +519,7 @@ function rewriteMonopackageImports(file, name, scope) {
       } else if (source === '../package.json') {
         source = '../../package.json';
       } else {
-        source = source.replace(/\.\.\/(src|stories|chromatic|intl)/, (_, tree) => `../../${tree}/${tree === 'src' ? 'private/' : ''}${name}`);
+        source = source.replace(/\.\.\/(src|stories|chromatic|intl)/, (_, tree) => `../../${tree}/${name}`);
       }
       node.source = t.stringLiteral(source);
     } else if (source.startsWith('/packages/') && !source.startsWith('/packages/@internationalized/')) {
@@ -512,7 +542,7 @@ function rewriteMonopackageImports(file, name, scope) {
 
       let tree = parts.shift();
 
-      source = `packages/${monopackage}/${tree}/${tree === 'src' ? 'private/' : ''}${pkg}/${parts.join('/')}`;
+      source = `packages/${monopackage}/${tree}/${pkg}/${parts.join('/')}`;
       source = path.relative(path.dirname(file), source);
       if (!source.startsWith('.')) {
         source = './' + source;
@@ -613,7 +643,7 @@ function getRenamedSpecifier(specifier, from, importedName, relative = true) {
     let subpath = pkg === monopackage ? name : `${pkg}/${name}`;
     let fullPath = monopackage === 'react-aria-components' || monopackage === '@react-spectrum/s2'
       ? `packages/${monopackage}/src/${subpath}`
-      : `packages/${monopackage}/src/private/${subpath}`;
+      : `packages/${monopackage}/src/${subpath}`;
     let relative = path.relative(path.dirname(from), fullPath);
     if (!relative.startsWith('.')) {
       relative = './' + relative;
@@ -648,7 +678,7 @@ function getRenamedSpecifier(specifier, from, importedName, relative = true) {
 }
 
 function createPublicExports(monopackage, scope, pkg) {
-  let file = `packages/${monopackage}/src/private/${pkg}/index.ts`;
+  let file = `packages/${monopackage}/src/${pkg}/index.ts`;
   let content = fs.readFileSync(file, 'utf8');
   let ast = recast.parse(content, {
     parser: {
@@ -687,7 +717,7 @@ function createPublicExports(monopackage, scope, pkg) {
       node.specifiers = node.specifiers.filter(s => importMap[monopackage][s.exported.name]);
       if (node.source.value.startsWith('./') && node.specifiers.length > 0) {
         let source = node.source.value.slice(2);
-        node.source.value = `./private/${pkg}/${source}`;
+        node.source.value = `${monopackage}/private/${pkg}/${source}`;
         if (standalone.has(source)) {
           groups[source] ||= [];
           groups[source].push(node);
@@ -705,7 +735,7 @@ function createPublicExports(monopackage, scope, pkg) {
       type: 'Program',
       body: groups[source].concat(unmatched)
     }, {objectCurlySpacing: false, quote: 'single'}).code;
-    fs.writeFileSync(`packages/${monopackage}/src/${path.basename(source)}.ts`, content);
+    fs.writeFileSync(`packages/${monopackage}/exports/${path.basename(source)}.ts`, content);
   }
 
   fs.rmSync(file);

From ef23b8c0294b6d73ec2d025d65453d5063daa544 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Fri, 16 Jan 2026 20:30:12 -0500
Subject: [PATCH 18/68] wip: fixing monopackages

---
 scripts/migrateDeps.mjs | 213 +++++++++++++++-------------------------
 1 file changed, 78 insertions(+), 135 deletions(-)

diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index b1bfda06227..69361b7efbb 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -4,7 +4,7 @@ import * as recast from 'recast';
 import * as t from '@babel/types';
 import {parse} from '@babel/parser';
 
-const skipped = ['example-theme', 'test-utils', 'story-utils', 's2', 'style-macro-s1'];
+const skipped = ['example-theme', 'test-utils', 'story-utils', 'style-macro-s1'];
 const importMap = {
   'react-aria': buildImportMap('packages/react-aria/src/index.ts'),
   'react-stately': buildImportMap('packages/react-stately/src/index.ts'),
@@ -52,6 +52,23 @@ standalone.add('TableHeader');
 standalone.add('useToggleGroupState');
 standalone.add('useColorPickerState');
 
+standalone.add('CloseButton');
+standalone.add('CustomDialog');
+standalone.add('FullscreenDialog');
+standalone.add('ImageCoordinator');
+standalone.add('NotificationBadge');
+standalone.add('SkeletonCollection');
+
+// these are questionable.
+standalone.add('ColorThumb');
+standalone.add('FieldError');
+standalone.add('Input');
+standalone.add('Collection');
+standalone.add('Label');
+standalone.add('OverlayArrow');
+standalone.add('SelectionIndicator');
+standalone.add('SharedElementTransition');
+
 // Documented but not in the monopackage.
 standalone.delete('useAutocomplete');
 standalone.delete('useAutocompleteState');
@@ -121,7 +138,8 @@ let parentFile = {
   // 'Point': 'useVirtualizerState',
   // 'Rect': 'useVirtualizerState',
   // 'Size': 'useVirtualizerState',
-  'DateSegmentType': 'useDateFieldState'
+  'DateSegmentType': 'useDateFieldState',
+  'DragAndDrop': 'useDragAndDrop'
 };
 
 // Names that are included in public files but not exported by monopackages.
@@ -172,7 +190,6 @@ migrateScope('@react-stately', 'react-stately');
 migrateScope('@react-spectrum', '@adobe/react-spectrum');
 migrateToMonopackage('react-aria-components');
 migrateToMonopackage('@react-spectrum/s2');
-migrateToMonopackage('@internationalized/number');
 
 function migrateScope(scope, monopackage) {
   prepareMonopackage(monopackage);
@@ -180,7 +197,7 @@ function migrateScope(scope, monopackage) {
   for (let pkg of fs.globSync(`packages/${scope}/*`).sort()) {
     if (fs.statSync(pkg).isDirectory()) {
       let name = path.basename(pkg);
-      if (skipped.includes(name)) {
+      if (skipped.includes(name) || name === 's2') {
         continue;
       }
 
@@ -189,7 +206,7 @@ function migrateScope(scope, monopackage) {
   }
 
   fs.renameSync(`packages/${monopackage}/src/index.ts`, `packages/${monopackage}/exports/index.ts`);
-  rewriteMonopackageImports(`packages/${monopackage}/exports/index.ts`);
+  rewriteMonopackageImports(`packages/${monopackage}/exports/index.ts`, monopackage, '');
 }
 
 function prepareMonopackage(monopackage) {
@@ -300,21 +317,7 @@ function migratePackage(scope, name, monopackage) {
   fs.writeFileSync(`packages/${scope}/${name}/package.json`, JSON.stringify(packageJSON, false, 2) + '\n');
   fs.rmSync(`packages/${scope}/${name}/index.ts`);
 
-  createPublicExports(monopackage, scope, name);
-}
-
-function remapExports(exports, name) {
-  exports = {...exports};
-  for (let key in exports) {
-    if (typeof exports[key] === 'string') {
-      exports[key] = exports[key].replace(/\.\/(src|dist)/, `./$1/${name}`);
-    } else if (Array.isArray(exports[key])) {
-      exports[key] = exports[key].map(v => v.replace(/\.\/(src|dist)/, `./$1/${name}`));
-    } else if (typeof exports[key] === 'object') {
-      exports[key] = remapExports(exports[key], name);
-    }
-  }
-  return exports;
+  createPublicExports(`packages/${monopackage}/src/${name}/index.ts`, monopackage, scope, name);
 }
 
 function moveTree(scope, name, tree, monopackage) {
@@ -326,76 +329,14 @@ function moveTree(scope, name, tree, monopackage) {
 
     for (let file of fs.globSync(`packages/${monopackage}/${monopackageTree}/${name}/**/*.{ts,tsx,js,jsx,mdx}`)) {
       // rewriteImports(file, scope, name);
-      rewriteMonopackageImports(file, name, scope);
+      rewriteMonopackageImports(file, `${scope}/${name}`, name);
     }
   }
 }
 
-// function rewriteImports(file, scope, name) {
-//   let contents = fs.readFileSync(file, 'utf8');
-//   contents = contents.replace(/@(react-aria|react-spectrum|react-stately)\/([^/'"]+)\/(src|test|stories|chromatic|intl)/g, (m, importedScope, pkg, dir) => {
-//     if (skipped.some(s => pkg.includes(s))) {
-//       return m;
-//     }
-
-//     if (importedScope === 'react-spectrum') {
-//       return pkg === 's2' ? `@react-spectrum/s2/${dir}` : `@adobe/react-spectrum/${dir}/${pkg}`;
-//     }
-//     return `${importedScope}/${dir}/${pkg}`;
-//   });
-
-//   contents = contents.replace(/@(react-aria|react-spectrum|react-stately)\/([^/'"]+)/g, (m, importedScope, pkg) => {
-//     if (skipped.some(s => pkg.includes(s))) {
-//       return m;
-//     }
-    
-//     if (scope && importedScope === scope.slice(1) && file.includes('src')) {
-//       return `../${pkg}`;
-//     }
-
-//     if (importedScope === 'react-spectrum') {
-//       return pkg === 's2' ? '@react-spectrum/s2' : `@adobe/react-spectrum/${pkg}`;
-//     }
-//     return `${importedScope}/${pkg}`;
-//   });
-
-//   if (scope) {
-//     contents = contents.replaceAll('../src', `../../src/${name}`);
-//     contents = contents.replaceAll('../stories', `../../stories/${name}`);
-//     contents = contents.replaceAll('../chromatic', `../../chromatic/${name}`);
-//     contents = contents.replaceAll('../index', `../../src/${name}`);
-//     contents = contents.replaceAll("'../'", `'../../src/${name}'`);
-//     contents = contents.replaceAll("'..'", `'../../src/${name}'`);
-//     contents = contents.replaceAll('../intl', `../../intl/${name}`);
-//     contents = contents.replaceAll('../package.json', '../../package.json');
-//   }
-
-//   fs.writeFileSync(file, contents);
-// }
-
-// function rewriteIndex(file, scope) {
-//   let contents = fs.readFileSync(file, 'utf8');
-//   contents = contents.replace(/@(react-aria|react-spectrum|react-stately)\/([^/'"]+)/g, (m, importedScope, pkg) => {
-//     if (skipped.some(s => pkg.includes(s))) {
-//       return m;
-//     }
-
-//     if (importedScope === scope.slice(1)) {
-//       return `./${pkg}`;
-//     }
-
-//     if (importedScope === 'react-spectrum') {
-//       return pkg === 's2' ? '@react-spectrum/s2' : `@adobe/react-spectrum/${pkg}`;
-//     }
-//     return `${importedScope}/${pkg}`;
-//   });
-
-//   fs.writeFileSync(file, contents);
-// }
-
 function migrateToMonopackage(pkg) {
   for (let file of fs.globSync(`packages/${pkg}/**/*.{ts,tsx,js,jsx,mdx}`)) {
-    rewriteMonopackageImports(file); // TODO: only src?
+    rewriteMonopackageImports(file, pkg, ''); // TODO: only src?
     // rewriteImports(file);
   }
 
@@ -417,24 +358,23 @@ function migrateToMonopackage(pkg) {
     };
   }
 
-  // for (let specifier in importMap[pkg]) {
-  //   let [source] = importMap[pkg][specifier];
-  //   if (source.startsWith('./') && !packageJSON.exports[source]) {
-  //     let ext = ['ts', 'tsx', 'js'].find(e => fs.existsSync(`packages/${pkg}/src/${source.slice(2)}.${e}`));
-  //     packageJSON.exports[source] = {
-  //       source: `./src/${source.slice(2)}.${ext}`,
-  //       types: [`./dist/${source.slice(2)}.d.ts`, `./src/${source.slice(2)}.${ext}`],
-  //       import: `./dist/${source.slice(2)}.mjs`,
-  //       require: `./dist/${source.slice(2)}.cjs`
-  //     };
-  //   }
-  // }
+  packageJSON.exports['.'].source = './exports/index.ts';
+  if (Array.isArray(packageJSON.exports['.'].types)) {
+    packageJSON.exports['.'].types[1] = './exports/index.ts';
+  }
 
   packageJSON.exports['./*'] = {
-    source: ['./src/*.ts', './src/*.tsx']
+    source: './exports/*.ts',
+    types: './exports/*.ts'
   };
 
   fs.writeFileSync(`packages/${pkg}/package.json`, JSON.stringify(packageJSON, false, 2) + '\n');
+
+  fs.mkdirSync(`packages/${pkg}/exports`, {recursive: true});
+  fs.renameSync(`packages/${pkg}/src/index.ts`, `packages/${pkg}/exports/index.ts`);
+  createPublicExports(`packages/${pkg}/exports/index.ts`, pkg);
+
+  fs.rmSync(`packages/${pkg}/index.ts`, {force: true});
 }
 
 function buildImportMap(file) {
@@ -460,7 +400,7 @@ function buildImportMap(file) {
   return map;
 }
 
-function rewriteMonopackageImports(file, name, scope) {
+function rewriteMonopackageImports(file, pkg, subpath) {
   if (path.extname(file) === '.mdx') {
     return;
   }
@@ -511,15 +451,15 @@ function rewriteMonopackageImports(file, name, scope) {
     if (importMap[source]) {
       hadImports = true;
       return getImportStatements(node, file);
-    } else if (source.startsWith('.') && name) {
+    } else if (source.startsWith('.') && pkg) {
       hadImports = true;
       if (source === '.' || source === './' || source === './index' || source === '../' || source === '..' || source === '../index' || source === '../src') {
-        node.source = t.stringLiteral(`${scope}/${name}`);
+        node.source = t.stringLiteral(pkg);
         return getImportStatements(node, file);
-      } else if (source === '../package.json') {
+      } else if (source === '../package.json' && subpath) {
         source = '../../package.json';
-      } else {
-        source = source.replace(/\.\.\/(src|stories|chromatic|intl)/, (_, tree) => `../../${tree}/${name}`);
+      } else if (subpath) {
+        source = source.replace(/\.\.\/(src|stories|chromatic|intl)/, (_, tree) => `../../${tree}/${subpath}`);
       }
       node.source = t.stringLiteral(source);
     } else if (source.startsWith('/packages/') && !source.startsWith('/packages/@internationalized/')) {
@@ -620,27 +560,25 @@ function getRenamedSpecifier(specifier, from, importedName, relative = true) {
 
   let parts = specifier.split('/');
   let scope = parts.shift();
-  let fullPkg = scope;
   let pkg = scope;
+  if (pkg.startsWith('@')) {
+    pkg = parts.shift();
+  }
+
   let monopackage;
   if (scope === '@react-spectrum') {
-    monopackage = '@adobe/react-spectrum';
+    monopackage = pkg === 's2' ? '@react-spectrum/s2' : '@adobe/react-spectrum';
   } else if (scope.startsWith('@')) {
     monopackage = scope.slice(1);
   } else {
     monopackage = scope;
   }
 
-  if (pkg.startsWith('@')) {
-    pkg = parts.shift();
-    fullPkg += '/' + pkg;
-  }
-
   let name = parts.join('/');
 
   let [fromPkg] = parsePackage(from);
   if (relative && fromPkg === monopackage) {
-    let subpath = pkg === monopackage ? name : `${pkg}/${name}`;
+    let subpath = pkg === monopackage || monopackage === '@react-spectrum/s2' ? name : `${pkg}/${name}`;
     let fullPath = monopackage === 'react-aria-components' || monopackage === '@react-spectrum/s2'
       ? `packages/${monopackage}/src/${subpath}`
       : `packages/${monopackage}/src/${subpath}`;
@@ -677,8 +615,11 @@ function getRenamedSpecifier(specifier, from, importedName, relative = true) {
   return `${monopackage}/${subpath}`;
 }
 
-function createPublicExports(monopackage, scope, pkg) {
-  let file = `packages/${monopackage}/src/${pkg}/index.ts`;
+function createPublicExports(file, monopackage, scope, pkg) {
+  if (!importMap[monopackage]) {
+    return;
+  }
+
   let content = fs.readFileSync(file, 'utf8');
   let ast = recast.parse(content, {
     parser: {
@@ -717,8 +658,8 @@ function createPublicExports(monopackage, scope, pkg) {
       node.specifiers = node.specifiers.filter(s => importMap[monopackage][s.exported.name]);
       if (node.source.value.startsWith('./') && node.specifiers.length > 0) {
         let source = node.source.value.slice(2);
-        node.source.value = `${monopackage}/private/${pkg}/${source}`;
-        if (standalone.has(source)) {
+        node.source.value = pkg ? `${monopackage}/private/${pkg}/${source}` : `../src/${source}`;
+        if (standalone.has(source) || (monopackage === 'react-aria-components' && source === 'utils')) {
           groups[source] ||= [];
           groups[source].push(node);
         } else if (parentFile[source]) {
@@ -733,29 +674,31 @@ function createPublicExports(monopackage, scope, pkg) {
     groups[source][0].comments = ast.program.body[0].leadingComments;
     let content = recast.print({
       type: 'Program',
-      body: groups[source].concat(unmatched)
+      body: groups[source]
     }, {objectCurlySpacing: false, quote: 'single'}).code;
     fs.writeFileSync(`packages/${monopackage}/exports/${path.basename(source)}.ts`, content);
   }
 
-  fs.rmSync(file);
-  
-  let imports = [];
-  if (specifiers.length) {
-    imports.push(...getImportStatements(t.exportNamedDeclaration(null, specifiers, t.stringLiteral(`${scope}/${pkg}`)), `packages/${scope}/${pkg}/src/index.ts`, false));
-  }
-  if (typeSpecifiers.length) {
-    let decl = t.exportNamedDeclaration(null, typeSpecifiers, t.stringLiteral(`${scope}/${pkg}`));
-    decl.exportKind = 'type';
-    imports.push(...getImportStatements(decl, `packages/${scope}/${pkg}/src/index.ts`, false));
+  if (scope) {
+    fs.rmSync(file);
+    
+    let imports = [];
+    if (specifiers.length) {
+      imports.push(...getImportStatements(t.exportNamedDeclaration(null, specifiers, t.stringLiteral(`${scope}/${pkg}`)), `packages/${scope}/${pkg}/src/index.ts`, false));
+    }
+    if (typeSpecifiers.length) {
+      let decl = t.exportNamedDeclaration(null, typeSpecifiers, t.stringLiteral(`${scope}/${pkg}`));
+      decl.exportKind = 'type';
+      imports.push(...getImportStatements(decl, `packages/${scope}/${pkg}/src/index.ts`, false));
+    }
+    imports.push(...unmatched);
+
+    imports[0].comments = ast.program.body[0].leadingComments;
+    let index = recast.print({
+      type: 'Program',
+      body: imports
+    }, {objectCurlySpacing: false, quote: 'single'}).code;
+    fs.mkdirSync(`packages/${scope}/${pkg}/src`);
+    fs.writeFileSync(`packages/${scope}/${pkg}/src/index.ts`, index);
   }
-  imports.push(...unmatched);
-
-  imports[0].comments = ast.program.body[0].leadingComments;
-  let index = recast.print({
-    type: 'Program',
-    body: imports
-  }, {objectCurlySpacing: false, quote: 'single'}).code;
-  fs.mkdirSync(`packages/${scope}/${pkg}/src`);
-  fs.writeFileSync(`packages/${scope}/${pkg}/src/index.ts`, index);
 }

From 6d2b54f97107b264d4fd7eaf29abab8517c8c021 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 27 Jan 2026 10:27:56 -0800
Subject: [PATCH 19/68] Refactor RSPContexts

---
 packages/dev/s2-docs/src/SearchTagGroups.tsx  |  2 +-
 .../src/Autocomplete.tsx                      | 22 +++++++-
 .../react-aria-components/src/Calendar.tsx    |  2 +-
 .../react-aria-components/src/Checkbox.tsx    |  2 +-
 .../react-aria-components/src/ColorArea.tsx   |  3 +-
 .../react-aria-components/src/ColorField.tsx  |  3 +-
 .../react-aria-components/src/ColorPicker.tsx |  5 +-
 .../react-aria-components/src/ColorSlider.tsx |  3 +-
 .../react-aria-components/src/ColorWheel.tsx  |  2 +-
 packages/react-aria-components/src/Dialog.tsx |  2 +-
 .../react-aria-components/src/GridList.tsx    |  3 +-
 .../react-aria-components/src/Heading.tsx     |  7 +--
 .../react-aria-components/src/ListBox.tsx     |  2 +-
 packages/react-aria-components/src/Menu.tsx   |  2 +-
 .../react-aria-components/src/RSPContexts.ts  | 52 -------------------
 .../react-aria-components/src/SearchField.tsx |  2 +-
 packages/react-aria-components/src/Table.tsx  |  3 +-
 .../react-aria-components/src/TagGroup.tsx    |  2 +-
 .../react-aria-components/src/TextField.tsx   |  2 +-
 packages/react-aria-components/src/Tree.tsx   |  2 +-
 packages/react-aria-components/src/index.ts   | 19 +++----
 21 files changed, 57 insertions(+), 85 deletions(-)
 delete mode 100644 packages/react-aria-components/src/RSPContexts.ts

diff --git a/packages/dev/s2-docs/src/SearchTagGroups.tsx b/packages/dev/s2-docs/src/SearchTagGroups.tsx
index 521d0335d1d..22a438eb498 100644
--- a/packages/dev/s2-docs/src/SearchTagGroups.tsx
+++ b/packages/dev/s2-docs/src/SearchTagGroups.tsx
@@ -2,7 +2,7 @@ import {divider} from './SearchMenu';
 import {Key, Separator as RACSeparator} from 'react-aria-components';
 import LinkOutIcon from '../../../@react-spectrum/s2/ui-icons/LinkOut';
 import React from 'react';
-import {SelectableCollectionContext} from '../../../react-aria-components/src/RSPContexts';
+import {SelectableCollectionContext} from '../../../react-aria-components/src/Autocomplete';
 import {style} from '@react-spectrum/s2/style' with { type: 'macro' };
 import {Tag, TagGroup} from '@react-spectrum/s2';
 
diff --git a/packages/react-aria-components/src/Autocomplete.tsx b/packages/react-aria-components/src/Autocomplete.tsx
index 88ece4f9a1a..82edfbfcc42 100644
--- a/packages/react-aria-components/src/Autocomplete.tsx
+++ b/packages/react-aria-components/src/Autocomplete.tsx
@@ -11,16 +11,34 @@
  */
 
 import {AriaAutocompleteProps, useAutocomplete} from '@react-aria/autocomplete';
+import {AriaTextFieldProps} from 'react-aria';
 import {AutocompleteState, useAutocompleteState} from '@react-stately/autocomplete';
-import {FieldInputContext, SelectableCollectionContext} from './RSPContexts';
+import {ContextValue, Provider, removeDataAttributes, SlotProps, SlottedContextValue, useSlottedContext} from './utils';
+import {DOMProps, FocusableElement, FocusEvents, KeyboardEvents, ValueBase} from '@react-types/shared';
 import {mergeProps} from '@react-aria/utils';
-import {Provider, removeDataAttributes, SlotProps, SlottedContextValue, useSlottedContext} from './utils';
 import React, {createContext, JSX, useRef} from 'react';
 
 export interface AutocompleteProps<T = object> extends AriaAutocompleteProps<T>, SlotProps {}
 export const AutocompleteContext = createContext<SlottedContextValue<Partial<AutocompleteProps<any>>>>(null);
 export const AutocompleteStateContext = createContext<AutocompleteState | null>(null);
 
+export interface SelectableCollectionContextValue<T> extends DOMProps, AriaLabelingProps {
+  filter?: (nodeTextValue: string, node: Node<T>) => boolean,
+  /** Whether the collection items should use virtual focus instead of being focused directly. */
+  shouldUseVirtualFocus?: boolean,
+  /** Whether typeahead is disabled. */
+  disallowTypeAhead?: boolean
+}
+interface FieldInputContextValue<T = FocusableElement> extends
+  DOMProps,
+  FocusEvents<T>,
+  KeyboardEvents,
+  Pick<ValueBase<string>, 'onChange' | 'value'>,
+  Pick<AriaTextFieldProps, 'enterKeyHint' | 'aria-controls' | 'aria-autocomplete' | 'aria-activedescendant' | 'spellCheck' | 'autoCorrect' | 'autoComplete'> {}
+
+export const SelectableCollectionContext = createContext<ContextValue<SelectableCollectionContextValue<any>, HTMLElement>>(null);
+export const FieldInputContext = createContext<ContextValue<FieldInputContextValue, FocusableElement>>(null);
+
 /**
  * An autocomplete allows users to search or filter a list of suggestions.
  */
diff --git a/packages/react-aria-components/src/Calendar.tsx b/packages/react-aria-components/src/Calendar.tsx
index de17a651abb..324aa919b4b 100644
--- a/packages/react-aria-components/src/Calendar.tsx
+++ b/packages/react-aria-components/src/Calendar.tsx
@@ -40,7 +40,7 @@ import {
 } from './utils';
 import {DOMAttributes, FocusableElement, forwardRefType, GlobalDOMAttributes, HoverEvents} from '@react-types/shared';
 import {filterDOMProps} from '@react-aria/utils';
-import {HeadingContext} from './RSPContexts';
+import {HeadingContext} from './Heading';
 import React, {createContext, ForwardedRef, forwardRef, ReactElement, useContext, useRef} from 'react';
 import {TextContext} from './Text';
 
diff --git a/packages/react-aria-components/src/Checkbox.tsx b/packages/react-aria-components/src/Checkbox.tsx
index c32c6428e1d..938baf78b9c 100644
--- a/packages/react-aria-components/src/Checkbox.tsx
+++ b/packages/react-aria-components/src/Checkbox.tsx
@@ -10,7 +10,6 @@
  * governing permissions and limitations under the License.
  */
 import {AriaCheckboxGroupProps, AriaCheckboxProps, HoverEvents, mergeProps, useCheckbox, useCheckboxGroup, useCheckboxGroupItem, useFocusRing, useHover, VisuallyHidden} from 'react-aria';
-import {CheckboxContext} from './RSPContexts';
 import {CheckboxGroupState, useCheckboxGroupState, useToggleState} from 'react-stately';
 import {
   ClassNameOrFunction,
@@ -132,6 +131,7 @@ export interface CheckboxRenderProps {
   isRequired: boolean
 }
 
+export const CheckboxContext = createContext<ContextValue<CheckboxProps, HTMLLabelElement>>(null);
 export const CheckboxGroupContext = createContext<ContextValue<CheckboxGroupProps, HTMLDivElement>>(null);
 export const CheckboxGroupStateContext = createContext<CheckboxGroupState | null>(null);
 
diff --git a/packages/react-aria-components/src/ColorArea.tsx b/packages/react-aria-components/src/ColorArea.tsx
index 4106818da5b..ebb0a290e44 100644
--- a/packages/react-aria-components/src/ColorArea.tsx
+++ b/packages/react-aria-components/src/ColorArea.tsx
@@ -1,13 +1,13 @@
 import {AriaColorAreaProps, useColorArea} from 'react-aria';
 import {
   ClassNameOrFunction,
+  ContextValue,
   Provider,
   RenderProps,
   SlotProps,
   useContextProps,
   useRenderProps
 } from './utils';
-import {ColorAreaContext} from './RSPContexts';
 import {ColorAreaState, useColorAreaState} from 'react-stately';
 import {filterDOMProps, mergeProps} from '@react-aria/utils';
 import {GlobalDOMAttributes} from '@react-types/shared';
@@ -34,6 +34,7 @@ export interface ColorAreaProps extends AriaColorAreaProps, RenderProps<ColorAre
   className?: ClassNameOrFunction<ColorAreaRenderProps>
 }
 
+export const ColorAreaContext = createContext<ContextValue<Partial<ColorAreaProps>, HTMLDivElement>>(null);
 export const ColorAreaStateContext = createContext<ColorAreaState | null>(null);
 
 /**
diff --git a/packages/react-aria-components/src/ColorField.tsx b/packages/react-aria-components/src/ColorField.tsx
index 98dd799e728..af3c0bcd8de 100644
--- a/packages/react-aria-components/src/ColorField.tsx
+++ b/packages/react-aria-components/src/ColorField.tsx
@@ -13,6 +13,7 @@
 import {AriaColorFieldProps, useColorChannelField, useColorField, useLocale} from 'react-aria';
 import {
   ClassNameOrFunction,
+  ContextValue,
   Provider,
   RACValidation,
   removeDataAttributes,
@@ -23,7 +24,6 @@ import {
   useSlot
 } from './utils';
 import {ColorChannel, ColorFieldState, ColorSpace, useColorChannelFieldState, useColorFieldState} from 'react-stately';
-import {ColorFieldContext} from './RSPContexts';
 import {FieldErrorContext} from './FieldError';
 import {filterDOMProps} from '@react-aria/utils';
 import {GlobalDOMAttributes, InputDOMProps, ValidationResult} from '@react-types/shared';
@@ -83,6 +83,7 @@ export interface ColorFieldProps extends Omit<AriaColorFieldProps, 'label' | 'pl
   colorSpace?: ColorSpace
 }
 
+export const ColorFieldContext = createContext<ContextValue<ColorFieldProps, HTMLDivElement>>(null);
 export const ColorFieldStateContext = createContext<ColorFieldState | null>(null);
 
 /**
diff --git a/packages/react-aria-components/src/ColorPicker.tsx b/packages/react-aria-components/src/ColorPicker.tsx
index 602f19e3662..ea136aeff11 100644
--- a/packages/react-aria-components/src/ColorPicker.tsx
+++ b/packages/react-aria-components/src/ColorPicker.tsx
@@ -12,9 +12,12 @@
 
 import {ChildrenOrFunction, Provider, SlotProps, SlottedContextValue, useRenderProps, useSlottedContext} from './utils';
 import {Color, ColorPickerState, ColorPickerProps as StatelyColorPickerProps, useColorPickerState} from 'react-stately';
-import {ColorAreaContext, ColorFieldContext, ColorSliderContext, ColorWheelContext} from './RSPContexts';
+import {ColorAreaContext} from './ColorArea';
+import {ColorFieldContext} from './ColorField';
+import {ColorSliderContext} from './ColorSlider';
 import {ColorSwatchContext} from './ColorSwatch';
 import {ColorSwatchPickerContext} from './ColorSwatchPicker';
+import {ColorWheelContext} from './ColorWheel';
 import {mergeProps} from 'react-aria';
 import React, {createContext, JSX} from 'react';
 
diff --git a/packages/react-aria-components/src/ColorSlider.tsx b/packages/react-aria-components/src/ColorSlider.tsx
index f2e32673d60..84e480cf1b3 100644
--- a/packages/react-aria-components/src/ColorSlider.tsx
+++ b/packages/react-aria-components/src/ColorSlider.tsx
@@ -1,6 +1,7 @@
 import {AriaColorSliderProps, Orientation, useColorSlider, useLocale} from 'react-aria';
 import {
   ClassNameOrFunction,
+  ContextValue,
   Provider,
   RenderProps,
   SlotProps,
@@ -8,7 +9,6 @@ import {
   useRenderProps,
   useSlot
 } from './utils';
-import {ColorSliderContext} from './RSPContexts';
 import {ColorSliderState, useColorSliderState} from 'react-stately';
 import {filterDOMProps} from '@react-aria/utils';
 import {GlobalDOMAttributes} from '@react-types/shared';
@@ -42,6 +42,7 @@ export interface ColorSliderProps extends Omit<AriaColorSliderProps, 'label'>, R
   className?: ClassNameOrFunction<ColorSliderRenderProps>
 }
 
+export const ColorSliderContext = createContext<ContextValue<Partial<ColorSliderProps>, HTMLDivElement>>(null);
 export const ColorSliderStateContext = createContext<ColorSliderState | null>(null);
 
 /**
diff --git a/packages/react-aria-components/src/ColorWheel.tsx b/packages/react-aria-components/src/ColorWheel.tsx
index 62975d56abf..c641b7d94a1 100644
--- a/packages/react-aria-components/src/ColorWheel.tsx
+++ b/packages/react-aria-components/src/ColorWheel.tsx
@@ -9,7 +9,6 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {ColorWheelContext} from './RSPContexts';
 import {ColorWheelState, useColorWheelState} from 'react-stately';
 import {filterDOMProps} from '@react-aria/utils';
 import {GlobalDOMAttributes} from '@react-types/shared';
@@ -36,6 +35,7 @@ export interface ColorWheelProps extends AriaColorWheelOptions, RenderProps<Colo
   className?: ClassNameOrFunction<ColorWheelRenderProps>
 }
 
+export const ColorWheelContext = createContext<ContextValue<Partial<ColorWheelProps>, HTMLDivElement>>(null);
 export const ColorWheelStateContext = createContext<ColorWheelState | null>(null);
 
 /**
diff --git a/packages/react-aria-components/src/Dialog.tsx b/packages/react-aria-components/src/Dialog.tsx
index 6cd79de255f..c0ab8b9afec 100644
--- a/packages/react-aria-components/src/Dialog.tsx
+++ b/packages/react-aria-components/src/Dialog.tsx
@@ -14,7 +14,7 @@ import {ButtonContext} from './Button';
 import {ContextValue, DEFAULT_SLOT, Provider, SlotProps, StyleProps, useContextProps, useRenderProps} from './utils';
 import {filterDOMProps, mergeProps, useResizeObserver} from '@react-aria/utils';
 import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared';
-import {HeadingContext} from './RSPContexts';
+import {HeadingContext} from './Heading';
 import {OverlayTriggerProps, OverlayTriggerState, useMenuTriggerState} from 'react-stately';
 import {PopoverContext} from './Popover';
 import {PressResponder} from '@react-aria/interactions';
diff --git a/packages/react-aria-components/src/GridList.tsx b/packages/react-aria-components/src/GridList.tsx
index 7711cf95e4e..774a6870735 100644
--- a/packages/react-aria-components/src/GridList.tsx
+++ b/packages/react-aria-components/src/GridList.tsx
@@ -11,7 +11,7 @@
  */
 import {AriaGridListProps, DraggableItemResult, DragPreviewRenderer, DropIndicatorAria, DroppableCollectionResult, FocusScope, ListKeyboardDelegate, mergeProps, useCollator, useFocusRing, useGridList, useGridListItem, useGridListSection, useGridListSelectionCheckbox, useHover, useLocale, useVisuallyHidden} from 'react-aria';
 import {ButtonContext} from './Button';
-import {CheckboxContext, FieldInputContext, SelectableCollectionContext, SelectableCollectionContextValue} from './RSPContexts';
+import {CheckboxContext} from './Checkbox';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -29,6 +29,7 @@ import {CollectionProps, CollectionRendererContext, DefaultCollectionRenderer, I
 import {DragAndDropContext, DropIndicatorContext, DropIndicatorProps, useDndPersistedKeys, useRenderDropIndicator} from './DragAndDrop';
 import {DragAndDropHooks} from './useDragAndDrop';
 import {DraggableCollectionState, DroppableCollectionState, Collection as ICollection, ListState, Node, SelectionBehavior, UNSTABLE_useFilteredListState, useListState} from 'react-stately';
+import {FieldInputContext, SelectableCollectionContext, SelectableCollectionContextValue} from './Autocomplete';
 import {filterDOMProps, inertValue, LoadMoreSentinelProps, useLoadMoreSentinel, useObjectRef} from '@react-aria/utils';
 import {forwardRefType, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, PressEvents, RefObject} from '@react-types/shared';
 import {ListStateContext} from './ListBox';
diff --git a/packages/react-aria-components/src/Heading.tsx b/packages/react-aria-components/src/Heading.tsx
index fc9649321df..63078d94ecf 100644
--- a/packages/react-aria-components/src/Heading.tsx
+++ b/packages/react-aria-components/src/Heading.tsx
@@ -10,14 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {HeadingContext} from './RSPContexts';
-import React, {ElementType, ForwardedRef, forwardRef, HTMLAttributes} from 'react';
-import {useContextProps} from './utils';
+import {ContextValue, useContextProps} from './utils';
+import React, {createContext, ElementType, ForwardedRef, forwardRef, HTMLAttributes} from 'react';
 
 export interface HeadingProps extends HTMLAttributes<HTMLElement> {
   level?: number
 }
 
+export const HeadingContext = createContext<ContextValue<HeadingProps, HTMLHeadingElement>>({});
+
 export const Heading = forwardRef(function Heading(props: HeadingProps, ref: ForwardedRef<HTMLHeadingElement>) {
   [props, ref] = useContextProps(props, ref, HeadingContext);
   let {children, level = 3, className, ...domProps} = props;
diff --git a/packages/react-aria-components/src/ListBox.tsx b/packages/react-aria-components/src/ListBox.tsx
index 721db33ce6f..cb16fe360dd 100644
--- a/packages/react-aria-components/src/ListBox.tsx
+++ b/packages/react-aria-components/src/ListBox.tsx
@@ -33,7 +33,7 @@ import {filterDOMProps, inertValue, LoadMoreSentinelProps, useLoadMoreSentinel,
 import {FocusEvents, forwardRefType, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, PressEvents, RefObject} from '@react-types/shared';
 import {HeaderContext} from './Header';
 import React, {createContext, ForwardedRef, forwardRef, JSX, ReactNode, useContext, useEffect, useMemo, useRef} from 'react';
-import {SelectableCollectionContext, SelectableCollectionContextValue} from './RSPContexts';
+import {SelectableCollectionContext, SelectableCollectionContextValue} from './Autocomplete';
 import {SelectionIndicatorContext} from './SelectionIndicator';
 import {SeparatorContext} from './Separator';
 import {SharedElementTransition} from './SharedElementTransition';
diff --git a/packages/react-aria-components/src/Menu.tsx b/packages/react-aria-components/src/Menu.tsx
index 6aef1a7d20e..1f4a221f44b 100644
--- a/packages/react-aria-components/src/Menu.tsx
+++ b/packages/react-aria-components/src/Menu.tsx
@@ -27,7 +27,7 @@ import {
   useSlottedContext
 } from './utils';
 import {CollectionProps, CollectionRendererContext, ItemRenderProps, SectionContext, SectionProps, usePersistedKeys} from './Collection';
-import {FieldInputContext, SelectableCollectionContext, SelectableCollectionContextValue} from './RSPContexts';
+import {FieldInputContext, SelectableCollectionContext, SelectableCollectionContextValue} from './Autocomplete';
 import {filterDOMProps, useObjectRef, useResizeObserver} from '@react-aria/utils';
 import {FocusStrategy, forwardRefType, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, MultipleSelection, PressEvents} from '@react-types/shared';
 import {HeaderContext} from './Header';
diff --git a/packages/react-aria-components/src/RSPContexts.ts b/packages/react-aria-components/src/RSPContexts.ts
deleted file mode 100644
index 1e45acc3e11..00000000000
--- a/packages/react-aria-components/src/RSPContexts.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2024 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-import {AriaLabelingProps, DOMProps, FocusableElement, FocusEvents, KeyboardEvents, Node, ValueBase} from '@react-types/shared';
-import {AriaTextFieldProps} from '@react-aria/textfield';
-import {CheckboxProps} from './Checkbox';
-import {ColorAreaProps} from './ColorArea';
-import {ColorFieldProps} from './ColorField';
-import {ColorSliderProps} from './ColorSlider';
-import {ColorWheelProps} from './ColorWheel';
-import {ContextValue} from './utils';
-import {createContext} from 'react';
-import {HeadingProps} from './Heading';
-
-// This file is a temporary workaround for a tree shaking issue in SWC (the minifier used by Parcel).
-// These are the contexts consumed by React Spectrum components that don't use the implementation from RAC
-// (they use hooks). When included in the same file as the implementation, Parcel includes both the context
-// and implementation even if only the context is imported. We moved these contexts to a separate file so
-// that the implementation does not get included in the bundle. This will be removed once the tree shaking
-// issue is fixed.
-export const CheckboxContext = createContext<ContextValue<CheckboxProps, HTMLLabelElement>>(null);
-export const ColorAreaContext = createContext<ContextValue<Partial<ColorAreaProps>, HTMLDivElement>>(null);
-export const ColorFieldContext = createContext<ContextValue<ColorFieldProps, HTMLDivElement>>(null);
-export const ColorSliderContext = createContext<ContextValue<Partial<ColorSliderProps>, HTMLDivElement>>(null);
-export const ColorWheelContext = createContext<ContextValue<Partial<ColorWheelProps>, HTMLDivElement>>(null);
-export const HeadingContext = createContext<ContextValue<HeadingProps, HTMLHeadingElement>>({});
-
-export interface SelectableCollectionContextValue<T> extends DOMProps, AriaLabelingProps {
-  filter?: (nodeTextValue: string, node: Node<T>) => boolean,
-  /** Whether the collection items should use virtual focus instead of being focused directly. */
-  shouldUseVirtualFocus?: boolean,
-  /** Whether typeahead is disabled. */
-  disallowTypeAhead?: boolean
-}
-interface FieldInputContextValue<T = FocusableElement> extends
-  DOMProps,
-  FocusEvents<T>,
-  KeyboardEvents,
-  Pick<ValueBase<string>, 'onChange' | 'value'>,
-  Pick<AriaTextFieldProps, 'enterKeyHint' | 'aria-controls' | 'aria-autocomplete' | 'aria-activedescendant' | 'spellCheck' | 'autoCorrect' | 'autoComplete'> {}
-
-export const SelectableCollectionContext = createContext<ContextValue<SelectableCollectionContextValue<any>, HTMLElement>>(null);
-export const FieldInputContext = createContext<ContextValue<FieldInputContextValue, FocusableElement>>(null);
diff --git a/packages/react-aria-components/src/SearchField.tsx b/packages/react-aria-components/src/SearchField.tsx
index 4a86b4f4ace..5cbf808fcfa 100644
--- a/packages/react-aria-components/src/SearchField.tsx
+++ b/packages/react-aria-components/src/SearchField.tsx
@@ -27,7 +27,7 @@ import {
 } from './utils';
 import {createHideableComponent} from '@react-aria/collections';
 import {FieldErrorContext} from './FieldError';
-import {FieldInputContext} from './RSPContexts';
+import {FieldInputContext} from './Autocomplete';
 import {filterDOMProps} from '@react-aria/utils';
 import {FormContext} from './Form';
 import {GlobalDOMAttributes} from '@react-types/shared';
diff --git a/packages/react-aria-components/src/Table.tsx b/packages/react-aria-components/src/Table.tsx
index 96836b8f5e8..541db6c6fea 100644
--- a/packages/react-aria-components/src/Table.tsx
+++ b/packages/react-aria-components/src/Table.tsx
@@ -2,7 +2,7 @@ import {AriaLabelingProps, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps,
 import {BaseCollection, Collection, CollectionBuilder, CollectionNode, createBranchComponent, createLeafComponent, FilterableNode, LoaderNode, useCachedChildren} from '@react-aria/collections';
 import {buildHeaderRows, TableColumnResizeState} from '@react-stately/table';
 import {ButtonContext} from './Button';
-import {CheckboxContext, FieldInputContext, SelectableCollectionContext, SelectableCollectionContextValue} from './RSPContexts';
+import {CheckboxContext} from './Checkbox';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -22,6 +22,7 @@ import {DisabledBehavior, DraggableCollectionState, DroppableCollectionState, Mu
 import {DragAndDropContext, DropIndicatorContext, DropIndicatorProps, useDndPersistedKeys, useRenderDropIndicator} from './DragAndDrop';
 import {DragAndDropHooks} from './useDragAndDrop';
 import {DraggableItemResult, DragPreviewRenderer, DropIndicatorAria, DroppableCollectionResult, FocusScope, ListKeyboardDelegate, mergeProps, useFocusRing, useHover, useLocale, useLocalizedStringFormatter, useTable, useTableCell, useTableColumnHeader, useTableColumnResize, useTableHeaderRow, useTableRow, useTableRowGroup, useTableSelectAllCheckbox, useTableSelectionCheckbox, useVisuallyHidden} from 'react-aria';
+import {FieldInputContext, SelectableCollectionContext, SelectableCollectionContextValue} from './Autocomplete';
 import {filterDOMProps, inertValue, isScrollable, LoadMoreSentinelProps, mergeRefs, useLayoutEffect, useLoadMoreSentinel, useObjectRef, useResizeObserver} from '@react-aria/utils';
 import {GridNode} from '@react-types/grid';
 // @ts-ignore
diff --git a/packages/react-aria-components/src/TagGroup.tsx b/packages/react-aria-components/src/TagGroup.tsx
index 0e63c0184f7..c744e1472c9 100644
--- a/packages/react-aria-components/src/TagGroup.tsx
+++ b/packages/react-aria-components/src/TagGroup.tsx
@@ -32,7 +32,7 @@ import {LabelContext} from './Label';
 import {ListState, Node, UNSTABLE_useFilteredListState, useListState} from 'react-stately';
 import {ListStateContext} from './ListBox';
 import React, {createContext, ForwardedRef, forwardRef, JSX, ReactNode, useContext, useEffect, useRef} from 'react';
-import {SelectableCollectionContext, SelectableCollectionContextValue} from './RSPContexts';
+import {SelectableCollectionContext, SelectableCollectionContextValue} from './Autocomplete';
 import {SelectionIndicatorContext} from './SelectionIndicator';
 import {SharedElementTransition} from './SharedElementTransition';
 import {TextContext} from './Text';
diff --git a/packages/react-aria-components/src/TextField.tsx b/packages/react-aria-components/src/TextField.tsx
index f99b95040ce..8a4558c2ea2 100644
--- a/packages/react-aria-components/src/TextField.tsx
+++ b/packages/react-aria-components/src/TextField.tsx
@@ -27,7 +27,7 @@ import {
 } from './utils';
 import {createHideableComponent} from '@react-aria/collections';
 import {FieldErrorContext} from './FieldError';
-import {FieldInputContext} from './RSPContexts';
+import {FieldInputContext} from './Autocomplete';
 import {filterDOMProps} from '@react-aria/utils';
 import {FormContext} from './Form';
 import {GlobalDOMAttributes} from '@react-types/shared';
diff --git a/packages/react-aria-components/src/Tree.tsx b/packages/react-aria-components/src/Tree.tsx
index 6eeac03c73e..5116904fe40 100644
--- a/packages/react-aria-components/src/Tree.tsx
+++ b/packages/react-aria-components/src/Tree.tsx
@@ -12,7 +12,7 @@
 
 import {AriaTreeItemOptions, AriaTreeProps, DraggableItemResult, DropIndicatorAria, DropIndicatorProps, DroppableCollectionResult, FocusScope, ListKeyboardDelegate, mergeProps, useCollator, useFocusRing,  useGridListSelectionCheckbox, useHover, useId, useLocale, useTree, useTreeItem, useVisuallyHidden} from 'react-aria';
 import {ButtonContext} from './Button';
-import {CheckboxContext} from './RSPContexts';
+import {CheckboxContext} from './Checkbox';
 import {
   ChildrenOrFunction,
   ClassNameOrFunction,
diff --git a/packages/react-aria-components/src/index.ts b/packages/react-aria-components/src/index.ts
index fe3d37dfe97..273fde49463 100644
--- a/packages/react-aria-components/src/index.ts
+++ b/packages/react-aria-components/src/index.ts
@@ -14,21 +14,19 @@
 // to import it from a React Server Component in a framework like Next.js.
 import 'client-only';
 
-export {CheckboxContext, ColorAreaContext, ColorFieldContext, ColorSliderContext, ColorWheelContext, HeadingContext, SelectableCollectionContext, FieldInputContext} from './RSPContexts';
-
-export {Autocomplete, AutocompleteContext, AutocompleteStateContext} from './Autocomplete';
+export {Autocomplete, AutocompleteContext, AutocompleteStateContext, SelectableCollectionContext, FieldInputContext} from './Autocomplete';
 export {Breadcrumbs, BreadcrumbsContext, Breadcrumb} from './Breadcrumbs';
 export {Button, ButtonContext} from './Button';
 export {Calendar, CalendarGrid, CalendarGridHeader, CalendarGridBody, CalendarHeaderCell, CalendarCell, RangeCalendar, CalendarContext, RangeCalendarContext, CalendarStateContext, RangeCalendarStateContext} from './Calendar';
-export {Checkbox, CheckboxGroup, CheckboxGroupContext, CheckboxGroupStateContext} from './Checkbox';
-export {ColorArea, ColorAreaStateContext} from './ColorArea';
-export {ColorField, ColorFieldStateContext} from './ColorField';
+export {Checkbox, CheckboxGroup, CheckboxContext, CheckboxGroupContext, CheckboxGroupStateContext} from './Checkbox';
+export {ColorArea, ColorAreaContext, ColorAreaStateContext} from './ColorArea';
+export {ColorField, ColorFieldContext, ColorFieldStateContext} from './ColorField';
 export {ColorPicker, ColorPickerContext, ColorPickerStateContext} from './ColorPicker';
-export {ColorSlider, ColorSliderStateContext} from './ColorSlider';
+export {ColorSlider, ColorSliderContext, ColorSliderStateContext} from './ColorSlider';
 export {ColorSwatch, ColorSwatchContext} from './ColorSwatch';
 export {ColorSwatchPicker, ColorSwatchPickerItem, ColorSwatchPickerContext} from './ColorSwatchPicker';
 export {ColorThumb} from './ColorThumb';
-export {ColorWheel, ColorWheelTrack, ColorWheelTrackContext, ColorWheelStateContext} from './ColorWheel';
+export {ColorWheel, ColorWheelContext, ColorWheelTrack, ColorWheelTrackContext, ColorWheelStateContext} from './ColorWheel';
 export {ComboBox, ComboBoxContext, ComboBoxStateContext} from './ComboBox';
 export {composeRenderProps, DEFAULT_SLOT, Provider, useContextProps, useRenderProps, useSlottedContext} from './utils';
 export {DateField, DateInput, DateSegment, TimeField, DateFieldContext, TimeFieldContext, DateFieldStateContext, TimeFieldStateContext} from './DateField';
@@ -42,7 +40,7 @@ export {Form, FormContext} from './Form';
 export {GridListLoadMoreItem, GridList, GridListItem, GridListContext, GridListHeader, GridListHeaderContext, GridListSection} from './GridList';
 export {Group, GroupContext} from './Group';
 export {Header, HeaderContext} from './Header';
-export {Heading} from './Heading';
+export {Heading, HeadingContext} from './Heading';
 export {Input, InputContext} from './Input';
 export {Section, CollectionRendererContext, DefaultCollectionRenderer} from './Collection';
 export {Collection, createLeafComponent, createBranchComponent, CollectionBuilder} from '@react-aria/collections';
@@ -87,7 +85,7 @@ export {FormValidationContext, parseColor, getColorChannels, ToastQueue as UNSTA
 export {ListLayout, GridLayout, WaterfallLayout} from '@react-stately/layout';
 export {Layout, LayoutInfo, Size, Rect, Point} from '@react-stately/virtualizer';
 
-export type {AutocompleteProps} from './Autocomplete';
+export type {AutocompleteProps, SelectableCollectionContextValue} from './Autocomplete';
 export type {BreadcrumbsProps, BreadcrumbProps, BreadcrumbRenderProps} from './Breadcrumbs';
 export type {ButtonProps, ButtonRenderProps} from './Button';
 export type {CalendarCellProps, CalendarProps, CalendarRenderProps, CalendarGridProps, CalendarGridHeaderProps, CalendarGridBodyProps, CalendarHeaderCellProps, CalendarCellRenderProps, RangeCalendarProps, RangeCalendarRenderProps} from './Calendar';
@@ -156,4 +154,3 @@ export type {CalendarState, CheckboxGroupState, Color, ColorAreaState, ColorFiel
 export type {AutocompleteState} from '@react-stately/autocomplete';
 export type {ListLayoutOptions, GridLayoutOptions, WaterfallLayoutOptions} from '@react-stately/layout';
 export type {RangeValue, ValidationResult, RouterConfig} from '@react-types/shared';
-export type {SelectableCollectionContextValue} from './RSPContexts';

From e64660d399aab2174159714875929e5189555aed Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 27 Jan 2026 10:41:47 -0800
Subject: [PATCH 20/68] merge RadioGroup and Radio files

---
 packages/@react-spectrum/s2/src/Radio.tsx     | 146 ------------------
 .../@react-spectrum/s2/src/RadioGroup.tsx     | 138 ++++++++++++++++-
 packages/@react-spectrum/s2/src/index.ts      |   6 +-
 3 files changed, 134 insertions(+), 156 deletions(-)
 delete mode 100644 packages/@react-spectrum/s2/src/Radio.tsx

diff --git a/packages/@react-spectrum/s2/src/Radio.tsx b/packages/@react-spectrum/s2/src/Radio.tsx
deleted file mode 100644
index ea4c535d9c1..00000000000
--- a/packages/@react-spectrum/s2/src/Radio.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2024 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-import {
-  Radio as AriaRadio,
-  RadioProps as AriaRadioProps,
-  RadioRenderProps
-} from 'react-aria-components';
-import {baseColor, focusRing, space, style} from '../style' with {type: 'macro'};
-import {CenterBaseline} from './CenterBaseline';
-import {controlFont, controlSize, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
-import {FocusableRef, GlobalDOMAttributes} from '@react-types/shared';
-import {FormContext, useFormProps} from './Form';
-import {forwardRef, ReactNode, useContext, useRef} from 'react';
-import {pressScale} from './pressScale';
-import {useFocusableRef} from '@react-spectrum/utils';
-
-export interface RadioProps extends Omit<AriaRadioProps, 'className' | 'style' | 'children' | 'onHover' | 'onHoverStart' | 'onHoverEnd' | 'onHoverChange' | 'onClick' | keyof GlobalDOMAttributes>, StyleProps {
-  /**
-   * The label for the element.
-   */
-  children?: ReactNode
-}
-
-interface ContextProps {
-  /**
-   * The size of the Radio.
-   *
-   * @default 'M'
-   */
-  size?: 'S' | 'M' | 'L' | 'XL',
-  /**
-   * Whether the Radio within a RadioGroup should be displayed with an emphasized style.
-   */
-  isEmphasized?: boolean
-}
-
-interface RadioContextProps extends RadioProps, ContextProps {}
-
-interface RenderProps extends RadioRenderProps, ContextProps {}
-
-const wrapper = style({
-  display: 'flex',
-  position: 'relative',
-  columnGap: 'text-to-control',
-  alignItems: 'baseline',
-  font: controlFont(),
-  transition: 'colors',
-  color: {
-    default: baseColor('neutral'),
-    isDisabled: {
-      default: 'disabled',
-      forcedColors: 'GrayText'
-    }
-  },
-  gridColumnStart: {
-    isInForm: 'field'
-  },
-  disableTapHighlight: true
-}, getAllowedOverrides());
-
-const circle = style<RenderProps>({
-  ...focusRing(),
-  size: controlSize('sm'),
-  flexShrink: 0,
-  display: 'flex',
-  alignItems: 'center',
-  justifyContent: 'center',
-  transition: 'default',
-  borderRadius: 'full',
-  borderStyle: 'solid',
-  boxSizing: 'border-box',
-  borderWidth: {
-    default: space(2),
-    isSelected: 'calc((self(height) - (4 / 16) * 1rem) / 2)'
-  },
-  forcedColorAdjust: 'none',
-  backgroundColor: 'gray-25',
-  borderColor: {
-    default: baseColor('gray-800'),
-    forcedColors: 'ButtonBorder',
-    isSelected: {
-      isEmphasized: baseColor('accent-900'),
-      forcedColors: 'Highlight'
-    },
-    isInvalid: {
-      default: baseColor('negative'),
-      forcedColors: 'Mark'
-    },
-    isDisabled: {
-      default: 'gray-400',
-      forcedColors: 'GrayText'
-    }
-  }
-});
-
-/**
- * Radio buttons allow users to select a single option from a list of mutually exclusive options.
- * All possible options are exposed up front for users to compare.
- */
-export const Radio = /*#__PURE__*/ forwardRef(function Radio(props: RadioProps, ref: FocusableRef<HTMLLabelElement>) {
-  let {children, UNSAFE_className = '', UNSAFE_style} = props;
-  let circleRef = useRef(null);
-  let inputRef = useRef<HTMLInputElement | null>(null);
-  let domRef = useFocusableRef(ref, inputRef);
-  let isInForm = !!useContext(FormContext);
-  let {
-    size = 'M',
-    ...allProps
-  } = useFormProps<RadioContextProps>(props);
-
-  return (
-    <AriaRadio
-      {...allProps}
-      ref={domRef}
-      inputRef={inputRef}
-      style={UNSAFE_style}
-      className={renderProps => UNSAFE_className + wrapper({...renderProps, isInForm, size}, allProps.styles)}>
-      {renderProps => (
-        <>
-          <CenterBaseline>
-            <div
-              ref={circleRef}
-              style={pressScale(circleRef)(renderProps)}
-              className={circle({
-                ...renderProps,
-                isEmphasized: allProps.isEmphasized,
-                isSelected: renderProps.isSelected,
-                size
-              })} />
-          </CenterBaseline>
-          {children}
-        </>
-      )}
-    </AriaRadio>
-  );
-});
diff --git a/packages/@react-spectrum/s2/src/RadioGroup.tsx b/packages/@react-spectrum/s2/src/RadioGroup.tsx
index 2d979c3a350..d332e7b2dc9 100644
--- a/packages/@react-spectrum/s2/src/RadioGroup.tsx
+++ b/packages/@react-spectrum/s2/src/RadioGroup.tsx
@@ -11,17 +11,22 @@
  */
 
 import {
+  Radio as AriaRadio,
   RadioGroup as AriaRadioGroup,
   RadioGroupProps as AriaRadioGroupProps,
-  ContextValue
+    RadioProps as AriaRadioProps,
+  ContextValue,
+  RadioRenderProps
 } from 'react-aria-components';
-import {DOMRef, DOMRefValue, GlobalDOMAttributes, HelpTextProps, Orientation, SpectrumLabelableProps} from '@react-types/shared';
-import {field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
+import {baseColor, focusRing, space, style} from '../style' with {type: 'macro'};
+import {CenterBaseline} from './CenterBaseline';
+import {controlFont, controlSize, field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
+import {DOMRef, DOMRefValue, FocusableRef, GlobalDOMAttributes, HelpTextProps, Orientation, SpectrumLabelableProps} from '@react-types/shared';
 import {FieldLabel, HelpText} from './Field';
 import {FormContext, useFormProps} from './Form';
-import React, {createContext, forwardRef, ReactNode, useContext} from 'react';
-import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {pressScale} from './pressScale';
+import React, {createContext, forwardRef, ReactNode, useContext, useRef} from 'react';
+import {useDOMRef, useFocusableRef} from '@react-spectrum/utils';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface RadioGroupProps extends Omit<AriaRadioGroupProps, 'className' | 'style' | 'children' | keyof GlobalDOMAttributes>, StyleProps, SpectrumLabelableProps, HelpTextProps {
@@ -137,3 +142,124 @@ export const RadioGroup = /*#__PURE__*/ forwardRef(function RadioGroup(props: Ra
     </AriaRadioGroup>
   );
 });
+
+export interface RadioProps extends Omit<AriaRadioProps, 'className' | 'style' | 'children' | 'onHover' | 'onHoverStart' | 'onHoverEnd' | 'onHoverChange' | 'onClick' | keyof GlobalDOMAttributes>, StyleProps {
+  /**
+   * The label for the element.
+   */
+  children?: ReactNode
+}
+
+interface ContextProps {
+  /**
+   * The size of the Radio.
+   *
+   * @default 'M'
+   */
+  size?: 'S' | 'M' | 'L' | 'XL',
+  /**
+   * Whether the Radio within a RadioGroup should be displayed with an emphasized style.
+   */
+  isEmphasized?: boolean
+}
+
+interface RadioContextProps extends RadioProps, ContextProps {}
+
+interface RenderProps extends RadioRenderProps, ContextProps {}
+
+const wrapper = style({
+  display: 'flex',
+  position: 'relative',
+  columnGap: 'text-to-control',
+  alignItems: 'baseline',
+  font: controlFont(),
+  transition: 'colors',
+  color: {
+    default: baseColor('neutral'),
+    isDisabled: {
+      default: 'disabled',
+      forcedColors: 'GrayText'
+    }
+  },
+  gridColumnStart: {
+    isInForm: 'field'
+  },
+  disableTapHighlight: true
+}, getAllowedOverrides());
+
+const circle = style<RenderProps>({
+  ...focusRing(),
+  size: controlSize('sm'),
+  flexShrink: 0,
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'center',
+  transition: 'default',
+  borderRadius: 'full',
+  borderStyle: 'solid',
+  boxSizing: 'border-box',
+  borderWidth: {
+    default: space(2),
+    isSelected: 'calc((self(height) - (4 / 16) * 1rem) / 2)'
+  },
+  forcedColorAdjust: 'none',
+  backgroundColor: 'gray-25',
+  borderColor: {
+    default: baseColor('gray-800'),
+    forcedColors: 'ButtonBorder',
+    isSelected: {
+      isEmphasized: baseColor('accent-900'),
+      forcedColors: 'Highlight'
+    },
+    isInvalid: {
+      default: baseColor('negative'),
+      forcedColors: 'Mark'
+    },
+    isDisabled: {
+      default: 'gray-400',
+      forcedColors: 'GrayText'
+    }
+  }
+});
+
+/**
+ * Radio buttons allow users to select a single option from a list of mutually exclusive options.
+ * All possible options are exposed up front for users to compare.
+ */
+export const Radio = /*#__PURE__*/ forwardRef(function Radio(props: RadioProps, ref: FocusableRef<HTMLLabelElement>) {
+  let {children, UNSAFE_className = '', UNSAFE_style} = props;
+  let circleRef = useRef(null);
+  let inputRef = useRef<HTMLInputElement | null>(null);
+  let domRef = useFocusableRef(ref, inputRef);
+  let isInForm = !!useContext(FormContext);
+  let {
+    size = 'M',
+    ...allProps
+  } = useFormProps<RadioContextProps>(props);
+
+  return (
+    <AriaRadio
+      {...allProps}
+      ref={domRef}
+      inputRef={inputRef}
+      style={UNSAFE_style}
+      className={renderProps => UNSAFE_className + wrapper({...renderProps, isInForm, size}, allProps.styles)}>
+      {renderProps => (
+        <>
+          <CenterBaseline>
+            <div
+              ref={circleRef}
+              style={pressScale(circleRef)(renderProps)}
+              className={circle({
+                ...renderProps,
+                isEmphasized: allProps.isEmphasized,
+                isSelected: renderProps.isSelected,
+                size
+              })} />
+          </CenterBaseline>
+          {children}
+        </>
+      )}
+    </AriaRadio>
+  );
+});
diff --git a/packages/@react-spectrum/s2/src/index.ts b/packages/@react-spectrum/s2/src/index.ts
index 0865c16c0cb..e56617a0e2c 100644
--- a/packages/@react-spectrum/s2/src/index.ts
+++ b/packages/@react-spectrum/s2/src/index.ts
@@ -66,8 +66,7 @@ export {Popover} from './Popover';
 export {ProgressBar, ProgressBarContext} from './ProgressBar';
 export {ProgressCircle, ProgressCircleContext} from './ProgressCircle';
 export {Provider, ColorSchemeContext} from './Provider';
-export {Radio} from './Radio';
-export {RadioGroup, RadioGroupContext} from './RadioGroup';
+export {RadioGroup, RadioGroupContext, Radio} from './RadioGroup';
 export {RangeCalendar, RangeCalendarContext} from './RangeCalendar';
 export {RangeSlider, RangeSliderContext} from './RangeSlider';
 export {SearchField, SearchFieldContext} from './SearchField';
@@ -144,8 +143,7 @@ export type {PopoverProps} from './Popover';
 export type {ProgressBarProps} from './ProgressBar';
 export type {ProgressCircleProps} from './ProgressCircle';
 export type {ProviderProps} from './Provider';
-export type {RadioProps} from './Radio';
-export type {RadioGroupProps} from './RadioGroup';
+export type {RadioGroupProps, RadioProps} from './RadioGroup';
 export type {SearchFieldProps} from './SearchField';
 export type {SegmentedControlProps, SegmentedControlItemProps} from './SegmentedControl';
 export type {SelectBoxProps, SelectBoxGroupProps} from './SelectBoxGroup';

From 2370622b1937668bbce74c43ba0b369d7247ca70 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 27 Jan 2026 10:45:25 -0800
Subject: [PATCH 21/68] re-export TableLayout from Table

---
 packages/react-aria-components/src/Table.tsx | 2 ++
 packages/react-aria-components/src/index.ts  | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/react-aria-components/src/Table.tsx b/packages/react-aria-components/src/Table.tsx
index 541db6c6fea..36165a70c5b 100644
--- a/packages/react-aria-components/src/Table.tsx
+++ b/packages/react-aria-components/src/Table.tsx
@@ -32,6 +32,8 @@ import ReactDOM from 'react-dom';
 import {SelectionIndicatorContext} from './SelectionIndicator';
 import {SharedElementTransition} from './SharedElementTransition';
 
+export {TableLayout} from './TableLayout';
+
 class TableCollection<T> extends BaseCollection<T> implements ITableCollection<T> {
   headerRows: GridNode<T>[] = [];
   columns: GridNode<T>[] = [];
diff --git a/packages/react-aria-components/src/index.ts b/packages/react-aria-components/src/index.ts
index 273fde49463..7ad504091e1 100644
--- a/packages/react-aria-components/src/index.ts
+++ b/packages/react-aria-components/src/index.ts
@@ -63,8 +63,7 @@ export {Separator, SeparatorContext} from './Separator';
 export {SharedElementTransition, SharedElement} from './SharedElementTransition';
 export {Slider, SliderOutput, SliderTrack, SliderThumb, SliderContext, SliderOutputContext, SliderTrackContext, SliderStateContext} from './Slider';
 export {Switch, SwitchContext} from './Switch';
-export {TableLoadMoreItem, Table, Row, Cell, Column, ColumnResizer, TableHeader, TableBody, TableContext, ResizableTableContainer, useTableOptions, TableStateContext, TableColumnResizeStateContext} from './Table';
-export {TableLayout} from './TableLayout';
+export {TableLoadMoreItem, Table, Row, Cell, Column, ColumnResizer, TableHeader, TableBody, TableContext, ResizableTableContainer, useTableOptions, TableStateContext, TableColumnResizeStateContext, TableLayout} from './Table';
 export {Tabs, TabList, TabPanels, TabPanel, Tab, TabsContext, TabListStateContext} from './Tabs';
 export {TagGroup, TagGroupContext, TagList, TagListContext, Tag} from './TagGroup';
 export {Text, TextContext} from './Text';

From ce90c1e449d3f0fcae2b529fbf1f8d79a1c28d57 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 27 Jan 2026 11:04:36 -0800
Subject: [PATCH 22/68] Fixes

---
 .../s2/stories/ColorField.stories.tsx              |  2 +-
 .../react-aria-components/src/Autocomplete.tsx     |  2 +-
 packages/react-aria-components/src/Toast.tsx       | 14 ++++++++------
 packages/react-aria-components/src/index.ts        |  8 +++-----
 .../react-aria-components/src/useDragAndDrop.tsx   |  3 +++
 scripts/migrateDeps.mjs                            |  3 ++-
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/packages/@react-spectrum/s2/stories/ColorField.stories.tsx b/packages/@react-spectrum/s2/stories/ColorField.stories.tsx
index 5848c32a64b..c82e5f4635b 100644
--- a/packages/@react-spectrum/s2/stories/ColorField.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/ColorField.stories.tsx
@@ -18,7 +18,7 @@ import {
   Heading,
   Link,
   Text
-} from '../src/';
+} from '../src';
 import type {Meta, StoryObj} from '@storybook/react';
 
 const meta: Meta<typeof ColorField> = {
diff --git a/packages/react-aria-components/src/Autocomplete.tsx b/packages/react-aria-components/src/Autocomplete.tsx
index 82edfbfcc42..d315676016d 100644
--- a/packages/react-aria-components/src/Autocomplete.tsx
+++ b/packages/react-aria-components/src/Autocomplete.tsx
@@ -11,10 +11,10 @@
  */
 
 import {AriaAutocompleteProps, useAutocomplete} from '@react-aria/autocomplete';
+import {AriaLabelingProps, DOMProps, FocusableElement, FocusEvents, KeyboardEvents, Node, ValueBase} from '@react-types/shared';
 import {AriaTextFieldProps} from 'react-aria';
 import {AutocompleteState, useAutocompleteState} from '@react-stately/autocomplete';
 import {ContextValue, Provider, removeDataAttributes, SlotProps, SlottedContextValue, useSlottedContext} from './utils';
-import {DOMProps, FocusableElement, FocusEvents, KeyboardEvents, ValueBase} from '@react-types/shared';
 import {mergeProps} from '@react-aria/utils';
 import React, {createContext, JSX, useRef} from 'react';
 
diff --git a/packages/react-aria-components/src/Toast.tsx b/packages/react-aria-components/src/Toast.tsx
index 8ba2e724dfe..5dda5fcb9e5 100644
--- a/packages/react-aria-components/src/Toast.tsx
+++ b/packages/react-aria-components/src/Toast.tsx
@@ -31,7 +31,7 @@ import {TextContext} from './Text';
 import {useIsSSR} from '@react-aria/ssr';
 import {useUNSAFE_PortalContext} from '@react-aria/overlays';
 
-export const ToastStateContext = createContext<ToastState<any> | null>(null);
+const ToastStateContext = createContext<ToastState<any> | null>(null);
 
 export interface ToastRegionRenderProps<T> {
   /** A list of all currently visible toasts. */
@@ -68,7 +68,7 @@ export interface ToastRegionProps<T> extends AriaToastRegionProps, StyleRenderPr
 /**
  * A ToastRegion displays one or more toast notifications.
  */
-export const ToastRegion = /*#__PURE__*/ (forwardRef as forwardRefType)(function ToastRegion<T>(props: ToastRegionProps<T>, ref: ForwardedRef<HTMLDivElement>): JSX.Element | null {
+const ToastRegion = /*#__PURE__*/ (forwardRef as forwardRefType)(function ToastRegion<T>(props: ToastRegionProps<T>, ref: ForwardedRef<HTMLDivElement>): JSX.Element | null {
   let isSSR = useIsSSR();
   let state = useToastQueue(props.queue);
   let objectRef = useObjectRef(ref);
@@ -124,7 +124,7 @@ export interface ToastListProps<T> extends Omit<ToastRegionProps<T>, 'queue' | '
   children: (renderProps: {toast: QueuedToast<T>}) => ReactElement
 }
 
-export const ToastList = /*#__PURE__*/ (forwardRef as forwardRefType)(function ToastList<T>(props: ToastListProps<T>, ref: ForwardedRef<HTMLOListElement>) {
+const ToastList = /*#__PURE__*/ (forwardRef as forwardRefType)(function ToastList<T>(props: ToastListProps<T>, ref: ForwardedRef<HTMLOListElement>) {
   let state = useContext(ToastStateContext)!;
   let {hoverProps, isHovered} = useHover({});
   let renderProps = useRenderProps({
@@ -178,7 +178,7 @@ export interface ToastProps<T> extends AriaToastProps<T>, RenderProps<ToastRende
 /**
  * A Toast displays a brief, temporary notification of actions, errors, or other events in an application.
  */
-export const Toast = /*#__PURE__*/ (forwardRef as forwardRefType)(function Toast<T>(props: ToastProps<T>, ref: ForwardedRef<HTMLDivElement>) {
+const Toast = /*#__PURE__*/ (forwardRef as forwardRefType)(function Toast<T>(props: ToastProps<T>, ref: ForwardedRef<HTMLDivElement>) {
   let state = useContext(ToastStateContext)!;
   let objectRef = useObjectRef(ref);
   let {toastProps, contentProps, titleProps, descriptionProps, closeButtonProps} = useToast(
@@ -229,12 +229,12 @@ export const Toast = /*#__PURE__*/ (forwardRef as forwardRefType)(function Toast
   );
 });
 
-export const ToastContentContext = createContext<ContextValue<HTMLAttributes<HTMLElement>, HTMLDivElement>>({});
+const ToastContentContext = createContext<ContextValue<HTMLAttributes<HTMLElement>, HTMLDivElement>>({});
 
 /**
  * ToastContent wraps the main content of a toast notification.
  */
-export const ToastContent = /*#__PURE__*/ forwardRef(function ToastContent(props: HTMLAttributes<HTMLElement>, ref: ForwardedRef<HTMLDivElement>) {
+const ToastContent = /*#__PURE__*/ forwardRef(function ToastContent(props: HTMLAttributes<HTMLElement>, ref: ForwardedRef<HTMLDivElement>) {
   [props, ref] = useContextProps(props, ref, ToastContentContext);
   return (
     <div className="react-aria-ToastContent" {...props} ref={ref}>
@@ -242,3 +242,5 @@ export const ToastContent = /*#__PURE__*/ forwardRef(function ToastContent(props
     </div>
   );
 });
+
+export {Toast as UNSTABLE_Toast, ToastList as UNSTABLE_ToastList, ToastRegion as UNSTABLE_ToastRegion, ToastContent as UNSTABLE_ToastContent, ToastStateContext as UNSTABLE_ToastStateContext};
diff --git a/packages/react-aria-components/src/index.ts b/packages/react-aria-components/src/index.ts
index 7ad504091e1..e1b2ed1c79f 100644
--- a/packages/react-aria-components/src/index.ts
+++ b/packages/react-aria-components/src/index.ts
@@ -69,15 +69,14 @@ export {TagGroup, TagGroupContext, TagList, TagListContext, Tag} from './TagGrou
 export {Text, TextContext} from './Text';
 export {TextArea, TextAreaContext} from './TextArea';
 export {TextField, TextFieldContext} from './TextField';
-export {Toast as UNSTABLE_Toast, ToastList as UNSTABLE_ToastList, ToastRegion as UNSTABLE_ToastRegion, ToastContent as UNSTABLE_ToastContent, ToastStateContext as UNSTABLE_ToastStateContext} from './Toast';
+export {UNSTABLE_Toast, UNSTABLE_ToastList, UNSTABLE_ToastRegion, UNSTABLE_ToastContent, UNSTABLE_ToastStateContext} from './Toast';
 export {ToggleButton, ToggleButtonContext} from './ToggleButton';
 export {ToggleButtonGroup, ToggleButtonGroupContext, ToggleGroupStateContext} from './ToggleButtonGroup';
 export {Toolbar, ToolbarContext} from './Toolbar';
 export {TooltipTrigger, Tooltip, TooltipTriggerStateContext, TooltipContext} from './Tooltip';
 export {TreeLoadMoreItem, Tree, TreeItem, TreeContext, TreeItemContent, TreeStateContext} from './Tree';
 export {useDrag, useDrop} from '@react-aria/dnd';
-export {useDragAndDrop} from './useDragAndDrop';
-export {DropIndicator, DropIndicatorContext, DragAndDropContext} from './DragAndDrop';
+export {useDragAndDrop, DropIndicator, DropIndicatorContext, DragAndDropContext} from './useDragAndDrop';
 export {Virtualizer} from './Virtualizer';
 export {DIRECTORY_DRAG_TYPE, isDirectoryDropItem, isFileDropItem, isTextDropItem, SSRProvider, RouterProvider, I18nProvider, isRTL, useLocale, useFilter, Pressable, Focusable, VisuallyHidden} from 'react-aria';
 export {FormValidationContext, parseColor, getColorChannels, ToastQueue as UNSTABLE_ToastQueue, useListData, useTreeData, useAsyncList} from 'react-stately';
@@ -142,8 +141,7 @@ export type {ToolbarProps, ToolbarRenderProps} from './Toolbar';
 export type {TooltipProps, TooltipRenderProps, TooltipTriggerComponentProps} from './Tooltip';
 export type {TreeProps, TreeRenderProps, TreeItemProps, TreeItemRenderProps, TreeItemContentProps, TreeItemContentRenderProps, TreeLoadMoreItemProps, TreeLoadMoreItemRenderProps} from './Tree';
 export type {DragOptions, DragResult} from '@react-aria/dnd';
-export type {DragAndDropHooks, DragAndDropOptions} from './useDragAndDrop';
-export type {DropIndicatorProps, DropIndicatorRenderProps} from './DragAndDrop';
+export type {DragAndDropHooks, DragAndDropOptions, DropIndicatorProps, DropIndicatorRenderProps} from './useDragAndDrop';
 export type {ContextValue, RenderProps, SlotProps, StyleRenderProps} from './utils';
 export type {VirtualizerProps} from './Virtualizer';
 
diff --git a/packages/react-aria-components/src/useDragAndDrop.tsx b/packages/react-aria-components/src/useDragAndDrop.tsx
index 319868dc470..eb9ed06c294 100644
--- a/packages/react-aria-components/src/useDragAndDrop.tsx
+++ b/packages/react-aria-components/src/useDragAndDrop.tsx
@@ -43,6 +43,9 @@ import {
 import {isVirtualDragging} from '@react-aria/dnd';
 import {JSX, useMemo} from 'react';
 
+export {DropIndicator, DropIndicatorContext, DragAndDropContext} from './DragAndDrop';
+export type {DropIndicatorProps, DropIndicatorRenderProps} from './DragAndDrop';
+
 interface DraggableCollectionStateOpts<T = object> extends Omit<DraggableCollectionStateOptions<T>, 'getItems'> {}
 
 interface DragHooks<T = object> {
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index 69361b7efbb..f1885b6233d 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -68,6 +68,7 @@ standalone.add('Label');
 standalone.add('OverlayArrow');
 standalone.add('SelectionIndicator');
 standalone.add('SharedElementTransition');
+standalone.add('pressScale');
 
 // Documented but not in the monopackage.
 standalone.delete('useAutocomplete');
@@ -596,7 +597,7 @@ function getRenamedSpecifier(specifier, from, importedName, relative = true) {
   let isPrivate = privateNames.has(importedName);
   if (
     (monopackage === 'react-aria' && name === 'Virtualizer') ||
-    (monopackage === '@adobe/react-spectrum' && (name === 'CardView' || name === 'Card' || name === 'Overlay' || name === 'Popover' || name === 'Modal' || name === 'StepList' || name === 'SearchAutocomplete'))
+    (monopackage === '@adobe/react-spectrum' && (name === 'CardView' || name === 'Card' || name === 'Overlay' || name === 'Popover' || name === 'Modal' || name === 'StepList' || name === 'SearchAutocomplete' || name === 'Label'))
   ) {
     isPrivate = true;
   }

From bafd0c89ff30f59038edb023f123af2a3d15500e Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 27 Jan 2026 11:11:10 -0800
Subject: [PATCH 23/68] stop depending on v3 from s2

---
 packages/@react-spectrum/s2/src/Accordion.tsx |  2 +-
 packages/@react-spectrum/s2/src/ActionBar.tsx |  2 +-
 .../@react-spectrum/s2/src/ActionButton.tsx   |  2 +-
 packages/@react-spectrum/s2/src/Avatar.tsx    |  2 +-
 .../@react-spectrum/s2/src/AvatarGroup.tsx    |  2 +-
 packages/@react-spectrum/s2/src/Badge.tsx     |  2 +-
 .../@react-spectrum/s2/src/Breadcrumbs.tsx    |  4 +-
 packages/@react-spectrum/s2/src/Button.tsx    |  2 +-
 .../@react-spectrum/s2/src/ButtonGroup.tsx    |  7 +--
 packages/@react-spectrum/s2/src/Card.tsx      |  2 +-
 packages/@react-spectrum/s2/src/CardView.tsx  |  2 +-
 packages/@react-spectrum/s2/src/Checkbox.tsx  |  2 +-
 .../@react-spectrum/s2/src/CheckboxGroup.tsx  |  2 +-
 .../@react-spectrum/s2/src/ClearButton.tsx    |  2 +-
 .../@react-spectrum/s2/src/CloseButton.tsx    |  2 +-
 packages/@react-spectrum/s2/src/ColorArea.tsx |  2 +-
 .../@react-spectrum/s2/src/ColorField.tsx     |  2 +-
 .../@react-spectrum/s2/src/ColorSlider.tsx    |  2 +-
 .../@react-spectrum/s2/src/ColorSwatch.tsx    |  2 +-
 .../s2/src/ColorSwatchPicker.tsx              |  2 +-
 .../@react-spectrum/s2/src/ColorWheel.tsx     |  2 +-
 packages/@react-spectrum/s2/src/ComboBox.tsx  |  2 +-
 packages/@react-spectrum/s2/src/Content.tsx   |  2 +-
 .../@react-spectrum/s2/src/CustomDialog.tsx   |  2 +-
 packages/@react-spectrum/s2/src/Dialog.tsx    |  2 +-
 .../@react-spectrum/s2/src/Disclosure.tsx     |  2 +-
 packages/@react-spectrum/s2/src/Divider.tsx   |  2 +-
 packages/@react-spectrum/s2/src/DropZone.tsx  |  2 +-
 packages/@react-spectrum/s2/src/Field.tsx     |  2 +-
 packages/@react-spectrum/s2/src/Form.tsx      |  2 +-
 .../s2/src/FullscreenDialog.tsx               |  2 +-
 .../s2/src/IllustratedMessage.tsx             |  2 +-
 .../@react-spectrum/s2/src/InlineAlert.tsx    |  2 +-
 packages/@react-spectrum/s2/src/Link.tsx      |  2 +-
 packages/@react-spectrum/s2/src/Meter.tsx     |  2 +-
 packages/@react-spectrum/s2/src/Modal.tsx     |  2 +-
 .../s2/src/NotificationBadge.tsx              |  2 +-
 .../@react-spectrum/s2/src/NumberField.tsx    |  2 +-
 packages/@react-spectrum/s2/src/Picker.tsx    |  2 +-
 packages/@react-spectrum/s2/src/Popover.tsx   |  2 +-
 .../@react-spectrum/s2/src/ProgressBar.tsx    |  2 +-
 .../@react-spectrum/s2/src/ProgressCircle.tsx |  2 +-
 .../@react-spectrum/s2/src/RadioGroup.tsx     |  2 +-
 .../@react-spectrum/s2/src/RangeSlider.tsx    |  2 +-
 .../@react-spectrum/s2/src/SearchField.tsx    |  2 +-
 .../s2/src/SegmentedControl.tsx               |  2 +-
 packages/@react-spectrum/s2/src/Skeleton.tsx  |  2 +-
 packages/@react-spectrum/s2/src/Slider.tsx    |  2 +-
 .../@react-spectrum/s2/src/StatusLight.tsx    |  2 +-
 packages/@react-spectrum/s2/src/Switch.tsx    |  2 +-
 packages/@react-spectrum/s2/src/TableView.tsx |  3 +-
 packages/@react-spectrum/s2/src/Tabs.tsx      |  2 +-
 .../@react-spectrum/s2/src/TabsPicker.tsx     |  2 +-
 packages/@react-spectrum/s2/src/TagGroup.tsx  |  2 +-
 packages/@react-spectrum/s2/src/TextField.tsx |  2 +-
 packages/@react-spectrum/s2/src/Toast.tsx     |  2 +-
 .../@react-spectrum/s2/src/ToggleButton.tsx   |  2 +-
 packages/@react-spectrum/s2/src/Tooltip.tsx   |  2 +-
 packages/@react-spectrum/s2/src/TreeView.tsx  |  2 +-
 packages/@react-spectrum/s2/src/useDOMRef.ts  | 57 +++++++++++++++++++
 .../@react-spectrum/s2/src/useMediaQuery.ts   | 44 ++++++++++++++
 packages/@react-spectrum/s2/src/utils.ts      |  2 +-
 scripts/migrateDeps.mjs                       |  3 +
 63 files changed, 167 insertions(+), 65 deletions(-)
 create mode 100644 packages/@react-spectrum/s2/src/useDOMRef.ts
 create mode 100644 packages/@react-spectrum/s2/src/useMediaQuery.ts

diff --git a/packages/@react-spectrum/s2/src/Accordion.tsx b/packages/@react-spectrum/s2/src/Accordion.tsx
index 03c9373946a..9a790fc5a67 100644
--- a/packages/@react-spectrum/s2/src/Accordion.tsx
+++ b/packages/@react-spectrum/s2/src/Accordion.tsx
@@ -22,7 +22,7 @@ import {
 import {getAllowedOverrides, StyleProps, StylesPropWithHeight, UnsafeStyles} from './style-utils' with { type: 'macro' };
 import React, {createContext, forwardRef, ReactNode} from 'react';
 import {style} from '../style' with { type: 'macro' };
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface AccordionProps extends UnsafeStyles, DOMProps, SlotProps {
diff --git a/packages/@react-spectrum/s2/src/ActionBar.tsx b/packages/@react-spectrum/s2/src/ActionBar.tsx
index b73d0669a9c..05f00b939c1 100644
--- a/packages/@react-spectrum/s2/src/ActionBar.tsx
+++ b/packages/@react-spectrum/s2/src/ActionBar.tsx
@@ -22,7 +22,7 @@ import intlMessages from '../intl/*.json';
 import {lightDark, style} from '../style' with {type: 'macro'};
 import {StyleProps} from './style-utils' with { type: 'macro' };
 import {useControlledState} from '@react-stately/utils';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useEnterAnimation, useExitAnimation, useObjectRef, useResizeObserver} from '@react-aria/utils';
 import {useLocalizedStringFormatter} from '@react-aria/i18n';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
diff --git a/packages/@react-spectrum/s2/src/ActionButton.tsx b/packages/@react-spectrum/s2/src/ActionButton.tsx
index 4ed24b9e0d9..a055c637992 100644
--- a/packages/@react-spectrum/s2/src/ActionButton.tsx
+++ b/packages/@react-spectrum/s2/src/ActionButton.tsx
@@ -27,7 +27,7 @@ import {pressScale} from './pressScale';
 import {ProgressCircle} from './ProgressCircle';
 import {SkeletonContext} from './Skeleton';
 import {Text, TextContext} from './Content';
-import {useFocusableRef} from '@react-spectrum/utils';
+import {useFocusableRef} from './useDOMRef';
 import {useFormProps} from './Form';
 import {useLocalizedStringFormatter} from '@react-aria/i18n';
 import {usePendingState} from './Button';
diff --git a/packages/@react-spectrum/s2/src/Avatar.tsx b/packages/@react-spectrum/s2/src/Avatar.tsx
index 19935ea2488..76662f37550 100644
--- a/packages/@react-spectrum/s2/src/Avatar.tsx
+++ b/packages/@react-spectrum/s2/src/Avatar.tsx
@@ -19,7 +19,7 @@ import {getAllowedOverrides, StylesPropWithoutWidth, UnsafeStyles} from './style
 import {Image} from './Image';
 import {isDocsEnv} from './macros' with {type: 'macro'};
 import {style} from '../style' with { type: 'macro' };
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface AvatarProps extends UnsafeStyles, DOMProps, SlotProps {
diff --git a/packages/@react-spectrum/s2/src/AvatarGroup.tsx b/packages/@react-spectrum/s2/src/AvatarGroup.tsx
index 2bba0fa7b4b..47331274ea7 100644
--- a/packages/@react-spectrum/s2/src/AvatarGroup.tsx
+++ b/packages/@react-spectrum/s2/src/AvatarGroup.tsx
@@ -17,7 +17,7 @@ import {createContext, CSSProperties, forwardRef, ReactNode} from 'react';
 import {filterDOMProps} from '@react-aria/utils';
 import {getAllowedOverrides, StylesPropWithoutWidth, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useLabel} from 'react-aria';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/Badge.tsx b/packages/@react-spectrum/s2/src/Badge.tsx
index 8766942111c..19db9d14970 100644
--- a/packages/@react-spectrum/s2/src/Badge.tsx
+++ b/packages/@react-spectrum/s2/src/Badge.tsx
@@ -20,7 +20,7 @@ import {IconContext} from './Icon';
 import React, {createContext, forwardRef, ReactNode} from 'react';
 import {SkeletonWrapper} from './Skeleton';
 import {Text, TextContext} from './Content';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface BadgeStyleProps {
diff --git a/packages/@react-spectrum/s2/src/Breadcrumbs.tsx b/packages/@react-spectrum/s2/src/Breadcrumbs.tsx
index 033fa2fa295..9d7fb76c14f 100644
--- a/packages/@react-spectrum/s2/src/Breadcrumbs.tsx
+++ b/packages/@react-spectrum/s2/src/Breadcrumbs.tsx
@@ -33,12 +33,12 @@ import {createContext, forwardRef, Fragment, ReactNode, RefObject, useCallback,
 // @ts-ignore
 import FolderIcon from '../s2wf-icons/S2_Icon_FolderBreadcrumb_20_N.svg';
 import {forwardRefType} from './types';
-import {inertValue, useLayoutEffect} from '@react-aria/utils';
+import {inertValue, useLayoutEffect, useResizeObserver} from '@react-aria/utils';
 // @ts-ignore
 import intlMessages from '../intl/*.json';
 import {Menu, MenuItem, MenuTrigger} from './Menu';
 import {Text} from './Content';
-import {useDOMRef, useResizeObserver} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useLocale} from 'react-aria';
 import {useLocalizedStringFormatter} from '@react-aria/i18n';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
diff --git a/packages/@react-spectrum/s2/src/Button.tsx b/packages/@react-spectrum/s2/src/Button.tsx
index a9b9db869ec..3928f583208 100644
--- a/packages/@react-spectrum/s2/src/Button.tsx
+++ b/packages/@react-spectrum/s2/src/Button.tsx
@@ -24,7 +24,7 @@ import {pressScale} from './pressScale';
 import {ProgressCircle} from './ProgressCircle';
 import {SkeletonContext} from './Skeleton';
 import {Text, TextContext} from './Content';
-import {useFocusableRef} from '@react-spectrum/utils';
+import {useFocusableRef} from './useDOMRef';
 import {useFormProps} from './Form';
 import {useLocalizedStringFormatter} from '@react-aria/i18n';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
diff --git a/packages/@react-spectrum/s2/src/ButtonGroup.tsx b/packages/@react-spectrum/s2/src/ButtonGroup.tsx
index 318302ea473..56729db4e64 100644
--- a/packages/@react-spectrum/s2/src/ButtonGroup.tsx
+++ b/packages/@react-spectrum/s2/src/ButtonGroup.tsx
@@ -14,13 +14,10 @@ import {ButtonContext, LinkButtonContext} from './Button';
 import {ContextValue, Provider, SlotProps} from 'react-aria-components';
 import {createContext, forwardRef, ReactNode, useCallback, useRef} from 'react';
 import {DOMProps, DOMRef, DOMRefValue} from '@react-types/shared';
-import {filterDOMProps, useLayoutEffect, useValueEffect} from '@react-aria/utils';
+import {filterDOMProps, useLayoutEffect, useResizeObserver, useValueEffect} from '@react-aria/utils';
 import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {style} from '../style' with {type: 'macro'};
-import {
-  useDOMRef,
-  useResizeObserver
-} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 interface ButtonGroupStyleProps {
diff --git a/packages/@react-spectrum/s2/src/Card.tsx b/packages/@react-spectrum/s2/src/Card.tsx
index 7ad9aeaf49e..39d3f9abab2 100644
--- a/packages/@react-spectrum/s2/src/Card.tsx
+++ b/packages/@react-spectrum/s2/src/Card.tsx
@@ -28,7 +28,7 @@ import {ImageCoordinator} from './ImageCoordinator';
 import {mergeStyles} from '../style/runtime';
 import {pressScale} from './pressScale';
 import {SkeletonContext, SkeletonWrapper, useIsSkeleton} from './Skeleton';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 interface CardRenderProps {
diff --git a/packages/@react-spectrum/s2/src/CardView.tsx b/packages/@react-spectrum/s2/src/CardView.tsx
index 2023a8c0d95..64d82a3cf43 100644
--- a/packages/@react-spectrum/s2/src/CardView.tsx
+++ b/packages/@react-spectrum/s2/src/CardView.tsx
@@ -30,7 +30,7 @@ import {focusRing, style} from '../style' with {type: 'macro'};
 import {getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {ImageCoordinator} from './ImageCoordinator';
 import {useActionBarContainer} from './ActionBar';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useEffectEvent, useLayoutEffect, useResizeObserver} from '@react-aria/utils';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/Checkbox.tsx b/packages/@react-spectrum/s2/src/Checkbox.tsx
index 6d00cf24917..2144e4387f0 100644
--- a/packages/@react-spectrum/s2/src/Checkbox.tsx
+++ b/packages/@react-spectrum/s2/src/Checkbox.tsx
@@ -20,7 +20,7 @@ import DashIcon from '../ui-icons/Dash';
 import {FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {FormContext, useFormProps} from './Form';
 import {pressScale} from './pressScale';
-import {useFocusableRef} from '@react-spectrum/utils';
+import {useFocusableRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 interface CheckboxStyleProps {
diff --git a/packages/@react-spectrum/s2/src/CheckboxGroup.tsx b/packages/@react-spectrum/s2/src/CheckboxGroup.tsx
index 94e8d1edb1b..3997578fe56 100644
--- a/packages/@react-spectrum/s2/src/CheckboxGroup.tsx
+++ b/packages/@react-spectrum/s2/src/CheckboxGroup.tsx
@@ -22,7 +22,7 @@ import {field, getAllowedOverrides, StyleProps} from './style-utils' with {type:
 import {FieldLabel, HelpText} from './Field';
 import {FormContext, useFormProps} from './Form';
 import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface CheckboxGroupProps extends Omit<AriaCheckboxGroupProps, 'className' | 'style' | 'children' | keyof GlobalDOMAttributes>, StyleProps, SpectrumLabelableProps, HelpTextProps {
diff --git a/packages/@react-spectrum/s2/src/ClearButton.tsx b/packages/@react-spectrum/s2/src/ClearButton.tsx
index f562f9e2d84..868806c6802 100644
--- a/packages/@react-spectrum/s2/src/ClearButton.tsx
+++ b/packages/@react-spectrum/s2/src/ClearButton.tsx
@@ -21,7 +21,7 @@ import {FocusableRef} from '@react-types/shared';
 import {focusRing, style} from '../style' with {type: 'macro'};
 import {forwardRef} from 'react';
 import {pressScale} from './pressScale';
-import {useFocusableRef} from '@react-spectrum/utils';
+import {useFocusableRef} from './useDOMRef';
 interface ClearButtonStyleProps {
   /**
    * The size of the ClearButton.
diff --git a/packages/@react-spectrum/s2/src/CloseButton.tsx b/packages/@react-spectrum/s2/src/CloseButton.tsx
index abd796e779e..b85b0c30bce 100644
--- a/packages/@react-spectrum/s2/src/CloseButton.tsx
+++ b/packages/@react-spectrum/s2/src/CloseButton.tsx
@@ -19,7 +19,7 @@ import {FocusableRef, FocusableRefValue} from '@react-types/shared';
 // @ts-ignore
 import intlMessages from '../intl/*.json';
 import {pressScale} from './pressScale';
-import {useFocusableRef} from '@react-spectrum/utils';
+import {useFocusableRef} from './useDOMRef';
 import {useLocalizedStringFormatter} from '@react-aria/i18n';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/ColorArea.tsx b/packages/@react-spectrum/s2/src/ColorArea.tsx
index 6c401b3efa8..c19f61a8cf2 100644
--- a/packages/@react-spectrum/s2/src/ColorArea.tsx
+++ b/packages/@react-spectrum/s2/src/ColorArea.tsx
@@ -21,7 +21,7 @@ import {createContext, forwardRef} from 'react';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface ColorAreaProps extends Omit<AriaColorAreaProps, 'children' | 'className' | 'style' | keyof GlobalDOMAttributes>, StyleProps {}
diff --git a/packages/@react-spectrum/s2/src/ColorField.tsx b/packages/@react-spectrum/s2/src/ColorField.tsx
index 1addb1c9f65..aceff3cdaa9 100644
--- a/packages/@react-spectrum/s2/src/ColorField.tsx
+++ b/packages/@react-spectrum/s2/src/ColorField.tsx
@@ -17,7 +17,7 @@ import {
   InputProps
 } from 'react-aria-components';
 import {createContext, forwardRef, Ref, useContext, useImperativeHandle, useRef} from 'react';
-import {createFocusableRef} from '@react-spectrum/utils';
+import {createFocusableRef} from './useDOMRef';
 import {field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {FieldErrorIcon, FieldGroup, FieldLabel, HelpText, Input} from './Field';
 import {FormContext, useFormProps} from './Form';
diff --git a/packages/@react-spectrum/s2/src/ColorSlider.tsx b/packages/@react-spectrum/s2/src/ColorSlider.tsx
index d9a78172a0e..fa3fcae7934 100644
--- a/packages/@react-spectrum/s2/src/ColorSlider.tsx
+++ b/packages/@react-spectrum/s2/src/ColorSlider.tsx
@@ -24,7 +24,7 @@ import {createContext, forwardRef, useRef} from 'react';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes, SpectrumLabelableProps} from '@react-types/shared';
 import {FieldLabel} from './Field';
 import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface ColorSliderProps extends Omit<AriaColorSliderProps, 'children' | 'className' | 'style' | keyof GlobalDOMAttributes>, Pick<SpectrumLabelableProps, 'contextualHelp'>, StyleProps {
diff --git a/packages/@react-spectrum/s2/src/ColorSwatch.tsx b/packages/@react-spectrum/s2/src/ColorSwatch.tsx
index 99a38464f9d..9ed06aeaa7f 100644
--- a/packages/@react-spectrum/s2/src/ColorSwatch.tsx
+++ b/packages/@react-spectrum/s2/src/ColorSwatch.tsx
@@ -21,7 +21,7 @@ import {createContext, forwardRef, JSX, ReactElement, useContext, useMemo} from
 import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface ColorSwatchProps extends Omit<AriaColorSwatchProps, 'className' | 'style' | keyof GlobalDOMAttributes>, UnsafeStyles {
diff --git a/packages/@react-spectrum/s2/src/ColorSwatchPicker.tsx b/packages/@react-spectrum/s2/src/ColorSwatchPicker.tsx
index c0f095e8545..75322ed4060 100644
--- a/packages/@react-spectrum/s2/src/ColorSwatchPicker.tsx
+++ b/packages/@react-spectrum/s2/src/ColorSwatchPicker.tsx
@@ -16,7 +16,7 @@ import {createContext, forwardRef, ReactElement, ReactNode} from 'react';
 import {DOMRef, DOMRefValue, ValueBase} from '@react-types/shared';
 import {focusRing, space, style} from '../style' with {type: 'macro'};
 import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface ColorSwatchPickerProps extends ValueBase<string | Color, Color>, StyleProps, SlotProps {
diff --git a/packages/@react-spectrum/s2/src/ColorWheel.tsx b/packages/@react-spectrum/s2/src/ColorWheel.tsx
index 57d63dec7ff..827031ce63b 100644
--- a/packages/@react-spectrum/s2/src/ColorWheel.tsx
+++ b/packages/@react-spectrum/s2/src/ColorWheel.tsx
@@ -21,7 +21,7 @@ import {createContext, forwardRef} from 'react';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {style} from '../style' with {type: 'macro'};
 import {StyleProps} from './style-utils';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface ColorWheelProps extends Omit<AriaColorWheelProps, 'children' | 'className' | 'style' | 'outerRadius' | 'innerRadius' | keyof GlobalDOMAttributes>, StyleProps {
diff --git a/packages/@react-spectrum/s2/src/ComboBox.tsx b/packages/@react-spectrum/s2/src/ComboBox.tsx
index ab2348328b6..485f5a19cb5 100644
--- a/packages/@react-spectrum/s2/src/ComboBox.tsx
+++ b/packages/@react-spectrum/s2/src/ComboBox.tsx
@@ -50,7 +50,7 @@ import {
 import CheckmarkIcon from '../ui-icons/Checkmark';
 import ChevronIcon from '../ui-icons/Chevron';
 import {createContext, CSSProperties, ForwardedRef, forwardRef, ReactNode, Ref, useCallback, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
-import {createFocusableRef} from '@react-spectrum/utils';
+import {createFocusableRef} from './useDOMRef';
 import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'};
 import {FieldErrorIcon, FieldGroup, FieldLabel, HelpText, Input} from './Field';
 import {FormContext, useFormProps} from './Form';
diff --git a/packages/@react-spectrum/s2/src/Content.tsx b/packages/@react-spectrum/s2/src/Content.tsx
index 662dff0a2a2..93575b8f908 100644
--- a/packages/@react-spectrum/s2/src/Content.tsx
+++ b/packages/@react-spectrum/s2/src/Content.tsx
@@ -16,7 +16,7 @@ import {DOMRef, DOMRefValue} from '@react-types/shared';
 import {inertValue} from '@react-aria/utils';
 import {StyleString} from '../style/types';
 import {UnsafeStyles} from './style-utils';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useIsSkeleton, useSkeletonText} from './Skeleton';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/CustomDialog.tsx b/packages/@react-spectrum/s2/src/CustomDialog.tsx
index 3520f8d730b..1af2ad9907d 100644
--- a/packages/@react-spectrum/s2/src/CustomDialog.tsx
+++ b/packages/@react-spectrum/s2/src/CustomDialog.tsx
@@ -16,7 +16,7 @@ import {forwardRef} from 'react';
 import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {Modal} from './Modal';
 import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 
 export interface CustomDialogProps extends Omit<RACDialogProps, 'className' | 'style' | keyof GlobalDOMAttributes>, StyleProps {
   /**
diff --git a/packages/@react-spectrum/s2/src/Dialog.tsx b/packages/@react-spectrum/s2/src/Dialog.tsx
index 0a2cd84ddf9..fb8d83630f8 100644
--- a/packages/@react-spectrum/s2/src/Dialog.tsx
+++ b/packages/@react-spectrum/s2/src/Dialog.tsx
@@ -20,7 +20,7 @@ import {ImageContext} from './Image';
 import {Modal} from './Modal';
 import {style} from '../style' with {type: 'macro'};
 import {StyleProps} from './style-utils';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 
 // TODO: what style overrides should be allowed?
 export interface DialogProps extends Omit<RACDialogProps, 'className' | 'style' | keyof GlobalDOMAttributes>, StyleProps {
diff --git a/packages/@react-spectrum/s2/src/Disclosure.tsx b/packages/@react-spectrum/s2/src/Disclosure.tsx
index 2c93b4c95d6..cd014d342b1 100644
--- a/packages/@react-spectrum/s2/src/Disclosure.tsx
+++ b/packages/@react-spectrum/s2/src/Disclosure.tsx
@@ -19,7 +19,7 @@ import {centerPadding, getAllowedOverrides, StyleProps, UnsafeStyles} from './st
 import Chevron from '../ui-icons/Chevron';
 import {filterDOMProps} from '@react-aria/utils';
 import React, {createContext, forwardRef, ReactNode, useContext} from 'react';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface DisclosureProps extends Omit<RACDisclosureProps, 'className' | 'style' | 'children' | keyof GlobalDOMAttributes>, StyleProps {
diff --git a/packages/@react-spectrum/s2/src/Divider.tsx b/packages/@react-spectrum/s2/src/Divider.tsx
index ce33d027e63..7652b2098df 100644
--- a/packages/@react-spectrum/s2/src/Divider.tsx
+++ b/packages/@react-spectrum/s2/src/Divider.tsx
@@ -15,7 +15,7 @@ import {createContext, forwardRef} from 'react';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {getAllowedOverrides, staticColor, StyleProps} from './style-utils' with {type: 'macro'};
 import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 /*
diff --git a/packages/@react-spectrum/s2/src/DropZone.tsx b/packages/@react-spectrum/s2/src/DropZone.tsx
index 65fc602491d..91887b20d0c 100644
--- a/packages/@react-spectrum/s2/src/DropZone.tsx
+++ b/packages/@react-spectrum/s2/src/DropZone.tsx
@@ -18,7 +18,7 @@ import {IllustratedMessageContext} from './IllustratedMessage';
 // @ts-ignore
 import intlMessages from '../intl/*.json';
 import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useLocalizedStringFormatter} from '@react-aria/i18n';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/Field.tsx b/packages/@react-spectrum/s2/src/Field.tsx
index 38c9dfda58e..a20f42bdba6 100644
--- a/packages/@react-spectrum/s2/src/Field.tsx
+++ b/packages/@react-spectrum/s2/src/Field.tsx
@@ -24,7 +24,7 @@ import {IconContext} from './Icon';
 import intlMessages from '../intl/*.json';
 import {mergeStyles} from '../style/runtime';
 import {StyleString} from '../style/types';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useId} from '@react-aria/utils';
 import {useLocalizedStringFormatter} from '@react-aria/i18n';
 
diff --git a/packages/@react-spectrum/s2/src/Form.tsx b/packages/@react-spectrum/s2/src/Form.tsx
index 3cc39c3b48a..0a61d601372 100644
--- a/packages/@react-spectrum/s2/src/Form.tsx
+++ b/packages/@react-spectrum/s2/src/Form.tsx
@@ -15,7 +15,7 @@ import {DOMRef, GlobalDOMAttributes, SpectrumLabelableProps} from '@react-types/
 import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {Form as RACForm, FormProps as RACFormProps} from 'react-aria-components';
 import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useIsSkeleton} from './Skeleton';
 
 interface FormStyleProps extends Omit<SpectrumLabelableProps, 'label' | 'contextualHelp'> {
diff --git a/packages/@react-spectrum/s2/src/FullscreenDialog.tsx b/packages/@react-spectrum/s2/src/FullscreenDialog.tsx
index cf293ee72a5..57ffc21d590 100644
--- a/packages/@react-spectrum/s2/src/FullscreenDialog.tsx
+++ b/packages/@react-spectrum/s2/src/FullscreenDialog.tsx
@@ -18,7 +18,7 @@ import {forwardRef} from 'react';
 import {Modal} from './Modal';
 import {style} from '../style' with {type: 'macro'};
 import {StyleProps} from './style-utils';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 
 // TODO: what style overrides should be allowed?
 export interface FullscreenDialogProps extends Omit<RACDialogProps, 'className' | 'style' | keyof GlobalDOMAttributes>, StyleProps {
diff --git a/packages/@react-spectrum/s2/src/IllustratedMessage.tsx b/packages/@react-spectrum/s2/src/IllustratedMessage.tsx
index a7de53690e9..98a02aeb25b 100644
--- a/packages/@react-spectrum/s2/src/IllustratedMessage.tsx
+++ b/packages/@react-spectrum/s2/src/IllustratedMessage.tsx
@@ -19,7 +19,7 @@ import {DOMProps, DOMRef, DOMRefValue} from '@react-types/shared';
 import {filterDOMProps} from '@react-aria/utils';
 import {IllustrationContext} from './Icon';
 import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 interface IllustratedMessageStyleProps {
diff --git a/packages/@react-spectrum/s2/src/InlineAlert.tsx b/packages/@react-spectrum/s2/src/InlineAlert.tsx
index e2340cff0bb..625d5c27682 100644
--- a/packages/@react-spectrum/s2/src/InlineAlert.tsx
+++ b/packages/@react-spectrum/s2/src/InlineAlert.tsx
@@ -24,7 +24,7 @@ import InfoCircle from '../s2wf-icons/S2_Icon_InfoCircle_20_N.svg';
 // @ts-ignore
 import intlMessages from '../intl/*.json';
 import NoticeSquare from '../s2wf-icons/S2_Icon_AlertDiamond_20_N.svg';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useFocusRing} from 'react-aria';
 import {useLocalizedStringFormatter} from '@react-aria/i18n';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
diff --git a/packages/@react-spectrum/s2/src/Link.tsx b/packages/@react-spectrum/s2/src/Link.tsx
index f3f73977ada..1abf11c77b7 100644
--- a/packages/@react-spectrum/s2/src/Link.tsx
+++ b/packages/@react-spectrum/s2/src/Link.tsx
@@ -16,7 +16,7 @@ import {createContext, forwardRef, ReactNode, useContext} from 'react';
 import {FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {getAllowedOverrides, staticColor, StyleProps} from './style-utils' with {type: 'macro'};
 import {SkeletonContext, useSkeletonText} from './Skeleton';
-import {useFocusableRef} from '@react-spectrum/utils';
+import {useFocusableRef} from './useDOMRef';
 import {useLayoutEffect} from '@react-aria/utils';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/Meter.tsx b/packages/@react-spectrum/s2/src/Meter.tsx
index 0c95b7e5b64..4c11af9011f 100644
--- a/packages/@react-spectrum/s2/src/Meter.tsx
+++ b/packages/@react-spectrum/s2/src/Meter.tsx
@@ -23,7 +23,7 @@ import {fieldLabel, getAllowedOverrides, StyleProps} from './style-utils' with {
 import {lightDark, style} from '../style' with {type: 'macro'};
 import {SkeletonWrapper} from './Skeleton';
 import {Text} from './Content';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 interface MeterStyleProps {
diff --git a/packages/@react-spectrum/s2/src/Modal.tsx b/packages/@react-spectrum/s2/src/Modal.tsx
index ad55a2b3b24..04573896450 100644
--- a/packages/@react-spectrum/s2/src/Modal.tsx
+++ b/packages/@react-spectrum/s2/src/Modal.tsx
@@ -16,7 +16,7 @@ import {DOMRef, GlobalDOMAttributes} from '@react-types/shared';
 import {forwardRef, MutableRefObject, useCallback, useContext} from 'react';
 import {ModalOverlay, ModalOverlayProps, Modal as RACModal, useLocale} from 'react-aria-components';
 import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 
 interface ModalProps extends Omit<ModalOverlayProps, 'className' | 'style' | keyof GlobalDOMAttributes> {
   /**
diff --git a/packages/@react-spectrum/s2/src/NotificationBadge.tsx b/packages/@react-spectrum/s2/src/NotificationBadge.tsx
index a2d86d8ef90..b89dd893dee 100644
--- a/packages/@react-spectrum/s2/src/NotificationBadge.tsx
+++ b/packages/@react-spectrum/s2/src/NotificationBadge.tsx
@@ -19,7 +19,7 @@ import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro
 import intlMessages from '../intl/*.json';
 import {NumberFormatter} from '@internationalized/number';
 import React, {createContext, forwardRef} from 'react';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/NumberField.tsx b/packages/@react-spectrum/s2/src/NumberField.tsx
index 8a9a189d2a3..1e1cec3ce3a 100644
--- a/packages/@react-spectrum/s2/src/NumberField.tsx
+++ b/packages/@react-spectrum/s2/src/NumberField.tsx
@@ -25,7 +25,7 @@ import {
 import {baseColor, space, style} from '../style' with {type: 'macro'};
 import {controlBorderRadius, field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {createContext, CSSProperties, ForwardedRef, forwardRef, ReactNode, Ref, useContext, useImperativeHandle, useMemo, useRef} from 'react';
-import {createFocusableRef} from '@react-spectrum/utils';
+import {createFocusableRef} from './useDOMRef';
 import Dash from '../ui-icons/Dash';
 import {FieldErrorIcon, FieldGroup, FieldLabel, HelpText, Input} from './Field';
 import {filterDOMProps, mergeProps, mergeRefs} from '@react-aria/utils';
diff --git a/packages/@react-spectrum/s2/src/Picker.tsx b/packages/@react-spectrum/s2/src/Picker.tsx
index 4db143d221d..7e499ff9d3d 100644
--- a/packages/@react-spectrum/s2/src/Picker.tsx
+++ b/packages/@react-spectrum/s2/src/Picker.tsx
@@ -77,7 +77,7 @@ import {pressScale} from './pressScale';
 import {ProgressCircle} from './ProgressCircle';
 import {raw} from '../style/style-macro' with {type: 'macro'};
 import React, {createContext, forwardRef, ReactNode, useContext, useMemo, useRef, useState} from 'react';
-import {useFocusableRef} from '@react-spectrum/utils';
+import {useFocusableRef} from './useDOMRef';
 import {useGlobalListeners, useSlotId} from '@react-aria/utils';
 import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
 import {useScale} from './utils';
diff --git a/packages/@react-spectrum/s2/src/Popover.tsx b/packages/@react-spectrum/s2/src/Popover.tsx
index e18bc565322..079fc9a4de5 100644
--- a/packages/@react-spectrum/s2/src/Popover.tsx
+++ b/packages/@react-spectrum/s2/src/Popover.tsx
@@ -28,7 +28,7 @@ import {lightDark, style} from '../style' with {type: 'macro'};
 import {mergeRefs} from '@react-aria/utils';
 import {mergeStyles} from '../style/runtime';
 import {StyleString} from '../style/types' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface PopoverProps extends UnsafeStyles, Omit<AriaPopoverProps,
diff --git a/packages/@react-spectrum/s2/src/ProgressBar.tsx b/packages/@react-spectrum/s2/src/ProgressBar.tsx
index 71e98fdb3f8..76ec6cb07a5 100644
--- a/packages/@react-spectrum/s2/src/ProgressBar.tsx
+++ b/packages/@react-spectrum/s2/src/ProgressBar.tsx
@@ -23,7 +23,7 @@ import {fieldLabel, getAllowedOverrides, StyleProps} from './style-utils' with {
 import {keyframes} from '../style/style-macro' with {type: 'macro'};
 import {mergeStyles} from '../style/runtime';
 import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useLocale} from '@react-aria/i18n';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/ProgressCircle.tsx b/packages/@react-spectrum/s2/src/ProgressCircle.tsx
index 90ed77b60a2..db3dabee2ee 100644
--- a/packages/@react-spectrum/s2/src/ProgressCircle.tsx
+++ b/packages/@react-spectrum/s2/src/ProgressCircle.tsx
@@ -17,7 +17,7 @@ import {getAllowedOverrides, staticColor, StylesPropWithHeight, UnsafeStyles} fr
 import {keyframes} from '../style/style-macro' with {type: 'macro'};
 import {pxToRem} from './progress-utils' with {type: 'macro'};
 import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 const pxToRemDynamic = (px: number): string => (px / 16) + 'rem';
diff --git a/packages/@react-spectrum/s2/src/RadioGroup.tsx b/packages/@react-spectrum/s2/src/RadioGroup.tsx
index d332e7b2dc9..0de9b898033 100644
--- a/packages/@react-spectrum/s2/src/RadioGroup.tsx
+++ b/packages/@react-spectrum/s2/src/RadioGroup.tsx
@@ -26,7 +26,7 @@ import {FieldLabel, HelpText} from './Field';
 import {FormContext, useFormProps} from './Form';
 import {pressScale} from './pressScale';
 import React, {createContext, forwardRef, ReactNode, useContext, useRef} from 'react';
-import {useDOMRef, useFocusableRef} from '@react-spectrum/utils';
+import {useDOMRef, useFocusableRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface RadioGroupProps extends Omit<AriaRadioGroupProps, 'className' | 'style' | 'children' | keyof GlobalDOMAttributes>, StyleProps, SpectrumLabelableProps, HelpTextProps {
diff --git a/packages/@react-spectrum/s2/src/RangeSlider.tsx b/packages/@react-spectrum/s2/src/RangeSlider.tsx
index 6792d3d6843..491743a5d8c 100644
--- a/packages/@react-spectrum/s2/src/RangeSlider.tsx
+++ b/packages/@react-spectrum/s2/src/RangeSlider.tsx
@@ -22,7 +22,7 @@ import {FormContext, useFormProps} from './Form';
 // @ts-ignore
 import intlMessages from '../intl/*.json';
 import {pressScale} from './pressScale';
-import {useFocusableRef} from '@react-spectrum/utils';
+import {useFocusableRef} from './useDOMRef';
 import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/SearchField.tsx b/packages/@react-spectrum/s2/src/SearchField.tsx
index 0d6965299db..9be89646873 100644
--- a/packages/@react-spectrum/s2/src/SearchField.tsx
+++ b/packages/@react-spectrum/s2/src/SearchField.tsx
@@ -21,7 +21,7 @@ import {baseColor, fontRelative, style} from '../style' with {type: 'macro'};
 import {centerBaseline} from './CenterBaseline';
 import {ClearButton} from './ClearButton';
 import {createContext, forwardRef, Ref, useContext, useImperativeHandle, useRef} from 'react';
-import {createFocusableRef} from '@react-spectrum/utils';
+import {createFocusableRef} from './useDOMRef';
 import {field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {FieldGroup, FieldLabel, HelpText, Input} from './Field';
 import {FormContext, useFormProps} from './Form';
diff --git a/packages/@react-spectrum/s2/src/SegmentedControl.tsx b/packages/@react-spectrum/s2/src/SegmentedControl.tsx
index 8009d75134b..a06ca907b15 100644
--- a/packages/@react-spectrum/s2/src/SegmentedControl.tsx
+++ b/packages/@react-spectrum/s2/src/SegmentedControl.tsx
@@ -19,7 +19,7 @@ import {createContext, forwardRef, ReactNode, useCallback, useContext, useRef} f
 import {IconContext} from './Icon';
 import {pressScale} from './pressScale';
 import {Text, TextContext} from './Content';
-import {useDOMRef, useFocusableRef} from '@react-spectrum/utils';
+import {useDOMRef, useFocusableRef} from './useDOMRef';
 import {useLayoutEffect} from '@react-aria/utils';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/Skeleton.tsx b/packages/@react-spectrum/s2/src/Skeleton.tsx
index 1cc218bb3d6..5c61ad33595 100644
--- a/packages/@react-spectrum/s2/src/Skeleton.tsx
+++ b/packages/@react-spectrum/s2/src/Skeleton.tsx
@@ -16,7 +16,7 @@ import {inertValue, mergeRefs} from '@react-aria/utils';
 import {mergeStyles} from '../style/runtime';
 import {raw} from '../style/style-macro' with {type: 'macro'};
 import {StyleString} from '../style/types';
-import {useMediaQuery} from '@react-spectrum/utils';
+import {useMediaQuery} from './useMediaQuery';
 
 export function useLoadingAnimation(isAnimating: boolean): (element: HTMLElement | null) => void {
   let animationRef = useRef<Animation | null>(null);
diff --git a/packages/@react-spectrum/s2/src/Slider.tsx b/packages/@react-spectrum/s2/src/Slider.tsx
index 8b8c140e759..83461b65894 100644
--- a/packages/@react-spectrum/s2/src/Slider.tsx
+++ b/packages/@react-spectrum/s2/src/Slider.tsx
@@ -28,7 +28,7 @@ import {focusRing, style} from '../style' with {type: 'macro'};
 import {FormContext, useFormProps} from './Form';
 import {mergeStyles} from '../style/runtime';
 import {pressScale} from './pressScale';
-import {useFocusableRef} from '@react-spectrum/utils';
+import {useFocusableRef} from './useDOMRef';
 import {useLocale, useNumberFormatter} from '@react-aria/i18n';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/StatusLight.tsx b/packages/@react-spectrum/s2/src/StatusLight.tsx
index ee0b46aa718..7e1d2160897 100644
--- a/packages/@react-spectrum/s2/src/StatusLight.tsx
+++ b/packages/@react-spectrum/s2/src/StatusLight.tsx
@@ -18,7 +18,7 @@ import {createContext, forwardRef, ReactNode} from 'react';
 import {filterDOMProps} from '@react-aria/utils';
 import {style} from '../style' with {type: 'macro'};
 import {Text} from './Content';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useIsSkeleton} from './Skeleton';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/Switch.tsx b/packages/@react-spectrum/s2/src/Switch.tsx
index f194a23533d..9cde1cd3902 100644
--- a/packages/@react-spectrum/s2/src/Switch.tsx
+++ b/packages/@react-spectrum/s2/src/Switch.tsx
@@ -24,7 +24,7 @@ import {createContext, forwardRef, ReactNode, useContext, useRef} from 'react';
 import {Direction, FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {FormContext, useFormProps} from './Form';
 import {pressScale} from './pressScale';
-import {useFocusableRef} from '@react-spectrum/utils';
+import {useFocusableRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 interface SwitchStyleProps {
diff --git a/packages/@react-spectrum/s2/src/TableView.tsx b/packages/@react-spectrum/s2/src/TableView.tsx
index 58a1ebc837b..b666fbf58af 100644
--- a/packages/@react-spectrum/s2/src/TableView.tsx
+++ b/packages/@react-spectrum/s2/src/TableView.tsx
@@ -74,8 +74,9 @@ import SortDownArrow from '../s2wf-icons/S2_Icon_SortDown_20_N.svg';
 import SortUpArrow from '../s2wf-icons/S2_Icon_SortUp_20_N.svg';
 import {Button as SpectrumButton} from './Button';
 import {useActionBarContainer} from './ActionBar';
-import {useDOMRef, useMediaQuery} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useMediaQuery} from './useMediaQuery';
 import {useScale} from './utils';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 import {VisuallyHidden} from 'react-aria';
diff --git a/packages/@react-spectrum/s2/src/Tabs.tsx b/packages/@react-spectrum/s2/src/Tabs.tsx
index b69c13b05f8..f97dd82033f 100644
--- a/packages/@react-spectrum/s2/src/Tabs.tsx
+++ b/packages/@react-spectrum/s2/src/Tabs.tsx
@@ -37,7 +37,7 @@ import {inertValue, useEffectEvent, useId, useLabels, useLayoutEffect, useResize
 import {Picker, PickerItem} from './TabsPicker';
 import {Text, TextContext} from './Content';
 import {useControlledState} from '@react-stately/utils';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useHasTabbableChild} from '@react-aria/focus';
 import {useLocale} from '@react-aria/i18n';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
diff --git a/packages/@react-spectrum/s2/src/TabsPicker.tsx b/packages/@react-spectrum/s2/src/TabsPicker.tsx
index 418cf01ea34..36241873c4a 100644
--- a/packages/@react-spectrum/s2/src/TabsPicker.tsx
+++ b/packages/@react-spectrum/s2/src/TabsPicker.tsx
@@ -51,7 +51,7 @@ import {PressResponder} from '@react-aria/interactions';
 import {pressScale} from './pressScale';
 import {raw} from '../style/style-macro' with {type: 'macro'};
 import React, {createContext, forwardRef, ReactNode, useContext, useRef, useState} from 'react';
-import {useFocusableRef} from '@react-spectrum/utils';
+import {useFocusableRef} from './useDOMRef';
 import {useFormProps} from './Form';
 import {useGlobalListeners} from '@react-aria/utils';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
diff --git a/packages/@react-spectrum/s2/src/TagGroup.tsx b/packages/@react-spectrum/s2/src/TagGroup.tsx
index 7b039822c43..ce9e4f763a4 100644
--- a/packages/@react-spectrum/s2/src/TagGroup.tsx
+++ b/packages/@react-spectrum/s2/src/TagGroup.tsx
@@ -47,7 +47,7 @@ import {inertValue, useEffectEvent, useId, useLayoutEffect, useResizeObserver} f
 import intlMessages from '../intl/*.json';
 import {pressScale} from './pressScale';
 import {Text, TextContext} from './Content';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useLocalizedStringFormatter} from '@react-aria/i18n';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/TextField.tsx b/packages/@react-spectrum/s2/src/TextField.tsx
index b82705b2ae2..c8ac857f2a6 100644
--- a/packages/@react-spectrum/s2/src/TextField.tsx
+++ b/packages/@react-spectrum/s2/src/TextField.tsx
@@ -23,7 +23,7 @@ import {
 } from 'react-aria-components';
 import {centerPadding, controlSize, field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {createContext, forwardRef, ReactNode, Ref, useContext, useImperativeHandle, useRef} from 'react';
-import {createFocusableRef} from '@react-spectrum/utils';
+import {createFocusableRef} from './useDOMRef';
 import {FieldErrorIcon, FieldGroup, FieldLabel, HelpText, Input} from './Field';
 import {FormContext, useFormProps} from './Form';
 import {GlobalDOMAttributes, HelpTextProps, RefObject, SpectrumLabelableProps} from '@react-types/shared';
diff --git a/packages/@react-spectrum/s2/src/Toast.tsx b/packages/@react-spectrum/s2/src/Toast.tsx
index ad54fe3dc63..222c02fea6d 100644
--- a/packages/@react-spectrum/s2/src/Toast.tsx
+++ b/packages/@react-spectrum/s2/src/Toast.tsx
@@ -30,7 +30,7 @@ import {ToastOptions as RACToastOptions, UNSTABLE_Toast as Toast, UNSTABLE_Toast
 import {Text} from './Content';
 import toastCss from './Toast.module.css';
 import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useMediaQuery} from '@react-spectrum/utils';
+import {useMediaQuery} from './useMediaQuery';
 import {useOverlayTriggerState} from 'react-stately';
 
 export type ToastPlacement = 'top' | 'top end' | 'bottom' | 'bottom end';
diff --git a/packages/@react-spectrum/s2/src/ToggleButton.tsx b/packages/@react-spectrum/s2/src/ToggleButton.tsx
index c681aabc3d7..c7b5b8ede53 100644
--- a/packages/@react-spectrum/s2/src/ToggleButton.tsx
+++ b/packages/@react-spectrum/s2/src/ToggleButton.tsx
@@ -22,7 +22,7 @@ import {SkeletonContext} from './Skeleton';
 import {StyleProps} from './style-utils';
 import {Text, TextContext} from './Content';
 import {ToggleButtonGroupContext} from './ToggleButtonGroup';
-import {useFocusableRef} from '@react-spectrum/utils';
+import {useFocusableRef} from './useDOMRef';
 import {useFormProps} from './Form';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/Tooltip.tsx b/packages/@react-spectrum/s2/src/Tooltip.tsx
index 504cba97f73..facf46ee36b 100644
--- a/packages/@react-spectrum/s2/src/Tooltip.tsx
+++ b/packages/@react-spectrum/s2/src/Tooltip.tsx
@@ -25,7 +25,7 @@ import {ColorSchemeContext} from './Provider';
 import {createContext, forwardRef, MutableRefObject, ReactNode, useCallback, useContext, useState} from 'react';
 import {DOMProps, DOMRef, GlobalDOMAttributes} from '@react-types/shared';
 import {style} from '../style' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 
 export interface TooltipTriggerProps extends Omit<AriaTooltipTriggerComponentProps, 'children' | 'closeDelay' | keyof GlobalDOMAttributes>, Pick<AriaTooltipProps, 'shouldFlip' | 'containerPadding' | 'crossOffset'> {
   /** The content of the tooltip. */
diff --git a/packages/@react-spectrum/s2/src/TreeView.tsx b/packages/@react-spectrum/s2/src/TreeView.tsx
index e539806b8b9..04a06ebf49e 100644
--- a/packages/@react-spectrum/s2/src/TreeView.tsx
+++ b/packages/@react-spectrum/s2/src/TreeView.tsx
@@ -41,7 +41,7 @@ import {ProgressCircle} from './ProgressCircle';
 import {raw} from '../style/style-macro' with {type: 'macro'};
 import React, {createContext, forwardRef, JSXElementConstructor, ReactElement, ReactNode, useRef} from 'react';
 import {Text, TextContext} from './Content';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useLocale, useLocalizedStringFormatter} from 'react-aria';
 import {useScale} from './utils';
 
diff --git a/packages/@react-spectrum/s2/src/useDOMRef.ts b/packages/@react-spectrum/s2/src/useDOMRef.ts
new file mode 100644
index 00000000000..fea09a48602
--- /dev/null
+++ b/packages/@react-spectrum/s2/src/useDOMRef.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2026 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+import {DOMRef, DOMRefValue, FocusableElement, FocusableRef, FocusableRefValue, RefObject} from '@react-types/shared';
+import {useImperativeHandle, useMemo, useRef} from 'react';
+
+export function createDOMRef<T extends HTMLElement = HTMLElement>(ref: RefObject<T | null>): DOMRefValue<T> {
+  return {
+    UNSAFE_getDOMNode() {
+      return ref.current;
+    }
+  };
+}
+
+export function createFocusableRef<T extends HTMLElement = HTMLElement>(domRef: RefObject<T | null>, focusableRef: RefObject<FocusableElement | null> = domRef): FocusableRefValue<T> {
+  return {
+    ...createDOMRef(domRef),
+    focus() {
+      if (focusableRef.current) {
+        focusableRef.current.focus();
+      }
+    }
+  };
+}
+
+export function useDOMRef<T extends HTMLElement = HTMLElement>(ref: DOMRef<T>): RefObject<T | null> {
+  let domRef = useRef<T>(null);
+  useImperativeHandle(ref, () => createDOMRef(domRef));
+  return domRef;
+}
+
+export function useFocusableRef<T extends HTMLElement = HTMLElement>(ref: FocusableRef<T>, focusableRef?: RefObject<FocusableElement | null>): RefObject<T | null> {
+  let domRef = useRef<T>(null);
+  useImperativeHandle(ref, () => createFocusableRef(domRef, focusableRef));
+  return domRef;
+}
+
+export function unwrapDOMRef<T extends HTMLElement>(ref: RefObject<DOMRefValue<T> | null>): RefObject<T | null> {
+  return {
+    get current() {
+      return ref.current && ref.current.UNSAFE_getDOMNode();
+    }
+  };
+}
+
+export function useUnwrapDOMRef<T extends HTMLElement>(ref: RefObject<DOMRefValue<T> | null>) : RefObject<T | null> {
+  return useMemo(() => unwrapDOMRef(ref), [ref]);
+}
diff --git a/packages/@react-spectrum/s2/src/useMediaQuery.ts b/packages/@react-spectrum/s2/src/useMediaQuery.ts
new file mode 100644
index 00000000000..826ebc430b1
--- /dev/null
+++ b/packages/@react-spectrum/s2/src/useMediaQuery.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2026 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+import {useEffect, useState} from 'react';
+import {useIsSSR} from '@react-aria/ssr';
+
+export function useMediaQuery(query: string): boolean {
+  let supportsMatchMedia = typeof window !== 'undefined' && typeof window.matchMedia === 'function';
+  let [matches, setMatches] = useState(() =>
+    supportsMatchMedia
+      ? window.matchMedia(query).matches
+      : false
+  );
+
+  useEffect(() => {
+    if (!supportsMatchMedia) {
+      return;
+    }
+
+    let mq = window.matchMedia(query);
+    let onChange = (evt) => {
+      setMatches(evt.matches);
+    };
+
+    mq.addListener(onChange);
+    return () => {
+      mq.removeListener(onChange);
+    };
+  }, [supportsMatchMedia, query]);
+
+  // If in SSR, the media query should never match. Once the page hydrates,
+  // this will update and the real value will be returned.
+  let isSSR = useIsSSR();
+  return isSSR ? false : matches;
+}
diff --git a/packages/@react-spectrum/s2/src/utils.ts b/packages/@react-spectrum/s2/src/utils.ts
index 6aac5801df9..d2957cb9ae5 100644
--- a/packages/@react-spectrum/s2/src/utils.ts
+++ b/packages/@react-spectrum/s2/src/utils.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {useMediaQuery} from '@react-spectrum/utils';
+import {useMediaQuery} from './useMediaQuery';
 
 export type Scale = 'large' | 'medium';
 
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index f1885b6233d..422e3b9f211 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -69,6 +69,9 @@ standalone.add('OverlayArrow');
 standalone.add('SelectionIndicator');
 standalone.add('SharedElementTransition');
 standalone.add('pressScale');
+standalone.add('theme-default');
+standalone.add('theme-light');
+standalone.add('theme-dark');
 
 // Documented but not in the monopackage.
 standalone.delete('useAutocomplete');

From 84faa7eb7b7181dfe440b205cfe5ee17569cd1e8 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 27 Jan 2026 16:44:45 -0800
Subject: [PATCH 24/68] stuff

---
 Makefile                                |    1 +
 package.json                            |    4 +-
 packages/dev/parcel-namer-s2/S2Namer.js |    5 +
 scripts/migrateDeps.mjs                 |   87 +-
 tsconfig.build.json                     |   56 +
 yarn.lock                               | 1959 +++++------------------
 6 files changed, 544 insertions(+), 1568 deletions(-)
 create mode 100644 tsconfig.build.json

diff --git a/Makefile b/Makefile
index f6dcdb3d4ae..83326f2d56c 100644
--- a/Makefile
+++ b/Makefile
@@ -98,6 +98,7 @@ publish-nightly: build
 	yarn publish:nightly
 
 build:
+	tsgo --project tsconfig.build.json --declaration --emitDeclarationOnly --outDir types --rootDir packages
 	parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/react-aria-components --no-optimize --config .parcelrc-build
 	yarn workspaces foreach --all -pt run prepublishOnly
 	for pkg in packages/@react-{spectrum,aria,stately}/*/  packages/@internationalized/{message,string,date,number}/ packages/@adobe/react-spectrum/ packages/react-aria/ packages/react-stately/ packages/react-aria-components/; \
diff --git a/package.json b/package.json
index 95d48ae0bd5..040648bf9ca 100644
--- a/package.json
+++ b/package.json
@@ -109,8 +109,8 @@
     "@parcel/transformer-react-static": "^2.16.3",
     "@parcel/transformer-svg-react": "^2.16.3",
     "@parcel/transformer-typescript-types": "^2.16.3",
-    "@react-spectrum/parcel-namer-s2": "^0.3.0",
-    "@react-spectrum/s2-icon-builder": "^0.3.0",
+    "@react-spectrum/parcel-namer-s2": "workspace:^",
+    "@react-spectrum/s2-icon-builder": "workspace:^",
     "@spectrum-css/component-builder": "workspace:^",
     "@spectrum-css/vars": "^2.3.0",
     "@storybook/addon-a11y": "patch:@storybook/addon-a11y@npm%3A8.6.14#~/.yarn/patches/@storybook-addon-a11y-npm-8.6.14-2119c57a0f.patch",
diff --git a/packages/dev/parcel-namer-s2/S2Namer.js b/packages/dev/parcel-namer-s2/S2Namer.js
index 4d1e02df57a..3a5fd5c93d8 100644
--- a/packages/dev/parcel-namer-s2/S2Namer.js
+++ b/packages/dev/parcel-namer-s2/S2Namer.js
@@ -33,7 +33,12 @@ module.exports = new Namer({
           return m[1] + '/internal/' + name + ext;
         }
         return m[1] + '/' + name + ext;
+      } else if (mainAsset.filePath.includes('/exports/')) {
+        name = 'exports/' + name;
+      } else if (bundle.target.distDir.endsWith('/dist')) {
+        name = 'private/' + name;
       }
+
       return name
         .replace(/^S2_Icon_(.*?)(Size\d+)?_\d+(?:x\d+)?_N$/, '$1')
         .replace(/^S2_(fill|lin)_(.+)_(generic\d)_(\d+)$/, (m, type, name, style) => {
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index 422e3b9f211..eaa30453e5d 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -220,21 +220,21 @@ function prepareMonopackage(monopackage) {
     monopackageJSON.exports = {
       '.': {
         source: './exports/index.ts',
-        types: './exports/index.ts',
-        import: './dist/import.mjs',
-        require: './dist/module.js'
+        types: './dist/exports/index.d.ts',
+        import: './dist/exports/index.mjs',
+        require: './dist/exports/index.js'
       },
       './private/*': {
-        source: ['./src/*.ts', './src/*.tsx', './src/*/index.ts'],
-        types: ['./dist/*.d.ts', './src/*.ts', './src/*.tsx'],
-        import: './dist/*.mjs',
-        require: './dist/*.js'
+        source: ['./src/*.ts', './src/*.tsx'],
+        types: ['./dist/private/*.d.ts'],
+        import: './dist/private/*.mjs',
+        require: './dist/private/*.js'
       },
       './*': {
         source: ['./exports/*.ts'],
-        types: ['./dist/*.d.ts', './exports/*.ts', './exports/*.tsx'],
-        import: './dist/*.mjs',
-        require: './dist/*.js'
+        types: './dist/exports/*.d.ts',
+        import: './dist/exports/*.mjs',
+        require: './dist/exports/*.js'
       }
     };
   } else {
@@ -242,25 +242,45 @@ function prepareMonopackage(monopackage) {
     monopackageJSON.exports = {
       '.': {
         source: './exports/index.ts',
-        types: './exports/index.ts',
-        import: './dist/import.mjs',
-        require: './dist/module.js'
+        types: './dist/exports/index.d.ts',
+        import: './dist/exports/index.mjs',
+        require: './dist/exports/index.js'
       },
       './private/*': {
-        source: ['./src/*.ts', './src/*.tsx', './src/*/index.ts'],
-        types: ['./dist/*.d.ts', './src/*.ts', './src/*.tsx'],
-        import: './dist/*.mjs',
-        require: './dist/*.js'
+        source: ['./src/*.ts', './src/*.tsx'],
+        types: ['./dist/private/*.d.ts'],
+        import: './dist/private/*.mjs',
+        require: './dist/private/*.js'
       },
       './*': {
         source: ['./exports/*.ts'],
-        types: ['./dist/*.d.ts', './exports/*.ts', './exports/*.tsx'],
-        import: './dist/*.mjs',
-        require: './dist/*.js'
+        types: './dist/exports/*.d.ts',
+        import: './dist/exports/*.mjs',
+        require: './dist/exports/*.js'
       }
     };
   }
 
+  monopackageJSON.targets = {
+    main: false,
+    module: false,
+    types: false,
+    "exports-module": {
+      "source": "exports/*.ts",
+      "distDir": "dist",
+      "isLibrary": true,
+      "outputFormat": "esmodule",
+      "includeNodeModules": false
+    },
+    "exports-main": {
+      "source": "exports/*.ts",
+      "distDir": "dist",
+      "isLibrary": true,
+      "outputFormat": "commonjs",
+      "includeNodeModules": false
+    }
+  };
+
   for (let dep in monopackageJSON.dependencies || {}) {
     let depScope = dep.match(/@(react-aria|react-spectrum|react-stately)/);
     if (depScope) {
@@ -309,7 +329,6 @@ function migratePackage(scope, name, monopackage) {
   fs.writeFileSync(`packages/${monopackage}/package.json`, JSON.stringify(monopackageJSON, false, 2) + '\n');
 
   packageJSON.source = 'src/index.ts';
-  // delete packageJSON.exports; // TODO
   packageJSON.exports = {
     source: './src/index.ts',
     types: './src/index.ts',
@@ -369,9 +388,33 @@ function migrateToMonopackage(pkg) {
 
   packageJSON.exports['./*'] = {
     source: './exports/*.ts',
-    types: './exports/*.ts'
+    types: './dist/*.d.ts',
+    import: './dist/*.mjs',
+    require: './dist/*.cjs'
   };
 
+  packageJSON.exports['./private/*'] = null;
+
+  Object.assign(packageJSON.targets ??= {}, {
+    main: false,
+    module: false,
+    types: false,
+    "exports-module": {
+      "source": "exports/*.ts",
+      "distDir": "dist",
+      "isLibrary": true,
+      "outputFormat": "esmodule",
+      "includeNodeModules": false
+    },
+    "exports-main": {
+      "source": "exports/*.ts",
+      "distDir": "dist",
+      "isLibrary": true,
+      "outputFormat": "commonjs",
+      "includeNodeModules": false
+    }
+  });
+
   fs.writeFileSync(`packages/${pkg}/package.json`, JSON.stringify(packageJSON, false, 2) + '\n');
 
   fs.mkdirSync(`packages/${pkg}/exports`, {recursive: true});
diff --git a/tsconfig.build.json b/tsconfig.build.json
new file mode 100644
index 00000000000..ac77b3ed0d3
--- /dev/null
+++ b/tsconfig.build.json
@@ -0,0 +1,56 @@
+{
+  "compilerOptions": {
+    // we can explicitly declare `any`, but we don't want to infer `any`
+    "noImplicitAny": false,
+    // maybe bump to 'esNext'?
+    "target": "es2018",
+    // allows react jsx in tsx files
+    // this is set to preserve so that different packages can use different JSX runtimes
+    // depending on the React version they support. ESLint will ensure that React is imported
+    // in packages using the old JSX runtime. Parcel will compile JSX according to the React
+    // version specified in the package.json of each package.
+    "jsx": "preserve",
+    // Eventually turn off, one we have no more assumed default exports.
+    // Allow default imports from modules with no default export.
+    "allowSyntheticDefaultImports": true,
+    // allows importing of json files, needed for locales as of right now
+    "resolveJsonModule": true,
+    // Search under node_modules for non-relative imports.
+    "moduleResolution": "bundler",
+    "customConditions": ["source"],
+    "module": "esnext",
+    // Process & infer types from .js files.
+    "allowJs": true,
+    // Disallow features that require cross-file information for emit.
+    "isolatedModules": true,
+    // Import non-ES modules as default imports.
+    "esModuleInterop": true,
+    // if 'target' is updated, this should be updated as well
+    "lib": [
+      "esnext",
+      "dom",
+      "dom.iterable"
+    ],
+    "skipLibCheck": false,
+    "strict": true,
+    "paths": {
+      "vanilla-starter/*": ["./starters/docs/src/*"],
+      "tailwind-starter/*": ["./starters/tailwind/src/*"],
+      "/*": ["./*"]
+    }
+  },
+  "include": [
+    "packages/**/src",
+    "packages/**/exports",
+    "lib/svg.d.ts",
+    "lib/viewTransitions.d.ts",
+    "lib/css.d.ts"
+  ],
+  "exclude": [
+    "**/node_modules",
+    "packages/dev/optimize-locales-plugin",
+    "packages/@react-spectrum/s2/s2wf-icons",
+    "packages/@react-spectrum/s2/icon.d.ts",
+    "packages/dev/s2-docs/pages/**"
+  ]
+}
diff --git a/yarn.lock b/yarn.lock
index 6500c7bc175..84bee5b7b98 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -88,76 +88,70 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@adobe/react-spectrum@workspace:packages/@adobe/react-spectrum":
+"@adobe/react-spectrum@npm:3.46.0, @adobe/react-spectrum@npm:^3.46.0, @adobe/react-spectrum@workspace:packages/@adobe/react-spectrum":
   version: 0.0.0-use.local
   resolution: "@adobe/react-spectrum@workspace:packages/@adobe/react-spectrum"
   dependencies:
+    "@adobe/react-spectrum": "npm:3.46.0"
     "@babel/cli": "npm:^7.12.10"
     "@babel/core": "npm:^7.24.3"
+    "@internationalized/date": "npm:^3.10.1"
     "@internationalized/string": "npm:^3.2.7"
-    "@react-aria/collections": "npm:^3.0.1"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-aria/visually-hidden": "npm:^3.8.29"
-    "@react-spectrum/accordion": "npm:^3.0.14"
-    "@react-spectrum/actionbar": "npm:^3.6.15"
-    "@react-spectrum/actiongroup": "npm:^3.11.5"
-    "@react-spectrum/avatar": "npm:^3.0.27"
-    "@react-spectrum/badge": "npm:^3.1.31"
-    "@react-spectrum/breadcrumbs": "npm:^3.9.25"
-    "@react-spectrum/button": "npm:^3.17.5"
-    "@react-spectrum/buttongroup": "npm:^3.6.27"
-    "@react-spectrum/calendar": "npm:^3.7.9"
-    "@react-spectrum/checkbox": "npm:^3.10.5"
-    "@react-spectrum/color": "npm:^3.1.5"
-    "@react-spectrum/combobox": "npm:^3.16.5"
-    "@react-spectrum/contextualhelp": "npm:^3.6.29"
-    "@react-spectrum/datepicker": "npm:^3.14.9"
-    "@react-spectrum/dialog": "npm:^3.9.5"
-    "@react-spectrum/divider": "npm:^3.5.28"
-    "@react-spectrum/dnd": "npm:^3.6.3"
-    "@react-spectrum/dropzone": "npm:^3.0.19"
-    "@react-spectrum/filetrigger": "npm:^3.0.19"
-    "@react-spectrum/form": "npm:^3.7.20"
-    "@react-spectrum/icon": "npm:^3.8.10"
-    "@react-spectrum/illustratedmessage": "npm:^3.5.15"
-    "@react-spectrum/image": "npm:^3.6.3"
-    "@react-spectrum/inlinealert": "npm:^3.2.21"
-    "@react-spectrum/labeledvalue": "npm:^3.2.8"
-    "@react-spectrum/layout": "npm:^3.6.20"
-    "@react-spectrum/link": "npm:^3.6.23"
-    "@react-spectrum/list": "npm:^3.10.9"
-    "@react-spectrum/listbox": "npm:^3.15.9"
-    "@react-spectrum/menu": "npm:^3.22.9"
-    "@react-spectrum/meter": "npm:^3.5.15"
-    "@react-spectrum/numberfield": "npm:^3.10.3"
-    "@react-spectrum/overlays": "npm:^5.9.1"
-    "@react-spectrum/picker": "npm:^3.16.5"
-    "@react-spectrum/progress": "npm:^3.7.21"
-    "@react-spectrum/provider": "npm:^3.10.12"
-    "@react-spectrum/radio": "npm:^3.7.22"
-    "@react-spectrum/searchfield": "npm:^3.8.24"
-    "@react-spectrum/slider": "npm:^3.8.3"
-    "@react-spectrum/statuslight": "npm:^3.5.27"
-    "@react-spectrum/switch": "npm:^3.6.7"
-    "@react-spectrum/table": "npm:^3.17.9"
-    "@react-spectrum/tabs": "npm:^3.8.28"
-    "@react-spectrum/tag": "npm:^3.3.8"
-    "@react-spectrum/text": "npm:^3.5.23"
-    "@react-spectrum/textfield": "npm:^3.14.3"
-    "@react-spectrum/theme-dark": "npm:^3.5.22"
-    "@react-spectrum/theme-default": "npm:^3.5.22"
-    "@react-spectrum/theme-light": "npm:^3.4.22"
-    "@react-spectrum/toast": "npm:^3.1.5"
-    "@react-spectrum/tooltip": "npm:^3.8.0"
-    "@react-spectrum/tree": "npm:^3.1.9"
-    "@react-spectrum/view": "npm:^3.6.24"
-    "@react-spectrum/well": "npm:^3.4.28"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/data": "npm:^3.15.0"
+    "@react-types/actionbar": "npm:^3.1.19"
+    "@react-types/actiongroup": "npm:^3.4.21"
+    "@react-types/autocomplete": "npm:3.0.0-alpha.36"
+    "@react-types/avatar": "npm:^3.0.19"
+    "@react-types/badge": "npm:^3.1.21"
+    "@react-types/breadcrumbs": "npm:^3.7.17"
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/buttongroup": "npm:^3.3.21"
+    "@react-types/calendar": "npm:^3.8.1"
+    "@react-types/card": "npm:3.0.0-alpha.41"
+    "@react-types/checkbox": "npm:^3.10.2"
+    "@react-types/color": "npm:^3.1.2"
+    "@react-types/combobox": "npm:^3.13.10"
+    "@react-types/contextualhelp": "npm:^3.2.22"
+    "@react-types/datepicker": "npm:^3.13.3"
+    "@react-types/dialog": "npm:^3.5.22"
+    "@react-types/divider": "npm:^3.3.21"
+    "@react-types/form": "npm:^3.7.16"
+    "@react-types/grid": "npm:^3.3.6"
+    "@react-types/illustratedmessage": "npm:^3.3.21"
+    "@react-types/image": "npm:^3.5.2"
+    "@react-types/label": "npm:^3.9.15"
+    "@react-types/layout": "npm:^3.3.27"
+    "@react-types/link": "npm:^3.6.5"
+    "@react-types/listbox": "npm:^3.7.4"
+    "@react-types/menu": "npm:^3.10.5"
+    "@react-types/meter": "npm:^3.4.13"
+    "@react-types/numberfield": "npm:^3.8.16"
+    "@react-types/overlays": "npm:^3.9.2"
+    "@react-types/progress": "npm:^3.5.16"
+    "@react-types/provider": "npm:^3.8.13"
+    "@react-types/radio": "npm:^3.9.2"
+    "@react-types/searchfield": "npm:^3.6.6"
+    "@react-types/select": "npm:^3.12.0"
     "@react-types/shared": "npm:^3.32.1"
+    "@react-types/slider": "npm:^3.8.2"
+    "@react-types/statuslight": "npm:^3.3.21"
+    "@react-types/switch": "npm:^3.5.15"
+    "@react-types/table": "npm:^3.13.4"
+    "@react-types/tabs": "npm:^3.3.20"
+    "@react-types/text": "npm:^3.3.21"
+    "@react-types/textfield": "npm:^3.12.6"
+    "@react-types/tooltip": "npm:^3.5.0"
+    "@react-types/view": "npm:^3.4.21"
+    "@react-types/well": "npm:^3.3.21"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@spectrum-icons/workflow": "npm:^4.2.26"
+    "@swc/helpers": "npm:^0.5.0"
     client-only: "npm:^0.0.1"
+    clsx: "npm:^2.0.0"
+    react-aria: "npm:3.45.0"
+    react-aria-components: "npm:^1.14.0"
+    react-stately: "npm:3.43.0"
+    react-transition-group: "npm:^4.4.5"
+    use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -177,13 +171,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@adobe/spectrum-tokens@npm:^13.15.1":
-  version: 13.16.0
-  resolution: "@adobe/spectrum-tokens@npm:13.16.0"
-  checksum: 10c0/625bb37073847f97320a74c261945c792f5685b1733408e8a225adc4aeda81281b42529780a66249af5ff4c1dce8b7bc76275d389b5cc9dfe9fd10b0306c49e2
-  languageName: node
-  linkType: hard
-
 "@adobe/spectrum-tokens@npm:^14.0.0":
   version: 14.0.0
   resolution: "@adobe/spectrum-tokens@npm:14.0.0"
@@ -4158,7 +4145,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/bundler-library@npm:^2.16.0, @parcel/bundler-library@npm:^2.16.3":
+"@parcel/bundler-library@npm:^2.16.3":
   version: 2.16.3
   resolution: "@parcel/bundler-library@npm:2.16.3"
   dependencies:
@@ -4191,7 +4178,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/compressor-raw@npm:2.16.3, @parcel/compressor-raw@npm:^2.16.0, @parcel/compressor-raw@npm:^2.16.3":
+"@parcel/compressor-raw@npm:2.16.3, @parcel/compressor-raw@npm:^2.16.3":
   version: 2.16.3
   resolution: "@parcel/compressor-raw@npm:2.16.3"
   dependencies:
@@ -4200,7 +4187,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/config-default@npm:2.16.3, @parcel/config-default@npm:^2.16.0, @parcel/config-default@npm:^2.16.3":
+"@parcel/config-default@npm:2.16.3, @parcel/config-default@npm:^2.16.3":
   version: 2.16.3
   resolution: "@parcel/config-default@npm:2.16.3"
   dependencies:
@@ -4255,7 +4242,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@parcel/core@npm:2.16.3, @parcel/core@npm:^2.16.0, @parcel/core@npm:^2.16.3":
+"@parcel/core@npm:2.16.3, @parcel/core@npm:^2.16.3":
   version: 2.16.3
   resolution: "@parcel/core@npm:2.16.3"
   dependencies:
@@ -4371,7 +4358,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/namer-default@npm:2.16.3, @parcel/namer-default@npm:^2.16.0, @parcel/namer-default@npm:^2.16.3":
+"@parcel/namer-default@npm:2.16.3, @parcel/namer-default@npm:^2.16.3":
   version: 2.16.3
   resolution: "@parcel/namer-default@npm:2.16.3"
   dependencies:
@@ -4550,7 +4537,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/packager-raw@npm:2.16.3, @parcel/packager-raw@npm:^2.16.0, @parcel/packager-raw@npm:^2.16.3":
+"@parcel/packager-raw@npm:2.16.3, @parcel/packager-raw@npm:^2.16.3":
   version: 2.16.3
   resolution: "@parcel/packager-raw@npm:2.16.3"
   dependencies:
@@ -4604,7 +4591,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/plugin@npm:2.16.3, @parcel/plugin@npm:^2.0.0, @parcel/plugin@npm:^2.16.0, @parcel/plugin@npm:^2.16.3":
+"@parcel/plugin@npm:2.16.3, @parcel/plugin@npm:^2.0.0, @parcel/plugin@npm:^2.16.3":
   version: 2.16.3
   resolution: "@parcel/plugin@npm:2.16.3"
   dependencies:
@@ -4636,7 +4623,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/reporter-cli@npm:2.16.3, @parcel/reporter-cli@npm:^2.16.0, @parcel/reporter-cli@npm:^2.16.3":
+"@parcel/reporter-cli@npm:2.16.3, @parcel/reporter-cli@npm:^2.16.3":
   version: 2.16.3
   resolution: "@parcel/reporter-cli@npm:2.16.3"
   dependencies:
@@ -4673,7 +4660,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/resolver-default@npm:2.16.3, @parcel/resolver-default@npm:^2.16.0, @parcel/resolver-default@npm:^2.16.3":
+"@parcel/resolver-default@npm:2.16.3, @parcel/resolver-default@npm:^2.16.3":
   version: 2.16.3
   resolution: "@parcel/resolver-default@npm:2.16.3"
   dependencies:
@@ -4942,7 +4929,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/transformer-js@npm:2.16.3, @parcel/transformer-js@npm:^2.16.0, @parcel/transformer-js@npm:^2.16.3":
+"@parcel/transformer-js@npm:2.16.3, @parcel/transformer-js@npm:^2.16.3":
   version: 2.16.3
   resolution: "@parcel/transformer-js@npm:2.16.3"
   dependencies:
@@ -5008,7 +4995,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/transformer-raw@npm:2.16.3, @parcel/transformer-raw@npm:^2.16.0, @parcel/transformer-raw@npm:^2.16.3":
+"@parcel/transformer-raw@npm:2.16.3, @parcel/transformer-raw@npm:^2.16.3":
   version: 2.16.3
   resolution: "@parcel/transformer-raw@npm:2.16.3"
   dependencies:
@@ -5017,7 +5004,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/transformer-react-refresh-wrap@npm:2.16.3, @parcel/transformer-react-refresh-wrap@npm:^2.16.0, @parcel/transformer-react-refresh-wrap@npm:^2.16.3":
+"@parcel/transformer-react-refresh-wrap@npm:2.16.3, @parcel/transformer-react-refresh-wrap@npm:^2.16.3":
   version: 2.16.3
   resolution: "@parcel/transformer-react-refresh-wrap@npm:2.16.3"
   dependencies:
@@ -5317,18 +5304,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-aria/actiongroup@npm:^3.7.22, @react-aria/actiongroup@workspace:packages/@react-aria/actiongroup":
+"@react-aria/actiongroup@workspace:packages/@react-aria/actiongroup":
   version: 0.0.0-use.local
   resolution: "@react-aria/actiongroup@workspace:packages/@react-aria/actiongroup"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-types/actiongroup": "npm:^3.4.21"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5339,105 +5319,61 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/aria-modal-polyfill@workspace:packages/@react-aria/aria-modal-polyfill"
   dependencies:
-    "@swc/helpers": "npm:^0.5.0"
-    aria-hidden: "npm:^1.2.3"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/autocomplete@npm:3.0.0-rc.4, @react-aria/autocomplete@workspace:packages/@react-aria/autocomplete":
+"@react-aria/autocomplete@workspace:packages/@react-aria/autocomplete":
   version: 0.0.0-use.local
   resolution: "@react-aria/autocomplete@workspace:packages/@react-aria/autocomplete"
   dependencies:
-    "@react-aria/combobox": "npm:^3.14.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/listbox": "npm:^3.15.1"
-    "@react-aria/searchfield": "npm:^3.8.10"
-    "@react-aria/textfield": "npm:^3.18.3"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/autocomplete": "npm:3.0.0-beta.4"
-    "@react-stately/combobox": "npm:^3.12.1"
-    "@react-types/autocomplete": "npm:3.0.0-alpha.36"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/breadcrumbs@npm:^3.5.30, @react-aria/breadcrumbs@workspace:packages/@react-aria/breadcrumbs":
+"@react-aria/breadcrumbs@workspace:packages/@react-aria/breadcrumbs":
   version: 0.0.0-use.local
   resolution: "@react-aria/breadcrumbs@workspace:packages/@react-aria/breadcrumbs"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/link": "npm:^3.8.7"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-types/breadcrumbs": "npm:^3.7.17"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/button@npm:^3.14.3, @react-aria/button@workspace:packages/@react-aria/button":
+"@react-aria/button@workspace:packages/@react-aria/button":
   version: 0.0.0-use.local
   resolution: "@react-aria/button@workspace:packages/@react-aria/button"
   dependencies:
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/toolbar": "npm:3.0.0-beta.22"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/toggle": "npm:^3.9.3"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/calendar@npm:^3.9.3, @react-aria/calendar@workspace:packages/@react-aria/calendar":
+"@react-aria/calendar@workspace:packages/@react-aria/calendar":
   version: 0.0.0-use.local
   resolution: "@react-aria/calendar@workspace:packages/@react-aria/calendar"
   dependencies:
-    "@internationalized/date": "npm:^3.10.1"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/calendar": "npm:^3.9.1"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/calendar": "npm:^3.8.1"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/checkbox@npm:^3.16.3, @react-aria/checkbox@workspace:packages/@react-aria/checkbox":
+"@react-aria/checkbox@workspace:packages/@react-aria/checkbox":
   version: 0.0.0-use.local
   resolution: "@react-aria/checkbox@workspace:packages/@react-aria/checkbox"
   dependencies:
-    "@react-aria/form": "npm:^3.1.3"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/label": "npm:^3.7.23"
-    "@react-aria/toggle": "npm:^3.12.3"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/checkbox": "npm:^3.7.3"
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-stately/toggle": "npm:^3.9.3"
-    "@react-types/checkbox": "npm:^3.10.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5448,120 +5384,62 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/collections@workspace:packages/@react-aria/collections"
   dependencies:
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
-    use-sync-external-store: "npm:^1.6.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/color@npm:^3.1.3, @react-aria/color@workspace:packages/@react-aria/color":
+"@react-aria/color@workspace:packages/@react-aria/color":
   version: 0.0.0-use.local
   resolution: "@react-aria/color@workspace:packages/@react-aria/color"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/numberfield": "npm:^3.12.3"
-    "@react-aria/slider": "npm:^3.8.3"
-    "@react-aria/spinbutton": "npm:^3.7.0"
-    "@react-aria/textfield": "npm:^3.18.3"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-aria/visually-hidden": "npm:^3.8.29"
-    "@react-stately/color": "npm:^3.9.3"
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-types/color": "npm:^3.1.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/combobox@npm:^3.14.1, @react-aria/combobox@workspace:packages/@react-aria/combobox":
+"@react-aria/combobox@workspace:packages/@react-aria/combobox":
   version: 0.0.0-use.local
   resolution: "@react-aria/combobox@workspace:packages/@react-aria/combobox"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/listbox": "npm:^3.15.1"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/menu": "npm:^3.19.4"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/selection": "npm:^3.27.0"
-    "@react-aria/textfield": "npm:^3.18.3"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/combobox": "npm:^3.12.1"
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/combobox": "npm:^3.13.10"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/datepicker@npm:^3.15.3, @react-aria/datepicker@workspace:packages/@react-aria/datepicker":
+"@react-aria/datepicker@workspace:packages/@react-aria/datepicker":
   version: 0.0.0-use.local
   resolution: "@react-aria/datepicker@workspace:packages/@react-aria/datepicker"
   dependencies:
-    "@internationalized/date": "npm:^3.10.1"
-    "@internationalized/number": "npm:^3.6.5"
-    "@internationalized/string": "npm:^3.2.7"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/form": "npm:^3.1.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/label": "npm:^3.7.23"
-    "@react-aria/spinbutton": "npm:^3.7.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/datepicker": "npm:^3.15.3"
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/calendar": "npm:^3.8.1"
-    "@react-types/datepicker": "npm:^3.13.3"
-    "@react-types/dialog": "npm:^3.5.22"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/dialog@npm:^3.5.32, @react-aria/dialog@workspace:packages/@react-aria/dialog":
+"@react-aria/dialog@workspace:packages/@react-aria/dialog":
   version: 0.0.0-use.local
   resolution: "@react-aria/dialog@workspace:packages/@react-aria/dialog"
   dependencies:
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-types/dialog": "npm:^3.5.22"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/disclosure@npm:^3.1.1, @react-aria/disclosure@workspace:packages/@react-aria/disclosure":
+"@react-aria/disclosure@workspace:packages/@react-aria/disclosure":
   version: 0.0.0-use.local
   resolution: "@react-aria/disclosure@workspace:packages/@react-aria/disclosure"
   dependencies:
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/disclosure": "npm:^3.0.9"
-    "@react-types/button": "npm:^3.14.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5572,17 +5450,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/dnd@workspace:packages/@react-aria/dnd"
   dependencies:
-    "@internationalized/string": "npm:^3.2.7"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/dnd": "npm:^3.7.2"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5595,53 +5463,33 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-aria/focus@npm:^3.20.4, @react-aria/focus@npm:^3.21.3, @react-aria/focus@workspace:packages/@react-aria/focus":
+"@react-aria/focus@npm:^3.20.4, @react-aria/focus@workspace:packages/@react-aria/focus":
   version: 0.0.0-use.local
   resolution: "@react-aria/focus@workspace:packages/@react-aria/focus"
   dependencies:
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
-    clsx: "npm:^2.0.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/form@npm:^3.1.3, @react-aria/form@workspace:packages/@react-aria/form":
+"@react-aria/form@workspace:packages/@react-aria/form":
   version: 0.0.0-use.local
   resolution: "@react-aria/form@workspace:packages/@react-aria/form"
   dependencies:
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/grid@npm:^3.14.6, @react-aria/grid@workspace:packages/@react-aria/grid":
+"@react-aria/grid@workspace:packages/@react-aria/grid":
   version: 0.0.0-use.local
   resolution: "@react-aria/grid@workspace:packages/@react-aria/grid"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/selection": "npm:^3.27.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/grid": "npm:^3.11.7"
-    "@react-stately/selection": "npm:^3.20.7"
-    "@react-types/checkbox": "npm:^3.10.2"
-    "@react-types/grid": "npm:^3.3.6"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5652,16 +5500,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/gridlist@workspace:packages/@react-aria/gridlist"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/grid": "npm:^3.14.6"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/selection": "npm:^3.27.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-stately/tree": "npm:^3.9.4"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5672,14 +5511,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/i18n@workspace:packages/@react-aria/i18n"
   dependencies:
-    "@internationalized/date": "npm:^3.10.1"
-    "@internationalized/message": "npm:^3.1.8"
-    "@internationalized/number": "npm:^3.6.5"
-    "@internationalized/string": "npm:^3.2.7"
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5690,83 +5522,62 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/interactions@workspace:packages/@react-aria/interactions"
   dependencies:
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/flags": "npm:^3.1.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/label@npm:^3.7.23, @react-aria/label@workspace:packages/@react-aria/label":
+"@react-aria/label@workspace:packages/@react-aria/label":
   version: 0.0.0-use.local
   resolution: "@react-aria/label@workspace:packages/@react-aria/label"
   dependencies:
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/landmark@npm:^3.0.8, @react-aria/landmark@workspace:packages/@react-aria/landmark":
+"@react-aria/landmark@workspace:packages/@react-aria/landmark":
   version: 0.0.0-use.local
   resolution: "@react-aria/landmark@workspace:packages/@react-aria/landmark"
   dependencies:
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
-    use-sync-external-store: "npm:^1.6.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/link@npm:^3.8.7, @react-aria/link@workspace:packages/@react-aria/link":
+"@react-aria/link@workspace:packages/@react-aria/link":
   version: 0.0.0-use.local
   resolution: "@react-aria/link@workspace:packages/@react-aria/link"
   dependencies:
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-types/link": "npm:^3.6.5"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/listbox@npm:^3.15.1, @react-aria/listbox@workspace:packages/@react-aria/listbox":
+"@react-aria/listbox@workspace:packages/@react-aria/listbox":
   version: 0.0.0-use.local
   resolution: "@react-aria/listbox@workspace:packages/@react-aria/listbox"
   dependencies:
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/label": "npm:^3.7.23"
-    "@react-aria/selection": "npm:^3.27.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-types/listbox": "npm:^3.7.4"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/live-announcer@npm:^3.4.4, @react-aria/live-announcer@workspace:packages/@react-aria/live-announcer":
+"@react-aria/live-announcer@workspace:packages/@react-aria/live-announcer":
   version: 0.0.0-use.local
   resolution: "@react-aria/live-announcer@workspace:packages/@react-aria/live-announcer"
   dependencies:
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   languageName: unknown
   linkType: soft
 
@@ -5783,59 +5594,33 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-aria/menu@npm:^3.19.4, @react-aria/menu@workspace:packages/@react-aria/menu":
+"@react-aria/menu@workspace:packages/@react-aria/menu":
   version: 0.0.0-use.local
   resolution: "@react-aria/menu@workspace:packages/@react-aria/menu"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/selection": "npm:^3.27.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/menu": "npm:^3.9.9"
-    "@react-stately/selection": "npm:^3.20.7"
-    "@react-stately/tree": "npm:^3.9.4"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/menu": "npm:^3.10.5"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/meter@npm:^3.4.28, @react-aria/meter@workspace:packages/@react-aria/meter":
+"@react-aria/meter@workspace:packages/@react-aria/meter":
   version: 0.0.0-use.local
   resolution: "@react-aria/meter@workspace:packages/@react-aria/meter"
   dependencies:
-    "@react-aria/progress": "npm:^3.4.28"
-    "@react-types/meter": "npm:^3.4.13"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/numberfield@npm:^3.12.3, @react-aria/numberfield@workspace:packages/@react-aria/numberfield":
+"@react-aria/numberfield@workspace:packages/@react-aria/numberfield":
   version: 0.0.0-use.local
   resolution: "@react-aria/numberfield@workspace:packages/@react-aria/numberfield"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/spinbutton": "npm:^3.7.0"
-    "@react-aria/textfield": "npm:^3.18.3"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-stately/numberfield": "npm:^3.10.3"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/numberfield": "npm:^3.8.16"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5854,17 +5639,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/overlays@workspace:packages/@react-aria/overlays"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-aria/visually-hidden": "npm:^3.8.29"
-    "@react-stately/overlays": "npm:^3.6.21"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/overlays": "npm:^3.9.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5879,142 +5654,88 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-aria/progress@npm:^3.4.28, @react-aria/progress@workspace:packages/@react-aria/progress":
+"@react-aria/progress@workspace:packages/@react-aria/progress":
   version: 0.0.0-use.local
   resolution: "@react-aria/progress@workspace:packages/@react-aria/progress"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/label": "npm:^3.7.23"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-types/progress": "npm:^3.5.16"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/radio@npm:^3.12.3, @react-aria/radio@workspace:packages/@react-aria/radio":
+"@react-aria/radio@workspace:packages/@react-aria/radio":
   version: 0.0.0-use.local
   resolution: "@react-aria/radio@workspace:packages/@react-aria/radio"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/form": "npm:^3.1.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/label": "npm:^3.7.23"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/radio": "npm:^3.11.3"
-    "@react-types/radio": "npm:^3.9.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/searchfield@npm:^3.8.10, @react-aria/searchfield@workspace:packages/@react-aria/searchfield":
+"@react-aria/searchfield@workspace:packages/@react-aria/searchfield":
   version: 0.0.0-use.local
   resolution: "@react-aria/searchfield@workspace:packages/@react-aria/searchfield"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/textfield": "npm:^3.18.3"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/searchfield": "npm:^3.5.17"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/searchfield": "npm:^3.6.6"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/select@npm:^3.17.1, @react-aria/select@workspace:packages/@react-aria/select":
+"@react-aria/select@workspace:packages/@react-aria/select":
   version: 0.0.0-use.local
   resolution: "@react-aria/select@workspace:packages/@react-aria/select"
   dependencies:
-    "@react-aria/form": "npm:^3.1.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/label": "npm:^3.7.23"
-    "@react-aria/listbox": "npm:^3.15.1"
-    "@react-aria/menu": "npm:^3.19.4"
-    "@react-aria/selection": "npm:^3.27.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-aria/visually-hidden": "npm:^3.8.29"
-    "@react-stately/select": "npm:^3.9.0"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/select": "npm:^3.12.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/selection@npm:^3.27.0, @react-aria/selection@workspace:packages/@react-aria/selection":
+"@react-aria/selection@workspace:packages/@react-aria/selection":
   version: 0.0.0-use.local
   resolution: "@react-aria/selection@workspace:packages/@react-aria/selection"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/selection": "npm:^3.20.7"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/separator@npm:^3.4.14, @react-aria/separator@workspace:packages/@react-aria/separator":
+"@react-aria/separator@workspace:packages/@react-aria/separator":
   version: 0.0.0-use.local
   resolution: "@react-aria/separator@workspace:packages/@react-aria/separator"
   dependencies:
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/slider@npm:^3.8.3, @react-aria/slider@workspace:packages/@react-aria/slider":
+"@react-aria/slider@workspace:packages/@react-aria/slider":
   version: 0.0.0-use.local
   resolution: "@react-aria/slider@workspace:packages/@react-aria/slider"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/label": "npm:^3.7.23"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/slider": "npm:^3.7.3"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/slider": "npm:^3.8.2"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/spinbutton@npm:^3.7.0, @react-aria/spinbutton@workspace:packages/@react-aria/spinbutton":
+"@react-aria/spinbutton@workspace:packages/@react-aria/spinbutton":
   version: 0.0.0-use.local
   resolution: "@react-aria/spinbutton@workspace:packages/@react-aria/spinbutton"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6025,100 +5746,61 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/ssr@workspace:packages/@react-aria/ssr"
   dependencies:
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/steplist@npm:3.0.0-alpha.23, @react-aria/steplist@workspace:packages/@react-aria/steplist":
+"@react-aria/steplist@workspace:packages/@react-aria/steplist":
   version: 0.0.0-use.local
   resolution: "@react-aria/steplist@workspace:packages/@react-aria/steplist"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/selection": "npm:^3.27.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/steplist": "npm:3.0.0-alpha.19"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/switch@npm:^3.7.9, @react-aria/switch@workspace:packages/@react-aria/switch":
+"@react-aria/switch@workspace:packages/@react-aria/switch":
   version: 0.0.0-use.local
   resolution: "@react-aria/switch@workspace:packages/@react-aria/switch"
   dependencies:
-    "@react-aria/toggle": "npm:^3.12.3"
-    "@react-stately/toggle": "npm:^3.9.3"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/switch": "npm:^3.5.15"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/table@npm:^3.17.9, @react-aria/table@workspace:packages/@react-aria/table":
+"@react-aria/table@workspace:packages/@react-aria/table":
   version: 0.0.0-use.local
   resolution: "@react-aria/table@workspace:packages/@react-aria/table"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/grid": "npm:^3.14.6"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-aria/visually-hidden": "npm:^3.8.29"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/flags": "npm:^3.1.2"
-    "@react-stately/table": "npm:^3.15.2"
-    "@react-types/checkbox": "npm:^3.10.2"
-    "@react-types/grid": "npm:^3.3.6"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/table": "npm:^3.13.4"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/tabs@npm:^3.10.9, @react-aria/tabs@workspace:packages/@react-aria/tabs":
+"@react-aria/tabs@workspace:packages/@react-aria/tabs":
   version: 0.0.0-use.local
   resolution: "@react-aria/tabs@workspace:packages/@react-aria/tabs"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/selection": "npm:^3.27.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/tabs": "npm:^3.8.7"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/tabs": "npm:^3.3.20"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/tag@npm:^3.7.3, @react-aria/tag@workspace:packages/@react-aria/tag":
+"@react-aria/tag@workspace:packages/@react-aria/tag":
   version: 0.0.0-use.local
   resolution: "@react-aria/tag@workspace:packages/@react-aria/tag"
   dependencies:
-    "@react-aria/gridlist": "npm:^3.14.2"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/label": "npm:^3.7.23"
-    "@react-aria/selection": "npm:^3.27.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6138,102 +5820,66 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-aria/textfield@npm:^3.18.3, @react-aria/textfield@workspace:packages/@react-aria/textfield":
+"@react-aria/textfield@workspace:packages/@react-aria/textfield":
   version: 0.0.0-use.local
   resolution: "@react-aria/textfield@workspace:packages/@react-aria/textfield"
   dependencies:
-    "@react-aria/form": "npm:^3.1.3"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/label": "npm:^3.7.23"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/textfield": "npm:^3.12.6"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/toast@npm:^3.0.9, @react-aria/toast@workspace:packages/@react-aria/toast":
+"@react-aria/toast@workspace:packages/@react-aria/toast":
   version: 0.0.0-use.local
   resolution: "@react-aria/toast@workspace:packages/@react-aria/toast"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/landmark": "npm:^3.0.8"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/toast": "npm:^3.1.2"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/toggle@npm:^3.12.3, @react-aria/toggle@workspace:packages/@react-aria/toggle":
+"@react-aria/toggle@workspace:packages/@react-aria/toggle":
   version: 0.0.0-use.local
   resolution: "@react-aria/toggle@workspace:packages/@react-aria/toggle"
   dependencies:
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/toggle": "npm:^3.9.3"
-    "@react-types/checkbox": "npm:^3.10.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/toolbar@npm:3.0.0-beta.22, @react-aria/toolbar@workspace:packages/@react-aria/toolbar":
+"@react-aria/toolbar@workspace:packages/@react-aria/toolbar":
   version: 0.0.0-use.local
   resolution: "@react-aria/toolbar@workspace:packages/@react-aria/toolbar"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/tooltip@npm:^3.9.0, @react-aria/tooltip@workspace:packages/@react-aria/tooltip":
+"@react-aria/tooltip@workspace:packages/@react-aria/tooltip":
   version: 0.0.0-use.local
   resolution: "@react-aria/tooltip@workspace:packages/@react-aria/tooltip"
   dependencies:
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/tooltip": "npm:^3.5.9"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/tooltip": "npm:^3.5.0"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/tree@npm:^3.1.5, @react-aria/tree@workspace:packages/@react-aria/tree":
+"@react-aria/tree@workspace:packages/@react-aria/tree":
   version: 0.0.0-use.local
   resolution: "@react-aria/tree@workspace:packages/@react-aria/tree"
   dependencies:
-    "@react-aria/gridlist": "npm:^3.14.2"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/selection": "npm:^3.27.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/tree": "npm:^3.9.4"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6244,59 +5890,41 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/utils@workspace:packages/@react-aria/utils"
   dependencies:
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-stately/flags": "npm:^3.1.2"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
-    clsx: "npm:^2.0.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/virtualizer@npm:^4.1.11, @react-aria/virtualizer@workspace:packages/@react-aria/virtualizer":
+"@react-aria/virtualizer@workspace:packages/@react-aria/virtualizer":
   version: 0.0.0-use.local
   resolution: "@react-aria/virtualizer@workspace:packages/@react-aria/virtualizer"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/virtualizer": "npm:^4.4.4"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/visually-hidden@npm:^3.1.0, @react-aria/visually-hidden@npm:^3.8.29, @react-aria/visually-hidden@workspace:packages/@react-aria/visually-hidden":
+"@react-aria/visually-hidden@npm:^3.1.0, @react-aria/visually-hidden@workspace:packages/@react-aria/visually-hidden":
   version: 0.0.0-use.local
   resolution: "@react-aria/visually-hidden@workspace:packages/@react-aria/visually-hidden"
   dependencies:
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/accordion@npm:^3.0.14, @react-spectrum/accordion@workspace:packages/@react-spectrum/accordion":
+"@react-spectrum/accordion@workspace:packages/@react-spectrum/accordion":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/accordion@workspace:packages/@react-spectrum/accordion"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
-    react-aria-components: "npm:^1.14.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6304,26 +5932,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/actionbar@npm:^3.6.15, @react-spectrum/actionbar@workspace:packages/@react-spectrum/actionbar":
+"@react-spectrum/actionbar@workspace:packages/@react-spectrum/actionbar":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/actionbar@workspace:packages/@react-spectrum/actionbar"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/actiongroup": "npm:^3.11.5"
-    "@react-spectrum/button": "npm:^3.17.5"
-    "@react-spectrum/overlays": "npm:^5.9.1"
-    "@react-spectrum/text": "npm:^3.5.23"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-types/actionbar": "npm:^3.1.19"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6331,28 +5945,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/actiongroup@npm:^3.11.5, @react-spectrum/actiongroup@workspace:packages/@react-spectrum/actiongroup":
+"@react-spectrum/actiongroup@workspace:packages/@react-spectrum/actiongroup":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/actiongroup@workspace:packages/@react-spectrum/actiongroup"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/actiongroup": "npm:^3.7.22"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/button": "npm:^3.17.5"
-    "@react-spectrum/menu": "npm:^3.22.9"
-    "@react-spectrum/text": "npm:^3.5.23"
-    "@react-spectrum/tooltip": "npm:^3.8.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-types/actiongroup": "npm:^3.4.21"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@spectrum-icons/workflow": "npm:^4.2.26"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.2.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6364,32 +5962,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/autocomplete@workspace:packages/@react-spectrum/autocomplete"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/autocomplete": "npm:3.0.0-rc.4"
-    "@react-aria/button": "npm:^3.14.3"
-    "@react-aria/dialog": "npm:^3.5.32"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/form": "npm:^3.1.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/label": "npm:^3.7.23"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/button": "npm:^3.17.5"
-    "@react-spectrum/form": "npm:^3.7.20"
-    "@react-spectrum/label": "npm:^3.16.20"
-    "@react-spectrum/listbox": "npm:^3.15.9"
-    "@react-spectrum/overlays": "npm:^5.9.1"
-    "@react-spectrum/progress": "npm:^3.7.21"
-    "@react-spectrum/textfield": "npm:^3.14.3"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/combobox": "npm:^3.12.1"
-    "@react-types/autocomplete": "npm:3.0.0-alpha.36"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6397,16 +5971,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/avatar@npm:^3.0.27, @react-spectrum/avatar@workspace:packages/@react-spectrum/avatar":
+"@react-spectrum/avatar@workspace:packages/@react-spectrum/avatar":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/avatar@workspace:packages/@react-spectrum/avatar"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/avatar": "npm:^3.0.19"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.2.1
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6414,17 +5984,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/badge@npm:^3.1.31, @react-spectrum/badge@workspace:packages/@react-spectrum/badge":
+"@react-spectrum/badge@workspace:packages/@react-spectrum/badge":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/badge@workspace:packages/@react-spectrum/badge"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/text": "npm:^3.5.23"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/badge": "npm:^3.1.21"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6432,24 +5997,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/breadcrumbs@npm:^3.1.0, @react-spectrum/breadcrumbs@npm:^3.9.25, @react-spectrum/breadcrumbs@workspace:packages/@react-spectrum/breadcrumbs":
+"@react-spectrum/breadcrumbs@npm:^3.1.0, @react-spectrum/breadcrumbs@workspace:packages/@react-spectrum/breadcrumbs":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/breadcrumbs@workspace:packages/@react-spectrum/breadcrumbs"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/breadcrumbs": "npm:^3.5.30"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/button": "npm:^3.17.5"
-    "@react-spectrum/menu": "npm:^3.22.9"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-types/breadcrumbs": "npm:^3.7.17"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6457,25 +6010,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/button@npm:^3.1.0, @react-spectrum/button@npm:^3.17.5, @react-spectrum/button@npm:^3.8.1, @react-spectrum/button@workspace:packages/@react-spectrum/button":
+"@react-spectrum/button@npm:^3.1.0, @react-spectrum/button@npm:^3.8.1, @react-spectrum/button@workspace:packages/@react-spectrum/button":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/button@workspace:packages/@react-spectrum/button"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/button": "npm:^3.14.3"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/progress": "npm:^3.7.21"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/text": "npm:^3.5.23"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/toggle": "npm:^3.9.3"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
@@ -6484,17 +6025,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/buttongroup@npm:^3.6.27, @react-spectrum/buttongroup@workspace:packages/@react-spectrum/buttongroup":
+"@react-spectrum/buttongroup@workspace:packages/@react-spectrum/buttongroup":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/buttongroup@workspace:packages/@react-spectrum/buttongroup"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/buttongroup": "npm:^3.3.21"
-    "@react-types/shared": "npm:^3.32.1"
     "@spectrum-icons/workflow": "npm:^4.0.0"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6502,28 +6039,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/calendar@npm:^3.7.9, @react-spectrum/calendar@workspace:packages/@react-spectrum/calendar":
+"@react-spectrum/calendar@workspace:packages/@react-spectrum/calendar":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/calendar@workspace:packages/@react-spectrum/calendar"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@internationalized/date": "npm:^3.10.1"
-    "@react-aria/calendar": "npm:^3.9.3"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-aria/visually-hidden": "npm:^3.8.29"
-    "@react-spectrum/button": "npm:^3.17.5"
-    "@react-spectrum/label": "npm:^3.16.20"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/calendar": "npm:^3.9.1"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/calendar": "npm:^3.8.1"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6535,24 +6057,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/card@workspace:packages/@react-spectrum/card"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/grid": "npm:^3.14.6"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-aria/virtualizer": "npm:^4.1.11"
-    "@react-spectrum/checkbox": "npm:^3.10.5"
-    "@react-spectrum/progress": "npm:^3.7.21"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/grid": "npm:^3.11.7"
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-stately/virtualizer": "npm:^4.4.4"
-    "@react-types/card": "npm:3.0.0-alpha.41"
-    "@react-types/provider": "npm:^3.8.13"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6560,24 +6066,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/checkbox@npm:^3.10.5, @react-spectrum/checkbox@workspace:packages/@react-spectrum/checkbox":
+"@react-spectrum/checkbox@workspace:packages/@react-spectrum/checkbox":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/checkbox@workspace:packages/@react-spectrum/checkbox"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/checkbox": "npm:^3.16.3"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-spectrum/form": "npm:^3.7.20"
-    "@react-spectrum/label": "npm:^3.16.20"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/checkbox": "npm:^3.7.3"
-    "@react-stately/toggle": "npm:^3.9.3"
-    "@react-types/checkbox": "npm:^3.10.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
-    react-aria-components: "npm:^1.14.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
@@ -6613,31 +6107,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/color@npm:^3.1.5, @react-spectrum/color@workspace:packages/@react-spectrum/color":
+"@react-spectrum/color@workspace:packages/@react-spectrum/color":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/color@workspace:packages/@react-spectrum/color"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/color": "npm:^3.1.3"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/dialog": "npm:^3.9.5"
-    "@react-spectrum/form": "npm:^3.7.20"
-    "@react-spectrum/label": "npm:^3.16.20"
-    "@react-spectrum/overlays": "npm:^5.9.1"
-    "@react-spectrum/picker": "npm:^3.16.5"
     "@react-spectrum/style-macro-s1": "npm:3.0.0-alpha.5"
-    "@react-spectrum/textfield": "npm:^3.14.3"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-spectrum/view": "npm:^3.6.24"
-    "@react-stately/color": "npm:^3.9.3"
-    "@react-types/color": "npm:^3.1.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/textfield": "npm:^3.12.6"
-    "@swc/helpers": "npm:^0.5.0"
-    react-aria-components: "npm:^1.14.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6645,36 +6121,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/combobox@npm:^3.16.5, @react-spectrum/combobox@workspace:packages/@react-spectrum/combobox":
+"@react-spectrum/combobox@workspace:packages/@react-spectrum/combobox":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/combobox@workspace:packages/@react-spectrum/combobox"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/button": "npm:^3.14.3"
-    "@react-aria/combobox": "npm:^3.14.1"
-    "@react-aria/dialog": "npm:^3.5.32"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/form": "npm:^3.1.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/label": "npm:^3.7.23"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/button": "npm:^3.17.5"
-    "@react-spectrum/form": "npm:^3.7.20"
-    "@react-spectrum/label": "npm:^3.16.20"
-    "@react-spectrum/listbox": "npm:^3.15.9"
-    "@react-spectrum/overlays": "npm:^5.9.1"
-    "@react-spectrum/progress": "npm:^3.7.21"
-    "@react-spectrum/textfield": "npm:^3.14.3"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/combobox": "npm:^3.12.1"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/combobox": "npm:^3.13.10"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6682,22 +6134,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/contextualhelp@npm:^3.6.29, @react-spectrum/contextualhelp@workspace:packages/@react-spectrum/contextualhelp":
+"@react-spectrum/contextualhelp@workspace:packages/@react-spectrum/contextualhelp":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/contextualhelp@workspace:packages/@react-spectrum/contextualhelp"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/button": "npm:^3.17.5"
-    "@react-spectrum/dialog": "npm:^3.9.5"
     "@react-spectrum/link": "npm:^3.2.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
     "@react-spectrum/view": "npm:^3.1.3"
-    "@react-types/contextualhelp": "npm:^3.2.22"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/workflow": "npm:^4.2.26"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6705,32 +6149,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/datepicker@npm:^3.14.9, @react-spectrum/datepicker@workspace:packages/@react-spectrum/datepicker":
+"@react-spectrum/datepicker@workspace:packages/@react-spectrum/datepicker":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/datepicker@workspace:packages/@react-spectrum/datepicker"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@internationalized/date": "npm:^3.10.1"
-    "@react-aria/datepicker": "npm:^3.15.3"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/button": "npm:^3.17.5"
-    "@react-spectrum/calendar": "npm:^3.7.9"
-    "@react-spectrum/dialog": "npm:^3.9.5"
-    "@react-spectrum/form": "npm:^3.7.20"
-    "@react-spectrum/label": "npm:^3.16.20"
-    "@react-spectrum/layout": "npm:^3.6.20"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-spectrum/view": "npm:^3.6.24"
-    "@react-stately/datepicker": "npm:^3.15.3"
-    "@react-types/datepicker": "npm:^3.13.3"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@spectrum-icons/workflow": "npm:^4.2.26"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6738,31 +6163,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/dialog@npm:^3.1.0, @react-spectrum/dialog@npm:^3.9.5, @react-spectrum/dialog@workspace:packages/@react-spectrum/dialog":
+"@react-spectrum/dialog@npm:^3.1.0, @react-spectrum/dialog@workspace:packages/@react-spectrum/dialog":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/dialog@workspace:packages/@react-spectrum/dialog"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/dialog": "npm:^3.5.32"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/button": "npm:^3.17.5"
-    "@react-spectrum/buttongroup": "npm:^3.6.27"
-    "@react-spectrum/divider": "npm:^3.5.28"
-    "@react-spectrum/layout": "npm:^3.6.20"
-    "@react-spectrum/overlays": "npm:^5.9.1"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/text": "npm:^3.5.23"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-spectrum/view": "npm:^3.6.24"
-    "@react-stately/overlays": "npm:^3.6.21"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/dialog": "npm:^3.5.22"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6770,31 +6177,24 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/divider@npm:^3.1.0, @react-spectrum/divider@npm:^3.5.28, @react-spectrum/divider@workspace:packages/@react-spectrum/divider":
+"@react-spectrum/divider@npm:^3.1.0, @react-spectrum/divider@workspace:packages/@react-spectrum/divider":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/divider@workspace:packages/@react-spectrum/divider"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/separator": "npm:^3.4.14"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/divider": "npm:^3.3.21"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/dnd@npm:^3.6.3, @react-spectrum/dnd@workspace:packages/@react-spectrum/dnd":
+"@react-spectrum/dnd@workspace:packages/@react-spectrum/dnd":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/dnd@workspace:packages/@react-spectrum/dnd"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/dnd": "npm:^3.11.4"
-    "@react-stately/dnd": "npm:^3.7.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6840,18 +6240,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/dropzone@npm:^3.0.19, @react-spectrum/dropzone@workspace:packages/@react-spectrum/dropzone":
+"@react-spectrum/dropzone@workspace:packages/@react-spectrum/dropzone":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/dropzone@workspace:packages/@react-spectrum/dropzone"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/utils": "npm:^3.32.0"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
-    react-aria-components: "npm:^1.14.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
@@ -6860,13 +6255,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/filetrigger@npm:^3.0.19, @react-spectrum/filetrigger@workspace:packages/@react-spectrum/filetrigger":
+"@react-spectrum/filetrigger@workspace:packages/@react-spectrum/filetrigger":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/filetrigger@workspace:packages/@react-spectrum/filetrigger"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@swc/helpers": "npm:^0.5.0"
-    react-aria-components: "npm:^1.14.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
@@ -6875,17 +6269,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/form@npm:^3.7.20, @react-spectrum/form@workspace:packages/@react-spectrum/form":
+"@react-spectrum/form@workspace:packages/@react-spectrum/form":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/form@workspace:packages/@react-spectrum/form"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-types/form": "npm:^3.7.16"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6897,11 +6286,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/icon@workspace:packages/@react-spectrum/icon"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6909,17 +6295,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/illustratedmessage@npm:^3.5.0, @react-spectrum/illustratedmessage@npm:^3.5.15, @react-spectrum/illustratedmessage@workspace:packages/@react-spectrum/illustratedmessage":
+"@react-spectrum/illustratedmessage@npm:^3.5.0, @react-spectrum/illustratedmessage@workspace:packages/@react-spectrum/illustratedmessage":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/illustratedmessage@workspace:packages/@react-spectrum/illustratedmessage"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/layout": "npm:^3.6.20"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/illustratedmessage": "npm:^3.3.21"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6927,16 +6308,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/image@npm:^3.6.3, @react-spectrum/image@workspace:packages/@react-spectrum/image":
+"@react-spectrum/image@workspace:packages/@react-spectrum/image":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/image@workspace:packages/@react-spectrum/image"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/image": "npm:^3.5.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6944,19 +6321,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/inlinealert@npm:^3.2.21, @react-spectrum/inlinealert@workspace:packages/@react-spectrum/inlinealert":
+"@react-spectrum/inlinealert@workspace:packages/@react-spectrum/inlinealert":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/inlinealert@workspace:packages/@react-spectrum/inlinealert"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/layout": "npm:^3.6.20"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6964,20 +6334,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/label@npm:^3.16.20, @react-spectrum/label@workspace:packages/@react-spectrum/label":
+"@react-spectrum/label@workspace:packages/@react-spectrum/label":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/label@workspace:packages/@react-spectrum/label"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/form": "npm:^3.7.20"
-    "@react-spectrum/layout": "npm:^3.6.20"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/label": "npm:^3.9.15"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6985,18 +6347,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/labeledvalue@npm:^3.2.8, @react-spectrum/labeledvalue@workspace:packages/@react-spectrum/labeledvalue":
+"@react-spectrum/labeledvalue@workspace:packages/@react-spectrum/labeledvalue":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/labeledvalue@workspace:packages/@react-spectrum/labeledvalue"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@internationalized/date": "npm:^3.10.1"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/label": "npm:^3.16.20"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7004,16 +6360,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/layout@npm:^3.1.0, @react-spectrum/layout@npm:^3.6.20, @react-spectrum/layout@workspace:packages/@react-spectrum/layout":
+"@react-spectrum/layout@npm:^3.1.0, @react-spectrum/layout@workspace:packages/@react-spectrum/layout":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/layout@workspace:packages/@react-spectrum/layout"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/layout": "npm:^3.3.27"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7021,19 +6373,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/link@npm:^3.2.0, @react-spectrum/link@npm:^3.6.23, @react-spectrum/link@workspace:packages/@react-spectrum/link":
+"@react-spectrum/link@npm:^3.2.0, @react-spectrum/link@workspace:packages/@react-spectrum/link":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/link@workspace:packages/@react-spectrum/link"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/link": "npm:^3.8.7"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/link": "npm:^3.6.5"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7045,34 +6390,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/list@workspace:packages/@react-spectrum/list"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/button": "npm:^3.14.3"
     "@react-aria/dnd": "npm:^3.0.0"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/gridlist": "npm:^3.14.2"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/selection": "npm:^3.27.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-aria/virtualizer": "npm:^4.1.11"
-    "@react-aria/visually-hidden": "npm:^3.8.29"
     "@react-spectrum/button": "npm:^3.8.1"
-    "@react-spectrum/checkbox": "npm:^3.10.5"
-    "@react-spectrum/dnd": "npm:^3.6.3"
-    "@react-spectrum/layout": "npm:^3.6.20"
-    "@react-spectrum/progress": "npm:^3.7.21"
-    "@react-spectrum/text": "npm:^3.5.23"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/collections": "npm:^3.12.8"
     "@react-stately/dnd": "npm:^3.0.0"
-    "@react-stately/layout": "npm:^4.5.2"
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-stately/virtualizer": "npm:^4.4.4"
-    "@react-types/grid": "npm:^3.3.6"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
-    react-transition-group: "npm:^4.4.5"
   peerDependencies:
     "@react-spectrum/provider": ^3.2.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7080,29 +6402,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/listbox@npm:^3.15.9, @react-spectrum/listbox@workspace:packages/@react-spectrum/listbox":
+"@react-spectrum/listbox@workspace:packages/@react-spectrum/listbox":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/listbox@workspace:packages/@react-spectrum/listbox"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/listbox": "npm:^3.15.1"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-aria/virtualizer": "npm:^4.1.11"
-    "@react-spectrum/layout": "npm:^3.6.20"
-    "@react-spectrum/progress": "npm:^3.7.21"
-    "@react-spectrum/text": "npm:^3.5.23"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/layout": "npm:^4.5.2"
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-stately/virtualizer": "npm:^4.4.4"
-    "@react-types/listbox": "npm:^3.7.4"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.2.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7124,33 +6429,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/menu@npm:^3.22.9, @react-spectrum/menu@workspace:packages/@react-spectrum/menu":
+"@react-spectrum/menu@workspace:packages/@react-spectrum/menu":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/menu@workspace:packages/@react-spectrum/menu"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/menu": "npm:^3.19.4"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/separator": "npm:^3.4.14"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/button": "npm:^3.17.5"
-    "@react-spectrum/layout": "npm:^3.6.20"
-    "@react-spectrum/overlays": "npm:^5.9.1"
-    "@react-spectrum/text": "npm:^3.5.23"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/menu": "npm:^3.9.9"
-    "@react-stately/overlays": "npm:^3.6.21"
-    "@react-stately/tree": "npm:^3.9.4"
-    "@react-types/menu": "npm:^3.10.5"
-    "@react-types/overlays": "npm:^3.9.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@spectrum-icons/workflow": "npm:^4.2.26"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7158,17 +6442,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/meter@npm:^3.5.15, @react-spectrum/meter@workspace:packages/@react-spectrum/meter":
+"@react-spectrum/meter@workspace:packages/@react-spectrum/meter":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/meter@workspace:packages/@react-spectrum/meter"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/meter": "npm:^3.4.28"
-    "@react-spectrum/progress": "npm:^3.7.21"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/meter": "npm:^3.4.13"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7176,29 +6455,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/numberfield@npm:^3.10.3, @react-spectrum/numberfield@workspace:packages/@react-spectrum/numberfield":
+"@react-spectrum/numberfield@workspace:packages/@react-spectrum/numberfield":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/numberfield@workspace:packages/@react-spectrum/numberfield"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/button": "npm:^3.14.3"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/numberfield": "npm:^3.12.3"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/form": "npm:^3.7.20"
-    "@react-spectrum/label": "npm:^3.16.20"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/textfield": "npm:^3.14.3"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/numberfield": "npm:^3.10.3"
-    "@react-types/button": "npm:^3.14.1"
-    "@react-types/numberfield": "npm:^3.8.16"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@spectrum-icons/workflow": "npm:^4.2.26"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7206,20 +6469,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/overlays@npm:^5.9.1, @react-spectrum/overlays@workspace:packages/@react-spectrum/overlays":
+"@react-spectrum/overlays@workspace:packages/@react-spectrum/overlays":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/overlays@workspace:packages/@react-spectrum/overlays"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/overlays": "npm:^3.6.21"
-    "@react-types/overlays": "npm:^3.9.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
-    react-transition-group: "npm:^4.4.5"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7227,16 +6482,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/parcel-namer-s2@npm:^0.3.0, @react-spectrum/parcel-namer-s2@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "@react-spectrum/parcel-namer-s2@npm:0.3.2"
-  dependencies:
-    "@parcel/plugin": "npm:^2.16.0"
-  checksum: 10c0/77d05e8d9949adc550a5af71cefbff8f288ecf63456a90479ed750dc149c8ca1f41794fdd54f9a7ee6139911912f5d612dd9d5981953512ee2bce5385999e476
-  languageName: node
-  linkType: hard
-
-"@react-spectrum/parcel-namer-s2@npm:^1.0.0, @react-spectrum/parcel-namer-s2@workspace:packages/dev/parcel-namer-s2":
+"@react-spectrum/parcel-namer-s2@npm:^1.0.0, @react-spectrum/parcel-namer-s2@workspace:^, @react-spectrum/parcel-namer-s2@workspace:packages/dev/parcel-namer-s2":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/parcel-namer-s2@workspace:packages/dev/parcel-namer-s2"
   dependencies:
@@ -7244,19 +6490,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/parcel-transformer-s2-icon@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "@react-spectrum/parcel-transformer-s2-icon@npm:0.3.2"
-  dependencies:
-    "@adobe/spectrum-tokens": "npm:^13.15.1"
-    "@parcel/plugin": "npm:^2.0.0"
-    "@svgr/core": "npm:^8.1.0"
-    "@svgr/plugin-jsx": "npm:^8.1.0"
-    "@svgr/plugin-svgo": "npm:^8.1.0"
-  checksum: 10c0/3bd78d03db2bc05728b631610a19513abf4ff44fccee63beaca84fdef85ee54547348b6b2395a4b0d6b1297b77a6d7e23be85ca76329b688b1ca7df9b83a6d69
-  languageName: node
-  linkType: hard
-
 "@react-spectrum/parcel-transformer-s2-icon@npm:^1.0.0, @react-spectrum/parcel-transformer-s2-icon@workspace:packages/dev/parcel-transformer-s2-icon":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/parcel-transformer-s2-icon@workspace:packages/dev/parcel-transformer-s2-icon"
@@ -7270,29 +6503,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/picker@npm:^3.1.0, @react-spectrum/picker@npm:^3.16.5, @react-spectrum/picker@workspace:packages/@react-spectrum/picker":
+"@react-spectrum/picker@npm:^3.1.0, @react-spectrum/picker@workspace:packages/@react-spectrum/picker":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/picker@workspace:packages/@react-spectrum/picker"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/select": "npm:^3.17.1"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/button": "npm:^3.17.5"
-    "@react-spectrum/form": "npm:^3.7.20"
-    "@react-spectrum/label": "npm:^3.16.20"
-    "@react-spectrum/listbox": "npm:^3.15.9"
-    "@react-spectrum/overlays": "npm:^5.9.1"
-    "@react-spectrum/progress": "npm:^3.7.21"
-    "@react-spectrum/text": "npm:^3.5.23"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/select": "npm:^3.9.0"
-    "@react-types/select": "npm:^3.12.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.1.4
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7300,17 +6516,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/progress@npm:^3.7.21, @react-spectrum/progress@workspace:packages/@react-spectrum/progress":
+"@react-spectrum/progress@workspace:packages/@react-spectrum/progress":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/progress@workspace:packages/@react-spectrum/progress"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/progress": "npm:^3.4.28"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/progress": "npm:^3.5.16"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7318,40 +6529,24 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/provider@npm:^3.1.0, @react-spectrum/provider@npm:^3.10.12, @react-spectrum/provider@workspace:packages/@react-spectrum/provider":
+"@react-spectrum/provider@npm:^3.1.0, @react-spectrum/provider@workspace:packages/@react-spectrum/provider":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/provider@workspace:packages/@react-spectrum/provider"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/provider": "npm:^3.8.13"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
-    clsx: "npm:^2.0.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/radio@npm:^3.7.22, @react-spectrum/radio@workspace:packages/@react-spectrum/radio":
+"@react-spectrum/radio@workspace:packages/@react-spectrum/radio":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/radio@workspace:packages/@react-spectrum/radio"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/radio": "npm:^3.12.3"
-    "@react-spectrum/form": "npm:^3.7.20"
-    "@react-spectrum/label": "npm:^3.16.20"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/radio": "npm:^3.11.3"
-    "@react-types/radio": "npm:^3.9.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7400,37 +6595,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/s2-icon-builder@npm:^0.3.0":
-  version: 0.3.2
-  resolution: "@react-spectrum/s2-icon-builder@npm:0.3.2"
-  dependencies:
-    "@parcel/bundler-library": "npm:^2.16.0"
-    "@parcel/compressor-raw": "npm:^2.16.0"
-    "@parcel/config-default": "npm:^2.16.0"
-    "@parcel/core": "npm:^2.16.0"
-    "@parcel/namer-default": "npm:^2.16.0"
-    "@parcel/packager-raw": "npm:^2.16.0"
-    "@parcel/plugin": "npm:^2.16.0"
-    "@parcel/reporter-cli": "npm:^2.16.0"
-    "@parcel/resolver-default": "npm:^2.16.0"
-    "@parcel/transformer-js": "npm:^2.16.0"
-    "@parcel/transformer-raw": "npm:^2.16.0"
-    "@parcel/transformer-react-refresh-wrap": "npm:^2.16.0"
-    "@react-spectrum/parcel-namer-s2": "npm:^0.3.2"
-    "@react-spectrum/parcel-transformer-s2-icon": "npm:^0.3.2"
-    "@swc/helpers": "npm:^0.5.0"
-    glob: "npm:^8.0.3"
-  peerDependencies:
-    "@react-spectrum/s2": ">=0.8.0"
-    react: ^18.0.0 || ^19.0.0-rc.1
-    react-dom: ^18.0.0 || ^19.0.0-rc.1
-  bin:
-    transform-icons: index.js
-  checksum: 10c0/8839d97a995546e144db27d927c4ae6f7ee9486cdee30e8c3558546fb5b076cbf822109dabad88340d9e7e44be0e26cd3ba337703d714f1d4676b8ff216a53fb
-  languageName: node
-  linkType: hard
-
-"@react-spectrum/s2-icon-builder@workspace:packages/dev/s2-icon-builder":
+"@react-spectrum/s2-icon-builder@workspace:^, @react-spectrum/s2-icon-builder@workspace:packages/dev/s2-icon-builder":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/s2-icon-builder@workspace:packages/dev/s2-icon-builder"
   dependencies:
@@ -7463,21 +6628,17 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/s2@workspace:packages/@react-spectrum/s2"
   dependencies:
+    "@adobe/react-spectrum": "npm:3.46.0"
     "@adobe/spectrum-tokens": "npm:^14.0.0"
     "@internationalized/date": "npm:^3.10.1"
     "@internationalized/number": "npm:^3.6.5"
     "@parcel/macros": "npm:^2.16.3"
-    "@react-aria/calendar": "npm:^3.9.3"
     "@react-aria/collections": "npm:^3.0.1"
-    "@react-aria/focus": "npm:^3.21.3"
     "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/live-announcer": "npm:^3.4.4"
     "@react-aria/test-utils": "npm:^1.0.0-alpha.8"
     "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/layout": "npm:^4.5.2"
-    "@react-stately/utils": "npm:^3.11.0"
+    "@react-stately/color": "npm:^3.9.3"
+    "@react-stately/toast": "npm:^3.1.2"
     "@react-types/dialog": "npm:^3.5.22"
     "@react-types/grid": "npm:^3.3.6"
     "@react-types/overlays": "npm:^3.9.2"
@@ -7500,22 +6661,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/searchfield@npm:^3.8.24, @react-spectrum/searchfield@workspace:packages/@react-spectrum/searchfield":
+"@react-spectrum/searchfield@workspace:packages/@react-spectrum/searchfield":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/searchfield@workspace:packages/@react-spectrum/searchfield"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/searchfield": "npm:^3.8.10"
-    "@react-spectrum/button": "npm:^3.17.5"
-    "@react-spectrum/form": "npm:^3.7.20"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/textfield": "npm:^3.14.3"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/searchfield": "npm:^3.5.17"
-    "@react-types/searchfield": "npm:^3.6.6"
-    "@react-types/textfield": "npm:^3.12.6"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7523,22 +6675,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/slider@npm:^3.8.3, @react-spectrum/slider@workspace:packages/@react-spectrum/slider":
+"@react-spectrum/slider@workspace:packages/@react-spectrum/slider":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/slider@workspace:packages/@react-spectrum/slider"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/slider": "npm:^3.8.3"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-aria/visually-hidden": "npm:^3.8.29"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/slider": "npm:^3.7.3"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/slider": "npm:^3.8.2"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7546,16 +6688,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/statuslight@npm:^3.5.27, @react-spectrum/statuslight@workspace:packages/@react-spectrum/statuslight":
+"@react-spectrum/statuslight@workspace:packages/@react-spectrum/statuslight":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/statuslight@workspace:packages/@react-spectrum/statuslight"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/statuslight": "npm:^3.3.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7567,19 +6705,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/steplist@workspace:packages/@react-spectrum/steplist"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/steplist": "npm:3.0.0-alpha.23"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-aria/visually-hidden": "npm:^3.8.29"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/steplist": "npm:3.0.0-alpha.19"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7606,19 +6733,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/switch@npm:^3.6.7, @react-spectrum/switch@workspace:packages/@react-spectrum/switch":
+"@react-spectrum/switch@workspace:packages/@react-spectrum/switch":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/switch@workspace:packages/@react-spectrum/switch"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/switch": "npm:^3.7.9"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/toggle": "npm:^3.9.3"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/switch": "npm:^3.5.15"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7626,39 +6746,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/table@npm:^3.17.9, @react-spectrum/table@workspace:packages/@react-spectrum/table":
+"@react-spectrum/table@workspace:packages/@react-spectrum/table":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/table@workspace:packages/@react-spectrum/table"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/button": "npm:^3.14.3"
     "@react-aria/dnd": "npm:^3.1.0"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/selection": "npm:^3.27.0"
-    "@react-aria/table": "npm:^3.17.9"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-aria/virtualizer": "npm:^4.1.11"
-    "@react-aria/visually-hidden": "npm:^3.8.29"
-    "@react-spectrum/checkbox": "npm:^3.10.5"
-    "@react-spectrum/dnd": "npm:^3.6.3"
-    "@react-spectrum/layout": "npm:^3.6.20"
-    "@react-spectrum/menu": "npm:^3.22.9"
-    "@react-spectrum/progress": "npm:^3.7.21"
-    "@react-spectrum/tooltip": "npm:^3.8.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
     "@react-stately/dnd": "npm:^3.1.0"
-    "@react-stately/flags": "npm:^3.1.2"
-    "@react-stately/layout": "npm:^4.5.2"
-    "@react-stately/table": "npm:^3.15.2"
-    "@react-stately/virtualizer": "npm:^4.4.4"
-    "@react-types/grid": "npm:^3.3.6"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/table": "npm:^3.13.4"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7666,26 +6761,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/tabs@npm:^3.8.28, @react-spectrum/tabs@workspace:packages/@react-spectrum/tabs":
+"@react-spectrum/tabs@workspace:packages/@react-spectrum/tabs":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/tabs@workspace:packages/@react-spectrum/tabs"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/tabs": "npm:^3.10.9"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/picker": "npm:^3.16.5"
-    "@react-spectrum/text": "npm:^3.5.23"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-stately/tabs": "npm:^3.8.7"
-    "@react-types/select": "npm:^3.12.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/tabs": "npm:^3.3.20"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7693,26 +6774,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/tag@npm:^3.3.8, @react-spectrum/tag@workspace:packages/@react-spectrum/tag":
+"@react-spectrum/tag@workspace:packages/@react-spectrum/tag":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/tag@workspace:packages/@react-spectrum/tag"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/selection": "npm:^3.27.0"
-    "@react-aria/tag": "npm:^3.7.3"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/button": "npm:^3.17.5"
-    "@react-spectrum/form": "npm:^3.7.20"
-    "@react-spectrum/label": "npm:^3.16.20"
-    "@react-spectrum/text": "npm:^3.5.23"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7758,17 +6825,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/text@npm:^3.1.0, @react-spectrum/text@npm:^3.5.23, @react-spectrum/text@workspace:packages/@react-spectrum/text":
+"@react-spectrum/text@npm:^3.1.0, @react-spectrum/text@workspace:packages/@react-spectrum/text":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/text@workspace:packages/@react-spectrum/text"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/text": "npm:^3.3.21"
-    "@swc/helpers": "npm:^0.5.0"
-    react-aria-components: "npm:^1.14.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
@@ -7777,25 +6839,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/textfield@npm:^3.14.3, @react-spectrum/textfield@workspace:packages/@react-spectrum/textfield":
+"@react-spectrum/textfield@workspace:packages/@react-spectrum/textfield":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/textfield@workspace:packages/@react-spectrum/textfield"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/textfield": "npm:^3.18.3"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/form": "npm:^3.7.20"
-    "@react-spectrum/label": "npm:^3.16.20"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/textfield": "npm:^3.12.6"
-    "@spectrum-icons/ui": "npm:^3.6.21"
     "@spectrum-icons/workflow": "npm:^4.0.0"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7803,25 +6853,23 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/theme-dark@npm:^3.5.22, @react-spectrum/theme-dark@workspace:packages/@react-spectrum/theme-dark":
+"@react-spectrum/theme-dark@workspace:packages/@react-spectrum/theme-dark":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/theme-dark@workspace:packages/@react-spectrum/theme-dark"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-types/provider": "npm:^3.8.13"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/theme-default@npm:^3.1.0, @react-spectrum/theme-default@npm:^3.5.13, @react-spectrum/theme-default@npm:^3.5.22, @react-spectrum/theme-default@workspace:packages/@react-spectrum/theme-default":
+"@react-spectrum/theme-default@npm:^3.1.0, @react-spectrum/theme-default@npm:^3.5.13, @react-spectrum/theme-default@workspace:packages/@react-spectrum/theme-default":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/theme-default@workspace:packages/@react-spectrum/theme-default"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-types/provider": "npm:^3.8.13"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -7831,70 +6879,45 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/theme-express@workspace:packages/@react-spectrum/theme-express"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-spectrum/theme-default": "npm:^3.5.22"
-    "@react-types/provider": "npm:^3.8.13"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/theme-light@npm:^3.4.22, @react-spectrum/theme-light@workspace:packages/@react-spectrum/theme-light":
+"@react-spectrum/theme-light@workspace:packages/@react-spectrum/theme-light":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/theme-light@workspace:packages/@react-spectrum/theme-light"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-types/provider": "npm:^3.8.13"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/toast@npm:^3.1.5, @react-spectrum/toast@workspace:packages/@react-spectrum/toast":
+"@react-spectrum/toast@workspace:packages/@react-spectrum/toast":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/toast@workspace:packages/@react-spectrum/toast"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/toast": "npm:^3.0.9"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/button": "npm:^3.17.5"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/toast": "npm:^3.1.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
     "@types/use-sync-external-store": "npm:^0.0.3"
-    use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
-
-"@react-spectrum/tooltip@npm:^3.8.0, @react-spectrum/tooltip@workspace:packages/@react-spectrum/tooltip":
-  version: 0.0.0-use.local
-  resolution: "@react-spectrum/tooltip@workspace:packages/@react-spectrum/tooltip"
-  dependencies:
-    "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/tooltip": "npm:^3.9.0"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/overlays": "npm:^5.9.1"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-stately/tooltip": "npm:^3.5.9"
-    "@react-types/overlays": "npm:^3.9.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/tooltip": "npm:^3.5.0"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
+
+"@react-spectrum/tooltip@workspace:packages/@react-spectrum/tooltip":
+  version: 0.0.0-use.local
+  resolution: "@react-spectrum/tooltip@workspace:packages/@react-spectrum/tooltip"
+  dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
+    "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7902,23 +6925,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/tree@npm:^3.1.9, @react-spectrum/tree@workspace:packages/@react-spectrum/tree":
+"@react-spectrum/tree@workspace:packages/@react-spectrum/tree":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/tree@workspace:packages/@react-spectrum/tree"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/button": "npm:^3.14.3"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/tree": "npm:^3.1.5"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/checkbox": "npm:^3.10.5"
     "@react-spectrum/style-macro-s1": "npm:3.0.0-alpha.5"
-    "@react-spectrum/text": "npm:^3.5.23"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/shared": "npm:^3.32.1"
-    "@spectrum-icons/ui": "npm:^3.6.21"
-    "@swc/helpers": "npm:^0.5.0"
-    react-aria-components: "npm:^1.14.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7932,32 +6945,23 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/utils@npm:^3.12.10, @react-spectrum/utils@npm:^3.12.6, @react-spectrum/utils@workspace:packages/@react-spectrum/utils":
+"@react-spectrum/utils@npm:^3.12.6, @react-spectrum/utils@workspace:packages/@react-spectrum/utils":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/utils@workspace:packages/@react-spectrum/utils"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
-    clsx: "npm:^2.0.0"
+    "@adobe/react-spectrum": "npm:^3.46.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/view@npm:^3.1.0, @react-spectrum/view@npm:^3.1.3, @react-spectrum/view@npm:^3.6.24, @react-spectrum/view@workspace:packages/@react-spectrum/view":
+"@react-spectrum/view@npm:^3.1.0, @react-spectrum/view@npm:^3.1.3, @react-spectrum/view@workspace:packages/@react-spectrum/view":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/view@workspace:packages/@react-spectrum/view"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/view": "npm:^3.4.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7965,16 +6969,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/well@npm:^3.4.28, @react-spectrum/well@workspace:packages/@react-spectrum/well":
+"@react-spectrum/well@workspace:packages/@react-spectrum/well":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/well@workspace:packages/@react-spectrum/well"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/utils": "npm:^3.12.10"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/well": "npm:^3.3.21"
-    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7985,47 +6985,37 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/autocomplete@workspace:packages/@react-stately/autocomplete"
   dependencies:
-    "@react-stately/utils": "npm:^3.11.0"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/calendar@npm:^3.9.1, @react-stately/calendar@workspace:packages/@react-stately/calendar":
+"@react-stately/calendar@workspace:packages/@react-stately/calendar":
   version: 0.0.0-use.local
   resolution: "@react-stately/calendar@workspace:packages/@react-stately/calendar"
   dependencies:
-    "@internationalized/date": "npm:^3.10.1"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/calendar": "npm:^3.8.1"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/checkbox@npm:^3.7.3, @react-stately/checkbox@workspace:packages/@react-stately/checkbox":
+"@react-stately/checkbox@workspace:packages/@react-stately/checkbox":
   version: 0.0.0-use.local
   resolution: "@react-stately/checkbox@workspace:packages/@react-stately/checkbox"
   dependencies:
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/checkbox": "npm:^3.10.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/collections@npm:^3.12.8, @react-stately/collections@workspace:packages/@react-stately/collections":
+"@react-stately/collections@workspace:packages/@react-stately/collections":
   version: 0.0.0-use.local
   resolution: "@react-stately/collections@workspace:packages/@react-stately/collections"
   dependencies:
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -8035,117 +7025,85 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/color@workspace:packages/@react-stately/color"
   dependencies:
-    "@internationalized/number": "npm:^3.6.5"
-    "@internationalized/string": "npm:^3.2.7"
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-stately/numberfield": "npm:^3.10.3"
-    "@react-stately/slider": "npm:^3.7.3"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/color": "npm:^3.1.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/combobox@npm:^3.12.1, @react-stately/combobox@workspace:packages/@react-stately/combobox":
+"@react-stately/combobox@workspace:packages/@react-stately/combobox":
   version: 0.0.0-use.local
   resolution: "@react-stately/combobox@workspace:packages/@react-stately/combobox"
   dependencies:
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-stately/overlays": "npm:^3.6.21"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/combobox": "npm:^3.13.10"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/data@npm:^3.15.0, @react-stately/data@workspace:packages/@react-stately/data":
+"@react-stately/data@workspace:packages/@react-stately/data":
   version: 0.0.0-use.local
   resolution: "@react-stately/data@workspace:packages/@react-stately/data"
   dependencies:
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/datepicker@npm:^3.15.3, @react-stately/datepicker@workspace:packages/@react-stately/datepicker":
+"@react-stately/datepicker@workspace:packages/@react-stately/datepicker":
   version: 0.0.0-use.local
   resolution: "@react-stately/datepicker@workspace:packages/@react-stately/datepicker"
   dependencies:
-    "@internationalized/date": "npm:^3.10.1"
-    "@internationalized/string": "npm:^3.2.7"
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-stately/overlays": "npm:^3.6.21"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/datepicker": "npm:^3.13.3"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/disclosure@npm:^3.0.9, @react-stately/disclosure@workspace:packages/@react-stately/disclosure":
+"@react-stately/disclosure@workspace:packages/@react-stately/disclosure":
   version: 0.0.0-use.local
   resolution: "@react-stately/disclosure@workspace:packages/@react-stately/disclosure"
   dependencies:
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/dnd@npm:^3.0.0, @react-stately/dnd@npm:^3.1.0, @react-stately/dnd@npm:^3.7.2, @react-stately/dnd@workspace:packages/@react-stately/dnd":
+"@react-stately/dnd@npm:^3.0.0, @react-stately/dnd@npm:^3.1.0, @react-stately/dnd@workspace:packages/@react-stately/dnd":
   version: 0.0.0-use.local
   resolution: "@react-stately/dnd@workspace:packages/@react-stately/dnd"
   dependencies:
-    "@react-stately/selection": "npm:^3.20.7"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/flags@npm:^3.1.2, @react-stately/flags@workspace:packages/@react-stately/flags":
+"@react-stately/flags@workspace:packages/@react-stately/flags":
   version: 0.0.0-use.local
   resolution: "@react-stately/flags@workspace:packages/@react-stately/flags"
   dependencies:
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   languageName: unknown
   linkType: soft
 
-"@react-stately/form@npm:^3.2.2, @react-stately/form@workspace:packages/@react-stately/form":
+"@react-stately/form@workspace:packages/@react-stately/form":
   version: 0.0.0-use.local
   resolution: "@react-stately/form@workspace:packages/@react-stately/form"
   dependencies:
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/grid@npm:^3.11.7, @react-stately/grid@workspace:packages/@react-stately/grid":
+"@react-stately/grid@workspace:packages/@react-stately/grid":
   version: 0.0.0-use.local
   resolution: "@react-stately/grid@workspace:packages/@react-stately/grid"
   dependencies:
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/selection": "npm:^3.20.7"
-    "@react-types/grid": "npm:^3.3.6"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -8155,109 +7113,78 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/layout@workspace:packages/@react-stately/layout"
   dependencies:
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/table": "npm:^3.15.2"
-    "@react-stately/virtualizer": "npm:^4.4.4"
-    "@react-types/grid": "npm:^3.3.6"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/table": "npm:^3.13.4"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/list@npm:^3.13.2, @react-stately/list@workspace:packages/@react-stately/list":
+"@react-stately/list@workspace:packages/@react-stately/list":
   version: 0.0.0-use.local
   resolution: "@react-stately/list@workspace:packages/@react-stately/list"
   dependencies:
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/selection": "npm:^3.20.7"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/menu@npm:^3.9.9, @react-stately/menu@workspace:packages/@react-stately/menu":
+"@react-stately/menu@workspace:packages/@react-stately/menu":
   version: 0.0.0-use.local
   resolution: "@react-stately/menu@workspace:packages/@react-stately/menu"
   dependencies:
-    "@react-stately/overlays": "npm:^3.6.21"
-    "@react-types/menu": "npm:^3.10.5"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/numberfield@npm:^3.10.3, @react-stately/numberfield@workspace:packages/@react-stately/numberfield":
+"@react-stately/numberfield@workspace:packages/@react-stately/numberfield":
   version: 0.0.0-use.local
   resolution: "@react-stately/numberfield@workspace:packages/@react-stately/numberfield"
   dependencies:
-    "@internationalized/number": "npm:^3.6.5"
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/numberfield": "npm:^3.8.16"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/overlays@npm:^3.6.21, @react-stately/overlays@workspace:packages/@react-stately/overlays":
+"@react-stately/overlays@workspace:packages/@react-stately/overlays":
   version: 0.0.0-use.local
   resolution: "@react-stately/overlays@workspace:packages/@react-stately/overlays"
   dependencies:
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/overlays": "npm:^3.9.2"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/radio@npm:^3.11.3, @react-stately/radio@workspace:packages/@react-stately/radio":
+"@react-stately/radio@workspace:packages/@react-stately/radio":
   version: 0.0.0-use.local
   resolution: "@react-stately/radio@workspace:packages/@react-stately/radio"
   dependencies:
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/radio": "npm:^3.9.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/searchfield@npm:^3.5.17, @react-stately/searchfield@workspace:packages/@react-stately/searchfield":
+"@react-stately/searchfield@workspace:packages/@react-stately/searchfield":
   version: 0.0.0-use.local
   resolution: "@react-stately/searchfield@workspace:packages/@react-stately/searchfield"
   dependencies:
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/searchfield": "npm:^3.6.6"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/select@npm:^3.9.0, @react-stately/select@workspace:packages/@react-stately/select":
+"@react-stately/select@workspace:packages/@react-stately/select":
   version: 0.0.0-use.local
   resolution: "@react-stately/select@workspace:packages/@react-stately/select"
   dependencies:
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-stately/overlays": "npm:^3.6.21"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/select": "npm:^3.12.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -8267,36 +7194,27 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/selection@workspace:packages/@react-stately/selection"
   dependencies:
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/slider@npm:^3.7.3, @react-stately/slider@workspace:packages/@react-stately/slider":
+"@react-stately/slider@workspace:packages/@react-stately/slider":
   version: 0.0.0-use.local
   resolution: "@react-stately/slider@workspace:packages/@react-stately/slider"
   dependencies:
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/slider": "npm:^3.8.2"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/steplist@npm:3.0.0-alpha.19, @react-stately/steplist@workspace:packages/@react-stately/steplist":
+"@react-stately/steplist@workspace:packages/@react-stately/steplist":
   version: 0.0.0-use.local
   resolution: "@react-stately/steplist@workspace:packages/@react-stately/steplist"
   dependencies:
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -8306,28 +7224,17 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/table@workspace:packages/@react-stately/table"
   dependencies:
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/flags": "npm:^3.1.2"
-    "@react-stately/grid": "npm:^3.11.7"
-    "@react-stately/selection": "npm:^3.20.7"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/grid": "npm:^3.3.6"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/table": "npm:^3.13.4"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/tabs@npm:^3.8.7, @react-stately/tabs@workspace:packages/@react-stately/tabs":
+"@react-stately/tabs@workspace:packages/@react-stately/tabs":
   version: 0.0.0-use.local
   resolution: "@react-stately/tabs@workspace:packages/@react-stately/tabs"
   dependencies:
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@react-types/tabs": "npm:^3.3.20"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -8337,48 +7244,38 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/toast@workspace:packages/@react-stately/toast"
   dependencies:
-    "@swc/helpers": "npm:^0.5.0"
     "@types/use-sync-external-store": "npm:^0.0.3"
-    use-sync-external-store: "npm:^1.6.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/toggle@npm:^3.9.3, @react-stately/toggle@workspace:packages/@react-stately/toggle":
+"@react-stately/toggle@workspace:packages/@react-stately/toggle":
   version: 0.0.0-use.local
   resolution: "@react-stately/toggle@workspace:packages/@react-stately/toggle"
   dependencies:
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/checkbox": "npm:^3.10.2"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/tooltip@npm:^3.5.9, @react-stately/tooltip@workspace:packages/@react-stately/tooltip":
+"@react-stately/tooltip@workspace:packages/@react-stately/tooltip":
   version: 0.0.0-use.local
   resolution: "@react-stately/tooltip@workspace:packages/@react-stately/tooltip"
   dependencies:
-    "@react-stately/overlays": "npm:^3.6.21"
-    "@react-types/tooltip": "npm:^3.5.0"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/tree@npm:^3.9.4, @react-stately/tree@workspace:packages/@react-stately/tree":
+"@react-stately/tree@workspace:packages/@react-stately/tree":
   version: 0.0.0-use.local
   resolution: "@react-stately/tree@workspace:packages/@react-stately/tree"
   dependencies:
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/selection": "npm:^3.20.7"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -8388,7 +7285,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/utils@workspace:packages/@react-stately/utils"
   dependencies:
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -8398,8 +7295,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/virtualizer@workspace:packages/@react-stately/virtualizer"
   dependencies:
-    "@react-types/shared": "npm:^3.32.1"
-    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -17260,19 +16156,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^8.0.3":
-  version: 8.1.0
-  resolution: "glob@npm:8.1.0"
-  dependencies:
-    fs.realpath: "npm:^1.0.0"
-    inflight: "npm:^1.0.4"
-    inherits: "npm:2"
-    minimatch: "npm:^5.0.1"
-    once: "npm:^1.3.0"
-  checksum: 10c0/cb0b5cab17a59c57299376abe5646c7070f8acb89df5595b492dba3bfb43d301a46c01e5695f01154e6553168207cb60d4eaf07d3be4bc3eb9b0457c5c561d0f
-  languageName: node
-  linkType: hard
-
 "global-dirs@npm:^0.1.0":
   version: 0.1.1
   resolution: "global-dirs@npm:0.1.1"
@@ -22013,15 +20896,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^5.0.1":
-  version: 5.1.6
-  resolution: "minimatch@npm:5.1.6"
-  dependencies:
-    brace-expansion: "npm:^2.0.1"
-  checksum: 10c0/3defdfd230914f22a8da203747c42ee3c405c39d4d37ffda284dac5e45b7e1f6c49aa8be606509002898e73091ff2a3bbfc59c2c6c71d4660609f63aa92f98e3
-  languageName: node
-  linkType: hard
-
 "minimatch@npm:^9.0.4":
   version: 9.0.4
   resolution: "minimatch@npm:9.0.4"
@@ -24598,28 +23472,32 @@ __metadata:
   dependencies:
     "@internationalized/date": "npm:^3.10.1"
     "@internationalized/string": "npm:^3.2.7"
-    "@react-aria/autocomplete": "npm:3.0.0-rc.4"
     "@react-aria/collections": "npm:^3.0.1"
     "@react-aria/dnd": "npm:^3.11.4"
-    "@react-aria/focus": "npm:^3.21.3"
     "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/live-announcer": "npm:^3.4.4"
     "@react-aria/overlays": "npm:^3.31.0"
     "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/textfield": "npm:^3.18.3"
-    "@react-aria/toolbar": "npm:3.0.0-beta.22"
     "@react-aria/utils": "npm:^3.32.0"
-    "@react-aria/virtualizer": "npm:^4.1.11"
     "@react-stately/autocomplete": "npm:3.0.0-beta.4"
     "@react-stately/layout": "npm:^4.5.2"
     "@react-stately/selection": "npm:^3.20.7"
     "@react-stately/table": "npm:^3.15.2"
     "@react-stately/utils": "npm:^3.11.0"
     "@react-stately/virtualizer": "npm:^4.4.4"
+    "@react-types/calendar": "npm:^3.8.1"
+    "@react-types/checkbox": "npm:^3.10.2"
+    "@react-types/color": "npm:^3.1.2"
+    "@react-types/datepicker": "npm:^3.13.3"
+    "@react-types/dialog": "npm:^3.5.22"
     "@react-types/form": "npm:^3.7.16"
     "@react-types/grid": "npm:^3.3.6"
+    "@react-types/listbox": "npm:^3.7.4"
+    "@react-types/menu": "npm:^3.10.5"
+    "@react-types/overlays": "npm:^3.9.2"
+    "@react-types/searchfield": "npm:^3.6.6"
     "@react-types/shared": "npm:^3.32.1"
     "@react-types/table": "npm:^3.13.4"
+    "@react-types/textfield": "npm:^3.12.6"
     "@swc/helpers": "npm:^0.5.0"
     "@tailwindcss/postcss": "npm:^4.0.0"
     client-only: "npm:^0.0.1"
@@ -24632,54 +23510,50 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"react-aria@npm:^3.40.0, react-aria@npm:^3.45.0, react-aria@workspace:packages/react-aria":
+"react-aria@npm:3.45.0, react-aria@npm:^3.40.0, react-aria@npm:^3.45.0, react-aria@workspace:packages/react-aria":
   version: 0.0.0-use.local
   resolution: "react-aria@workspace:packages/react-aria"
   dependencies:
     "@babel/cli": "npm:^7.24.1"
     "@babel/core": "npm:^7.24.3"
+    "@internationalized/date": "npm:^3.10.1"
+    "@internationalized/message": "npm:^3.1.8"
+    "@internationalized/number": "npm:^3.6.5"
     "@internationalized/string": "npm:^3.2.7"
-    "@react-aria/breadcrumbs": "npm:^3.5.30"
-    "@react-aria/button": "npm:^3.14.3"
-    "@react-aria/calendar": "npm:^3.9.3"
-    "@react-aria/checkbox": "npm:^3.16.3"
-    "@react-aria/color": "npm:^3.1.3"
-    "@react-aria/combobox": "npm:^3.14.1"
-    "@react-aria/datepicker": "npm:^3.15.3"
-    "@react-aria/dialog": "npm:^3.5.32"
-    "@react-aria/disclosure": "npm:^3.1.1"
-    "@react-aria/dnd": "npm:^3.11.4"
-    "@react-aria/focus": "npm:^3.21.3"
-    "@react-aria/gridlist": "npm:^3.14.2"
-    "@react-aria/i18n": "npm:^3.12.14"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/label": "npm:^3.7.23"
-    "@react-aria/landmark": "npm:^3.0.8"
-    "@react-aria/link": "npm:^3.8.7"
-    "@react-aria/listbox": "npm:^3.15.1"
-    "@react-aria/menu": "npm:^3.19.4"
-    "@react-aria/meter": "npm:^3.4.28"
-    "@react-aria/numberfield": "npm:^3.12.3"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/progress": "npm:^3.4.28"
-    "@react-aria/radio": "npm:^3.12.3"
-    "@react-aria/searchfield": "npm:^3.8.10"
-    "@react-aria/select": "npm:^3.17.1"
-    "@react-aria/selection": "npm:^3.27.0"
-    "@react-aria/separator": "npm:^3.4.14"
-    "@react-aria/slider": "npm:^3.8.3"
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/switch": "npm:^3.7.9"
-    "@react-aria/table": "npm:^3.17.9"
-    "@react-aria/tabs": "npm:^3.10.9"
-    "@react-aria/tag": "npm:^3.7.3"
-    "@react-aria/textfield": "npm:^3.18.3"
-    "@react-aria/toast": "npm:^3.0.9"
-    "@react-aria/tooltip": "npm:^3.9.0"
-    "@react-aria/tree": "npm:^3.1.5"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-aria/visually-hidden": "npm:^3.8.29"
+    "@react-types/actiongroup": "npm:^3.4.21"
+    "@react-types/autocomplete": "npm:3.0.0-alpha.36"
+    "@react-types/breadcrumbs": "npm:^3.7.17"
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/calendar": "npm:^3.8.1"
+    "@react-types/checkbox": "npm:^3.10.2"
+    "@react-types/color": "npm:^3.1.2"
+    "@react-types/combobox": "npm:^3.13.10"
+    "@react-types/datepicker": "npm:^3.13.3"
+    "@react-types/dialog": "npm:^3.5.22"
+    "@react-types/grid": "npm:^3.3.6"
+    "@react-types/link": "npm:^3.6.5"
+    "@react-types/listbox": "npm:^3.7.4"
+    "@react-types/menu": "npm:^3.10.5"
+    "@react-types/meter": "npm:^3.4.13"
+    "@react-types/numberfield": "npm:^3.8.16"
+    "@react-types/overlays": "npm:^3.9.2"
+    "@react-types/progress": "npm:^3.5.16"
+    "@react-types/radio": "npm:^3.9.2"
+    "@react-types/searchfield": "npm:^3.6.6"
+    "@react-types/select": "npm:^3.12.0"
     "@react-types/shared": "npm:^3.32.1"
+    "@react-types/slider": "npm:^3.8.2"
+    "@react-types/switch": "npm:^3.5.15"
+    "@react-types/table": "npm:^3.13.4"
+    "@react-types/tabs": "npm:^3.3.20"
+    "@react-types/textfield": "npm:^3.12.6"
+    "@react-types/tooltip": "npm:^3.5.0"
+    "@swc/helpers": "npm:^0.5.0"
+    aria-hidden: "npm:^1.2.3"
+    clsx: "npm:^2.0.0"
+    react-aria: "npm:3.45.0"
+    react-stately: "npm:3.43.0"
+    use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -24813,8 +23687,8 @@ __metadata:
     "@parcel/transformer-react-static": "npm:^2.16.3"
     "@parcel/transformer-svg-react": "npm:^2.16.3"
     "@parcel/transformer-typescript-types": "npm:^2.16.3"
-    "@react-spectrum/parcel-namer-s2": "npm:^0.3.0"
-    "@react-spectrum/s2-icon-builder": "npm:^0.3.0"
+    "@react-spectrum/parcel-namer-s2": "workspace:^"
+    "@react-spectrum/s2-icon-builder": "workspace:^"
     "@spectrum-css/component-builder": "workspace:^"
     "@spectrum-css/vars": "npm:^2.3.0"
     "@storybook/addon-a11y": "patch:@storybook/addon-a11y@npm%3A8.6.14#~/.yarn/patches/@storybook-addon-a11y-npm-8.6.14-2119c57a0f.patch"
@@ -24912,38 +23786,35 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"react-stately@npm:^3.38.0, react-stately@npm:^3.43.0, react-stately@workspace:packages/react-stately":
+"react-stately@npm:3.43.0, react-stately@npm:^3.38.0, react-stately@npm:^3.43.0, react-stately@workspace:packages/react-stately":
   version: 0.0.0-use.local
   resolution: "react-stately@workspace:packages/react-stately"
   dependencies:
     "@babel/cli": "npm:^7.24.1"
     "@babel/core": "npm:^7.24.3"
-    "@react-stately/calendar": "npm:^3.9.1"
-    "@react-stately/checkbox": "npm:^3.7.3"
-    "@react-stately/collections": "npm:^3.12.8"
-    "@react-stately/color": "npm:^3.9.3"
-    "@react-stately/combobox": "npm:^3.12.1"
-    "@react-stately/data": "npm:^3.15.0"
-    "@react-stately/datepicker": "npm:^3.15.3"
-    "@react-stately/disclosure": "npm:^3.0.9"
-    "@react-stately/dnd": "npm:^3.7.2"
-    "@react-stately/form": "npm:^3.2.2"
-    "@react-stately/list": "npm:^3.13.2"
-    "@react-stately/menu": "npm:^3.9.9"
-    "@react-stately/numberfield": "npm:^3.10.3"
-    "@react-stately/overlays": "npm:^3.6.21"
-    "@react-stately/radio": "npm:^3.11.3"
-    "@react-stately/searchfield": "npm:^3.5.17"
-    "@react-stately/select": "npm:^3.9.0"
-    "@react-stately/selection": "npm:^3.20.7"
-    "@react-stately/slider": "npm:^3.7.3"
-    "@react-stately/table": "npm:^3.15.2"
-    "@react-stately/tabs": "npm:^3.8.7"
-    "@react-stately/toast": "npm:^3.1.2"
-    "@react-stately/toggle": "npm:^3.9.3"
-    "@react-stately/tooltip": "npm:^3.5.9"
-    "@react-stately/tree": "npm:^3.9.4"
+    "@internationalized/date": "npm:^3.10.1"
+    "@internationalized/number": "npm:^3.6.5"
+    "@internationalized/string": "npm:^3.2.7"
+    "@react-types/calendar": "npm:^3.8.1"
+    "@react-types/checkbox": "npm:^3.10.2"
+    "@react-types/color": "npm:^3.1.2"
+    "@react-types/combobox": "npm:^3.13.10"
+    "@react-types/datepicker": "npm:^3.13.3"
+    "@react-types/grid": "npm:^3.3.6"
+    "@react-types/menu": "npm:^3.10.5"
+    "@react-types/numberfield": "npm:^3.8.16"
+    "@react-types/overlays": "npm:^3.9.2"
+    "@react-types/radio": "npm:^3.9.2"
+    "@react-types/searchfield": "npm:^3.6.6"
+    "@react-types/select": "npm:^3.12.0"
     "@react-types/shared": "npm:^3.32.1"
+    "@react-types/slider": "npm:^3.8.2"
+    "@react-types/table": "npm:^3.13.4"
+    "@react-types/tabs": "npm:^3.3.20"
+    "@react-types/tooltip": "npm:^3.5.0"
+    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:3.43.0"
+    use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown

From 511bfc45aea5c659d3c55f49f3b9c6eb1c2c4ce1 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 27 Jan 2026 17:44:22 -0800
Subject: [PATCH 25/68] build stuff

---
 Makefile                | 2 +-
 scripts/migrateDeps.mjs | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 83326f2d56c..cb770b909f0 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ publish-nightly: build
 
 build:
 	tsgo --project tsconfig.build.json --declaration --emitDeclarationOnly --outDir types --rootDir packages
-	parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/react-aria-components --no-optimize --config .parcelrc-build
+	parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/{react-aria,react-stately,react-aria-components,@adobe/react-spectrum} --no-optimize --config .parcelrc-build
 	yarn workspaces foreach --all -pt run prepublishOnly
 	for pkg in packages/@react-{spectrum,aria,stately}/*/  packages/@internationalized/{message,string,date,number}/ packages/@adobe/react-spectrum/ packages/react-aria/ packages/react-stately/ packages/react-aria-components/; \
 		do node scripts/buildEsm.js $$pkg; \
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index eaa30453e5d..5a9342623c5 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -329,6 +329,7 @@ function migratePackage(scope, name, monopackage) {
   fs.writeFileSync(`packages/${monopackage}/package.json`, JSON.stringify(monopackageJSON, false, 2) + '\n');
 
   packageJSON.source = 'src/index.ts';
+  packageJSON.types = './src/index.ts';
   packageJSON.exports = {
     source: './src/index.ts',
     types: './src/index.ts',
@@ -337,6 +338,10 @@ function migratePackage(scope, name, monopackage) {
   packageJSON.dependencies = {
     [monopackage]: '^' + monopackageJSON.version
   };
+  packageJSON.targets = {
+    types: false // TODO: i18n package
+  };
+  
   fs.writeFileSync(`packages/${scope}/${name}/package.json`, JSON.stringify(packageJSON, false, 2) + '\n');
   fs.rmSync(`packages/${scope}/${name}/index.ts`);
 
@@ -381,6 +386,7 @@ function migrateToMonopackage(pkg) {
     };
   }
 
+  packageJSON.source = 'exports/index.ts';
   packageJSON.exports['.'].source = './exports/index.ts';
   if (Array.isArray(packageJSON.exports['.'].types)) {
     packageJSON.exports['.'].types[1] = './exports/index.ts';

From 53e685d3dbf285bfa57517b3d831d38b5ef88c8f Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Wed, 28 Jan 2026 13:12:25 -0800
Subject: [PATCH 26/68] wip

---
 Makefile                                | 13 ++--
 packages/dev/parcel-namer-s2/S2Namer.js | 70 +++++++++++++--------
 scripts/esm-support/testESM.mjs         |  2 +
 scripts/migrateDeps.mjs                 | 83 ++++++++++++++++---------
 4 files changed, 107 insertions(+), 61 deletions(-)

diff --git a/Makefile b/Makefile
index cb770b909f0..e0480c74b32 100644
--- a/Makefile
+++ b/Makefile
@@ -98,15 +98,20 @@ publish-nightly: build
 	yarn publish:nightly
 
 build:
-	tsgo --project tsconfig.build.json --declaration --emitDeclarationOnly --outDir types --rootDir packages
+	yarn tsgo --project tsconfig.build.json --declaration --emitDeclarationOnly --outDir types --rootDir packages
 	parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/{react-aria,react-stately,react-aria-components,@adobe/react-spectrum} --no-optimize --config .parcelrc-build
-	yarn workspaces foreach --all -pt run prepublishOnly
-	for pkg in packages/@react-{spectrum,aria,stately}/*/  packages/@internationalized/{message,string,date,number}/ packages/@adobe/react-spectrum/ packages/react-aria/ packages/react-stately/ packages/react-aria-components/; \
+	# yarn workspaces foreach --all -pt run prepublishOnly
+	for pkg in packages/@react-{spectrum,aria,stately}/*/  packages/@internationalized/{message,string,date,number}/; \
 		do node scripts/buildEsm.js $$pkg; \
 	done
 	node scripts/buildI18n.js
 	node scripts/generateIconDts.js
-	node scripts/fixUseClient.js
+	# node scripts/fixUseClient.js
+	for pkg in types/@react-{spectrum,aria,stately}/*/ types/@internationalized/{message,string,date,number}/ types/{react-aria,react-stately,react-aria-components,@adobe/react-spectrum}; do \
+		mkdir -p packages/$${pkg#types/}/dist; \
+		mv $$pkg packages/$${pkg#types/}/dist/types; \
+	done
+	rm -rf types
 
 website:
 	yarn build:docs --public-url /reactspectrum/$$(git rev-parse HEAD)/docs --dist-dir dist/$$(git rev-parse HEAD)/docs
diff --git a/packages/dev/parcel-namer-s2/S2Namer.js b/packages/dev/parcel-namer-s2/S2Namer.js
index 3a5fd5c93d8..b62d7270007 100644
--- a/packages/dev/parcel-namer-s2/S2Namer.js
+++ b/packages/dev/parcel-namer-s2/S2Namer.js
@@ -17,36 +17,54 @@ module.exports = new Namer({
   name({bundle}) {
     let mainAsset = bundle.getMainEntry();
 
-    if (mainAsset?.filePath.includes('@react-spectrum/s2') || !mainAsset?.filePath.includes('react-spectrum/packages')) {
-      if (bundle.needsStableName && bundle.target.distEntry) {
-        return bundle.target.distEntry;
-      }
-      let ext = '.' + bundle.type;
-      if (bundle.type === 'js') {
-        ext = bundle.env.outputFormat === 'esmodule' ? '.mjs' : '.cjs';
+    // if (mainAsset?.filePath.includes('@react-spectrum/s2') || !mainAsset?.filePath.includes('react-spectrum/packages')) {
+    if (bundle.needsStableName && bundle.target.distEntry) {
+      return bundle.target.distEntry;
+    }
+    let ext = '.' + bundle.type;
+    if (bundle.type === 'js') {
+      ext = bundle.env.outputFormat === 'esmodule' ? '.mjs' : '.cjs';
+    }
+    let originalExt = path.extname(mainAsset.filePath);
+    let name = path.basename(mainAsset.filePath, originalExt).replace(/\*/g, 'intlStrings');
+    let m = mainAsset.filePath.match(/spectrum-illustrations\/(linear|gradient\/generic\d)/);
+    if (m) {
+      if (originalExt === '.svg') {
+        return m[1] + '/internal/' + name + ext;
       }
-      let originalExt = path.extname(mainAsset.filePath);
-      let name = path.basename(mainAsset.filePath, originalExt).replace(/\*/g, 'intlStrings');
-      let m = mainAsset.filePath.match(/spectrum-illustrations\/(linear|gradient\/generic\d)/);
-      if (m) {
-        if (originalExt === '.svg') {
-          return m[1] + '/internal/' + name + ext;
+      return m[1] + '/' + name + ext;
+    } else if (mainAsset.filePath.includes('/exports/')) {
+      name = 'exports/' + name;
+    } else if (bundle.target.distDir.endsWith('/dist')) {
+      let index = mainAsset.filePath.indexOf('/src/');
+      if (index >= 0) {
+        name = 'private/' + path.dirname(mainAsset.filePath.slice(index + 5)) + '/' + name;
+      } else {
+        index = mainAsset.filePath.indexOf('/intl/');
+        if (index >= 0) {
+          name = 'private/' + path.dirname(mainAsset.filePath.slice(index)) + '/' + name;
+        } else {
+          name = 'private/' + name;
         }
-        return m[1] + '/' + name + ext;
-      } else if (mainAsset.filePath.includes('/exports/')) {
-        name = 'exports/' + name;
-      } else if (bundle.target.distDir.endsWith('/dist')) {
-        name = 'private/' + name;
       }
+    }
 
-      return name
-        .replace(/^S2_Icon_(.*?)(Size\d+)?_\d+(?:x\d+)?_N$/, '$1')
-        .replace(/^S2_(fill|lin)_(.+)_(generic\d)_(\d+)$/, (m, type, name, style) => {
-          name = name[0].toUpperCase() + name.slice(1).replace(/_/g, '');
-          return 'gradient/' + style + '/' + name;
-        })
-        .replace(/\.module$/, '_module')
-        + ext;
+    if (mainAsset.filePath.includes('@adobe/spectrum-css-temp')) {
+      name = mainAsset.filePath.split(path.sep).at(-2) + '_' + name;
+    }
+    if (path.extname(mainAsset.filePath) === '.css' && mainAsset.type === 'js') {
+      // CSS module
+      name += '_css';
     }
+
+    return name
+      .replace(/^S2_Icon_(.*?)(Size\d+)?_\d+(?:x\d+)?_N$/, '$1')
+      .replace(/^S2_(fill|lin)_(.+)_(generic\d)_(\d+)$/, (m, type, name, style) => {
+        name = name[0].toUpperCase() + name.slice(1).replace(/_/g, '');
+        return 'gradient/' + style + '/' + name;
+      })
+      .replace(/\.module$/, '_module')
+      + ext;
+    // }
   }
 });
diff --git a/scripts/esm-support/testESM.mjs b/scripts/esm-support/testESM.mjs
index 85fd34c8d0c..1d1555f94f7 100644
--- a/scripts/esm-support/testESM.mjs
+++ b/scripts/esm-support/testESM.mjs
@@ -12,4 +12,6 @@
 
 export * from 'react-aria';
 export * from 'react-stately';
+export * from 'react-aria-components';
 export * from '@adobe/react-spectrum';
+export * from '@react-spectrum/s2';
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index 5a9342623c5..4404c47fd07 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -17,6 +17,17 @@ for (let pkg of fs.globSync(['packages/@react-aria/*', 'packages/@react-spectrum
   if (fs.statSync(pkg).isDirectory()) {
     let name = pkg.split('/').slice(1).join('/');
     if (skipped.includes(path.basename(pkg))) {
+      let pkgJSON = JSON.parse(fs.readFileSync(`${pkg}/package.json`, 'utf8'));
+      if (pkgJSON.types) {
+        pkgJSON.types = './dist/types/src/index.d.ts';
+        if (pkgJSON.exports) {
+          pkgJSON.exports.types = pkgJSON.types;
+        }
+        pkgJSON.targets = {
+          types: false
+        };
+        fs.writeFileSync(`${pkg}/package.json`, JSON.stringify(pkgJSON, false, 2) + '\n');
+      }
       continue;
     }
 
@@ -24,6 +35,18 @@ for (let pkg of fs.globSync(['packages/@react-aria/*', 'packages/@react-spectrum
   }
 }
 
+for (let pkg of fs.globSync('packages/@internationalized/{message,string,date,number}')) {
+  let pkgJSON = JSON.parse(fs.readFileSync(`${pkg}/package.json`, 'utf8'));
+  if (pkgJSON.types) {
+    pkgJSON.types = './dist/types/src/index.d.ts';
+    pkgJSON.exports.types = pkgJSON.types;
+    pkgJSON.targets = {
+      types: false
+    };
+    fs.writeFileSync(`${pkg}/package.json`, JSON.stringify(pkgJSON, false, 2) + '\n');
+  }
+}
+
 let standalone = new Set();
 for (let f of fs.globSync('packages/**/*.mdx')) {
   standalone.add(path.basename(f, path.extname(f)));
@@ -143,7 +166,9 @@ let parentFile = {
   // 'Rect': 'useVirtualizerState',
   // 'Size': 'useVirtualizerState',
   'DateSegmentType': 'useDateFieldState',
-  'DragAndDrop': 'useDragAndDrop'
+  'DragAndDrop': 'useDragAndDrop',
+  parseColor: 'Color',
+  useLocale: 'I18nProvider'
 };
 
 // Names that are included in public files but not exported by monopackages.
@@ -215,18 +240,18 @@ function migrateScope(scope, monopackage) {
 
 function prepareMonopackage(monopackage) {
   let monopackageJSON = JSON.parse(fs.readFileSync(`packages/${monopackage}/package.json`, 'utf8'));
-  monopackageJSON.source = 'exports/*.ts';
+  monopackageJSON.source = 'exports/index.ts';
   if (!monopackageJSON.exports['.']) {
     monopackageJSON.exports = {
       '.': {
         source: './exports/index.ts',
-        types: './dist/exports/index.d.ts',
+        types: './dist/types/exports/index.d.ts',
         import: './dist/exports/index.mjs',
         require: './dist/exports/index.js'
       },
       './private/*': {
         source: ['./src/*.ts', './src/*.tsx'],
-        types: ['./dist/private/*.d.ts'],
+        types: ['./dist/types/src/*.d.ts'],
         import: './dist/private/*.mjs',
         require: './dist/private/*.js'
       },
@@ -238,27 +263,26 @@ function prepareMonopackage(monopackage) {
       }
     };
   } else {
-    // TODO
-    monopackageJSON.exports = {
+    Object.assign(monopackageJSON.exports, {
       '.': {
         source: './exports/index.ts',
-        types: './dist/exports/index.d.ts',
+        types: './dist/types/exports/index.d.ts',
         import: './dist/exports/index.mjs',
         require: './dist/exports/index.js'
       },
       './private/*': {
         source: ['./src/*.ts', './src/*.tsx'],
-        types: ['./dist/private/*.d.ts'],
+        types: ['./dist/types/src/*.d.ts'],
         import: './dist/private/*.mjs',
         require: './dist/private/*.js'
       },
       './*': {
         source: ['./exports/*.ts'],
-        types: './dist/exports/*.d.ts',
+        types: './dist/types/exports/*.d.ts',
         import: './dist/exports/*.mjs',
         require: './dist/exports/*.js'
       }
-    };
+    });
   }
 
   monopackageJSON.targets = {
@@ -266,14 +290,14 @@ function prepareMonopackage(monopackage) {
     module: false,
     types: false,
     "exports-module": {
-      "source": "exports/*.ts",
+      "source": ["exports/*.ts", "src/**/*.{ts,tsx}"],
       "distDir": "dist",
       "isLibrary": true,
       "outputFormat": "esmodule",
       "includeNodeModules": false
     },
     "exports-main": {
-      "source": "exports/*.ts",
+      "source": ["exports/*.ts", "src/**/*.{ts,tsx}"],
       "distDir": "dist",
       "isLibrary": true,
       "outputFormat": "commonjs",
@@ -310,13 +334,6 @@ function migratePackage(scope, name, monopackage) {
   moveTree(scope, name, 'docs', monopackage);
   moveTree(scope, name, 'intl', monopackage);
   
-  let exports = packageJSON.exports || {source: './' + packageJSON.source};
-  if (exports['.']) {
-    exports = exports['.'];
-    // TODO: add others
-  }
-
-  // monopackageJSON.exports[`./${name}`] = remapExports(exports, name);
   for (let dep in packageJSON.dependencies || {}) {
     let depScope = dep.match(/@(react-aria|react-spectrum|react-stately)/);
     if (!depScope && !monopackageJSON.dependencies[dep]) {
@@ -329,12 +346,6 @@ function migratePackage(scope, name, monopackage) {
   fs.writeFileSync(`packages/${monopackage}/package.json`, JSON.stringify(monopackageJSON, false, 2) + '\n');
 
   packageJSON.source = 'src/index.ts';
-  packageJSON.types = './src/index.ts';
-  packageJSON.exports = {
-    source: './src/index.ts',
-    types: './src/index.ts',
-    // TODO
-  };
   packageJSON.dependencies = {
     [monopackage]: '^' + monopackageJSON.version
   };
@@ -388,19 +399,29 @@ function migrateToMonopackage(pkg) {
 
   packageJSON.source = 'exports/index.ts';
   packageJSON.exports['.'].source = './exports/index.ts';
-  if (Array.isArray(packageJSON.exports['.'].types)) {
-    packageJSON.exports['.'].types[1] = './exports/index.ts';
-  }
+
+  packageJSON.types = './dist/types/exports/index.ts';
+  packageJSON.exports['.'].types = './dist/types/exports/index.ts';
+
+  packageJSON.main = './dist/exports/index.cjs';
+  packageJSON.exports['.'].require = './dist/exports/index.cjs';
+
+  packageJSON.module = './dist/exports/index.mjs';
+  packageJSON.exports['.'].import = './dist/exports/index.mjs';
 
   packageJSON.exports['./*'] = {
     source: './exports/*.ts',
-    types: './dist/*.d.ts',
-    import: './dist/*.mjs',
-    require: './dist/*.cjs'
+    types: './dist/types/exports/*.d.ts',
+    import: './dist/exports/*.mjs',
+    require: './dist/exports/*.cjs'
   };
 
   packageJSON.exports['./private/*'] = null;
 
+  delete packageJSON['style-types'];
+  if (packageJSON.targets) {
+    delete packageJSON.targets['style-types'];
+  }
   Object.assign(packageJSON.targets ??= {}, {
     main: false,
     module: false,

From a9ec1c5b81d793c546febe2c4e139995f76069b4 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Wed, 28 Jan 2026 17:36:01 -0800
Subject: [PATCH 27/68] Update i18n script

---
 scripts/buildI18n.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/scripts/buildI18n.js b/scripts/buildI18n.js
index 2f06fd34e3a..2a44bd65fd7 100644
--- a/scripts/buildI18n.js
+++ b/scripts/buildI18n.js
@@ -3,19 +3,26 @@ const fs = require('fs');
 const {compileStrings} = require('@internationalized/string-compiler');
 const {minifySync} = require('@swc/core');
 
-function build(scope, dist = scope.slice(1)) {
+function build(scope, dist) {
   let languages = {};
   let deps = {};
-  for (let file of glob(`packages/${scope}/intl/*.json`)) {
+  for (let file of glob([`packages/${scope}/intl/**/*.json`, `packages/${dist}/intl/**/*.json`])) {
     let parts = file.split('/');
     let lang = parts.at(-1).slice(0, -5);
-    let pkg = parts[1].startsWith('@') ? parts.slice(1, 3).join('/') : parts[1];
+    let pkg;
+    if (parts[1] === 'react-aria' || parts[1] === 'react-stately') {
+      pkg = '@' + parts[1] + '/' + parts[3];
+    } else if (parts[1] === '@adobe' && parts[2] === 'react-spectrum') {
+      pkg = '@react-spectrum/' + parts[4];
+    } else {
+      pkg = parts[1];
+    }
     if (pkg === '@react-spectrum/s2') {
       continue;
     }
   
     let compiled = compileStrings(JSON.parse(fs.readFileSync(file, 'utf8'))).replace('module.exports = ', '');
-    let pkgJson = JSON.parse(fs.readFileSync(`packages/${pkg}/package.json`, 'utf8'));
+    let pkgJson = JSON.parse(fs.readFileSync(`packages/${dist}/package.json`, 'utf8'));
 
     if (!languages[lang]) {
       languages[lang] = {};
@@ -141,6 +148,6 @@ export declare function createLocalizedStringDictionary(packages: string[]): Loc
 `);
 }
 
-build('{@react-aria/*,@react-stately/*,@react-spectrum/*,react-aria-components}', '@adobe/react-spectrum');
-build('{@react-aria/*,@react-stately/*,react-aria-components}', 'react-aria-components');
-build('{@react-aria,@react-stately}/*', 'react-aria');
+build('{react-aria,react-stately,react-aria-components}', '@adobe/react-spectrum');
+build('{react-aria,react-stately}', 'react-aria-components');
+build('react-stately', 'react-aria');

From d68337d1da9e1b3360d915c76b8daeb4ac70655c Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 29 Jan 2026 11:10:35 -0800
Subject: [PATCH 28/68] fix

---
 scripts/lint-packages.js |  11 ----
 scripts/migrateDeps.mjs  | 136 +++++++++++++++++++--------------------
 scripts/testCJS.cjs      |   7 ++
 tsconfig.build.json      |   5 +-
 4 files changed, 76 insertions(+), 83 deletions(-)
 create mode 100644 scripts/testCJS.cjs

diff --git a/scripts/lint-packages.js b/scripts/lint-packages.js
index 97bf18a41c2..7b9ece77796 100644
--- a/scripts/lint-packages.js
+++ b/scripts/lint-packages.js
@@ -72,17 +72,6 @@ for (let pkgPath of packagePaths) {
 
 for (let pkg of packagePaths) {
   let json = packages[pkg];
-
-  if (!pkg.includes('@react-types') && !pkg.includes('@spectrum-icons') && !pkg.includes('@react-aria/example-theme') && !pkg.includes('@react-spectrum/style-macro-s1') && json.rsp?.type !== 'cli') {
-    let topIndexExists = fs.existsSync(path.join(pkg, '..', 'index.ts'));
-    if (topIndexExists) {
-      let contents = fs.readFileSync(path.join(pkg, '..', 'index.ts'));
-      softAssert(/export \* from '.\/src';/.test(contents), `contents of ${path.join(pkg, '..', 'index.ts')} are not "export * from './src';"`);
-    }
-    softAssert(topIndexExists, `${pkg} is missing an index.ts`);
-    softAssert(fs.existsSync(path.join(pkg, '..', 'src', 'index.ts')), `${pkg} is missing a src/index.ts`);
-  }
-
   let readme = path.join(path.dirname(pkg), 'README.md');
   if (!fs.existsSync(readme)) {
     fs.writeFileSync(readme, `# ${json.name}\n\nThis package is part of [react-spectrum](https://github.com/adobe/react-spectrum). See the repo for more details.`);
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index 4404c47fd07..68de6d4aff1 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -1,8 +1,8 @@
 import fs from 'fs';
+import {parse} from '@babel/parser';
 import path from 'path';
 import * as recast from 'recast';
 import * as t from '@babel/types';
-import {parse} from '@babel/parser';
 
 const skipped = ['example-theme', 'test-utils', 'story-utils', 'style-macro-s1'];
 const importMap = {
@@ -241,67 +241,55 @@ function migrateScope(scope, monopackage) {
 function prepareMonopackage(monopackage) {
   let monopackageJSON = JSON.parse(fs.readFileSync(`packages/${monopackage}/package.json`, 'utf8'));
   monopackageJSON.source = 'exports/index.ts';
-  if (!monopackageJSON.exports['.']) {
+  if (monopackageJSON.exports && !monopackageJSON.exports['.']) {
     monopackageJSON.exports = {
-      '.': {
-        source: './exports/index.ts',
-        types: './dist/types/exports/index.d.ts',
-        import: './dist/exports/index.mjs',
-        require: './dist/exports/index.js'
-      },
-      './private/*': {
-        source: ['./src/*.ts', './src/*.tsx'],
-        types: ['./dist/types/src/*.d.ts'],
-        import: './dist/private/*.mjs',
-        require: './dist/private/*.js'
-      },
-      './*': {
-        source: ['./exports/*.ts'],
-        types: './dist/exports/*.d.ts',
-        import: './dist/exports/*.mjs',
-        require: './dist/exports/*.js'
-      }
+      '.': monopackageJSON.exports
     };
-  } else {
-    Object.assign(monopackageJSON.exports, {
-      '.': {
-        source: './exports/index.ts',
-        types: './dist/types/exports/index.d.ts',
-        import: './dist/exports/index.mjs',
-        require: './dist/exports/index.js'
-      },
-      './private/*': {
-        source: ['./src/*.ts', './src/*.tsx'],
-        types: ['./dist/types/src/*.d.ts'],
-        import: './dist/private/*.mjs',
-        require: './dist/private/*.js'
-      },
-      './*': {
-        source: ['./exports/*.ts'],
-        types: './dist/types/exports/*.d.ts',
-        import: './dist/exports/*.mjs',
-        require: './dist/exports/*.js'
-      }
-    });
+  }
+
+  Object.assign(monopackageJSON.exports ??= {}, {
+    '.': {
+      source: './exports/index.ts',
+      types: './dist/types/exports/index.d.ts',
+      import: './dist/exports/index.mjs',
+      require: './dist/exports/index.cjs'
+    },
+    './private/*': {
+      source: ['./src/*.ts', './src/*.tsx'],
+      types: ['./dist/types/src/*.d.ts'],
+      import: './dist/private/*.mjs',
+      require: './dist/private/*.cjs'
+    },
+    './*': {
+      source: ['./exports/*.ts'],
+      types: './dist/types/exports/*.d.ts',
+      import: './dist/exports/*.mjs',
+      require: './dist/exports/*.cjs'
+    }
+  });
+
+  let includeNodeModules = false;
+  if (monopackage === '@adobe/react-spectrum') {
+    includeNodeModules = ['@adobe/spectrum-css-temp'];
   }
 
   monopackageJSON.targets = {
     main: false,
     module: false,
     types: false,
-    "exports-module": {
-      "source": ["exports/*.ts", "src/**/*.{ts,tsx}"],
-      "distDir": "dist",
-      "isLibrary": true,
-      "outputFormat": "esmodule",
-      "includeNodeModules": false
+    'exports-module': {
+      'source': ['exports/*.ts', 'src/**/*.{ts,tsx}'],
+      'distDir': 'dist',
+      'isLibrary': true,
+      'outputFormat': 'esmodule',
+      'includeNodeModules': includeNodeModules
     },
-    "exports-main": {
-      "source": ["exports/*.ts", "src/**/*.{ts,tsx}"],
-      "distDir": "dist",
-      "isLibrary": true,
-      "outputFormat": "commonjs",
-      "includeNodeModules": false
+    'exports-main': {
+      'source': ['exports/*.ts', 'src/**/*.{ts,tsx}'],
+      'distDir': 'dist',
+      'isLibrary': true,
+      'outputFormat': 'commonjs',
+      'includeNodeModules': includeNodeModules
     }
   };
 
@@ -316,6 +304,10 @@ function prepareMonopackage(monopackage) {
     }
   }
 
+  if (monopackage === '@adobe/react-spectrum') {
+    monopackageJSON.devDependencies['@adobe/spectrum-css-temp'] = '3.0.0-alpha.1';
+  }
+
   fs.mkdirSync(`packages/${monopackage}/exports`, {recursive: true});
   fs.writeFileSync(`packages/${monopackage}/package.json`, JSON.stringify(monopackageJSON, false, 2) + '\n');
   fs.rmSync(`packages/${monopackage}/index.ts`);
@@ -341,14 +333,20 @@ function migratePackage(scope, name, monopackage) {
     } else if (depScope && depScope[0] !== scope && !monopackageJSON.dependencies[depScope[1]]) {
       monopackageJSON.dependencies[depScope[1]] = JSON.parse(fs.readFileSync(`packages/${depScope[1]}/package.json`, 'utf8')).version;
     }
+
+    if (depScope) {
+      let p = depScope[1] === 'react-spectrum' ? '@adobe/react-spectrum' : depScope[1];
+      if (!packageJSON.dependencies[p]) {
+        packageJSON.dependencies[p] = '^' + JSON.parse(fs.readFileSync(`packages/${p}/package.json`, 'utf8')).version;
+      }
+      delete packageJSON.dependencies[dep];
+    }
   }
 
   fs.writeFileSync(`packages/${monopackage}/package.json`, JSON.stringify(monopackageJSON, false, 2) + '\n');
 
   packageJSON.source = 'src/index.ts';
-  packageJSON.dependencies = {
-    [monopackage]: '^' + monopackageJSON.version
-  };
+  packageJSON.dependencies[monopackage] = '^' + monopackageJSON.version;
   packageJSON.targets = {
     types: false // TODO: i18n package
   };
@@ -426,19 +424,19 @@ function migrateToMonopackage(pkg) {
     main: false,
     module: false,
     types: false,
-    "exports-module": {
-      "source": "exports/*.ts",
-      "distDir": "dist",
-      "isLibrary": true,
-      "outputFormat": "esmodule",
-      "includeNodeModules": false
+    'exports-module': {
+      'source': 'exports/*.ts',
+      'distDir': 'dist',
+      'isLibrary': true,
+      'outputFormat': 'esmodule',
+      'includeNodeModules': false
     },
-    "exports-main": {
-      "source": "exports/*.ts",
-      "distDir": "dist",
-      "isLibrary": true,
-      "outputFormat": "commonjs",
-      "includeNodeModules": false
+    'exports-main': {
+      'source': 'exports/*.ts',
+      'distDir': 'dist',
+      'isLibrary': true,
+      'outputFormat': 'commonjs',
+      'includeNodeModules': false
     }
   });
 
@@ -586,7 +584,7 @@ function getImportStatements(node, file, relative = true) {
     }
     let importSource = source;
     let [src, imported] = importMap[source][importedName];
-    if (importMap[src] && importMap[src][imported]) {
+    while (importMap[src] && importMap[src][imported]) {
       importSource = src;
       [src, imported] = importMap[src][imported];
     }
diff --git a/scripts/testCJS.cjs b/scripts/testCJS.cjs
new file mode 100644
index 00000000000..ec621973edd
--- /dev/null
+++ b/scripts/testCJS.cjs
@@ -0,0 +1,7 @@
+require.extensions['.css'] = function () {};
+
+require('react-aria');
+require('react-stately');
+require('react-aria-components');
+require('@adobe/react-spectrum');
+require('@react-spectrum/s2');
diff --git a/tsconfig.build.json b/tsconfig.build.json
index ac77b3ed0d3..a0936c90351 100644
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@ -19,8 +19,6 @@
     "moduleResolution": "bundler",
     "customConditions": ["source"],
     "module": "esnext",
-    // Process & infer types from .js files.
-    "allowJs": true,
     // Disallow features that require cross-file information for emit.
     "isolatedModules": true,
     // Import non-ES modules as default imports.
@@ -51,6 +49,7 @@
     "packages/dev/optimize-locales-plugin",
     "packages/@react-spectrum/s2/s2wf-icons",
     "packages/@react-spectrum/s2/icon.d.ts",
-    "packages/dev/s2-docs/pages/**"
+    "packages/dev/s2-docs/pages/**",
+    "lib/*.js"
   ]
 }

From c0c3fc8c6aaf643b4c7db15c0fb856dcb568f54a Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 29 Jan 2026 11:22:58 -0800
Subject: [PATCH 29/68] Update icons

---
 packages/@spectrum-icons/color/package.json                 | 3 +--
 packages/@spectrum-icons/color/scripts/generateIcons.cjs    | 2 +-
 packages/@spectrum-icons/express/package.json               | 3 +--
 packages/@spectrum-icons/express/scripts/generateIcons.cjs  | 2 +-
 packages/@spectrum-icons/illustrations/package.json         | 4 +---
 packages/@spectrum-icons/illustrations/src/Error.tsx        | 2 +-
 packages/@spectrum-icons/illustrations/src/File.tsx         | 2 +-
 packages/@spectrum-icons/illustrations/src/Folder.tsx       | 2 +-
 packages/@spectrum-icons/illustrations/src/NotFound.tsx     | 2 +-
 packages/@spectrum-icons/illustrations/src/Timeout.tsx      | 2 +-
 packages/@spectrum-icons/illustrations/src/Unauthorized.tsx | 2 +-
 packages/@spectrum-icons/illustrations/src/Unavailable.tsx  | 2 +-
 packages/@spectrum-icons/illustrations/src/Upload.tsx       | 2 +-
 packages/@spectrum-icons/ui/package.json                    | 3 +--
 packages/@spectrum-icons/ui/scripts/generateIcons.cjs       | 4 ++--
 packages/@spectrum-icons/workflow/package.json              | 3 +--
 packages/@spectrum-icons/workflow/scripts/generateIcons.cjs | 2 +-
 17 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/packages/@spectrum-icons/color/package.json b/packages/@spectrum-icons/color/package.json
index 71cc4adf1d1..319d38169da 100644
--- a/packages/@spectrum-icons/color/package.json
+++ b/packages/@spectrum-icons/color/package.json
@@ -23,7 +23,6 @@
   },
   "dependencies": {
     "@adobe/react-spectrum-workflow-color": "1.1.1",
-    "@react-spectrum/icon": "^3.8.10",
     "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
@@ -31,7 +30,7 @@
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
+    "@adobe/react-spectrum": "^3.46.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@spectrum-icons/color/scripts/generateIcons.cjs b/packages/@spectrum-icons/color/scripts/generateIcons.cjs
index 98d5174c850..3bfc90a593c 100644
--- a/packages/@spectrum-icons/color/scripts/generateIcons.cjs
+++ b/packages/@spectrum-icons/color/scripts/generateIcons.cjs
@@ -23,7 +23,7 @@ function template(iconName) {
   }
   return (
 `import {${iconName} as IconComponent} from '@adobe/react-spectrum-workflow-color/dist/${iconRename}.js';
-import {Icon, IconPropsWithoutChildren} from '@react-spectrum/icon';
+import {Icon, IconPropsWithoutChildren} from '@@adobe/react-spectrum/private/icon/Icon';
 import React, {JSX} from 'react';
 
 export default function ${iconRename}(props: IconPropsWithoutChildren): JSX.Element {
diff --git a/packages/@spectrum-icons/express/package.json b/packages/@spectrum-icons/express/package.json
index 838bdcc329e..2b93432a686 100644
--- a/packages/@spectrum-icons/express/package.json
+++ b/packages/@spectrum-icons/express/package.json
@@ -23,14 +23,13 @@
   },
   "dependencies": {
     "@adobe/spectrum-css-ccx-workflow-icons": "1.0.2",
-    "@react-spectrum/icon": "^3.8.10",
     "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@spectrum-icons/build-tools": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
+    "@adobe/react-spectrum": "^3.46.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@spectrum-icons/express/scripts/generateIcons.cjs b/packages/@spectrum-icons/express/scripts/generateIcons.cjs
index e1067463a36..a78da0f419c 100644
--- a/packages/@spectrum-icons/express/scripts/generateIcons.cjs
+++ b/packages/@spectrum-icons/express/scripts/generateIcons.cjs
@@ -29,7 +29,7 @@ for (let file of fs.readdirSync(dir)) {
   }
 
   let jsx = compileSVG(path.join(dir, file));
-  let wrapper = `import {Icon, IconPropsWithoutChildren} from '@react-spectrum/icon';
+  let wrapper = `import {Icon, IconPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Icon';
 import React, {JSX} from 'react';
 
 ${jsx}
diff --git a/packages/@spectrum-icons/illustrations/package.json b/packages/@spectrum-icons/illustrations/package.json
index 6cfc6a471f5..f758e32e1eb 100644
--- a/packages/@spectrum-icons/illustrations/package.json
+++ b/packages/@spectrum-icons/illustrations/package.json
@@ -21,15 +21,13 @@
     "build-icons": "yarn build-cjs && yarn build-esm && yarn generate-types"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.32.0",
-    "@react-spectrum/icon": "^3.8.10",
     "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@spectrum-icons/build-tools": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
+    "@adobe/react-spectrum": "^3.46.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@spectrum-icons/illustrations/src/Error.tsx b/packages/@spectrum-icons/illustrations/src/Error.tsx
index 8899311a1d6..13c899ade05 100644
--- a/packages/@spectrum-icons/illustrations/src/Error.tsx
+++ b/packages/@spectrum-icons/illustrations/src/Error.tsx
@@ -1,4 +1,4 @@
-import {Illustration, IllustrationPropsWithoutChildren} from '@react-spectrum/icon';
+import {Illustration, IllustrationPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Illustration';
 import React, {JSX} from 'react';
 
 export default function Error500(props: IllustrationPropsWithoutChildren): JSX.Element {
diff --git a/packages/@spectrum-icons/illustrations/src/File.tsx b/packages/@spectrum-icons/illustrations/src/File.tsx
index 6672b436294..6ed93411574 100644
--- a/packages/@spectrum-icons/illustrations/src/File.tsx
+++ b/packages/@spectrum-icons/illustrations/src/File.tsx
@@ -1,4 +1,4 @@
-import {Illustration, IllustrationPropsWithoutChildren} from '@react-spectrum/icon';
+import {Illustration, IllustrationPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Illustration';
 import React, {JSX} from 'react';
 
 export default function File(props: IllustrationPropsWithoutChildren): JSX.Element {
diff --git a/packages/@spectrum-icons/illustrations/src/Folder.tsx b/packages/@spectrum-icons/illustrations/src/Folder.tsx
index 8aac3d22b72..aea9bd81f1a 100644
--- a/packages/@spectrum-icons/illustrations/src/Folder.tsx
+++ b/packages/@spectrum-icons/illustrations/src/Folder.tsx
@@ -1,4 +1,4 @@
-import {Illustration, IllustrationPropsWithoutChildren} from '@react-spectrum/icon';
+import {Illustration, IllustrationPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Illustration';
 import React, {JSX} from 'react';
 
 export default function File(props: IllustrationPropsWithoutChildren): JSX.Element {
diff --git a/packages/@spectrum-icons/illustrations/src/NotFound.tsx b/packages/@spectrum-icons/illustrations/src/NotFound.tsx
index f0904063f25..a276bec77b2 100644
--- a/packages/@spectrum-icons/illustrations/src/NotFound.tsx
+++ b/packages/@spectrum-icons/illustrations/src/NotFound.tsx
@@ -1,4 +1,4 @@
-import {Illustration, IllustrationPropsWithoutChildren} from '@react-spectrum/icon';
+import {Illustration, IllustrationPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Illustration';
 import React, {JSX} from 'react';
 
 export default function Error404(props: IllustrationPropsWithoutChildren): JSX.Element {
diff --git a/packages/@spectrum-icons/illustrations/src/Timeout.tsx b/packages/@spectrum-icons/illustrations/src/Timeout.tsx
index f991ed972e9..f8869693c62 100644
--- a/packages/@spectrum-icons/illustrations/src/Timeout.tsx
+++ b/packages/@spectrum-icons/illustrations/src/Timeout.tsx
@@ -1,4 +1,4 @@
-import {Illustration, IllustrationPropsWithoutChildren} from '@react-spectrum/icon';
+import {Illustration, IllustrationPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Illustration';
 import React, {JSX} from 'react';
 
 export default function Error504(props: IllustrationPropsWithoutChildren): JSX.Element {
diff --git a/packages/@spectrum-icons/illustrations/src/Unauthorized.tsx b/packages/@spectrum-icons/illustrations/src/Unauthorized.tsx
index ba7c1f3d078..a97db7b92a8 100644
--- a/packages/@spectrum-icons/illustrations/src/Unauthorized.tsx
+++ b/packages/@spectrum-icons/illustrations/src/Unauthorized.tsx
@@ -1,4 +1,4 @@
-import {Illustration, IllustrationPropsWithoutChildren} from '@react-spectrum/icon';
+import {Illustration, IllustrationPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Illustration';
 import React, {JSX} from 'react';
 
 export default function Error403(props: IllustrationPropsWithoutChildren): JSX.Element {
diff --git a/packages/@spectrum-icons/illustrations/src/Unavailable.tsx b/packages/@spectrum-icons/illustrations/src/Unavailable.tsx
index 4c98d7a8ef5..e4755b51b6a 100644
--- a/packages/@spectrum-icons/illustrations/src/Unavailable.tsx
+++ b/packages/@spectrum-icons/illustrations/src/Unavailable.tsx
@@ -1,4 +1,4 @@
-import {Illustration, IllustrationPropsWithoutChildren} from '@react-spectrum/icon';
+import {Illustration, IllustrationPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Illustration';
 import React, {JSX} from 'react';
 
 export default function Error503(props: IllustrationPropsWithoutChildren): JSX.Element {
diff --git a/packages/@spectrum-icons/illustrations/src/Upload.tsx b/packages/@spectrum-icons/illustrations/src/Upload.tsx
index fcb51b561f2..20b41e643bf 100644
--- a/packages/@spectrum-icons/illustrations/src/Upload.tsx
+++ b/packages/@spectrum-icons/illustrations/src/Upload.tsx
@@ -1,4 +1,4 @@
-import {Illustration, IllustrationPropsWithoutChildren} from '@react-spectrum/icon';
+import {Illustration, IllustrationPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Illustration';
 import React, {JSX} from 'react';
 
 export default function Error504(props: IllustrationPropsWithoutChildren): JSX.Element {
diff --git a/packages/@spectrum-icons/ui/package.json b/packages/@spectrum-icons/ui/package.json
index 41fcfa08fe2..53a9f7174e5 100644
--- a/packages/@spectrum-icons/ui/package.json
+++ b/packages/@spectrum-icons/ui/package.json
@@ -24,7 +24,6 @@
   "dependencies": {
     "@adobe/react-spectrum-ui": "1.2.1",
     "@babel/runtime": "^7.24.4",
-    "@react-spectrum/icon": "^3.8.10",
     "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
@@ -32,7 +31,7 @@
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
+    "@adobe/react-spectrum": "^3.46.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@spectrum-icons/ui/scripts/generateIcons.cjs b/packages/@spectrum-icons/ui/scripts/generateIcons.cjs
index ccf6eeb3a9d..892d79a7eee 100644
--- a/packages/@spectrum-icons/ui/scripts/generateIcons.cjs
+++ b/packages/@spectrum-icons/ui/scripts/generateIcons.cjs
@@ -37,7 +37,7 @@ function template(iconName) {
 
     return (
 `import {${iconName} as IconComponent} from '@adobe/react-spectrum-ui/dist/${iconName}.js';
-import {UIIcon, UIIconPropsWithoutChildren} from '@react-spectrum/icon';
+import {UIIcon, UIIconPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/UIIcon';
 import {useProvider} from '@react-spectrum/provider';
 import React, {JSX} from 'react';
 
@@ -60,7 +60,7 @@ export default function ${iconName}(props: UIIconPropsWithoutChildren): JSX.Elem
 
   return (
 `import {${iconName} as IconComponent} from '@adobe/react-spectrum-ui/dist/${iconName}.js';
-import {UIIcon, UIIconPropsWithoutChildren} from '@react-spectrum/icon';
+import {UIIcon, UIIconPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/UIIcon';
 import React, {JSX} from 'react';
 
 export default function ${iconName}(props: UIIconPropsWithoutChildren): JSX.Element {
diff --git a/packages/@spectrum-icons/workflow/package.json b/packages/@spectrum-icons/workflow/package.json
index 48b3116fa63..833967f5bad 100644
--- a/packages/@spectrum-icons/workflow/package.json
+++ b/packages/@spectrum-icons/workflow/package.json
@@ -23,7 +23,6 @@
   },
   "dependencies": {
     "@adobe/react-spectrum-workflow": "2.3.5",
-    "@react-spectrum/icon": "^3.8.10",
     "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
@@ -31,7 +30,7 @@
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
+    "@adobe/react-spectrum": "^3.46.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@spectrum-icons/workflow/scripts/generateIcons.cjs b/packages/@spectrum-icons/workflow/scripts/generateIcons.cjs
index 0bbed3c8157..f2f816a4f74 100644
--- a/packages/@spectrum-icons/workflow/scripts/generateIcons.cjs
+++ b/packages/@spectrum-icons/workflow/scripts/generateIcons.cjs
@@ -23,7 +23,7 @@ function template(iconName) {
   }
   return (
 `import {${iconName} as IconComponent} from '@adobe/react-spectrum-workflow/dist/${importName}.js';
-import {Icon, IconPropsWithoutChildren} from '@react-spectrum/icon';
+import {Icon, IconPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Icon';
 import React, {JSX} from 'react';
 
 export default function ${iconRename}(props: IconPropsWithoutChildren): JSX.Element {

From 6f02343b12a1054a44cc614a483b37ed58459e94 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 29 Jan 2026 11:53:52 -0800
Subject: [PATCH 30/68] fix constraints

---
 packages/dev/docs/package.json |  1 +
 scripts/migrateDeps.mjs        |  8 ++++
 yarn.config.cjs                | 69 +---------------------------------
 3 files changed, 11 insertions(+), 67 deletions(-)

diff --git a/packages/dev/docs/package.json b/packages/dev/docs/package.json
index 70f8d3ea505..be57282ba2f 100644
--- a/packages/dev/docs/package.json
+++ b/packages/dev/docs/package.json
@@ -4,6 +4,7 @@
   "private": true,
   "source": "src/index.js",
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.0",
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
     "@mdx-js/react": "next",
     "@react-aria/aria-modal-polyfill": "^3.1.0",
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index 68de6d4aff1..7fc8a2aef5b 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -306,6 +306,7 @@ function prepareMonopackage(monopackage) {
 
   if (monopackage === '@adobe/react-spectrum') {
     monopackageJSON.devDependencies['@adobe/spectrum-css-temp'] = '3.0.0-alpha.1';
+    monopackageJSON.sideEffects = ['*.css'];
   }
 
   fs.mkdirSync(`packages/${monopackage}/exports`, {recursive: true});
@@ -350,6 +351,13 @@ function migratePackage(scope, name, monopackage) {
   packageJSON.targets = {
     types: false // TODO: i18n package
   };
+
+  Object.assign(packageJSON.peerDependencies ??= {}, {
+    react: '^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1',
+    'react-dom': '^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1'
+  });
+
+  delete packageJSON.peerDependencies['@react-spectrum/provider'];
   
   fs.writeFileSync(`packages/${scope}/${name}/package.json`, JSON.stringify(packageJSON, false, 2) + '\n');
   fs.rmSync(`packages/${scope}/${name}/index.ts`);
diff --git a/yarn.config.cjs b/yarn.config.cjs
index 69d520b3723..7564de2664c 100644
--- a/yarn.config.cjs
+++ b/yarn.config.cjs
@@ -105,6 +105,7 @@ function enforceNoCircularDependencies({Yarn}) {
     seen.add(workspace.ident);
 
     for (let d of Yarn.dependencies({ident: workspace.ident})) {
+      if (d.type === 'peerDependencies') {continue;}
       addDep(d.workspace, seen);
     }
 
@@ -183,25 +184,6 @@ function enforceWorkspaceDependencies({Yarn}) {
   }
 }
 
-/** @param {Context} context */
-function enforceCSS({Yarn}) {
-  for (const workspace of Yarn.workspaces()) {
-    let name = workspace.ident;
-    if (!name.startsWith('@react-spectrum/docs')
-      && !name.startsWith('@react-spectrum/s2-docs')
-      && !name.startsWith('@react-spectrum/test-utils')
-      && name.startsWith('@react-spectrum')
-      && !name.startsWith('@react-spectrum/mcp')
-      && workspace.pkg.dependencies?.has('@adobe/spectrum-css-temp')) {
-
-      workspace.set('targets', {
-        main: {includeNodeModules: ['@adobe/spectrum-css-temp']},
-        module: {includeNodeModules: ['@adobe/spectrum-css-temp']}
-      });
-    }
-  }
-}
-
 /** @param {Workspace} workspace */
 function isPublishing(workspace) {
   let name = workspace.ident;
@@ -242,58 +224,12 @@ function enforcePublishing({Yarn}) {
   }
 }
 
-function setExtension(filepath, ext = '.js') {
-  if (!filepath) {
-    return;
-  }
-  return filepath.replace(/\.[a-zA-Z0-9]*$/, ext);
-}
-
 /** @param {Context} context */
 function enforceExports({Yarn}) {
   // make sure build fields are correctly set
   for (const workspace of Yarn.workspaces()) {
     let name = workspace.ident;
     if (isPublishing(workspace) && workspace.manifest.rsp?.type !== 'cli') {
-      let moduleExt = name === '@react-spectrum/s2' ? '.mjs' : '.js';
-      let cjsExt = name === '@react-spectrum/s2' ? '.cjs' : '.js';
-      if (workspace.manifest.main) {
-        workspace.set('main', setExtension(workspace.manifest.main, cjsExt));
-      } else {
-        workspace.set('main', setExtension('dist/main.js', cjsExt));
-      }
-
-      if (
-        name !== '@internationalized/string-compiler' &&
-        name !== 'tailwindcss-react-aria-components'
-      ) {
-        workspace.set('module', setExtension('dist/module.js', moduleExt));
-      }
-
-      let exportsRequire = workspace.manifest?.exports?.require;
-      let exportsImport = workspace.manifest?.exports?.import;
-      if (workspace.manifest.exports?.['.']) {
-        for (let key in workspace.manifest.exports) {
-          if (workspace.manifest.exports[key]) {
-            let subExportsRequire = workspace.manifest.exports[key].require;
-            workspace.set(`exports["${key}"].require`, setExtension(subExportsRequire, cjsExt));
-            let subExportsImport = workspace.manifest.exports[key].import;
-            workspace.set(`exports["${key}"].import`, setExtension(subExportsImport, '.mjs'));
-          }
-        }
-      } else {
-        workspace.set('exports.require', setExtension(exportsRequire, cjsExt));
-        workspace.set('exports.import', setExtension(exportsImport, '.mjs'));
-      }
-
-      if ((!workspace.manifest.types || !workspace.manifest.types.endsWith('.d.ts'))) {
-        workspace.set('types', 'dist/types.d.ts');
-      }
-
-      if (name !== '@adobe/react-spectrum' && name !== 'react-aria' && name !== 'react-stately' && name !== '@internationalized/string-compiler' && name !== 'tailwindcss-react-aria-components') {
-        workspace.set('source', 'src/index.ts');
-      }
-
       if (name !== '@adobe/react-spectrum' && name !== 'react-aria' && name !== 'react-stately' && name !== '@internationalized/string-compiler' && name !== 'tailwindcss-react-aria-components') {
         if (!workspace.manifest.files || (!workspace.manifest.files.includes('dist') && !workspace.manifest.files.includes('src'))) {
           workspace.set('files', [...workspace.manifest.files || [], 'dist', 'src']);
@@ -306,7 +242,7 @@ function enforceExports({Yarn}) {
 
       // better to do in enforceCSS? it doesn't match the set of packages handled
       if (name !== 'react-aria-components') {
-        if (name.includes('@react-spectrum') || name.includes('@react-aria/visually-hidden')) {
+        if (name.includes('@react-spectrum') || name.includes('@adobe/react-spectrum') || name.includes('@react-aria/visually-hidden')) {
           workspace.set('sideEffects', ['*.css']);
         } else {
           workspace.set('sideEffects', false);
@@ -320,7 +256,6 @@ module.exports = defineConfig({
   constraints: async ctx => {
     enforceWorkspaceDependencies(ctx);
     enforceConsistentDependenciesAcrossTheProject(ctx);
-    enforceCSS(ctx);
     enforcePublishing(ctx);
     enforceExports(ctx);
     enforceNonPrivateDependencies(ctx);

From 9851d9fd597b5593b5844a54862f292821f6733c Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 29 Jan 2026 17:27:12 -0800
Subject: [PATCH 31/68] fix tests

---
 jest.config.js                                |  4 +-
 .../i18n/test/languagechange.test.js          |  2 +-
 .../src/s1-to-s2/src/getComponents.ts         |  2 +-
 scripts/migrateDeps.mjs                       | 65 +++++++++++++++++--
 4 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index a71bca685f9..0c77e5fa46c 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -156,7 +156,9 @@ module.exports = {
   testEnvironment: 'jsdom',
 
   // Options that will be passed to the testEnvironment
-  // testEnvironmentOptions: {},
+  testEnvironmentOptions: {
+    customExportConditions: ['source']
+  },
 
   // Adds a location field to test results
   // testLocationInResults: false,
diff --git a/packages/@react-aria/i18n/test/languagechange.test.js b/packages/@react-aria/i18n/test/languagechange.test.js
index c18275ebd54..8662cf1e84d 100644
--- a/packages/@react-aria/i18n/test/languagechange.test.js
+++ b/packages/@react-aria/i18n/test/languagechange.test.js
@@ -11,7 +11,7 @@
  */
 
 import {act, render} from '@react-spectrum/test-utils-internal';
-import {I18nProvider, useLocale} from '../src/context';
+import {I18nProvider, useLocale} from '../src/I18nProvider';
 import React from 'react';
 
 function TestComponent() {
diff --git a/packages/dev/codemods/src/s1-to-s2/src/getComponents.ts b/packages/dev/codemods/src/s1-to-s2/src/getComponents.ts
index ee0987182c6..6786c997bc5 100644
--- a/packages/dev/codemods/src/s1-to-s2/src/getComponents.ts
+++ b/packages/dev/codemods/src/s1-to-s2/src/getComponents.ts
@@ -16,7 +16,7 @@ export function getComponents(): Set<string> {
   // Determine list of available components in S2 from index.ts
   let availableComponents = new Set<string>();
   const packagePath = require.resolve('@react-spectrum/s2');
-  const indexPath = path.join(path.dirname(packagePath), '../src/index.ts');
+  const indexPath = path.join(path.dirname(packagePath), '../exports/index.ts');
   let index = parse(readFileSync(indexPath, 'utf8'), {sourceType: 'module', plugins: ['typescript']});
   traverse(index, {
     ExportNamedDeclaration(path) {
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index 7fc8a2aef5b..ab1aeb13200 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -220,6 +220,9 @@ migrateScope('@react-spectrum', '@adobe/react-spectrum');
 migrateToMonopackage('react-aria-components');
 migrateToMonopackage('@react-spectrum/s2');
 
+// Special case
+rewriteMonopackageImports('packages/@internationalized/number/test/NumberParser.test.js');
+
 function migrateScope(scope, monopackage) {
   prepareMonopackage(monopackage);
 
@@ -255,13 +258,14 @@ function prepareMonopackage(monopackage) {
       require: './dist/exports/index.cjs'
     },
     './private/*': {
-      source: ['./src/*.ts', './src/*.tsx'],
-      types: ['./dist/types/src/*.d.ts'],
+      // extensionless works in parcel, typescript requires an extension and supports fallbacks.
+      source: ['./src/*', './src/*.ts', './src/*.tsx'],
+      types: './dist/types/src/*.d.ts',
       import: './dist/private/*.mjs',
       require: './dist/private/*.cjs'
     },
     './*': {
-      source: ['./exports/*.ts'],
+      source: './exports/*.ts',
       types: './dist/types/exports/*.d.ts',
       import: './dist/exports/*.mjs',
       require: './dist/exports/*.cjs'
@@ -569,11 +573,64 @@ function rewriteMonopackageImports(file, pkg, subpath) {
       }
 
       node.source = t.stringLiteral(source);
+    } else {
+      switch (source) {
+        case '@react-aria/table/test/tableResizingTests.tsx':
+          node.source.value = 'react-aria/test/table/tableResizingTests.tsx';
+          hadImports = true;
+          break;
+        case '@react-aria/dnd/test/mocks':
+          node.source.value = 'react-aria/test/dnd/mocks';
+          hadImports = true;
+          break;
+        case '@react-aria/dnd/src/constants':
+          node.source.value = 'react-aria/private/dnd/constants';
+          hadImports = true;
+          break;
+        case '@react-aria/dnd/test/examples':
+          node.source.value = 'react-aria/test/dnd/examples';
+          hadImports = true;
+          break;
+        case '@react-aria/dnd/src/utils':
+          node.source.value = 'react-aria/private/dnd/utils';
+          hadImports = true;
+          break;
+        case '@react-aria/numberfield/intl/*.json':
+          node.source.value = 'react-aria/intl/numberfield/*.json';
+          hadImports = true;
+          break;
+      }
     }
 
     return [node];
   });
 
+  t.traverseFast(ast.program, node => {
+    if (
+      node.type === 'CallExpression' && 
+      node.callee.type === 'MemberExpression' &&
+      node.callee.object.type === 'Identifier' &&
+      node.callee.object.name === 'jest' &&
+      (node.callee.property.name === 'mock' || node.callee.property.name === 'requireActual') &&
+      node.arguments[0]?.type === 'StringLiteral'
+    ) {
+      // Hard coding special cases here
+      switch (node.arguments[0].value) {
+        case '@react-aria/live-announcer':
+          node.arguments[0].value = 'react-aria/private/live-announcer/LiveAnnouncer';
+          break;
+        case '@react-aria/utils/src/scrollIntoView':
+          node.arguments[0].value = 'react-aria/private/utils/scrollIntoView';
+          break;
+        case '@react-aria/utils':
+          node.arguments[0].value = '../../src/utils/focusWithoutScrolling';
+          break;
+        default:
+          console.log(node.arguments[0].value);
+      }
+    }
+  });
+
   if (!hadImports) {
     return;
   }
@@ -673,7 +730,7 @@ function getRenamedSpecifier(specifier, from, importedName, relative = true) {
     return `${monopackage}/${name}`;
   }
 
-  let isPrivate = privateNames.has(importedName);
+  let isPrivate = importedName == null || privateNames.has(importedName);
   if (
     (monopackage === 'react-aria' && name === 'Virtualizer') ||
     (monopackage === '@adobe/react-spectrum' && (name === 'CardView' || name === 'Card' || name === 'Overlay' || name === 'Popover' || name === 'Modal' || name === 'StepList' || name === 'SearchAutocomplete' || name === 'Label'))

From 4dc1b2042661c05af5ff07f582687f569f172cfa Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 5 Mar 2026 17:46:07 -0800
Subject: [PATCH 32/68] Add missing gridlist types to monopackage

---
 packages/react-aria/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-aria/src/index.ts b/packages/react-aria/src/index.ts
index 12613688517..218ef19d5f0 100644
--- a/packages/react-aria/src/index.ts
+++ b/packages/react-aria/src/index.ts
@@ -68,7 +68,7 @@ export type {AriaFieldProps, FieldAria, LabelAria, LabelAriaProps} from '@react-
 export type {AriaLandmarkRole, AriaLandmarkProps, LandmarkAria, LandmarkController} from '@react-aria/landmark';
 export type {AriaLinkOptions, LinkAria} from '@react-aria/link';
 export type {AriaListBoxOptions, AriaListBoxProps, AriaListBoxSectionProps, AriaOptionProps, ListBoxAria, ListBoxSectionAria, OptionAria} from '@react-aria/listbox';
-export type {AriaGridListOptions, GridListProps, AriaGridListProps, GridListAria, AriaGridListItemOptions, GridListItemAria, AriaGridSelectionCheckboxProps, GridSelectionCheckboxAria} from '@react-aria/gridlist';
+export type {AriaGridListOptions, GridListProps, AriaGridListProps, GridListAria, AriaGridListItemOptions, GridListItemAria, AriaGridSelectionCheckboxProps, GridSelectionCheckboxAria, AriaGridListSectionProps, GridListSectionAria} from '@react-aria/gridlist';
 export type {AriaMenuProps, AriaMenuItemProps, AriaMenuOptions, AriaMenuSectionProps, AriaMenuTriggerProps, MenuAria, MenuItemAria, MenuSectionAria, MenuTriggerAria, SubmenuTriggerAria, AriaSubmenuTriggerProps} from '@react-aria/menu';
 export type {AriaMeterProps, MeterAria} from '@react-aria/meter';
 export type {AriaNumberFieldProps, NumberFieldAria} from '@react-aria/numberfield';

From 92c7142207e7a4ba92dad794ca208057cd00e2e0 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 5 Mar 2026 18:03:42 -0800
Subject: [PATCH 33/68] Add shim for private exports

---
 scripts/migrateDeps.mjs |  81 ++++-
 yarn.lock               | 753 ++++++++++++++++++++++++++++++++++------
 2 files changed, 715 insertions(+), 119 deletions(-)

diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index ab1aeb13200..0ea06006a72 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -1,3 +1,4 @@
+/* eslint-disable max-depth */
 import fs from 'fs';
 import {parse} from '@babel/parser';
 import path from 'path';
@@ -115,6 +116,7 @@ let parentFile = {
   'useDroppableItem': 'useDroppableCollection',
   // 'utils': '',
   'useGridListItem': 'useGridList',
+  'useGridListSection': 'useGridList',
   'useGridListSelectionCheckbox': 'useGridList',
   // 'useFocusable': '',
   // 'useInteractOutside': '',
@@ -139,12 +141,14 @@ let parentFile = {
   'useTableColumnResize': 'useTable',
   'useTableHeaderRow': 'useTable',
   'useTableRow': 'useTable',
+  'useTableRowGroup': 'useTable',
   'useTableSelectionCheckbox': 'useTable',
   'useTab': 'useTabList',
   'useTabPanel': 'useTabList',
   'useTag': 'useTagGroup',
   'useToastRegion': 'useToast',
   'useTooltip': 'useTooltipTrigger',
+  'ToastContainer': 'Toast',
   // 'useTree': '',
   // 'chain': '',
   // 'openLink': '',
@@ -223,6 +227,8 @@ migrateToMonopackage('@react-spectrum/s2');
 // Special case
 rewriteMonopackageImports('packages/@internationalized/number/test/NumberParser.test.js');
 
+writePrivateExports();
+
 function migrateScope(scope, monopackage) {
   prepareMonopackage(monopackage);
 
@@ -257,13 +263,6 @@ function prepareMonopackage(monopackage) {
       import: './dist/exports/index.mjs',
       require: './dist/exports/index.cjs'
     },
-    './private/*': {
-      // extensionless works in parcel, typescript requires an extension and supports fallbacks.
-      source: ['./src/*', './src/*.ts', './src/*.tsx'],
-      types: './dist/types/src/*.d.ts',
-      import: './dist/private/*.mjs',
-      require: './dist/private/*.cjs'
-    },
     './*': {
       source: './exports/*.ts',
       types: './dist/types/exports/*.d.ts',
@@ -282,14 +281,14 @@ function prepareMonopackage(monopackage) {
     module: false,
     types: false,
     'exports-module': {
-      'source': ['exports/*.ts', 'src/**/*.{ts,tsx}'],
+      'source': ['exports/**/*.ts'],
       'distDir': 'dist',
       'isLibrary': true,
       'outputFormat': 'esmodule',
       'includeNodeModules': includeNodeModules
     },
     'exports-main': {
-      'source': ['exports/*.ts', 'src/**/*.{ts,tsx}'],
+      'source': ['exports/**/*.ts'],
       'distDir': 'dist',
       'isLibrary': true,
       'outputFormat': 'commonjs',
@@ -584,7 +583,7 @@ function rewriteMonopackageImports(file, pkg, subpath) {
           hadImports = true;
           break;
         case '@react-aria/dnd/src/constants':
-          node.source.value = 'react-aria/private/dnd/constants';
+          node.source.value = 'react-aria/src/dnd/constants';
           hadImports = true;
           break;
         case '@react-aria/dnd/test/examples':
@@ -592,7 +591,7 @@ function rewriteMonopackageImports(file, pkg, subpath) {
           hadImports = true;
           break;
         case '@react-aria/dnd/src/utils':
-          node.source.value = 'react-aria/private/dnd/utils';
+          node.source.value = 'react-aria/src/dnd/utils';
           hadImports = true;
           break;
         case '@react-aria/numberfield/intl/*.json':
@@ -617,10 +616,10 @@ function rewriteMonopackageImports(file, pkg, subpath) {
       // Hard coding special cases here
       switch (node.arguments[0].value) {
         case '@react-aria/live-announcer':
-          node.arguments[0].value = 'react-aria/private/live-announcer/LiveAnnouncer';
+          node.arguments[0].value = file.startsWith('packages/react-aria') ? '../../src/live-announcer/LiveAnnouncer' : 'react-aria/src/live-announcer/LiveAnnouncer';
           break;
         case '@react-aria/utils/src/scrollIntoView':
-          node.arguments[0].value = 'react-aria/private/utils/scrollIntoView';
+          node.arguments[0].value = file.startsWith('packages/react-aria') ? '../../src/utils/scrollIntoView' : 'react-aria/src/utils/scrollIntoView';
           break;
         case '@react-aria/utils':
           node.arguments[0].value = '../../src/utils/focusWithoutScrolling';
@@ -795,7 +794,7 @@ function createPublicExports(file, monopackage, scope, pkg) {
       node.specifiers = node.specifiers.filter(s => importMap[monopackage][s.exported.name]);
       if (node.source.value.startsWith('./') && node.specifiers.length > 0) {
         let source = node.source.value.slice(2);
-        node.source.value = pkg ? `${monopackage}/private/${pkg}/${source}` : `../src/${source}`;
+        node.source.value = pkg ? `../src/${pkg}/${source}` : `../src/${source}`;
         if (standalone.has(source) || (monopackage === 'react-aria-components' && source === 'utils')) {
           groups[source] ||= [];
           groups[source].push(node);
@@ -839,3 +838,57 @@ function createPublicExports(file, monopackage, scope, pkg) {
     fs.writeFileSync(`packages/${scope}/${pkg}/src/index.ts`, index);
   }
 }
+
+function writePrivateExports() {
+  let privateExports = {};
+
+  for (let file of fs.globSync('packages/**/*.{ts,tsx,js}')) {
+    let content = fs.readFileSync(file, 'utf8');
+    let ast = parse(content, {
+      sourceType: 'module',
+      plugins: ['typescript', 'jsx', 'importAttributes'],
+      sourceFilename: file,
+      tokens: true,
+      errorRecovery: true
+    });
+
+    for (let item of ast.program.body) {
+      if (item.type === 'ImportDeclaration' || (item.type === 'ExportNamedDeclaration' && item.source)) {
+        if (item.source.value.includes('/private/')) {
+          privateExports[item.source.value] ??= new Set();
+          for (let specifier of item.specifiers) {
+            let importedName = specifier.type === 'ImportSpecifier' ? specifier.imported.name : specifier.local.name;
+            privateExports[item.source.value].add(importedName);
+          }
+        }
+      }
+    }
+  }
+
+  console.log(privateExports)
+  for (let specifier in privateExports) {
+    let file = `packages/${specifier.replace('/private/', '/exports/private/')}.ts`;
+    fs.mkdirSync(path.dirname(file), {recursive: true});
+
+    let contents = 'export {';
+    let first = true;
+    for (let exp of privateExports[specifier]) {
+      if (!first) {
+        contents += ', ';
+      }
+      first = false;
+      if ((!/^(use|UNSTABLE_use)/.test(exp) && /(Aria|Props|State|Options)$/.test(exp) && exp !== 'filterDOMProps' && exp !== 'getSyntheticLinkProps' && exp !== 'baseStyleProps' && exp !== 'viewStyleProps' && exp !== 'convertStyleProps') || exp === 'LayoutNode' || exp === 'MultipleSelectionManager' || exp === 'RectCorner' || exp === 'InvalidationContext' || exp === 'CollectionBuilderContext' || exp === 'PartialNode' || exp === 'Modality' || exp === 'SelectableItemStates' || exp === 'RTLOffsetType' || exp === 'FormatMessage' || exp === 'FocusVisibleHandler' || exp === 'IconPropsWithoutChildren' || exp === 'IllustrationPropsWithoutChildren' || exp === 'UIIconPropsWithoutChildren' || exp === 'StyleHandlers' || exp === 'Filter' || exp === 'Locale') {
+        contents += 'type ';
+      }
+      contents += exp;
+    }
+
+    contents += '} from ';
+
+    let originalFile = `packages/${specifier.replace('/private/', '/src/')}`;
+    specifier = path.relative(path.dirname(file), originalFile);
+
+    contents += `'${specifier}'` + ';\n';
+    fs.writeFileSync(file, contents);
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index 84bee5b7b98..f44e5c31d05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -93,6 +93,7 @@ __metadata:
   resolution: "@adobe/react-spectrum@workspace:packages/@adobe/react-spectrum"
   dependencies:
     "@adobe/react-spectrum": "npm:3.46.0"
+    "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@babel/cli": "npm:^7.12.10"
     "@babel/core": "npm:^7.24.3"
     "@internationalized/date": "npm:^3.10.1"
@@ -5308,7 +5309,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/actiongroup@workspace:packages/@react-aria/actiongroup"
   dependencies:
+    "@react-types/actiongroup": "npm:^3.4.21"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5319,9 +5324,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/aria-modal-polyfill@workspace:packages/@react-aria/aria-modal-polyfill"
   dependencies:
+    "@swc/helpers": "npm:^0.5.0"
+    aria-hidden: "npm:^1.2.3"
     react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -5329,7 +5337,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/autocomplete@workspace:packages/@react-aria/autocomplete"
   dependencies:
+    "@react-types/autocomplete": "npm:3.0.0-alpha.36"
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5340,6 +5353,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/breadcrumbs@workspace:packages/@react-aria/breadcrumbs"
   dependencies:
+    "@react-types/breadcrumbs": "npm:^3.7.17"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5351,7 +5367,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/button@workspace:packages/@react-aria/button"
   dependencies:
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5362,7 +5382,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/calendar@workspace:packages/@react-aria/calendar"
   dependencies:
+    "@internationalized/date": "npm:^3.10.1"
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/calendar": "npm:^3.8.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5373,18 +5399,25 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/checkbox@workspace:packages/@react-aria/checkbox"
   dependencies:
+    "@react-types/checkbox": "npm:^3.10.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/collections@npm:^3.0.1, @react-aria/collections@workspace:packages/@react-aria/collections":
+"@react-aria/collections@workspace:packages/@react-aria/collections":
   version: 0.0.0-use.local
   resolution: "@react-aria/collections@workspace:packages/@react-aria/collections"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5395,7 +5428,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/color@workspace:packages/@react-aria/color"
   dependencies:
+    "@react-types/color": "npm:^3.1.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5406,7 +5443,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/combobox@workspace:packages/@react-aria/combobox"
   dependencies:
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/combobox": "npm:^3.13.10"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5417,7 +5459,17 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/datepicker@workspace:packages/@react-aria/datepicker"
   dependencies:
+    "@internationalized/date": "npm:^3.10.1"
+    "@internationalized/number": "npm:^3.6.5"
+    "@internationalized/string": "npm:^3.2.7"
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/calendar": "npm:^3.8.1"
+    "@react-types/datepicker": "npm:^3.13.3"
+    "@react-types/dialog": "npm:^3.5.22"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5428,6 +5480,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/dialog@workspace:packages/@react-aria/dialog"
   dependencies:
+    "@react-types/dialog": "npm:^3.5.22"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5439,18 +5494,26 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/disclosure@workspace:packages/@react-aria/disclosure"
   dependencies:
+    "@react-types/button": "npm:^3.14.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/dnd@npm:^3.0.0, @react-aria/dnd@npm:^3.1.0, @react-aria/dnd@npm:^3.11.4, @react-aria/dnd@workspace:packages/@react-aria/dnd":
+"@react-aria/dnd@npm:^3.0.0, @react-aria/dnd@npm:^3.1.0, @react-aria/dnd@workspace:packages/@react-aria/dnd":
   version: 0.0.0-use.local
   resolution: "@react-aria/dnd@workspace:packages/@react-aria/dnd"
   dependencies:
+    "@internationalized/string": "npm:^3.2.7"
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5467,6 +5530,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/focus@workspace:packages/@react-aria/focus"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    clsx: "npm:^2.0.0"
     react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5478,7 +5544,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/form@workspace:packages/@react-aria/form"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5489,7 +5558,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/grid@workspace:packages/@react-aria/grid"
   dependencies:
+    "@react-types/checkbox": "npm:^3.10.2"
+    "@react-types/grid": "npm:^3.3.6"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5500,17 +5574,26 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/gridlist@workspace:packages/@react-aria/gridlist"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/i18n@npm:^3.12.10, @react-aria/i18n@npm:^3.12.14, @react-aria/i18n@workspace:packages/@react-aria/i18n":
+"@react-aria/i18n@npm:^3.12.10, @react-aria/i18n@workspace:packages/@react-aria/i18n":
   version: 0.0.0-use.local
   resolution: "@react-aria/i18n@workspace:packages/@react-aria/i18n"
   dependencies:
+    "@internationalized/date": "npm:^3.10.1"
+    "@internationalized/message": "npm:^3.1.8"
+    "@internationalized/number": "npm:^3.6.5"
+    "@internationalized/string": "npm:^3.2.7"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5518,11 +5601,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-aria/interactions@npm:^3.1.0, @react-aria/interactions@npm:^3.25.1, @react-aria/interactions@npm:^3.26.0, @react-aria/interactions@workspace:packages/@react-aria/interactions":
+"@react-aria/interactions@npm:^3.1.0, @react-aria/interactions@npm:^3.25.1, @react-aria/interactions@workspace:packages/@react-aria/interactions":
   version: 0.0.0-use.local
   resolution: "@react-aria/interactions@workspace:packages/@react-aria/interactions"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5533,6 +5619,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/label@workspace:packages/@react-aria/label"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5544,7 +5632,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/landmark@workspace:packages/@react-aria/landmark"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5555,6 +5646,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/link@workspace:packages/@react-aria/link"
   dependencies:
+    "@react-types/link": "npm:^3.6.5"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5566,7 +5660,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/listbox@workspace:packages/@react-aria/listbox"
   dependencies:
+    "@react-types/listbox": "npm:^3.7.4"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5577,7 +5675,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/live-announcer@workspace:packages/@react-aria/live-announcer"
   dependencies:
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -5598,7 +5700,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/menu@workspace:packages/@react-aria/menu"
   dependencies:
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/menu": "npm:^3.10.5"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5609,6 +5716,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/meter@workspace:packages/@react-aria/meter"
   dependencies:
+    "@react-types/meter": "npm:^3.4.13"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5620,7 +5730,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/numberfield@workspace:packages/@react-aria/numberfield"
   dependencies:
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/numberfield": "npm:^3.8.16"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5635,11 +5750,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-aria/overlays@npm:^3.31.0, @react-aria/overlays@workspace:packages/@react-aria/overlays":
+"@react-aria/overlays@workspace:packages/@react-aria/overlays":
   version: 0.0.0-use.local
   resolution: "@react-aria/overlays@workspace:packages/@react-aria/overlays"
   dependencies:
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/overlays": "npm:^3.9.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5658,6 +5778,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/progress@workspace:packages/@react-aria/progress"
   dependencies:
+    "@react-types/progress": "npm:^3.5.16"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5669,7 +5792,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/radio@workspace:packages/@react-aria/radio"
   dependencies:
+    "@react-types/radio": "npm:^3.9.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5680,7 +5807,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/searchfield@workspace:packages/@react-aria/searchfield"
   dependencies:
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/searchfield": "npm:^3.6.6"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5691,7 +5823,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/select@workspace:packages/@react-aria/select"
   dependencies:
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/select": "npm:^3.12.0"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5702,7 +5839,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/selection@workspace:packages/@react-aria/selection"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5713,6 +5853,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/separator@workspace:packages/@react-aria/separator"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5724,7 +5866,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/slider@workspace:packages/@react-aria/slider"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/slider": "npm:^3.8.2"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5735,6 +5881,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/spinbutton@workspace:packages/@react-aria/spinbutton"
   dependencies:
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5742,13 +5891,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-aria/ssr@npm:^3.0.0, @react-aria/ssr@npm:^3.9.10, @react-aria/ssr@workspace:packages/@react-aria/ssr":
+"@react-aria/ssr@npm:^3.0.0, @react-aria/ssr@workspace:packages/@react-aria/ssr":
   version: 0.0.0-use.local
   resolution: "@react-aria/ssr@workspace:packages/@react-aria/ssr"
   dependencies:
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -5756,7 +5907,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/steplist@workspace:packages/@react-aria/steplist"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5767,7 +5921,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/switch@workspace:packages/@react-aria/switch"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/switch": "npm:^3.5.15"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5778,7 +5936,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/table@workspace:packages/@react-aria/table"
   dependencies:
+    "@react-types/checkbox": "npm:^3.10.2"
+    "@react-types/grid": "npm:^3.3.6"
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/table": "npm:^3.13.4"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5789,7 +5953,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/tabs@workspace:packages/@react-aria/tabs"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/tabs": "npm:^3.3.20"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5800,7 +5968,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/tag@workspace:packages/@react-aria/tag"
   dependencies:
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5824,7 +5996,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/textfield@workspace:packages/@react-aria/textfield"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/textfield": "npm:^3.12.6"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5835,7 +6011,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/toast@workspace:packages/@react-aria/toast"
   dependencies:
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5846,7 +6026,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/toggle@workspace:packages/@react-aria/toggle"
   dependencies:
+    "@react-types/checkbox": "npm:^3.10.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5857,6 +6041,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/toolbar@workspace:packages/@react-aria/toolbar"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5868,7 +6054,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/tooltip@workspace:packages/@react-aria/tooltip"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/tooltip": "npm:^3.5.0"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5879,18 +6069,26 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/tree@workspace:packages/@react-aria/tree"
   dependencies:
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/utils@npm:^3.29.0, @react-aria/utils@npm:^3.32.0, @react-aria/utils@npm:^3.8.0, @react-aria/utils@workspace:packages/@react-aria/utils":
+"@react-aria/utils@npm:^3.29.0, @react-aria/utils@npm:^3.8.0, @react-aria/utils@workspace:packages/@react-aria/utils":
   version: 0.0.0-use.local
   resolution: "@react-aria/utils@workspace:packages/@react-aria/utils"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    clsx: "npm:^2.0.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5901,7 +6099,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/virtualizer@workspace:packages/@react-aria/virtualizer"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5912,6 +6113,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/visually-hidden@workspace:packages/@react-aria/visually-hidden"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5925,8 +6128,12 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-aria-components: "npm:^1.14.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -5938,8 +6145,13 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/actionbar": "npm:^3.1.19"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -5951,8 +6163,14 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/actiongroup": "npm:^3.4.21"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@spectrum-icons/workflow": "npm:^4.2.26"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.2.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -5964,8 +6182,14 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/autocomplete": "npm:3.0.0-alpha.36"
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -5977,8 +6201,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/avatar": "npm:^3.0.19"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.2.1
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -5990,8 +6217,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/badge": "npm:^3.1.21"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6003,8 +6233,13 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/breadcrumbs": "npm:^3.7.17"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6017,9 +6252,14 @@ __metadata:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6031,9 +6271,12 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/buttongroup": "npm:^3.3.21"
+    "@react-types/shared": "npm:^3.32.1"
     "@spectrum-icons/workflow": "npm:^4.0.0"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6045,9 +6288,16 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@internationalized/date": "npm:^3.10.1"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/calendar": "npm:^3.8.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6059,8 +6309,13 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/card": "npm:3.0.0-alpha.41"
+    "@react-types/provider": "npm:^3.8.13"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6072,9 +6327,15 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/checkbox": "npm:^3.10.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-aria-components: "npm:^1.14.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6114,8 +6375,14 @@ __metadata:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-spectrum/style-macro-s1": "npm:3.0.0-alpha.5"
+    "@react-types/color": "npm:^3.1.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/textfield": "npm:^3.12.6"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-aria-components: "npm:^1.14.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6127,8 +6394,14 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/combobox": "npm:^3.13.10"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6142,8 +6415,12 @@ __metadata:
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-spectrum/link": "npm:^3.2.0"
     "@react-spectrum/view": "npm:^3.1.3"
+    "@react-types/contextualhelp": "npm:^3.2.22"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/workflow": "npm:^4.2.26"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6155,9 +6432,16 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@internationalized/date": "npm:^3.10.1"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
+    "@react-types/datepicker": "npm:^3.13.3"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@spectrum-icons/workflow": "npm:^4.2.26"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6170,8 +6454,14 @@ __metadata:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/dialog": "npm:^3.5.22"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6183,6 +6473,10 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/divider": "npm:^3.3.21"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6195,8 +6489,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6206,6 +6503,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/docs@workspace:packages/dev/docs"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@mdx-js/react": "npm:next"
     "@react-aria/aria-modal-polyfill": "npm:^3.1.0"
@@ -6247,9 +6545,12 @@ __metadata:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-aria-components: "npm:^1.14.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6261,9 +6562,10 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria-components: "npm:^1.14.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6275,21 +6577,27 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/form": "npm:^3.7.16"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/icon@npm:^3.8.10, @react-spectrum/icon@workspace:packages/@react-spectrum/icon":
+"@react-spectrum/icon@workspace:packages/@react-spectrum/icon":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/icon@workspace:packages/@react-spectrum/icon"
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6301,8 +6609,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/illustratedmessage": "npm:^3.3.21"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6314,8 +6625,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/image": "npm:^3.5.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6327,8 +6641,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6340,8 +6657,12 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/label": "npm:^3.9.15"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6353,8 +6674,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@internationalized/date": "npm:^3.10.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6366,8 +6690,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/layout": "npm:^3.3.27"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6379,8 +6706,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/link": "npm:^3.6.5"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6395,8 +6725,14 @@ __metadata:
     "@react-aria/dnd": "npm:^3.0.0"
     "@react-spectrum/button": "npm:^3.8.1"
     "@react-stately/dnd": "npm:^3.0.0"
+    "@react-types/grid": "npm:^3.3.6"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
+    react-transition-group: "npm:^4.4.5"
   peerDependencies:
-    "@react-spectrum/provider": ^3.2.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6408,8 +6744,13 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/listbox": "npm:^3.7.4"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.2.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6435,8 +6776,15 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/menu": "npm:^3.10.5"
+    "@react-types/overlays": "npm:^3.9.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@spectrum-icons/workflow": "npm:^4.2.26"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6448,8 +6796,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/meter": "npm:^3.4.13"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6462,8 +6813,15 @@ __metadata:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
+    "@react-types/button": "npm:^3.14.1"
+    "@react-types/numberfield": "npm:^3.8.16"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@spectrum-icons/workflow": "npm:^4.2.26"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6475,8 +6833,13 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/overlays": "npm:^3.9.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
+    react-transition-group: "npm:^4.4.5"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6509,8 +6872,13 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/select": "npm:^3.12.0"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.1.4
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6522,8 +6890,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/progress": "npm:^3.5.16"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6535,6 +6906,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/provider": "npm:^3.8.13"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    clsx: "npm:^2.0.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6547,8 +6923,12 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/radio": "npm:^3.9.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6633,12 +7013,7 @@ __metadata:
     "@internationalized/date": "npm:^3.10.1"
     "@internationalized/number": "npm:^3.6.5"
     "@parcel/macros": "npm:^2.16.3"
-    "@react-aria/collections": "npm:^3.0.1"
-    "@react-aria/i18n": "npm:^3.12.14"
     "@react-aria/test-utils": "npm:^1.0.0-alpha.8"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/color": "npm:^3.9.3"
-    "@react-stately/toast": "npm:^3.1.2"
     "@react-types/dialog": "npm:^3.5.22"
     "@react-types/grid": "npm:^3.3.6"
     "@react-types/overlays": "npm:^3.9.2"
@@ -6668,8 +7043,13 @@ __metadata:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
+    "@react-types/searchfield": "npm:^3.6.6"
+    "@react-types/textfield": "npm:^3.12.6"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6681,8 +7061,12 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/slider": "npm:^3.8.2"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6694,8 +7078,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/statuslight": "npm:^3.3.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6707,8 +7094,12 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6739,8 +7130,12 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/switch": "npm:^3.5.15"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6754,8 +7149,14 @@ __metadata:
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-aria/dnd": "npm:^3.1.0"
     "@react-stately/dnd": "npm:^3.1.0"
+    "@react-types/grid": "npm:^3.3.6"
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/table": "npm:^3.13.4"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6767,8 +7168,13 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/select": "npm:^3.12.0"
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/tabs": "npm:^3.3.20"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6780,8 +7186,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6831,9 +7240,13 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/text": "npm:^3.3.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-aria-components: "npm:^1.14.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6845,9 +7258,14 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/textfield": "npm:^3.12.6"
+    "@spectrum-icons/ui": "npm:^3.6.21"
     "@spectrum-icons/workflow": "npm:^4.0.0"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6859,8 +7277,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/provider": "npm:^3.8.13"
+    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -6870,8 +7291,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/provider": "npm:^3.8.13"
+    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -6881,8 +7305,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/provider": "npm:^3.8.13"
+    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -6892,8 +7319,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/provider": "npm:^3.8.13"
+    "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -6904,9 +7334,14 @@ __metadata:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
     "@types/use-sync-external-store": "npm:^0.0.3"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
+    use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6918,8 +7353,14 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/overlays": "npm:^3.9.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/tooltip": "npm:^3.5.0"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-stately: "npm:^3.43.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6932,8 +7373,12 @@ __metadata:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-spectrum/style-macro-s1": "npm:3.0.0-alpha.5"
+    "@react-types/shared": "npm:^3.32.1"
+    "@spectrum-icons/ui": "npm:^3.6.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
+    react-aria-components: "npm:^1.14.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6950,6 +7395,10 @@ __metadata:
   resolution: "@react-spectrum/utils@workspace:packages/@react-spectrum/utils"
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
+    clsx: "npm:^2.0.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6962,8 +7411,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/view": "npm:^3.4.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6975,19 +7427,25 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum": "npm:^3.46.0"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/well": "npm:^3.3.21"
+    "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/autocomplete@npm:3.0.0-beta.4, @react-stately/autocomplete@workspace:packages/@react-stately/autocomplete":
+"@react-stately/autocomplete@workspace:packages/@react-stately/autocomplete":
   version: 0.0.0-use.local
   resolution: "@react-stately/autocomplete@workspace:packages/@react-stately/autocomplete"
   dependencies:
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -6995,9 +7453,14 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/calendar@workspace:packages/@react-stately/calendar"
   dependencies:
+    "@internationalized/date": "npm:^3.10.1"
+    "@react-types/calendar": "npm:^3.8.1"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7005,9 +7468,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/checkbox@workspace:packages/@react-stately/checkbox"
   dependencies:
+    "@react-types/checkbox": "npm:^3.10.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7015,19 +7482,28 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/collections@workspace:packages/@react-stately/collections"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/color@npm:^3.9.3, @react-stately/color@workspace:packages/@react-stately/color":
+"@react-stately/color@workspace:packages/@react-stately/color":
   version: 0.0.0-use.local
   resolution: "@react-stately/color@workspace:packages/@react-stately/color"
   dependencies:
+    "@internationalized/number": "npm:^3.6.5"
+    "@internationalized/string": "npm:^3.2.7"
+    "@react-types/color": "npm:^3.1.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7035,9 +7511,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/combobox@workspace:packages/@react-stately/combobox"
   dependencies:
+    "@react-types/combobox": "npm:^3.13.10"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7045,9 +7525,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/data@workspace:packages/@react-stately/data"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7055,9 +7538,15 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/datepicker@workspace:packages/@react-stately/datepicker"
   dependencies:
+    "@internationalized/date": "npm:^3.10.1"
+    "@internationalized/string": "npm:^3.2.7"
+    "@react-types/datepicker": "npm:^3.13.3"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7065,9 +7554,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/disclosure@workspace:packages/@react-stately/disclosure"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7075,9 +7567,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/dnd@workspace:packages/@react-stately/dnd"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7085,7 +7580,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/flags@workspace:packages/@react-stately/flags"
   dependencies:
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7093,9 +7592,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/form@workspace:packages/@react-stately/form"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7103,16 +7605,24 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/grid@workspace:packages/@react-stately/grid"
   dependencies:
+    "@react-types/grid": "npm:^3.3.6"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/layout@npm:^4.5.2, @react-stately/layout@workspace:packages/@react-stately/layout":
+"@react-stately/layout@workspace:packages/@react-stately/layout":
   version: 0.0.0-use.local
   resolution: "@react-stately/layout@workspace:packages/@react-stately/layout"
   dependencies:
+    "@react-types/grid": "npm:^3.3.6"
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/table": "npm:^3.13.4"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7124,9 +7634,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/list@workspace:packages/@react-stately/list"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7134,9 +7647,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/menu@workspace:packages/@react-stately/menu"
   dependencies:
+    "@react-types/menu": "npm:^3.10.5"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7144,9 +7661,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/numberfield@workspace:packages/@react-stately/numberfield"
   dependencies:
+    "@internationalized/number": "npm:^3.6.5"
+    "@react-types/numberfield": "npm:^3.8.16"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7154,9 +7675,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/overlays@workspace:packages/@react-stately/overlays"
   dependencies:
+    "@react-types/overlays": "npm:^3.9.2"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7164,9 +7688,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/radio@workspace:packages/@react-stately/radio"
   dependencies:
+    "@react-types/radio": "npm:^3.9.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7174,9 +7702,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/searchfield@workspace:packages/@react-stately/searchfield"
   dependencies:
+    "@react-types/searchfield": "npm:^3.6.6"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7184,19 +7715,26 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/select@workspace:packages/@react-stately/select"
   dependencies:
+    "@react-types/select": "npm:^3.12.0"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/selection@npm:^3.20.7, @react-stately/selection@workspace:packages/@react-stately/selection":
+"@react-stately/selection@workspace:packages/@react-stately/selection":
   version: 0.0.0-use.local
   resolution: "@react-stately/selection@workspace:packages/@react-stately/selection"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7204,9 +7742,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/slider@workspace:packages/@react-stately/slider"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/slider": "npm:^3.8.2"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7214,19 +7756,27 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/steplist@workspace:packages/@react-stately/steplist"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/table@npm:^3.15.2, @react-stately/table@workspace:packages/@react-stately/table":
+"@react-stately/table@workspace:packages/@react-stately/table":
   version: 0.0.0-use.local
   resolution: "@react-stately/table@workspace:packages/@react-stately/table"
   dependencies:
+    "@react-types/grid": "npm:^3.3.6"
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/table": "npm:^3.13.4"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7234,20 +7784,27 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/tabs@workspace:packages/@react-stately/tabs"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@react-types/tabs": "npm:^3.3.20"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/toast@npm:^3.1.2, @react-stately/toast@workspace:packages/@react-stately/toast":
+"@react-stately/toast@workspace:packages/@react-stately/toast":
   version: 0.0.0-use.local
   resolution: "@react-stately/toast@workspace:packages/@react-stately/toast"
   dependencies:
+    "@swc/helpers": "npm:^0.5.0"
     "@types/use-sync-external-store": "npm:^0.0.3"
     react-stately: "npm:^3.43.0"
+    use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7255,9 +7812,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/toggle@workspace:packages/@react-stately/toggle"
   dependencies:
+    "@react-types/checkbox": "npm:^3.10.2"
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7265,9 +7826,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/tooltip@workspace:packages/@react-stately/tooltip"
   dependencies:
+    "@react-types/tooltip": "npm:^3.5.0"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7275,19 +7839,24 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/tree@workspace:packages/@react-stately/tree"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/utils@npm:^3.11.0, @react-stately/utils@workspace:packages/@react-stately/utils":
+"@react-stately/utils@workspace:packages/@react-stately/utils":
   version: 0.0.0-use.local
   resolution: "@react-stately/utils@workspace:packages/@react-stately/utils"
   dependencies:
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7295,6 +7864,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-stately/virtualizer@workspace:packages/@react-stately/virtualizer"
   dependencies:
+    "@react-types/shared": "npm:^3.32.1"
+    "@swc/helpers": "npm:^0.5.0"
     react-stately: "npm:^3.43.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -7903,12 +8474,11 @@ __metadata:
   resolution: "@spectrum-icons/color@workspace:packages/@spectrum-icons/color"
   dependencies:
     "@adobe/react-spectrum-workflow-color": "npm:1.1.1"
-    "@react-spectrum/icon": "npm:^3.8.10"
     "@spectrum-icons/build-tools": "npm:3.0.0-alpha.1"
     "@swc/helpers": "npm:^0.5.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
+    "@adobe/react-spectrum": ^3.46.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -7919,11 +8489,10 @@ __metadata:
   resolution: "@spectrum-icons/express@workspace:packages/@spectrum-icons/express"
   dependencies:
     "@adobe/spectrum-css-ccx-workflow-icons": "npm:1.0.2"
-    "@react-spectrum/icon": "npm:^3.8.10"
     "@spectrum-icons/build-tools": "npm:3.0.0-alpha.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
+    "@adobe/react-spectrum": ^3.46.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -7933,12 +8502,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@spectrum-icons/illustrations@workspace:packages/@spectrum-icons/illustrations"
   dependencies:
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-spectrum/icon": "npm:^3.8.10"
     "@spectrum-icons/build-tools": "npm:3.0.0-alpha.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
+    "@adobe/react-spectrum": ^3.46.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -7950,12 +8517,11 @@ __metadata:
   dependencies:
     "@adobe/react-spectrum-ui": "npm:1.2.1"
     "@babel/runtime": "npm:^7.24.4"
-    "@react-spectrum/icon": "npm:^3.8.10"
     "@spectrum-icons/build-tools": "npm:3.0.0-alpha.1"
     "@swc/helpers": "npm:^0.5.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
+    "@adobe/react-spectrum": ^3.46.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -7966,12 +8532,11 @@ __metadata:
   resolution: "@spectrum-icons/workflow@workspace:packages/@spectrum-icons/workflow"
   dependencies:
     "@adobe/react-spectrum-workflow": "npm:2.3.5"
-    "@react-spectrum/icon": "npm:^3.8.10"
     "@spectrum-icons/build-tools": "npm:3.0.0-alpha.1"
     "@swc/helpers": "npm:^0.5.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
+    "@adobe/react-spectrum": ^3.46.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -23472,32 +24037,10 @@ __metadata:
   dependencies:
     "@internationalized/date": "npm:^3.10.1"
     "@internationalized/string": "npm:^3.2.7"
-    "@react-aria/collections": "npm:^3.0.1"
-    "@react-aria/dnd": "npm:^3.11.4"
-    "@react-aria/interactions": "npm:^3.26.0"
-    "@react-aria/overlays": "npm:^3.31.0"
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.32.0"
-    "@react-stately/autocomplete": "npm:3.0.0-beta.4"
-    "@react-stately/layout": "npm:^4.5.2"
-    "@react-stately/selection": "npm:^3.20.7"
-    "@react-stately/table": "npm:^3.15.2"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-stately/virtualizer": "npm:^4.4.4"
-    "@react-types/calendar": "npm:^3.8.1"
-    "@react-types/checkbox": "npm:^3.10.2"
-    "@react-types/color": "npm:^3.1.2"
-    "@react-types/datepicker": "npm:^3.13.3"
-    "@react-types/dialog": "npm:^3.5.22"
     "@react-types/form": "npm:^3.7.16"
     "@react-types/grid": "npm:^3.3.6"
-    "@react-types/listbox": "npm:^3.7.4"
-    "@react-types/menu": "npm:^3.10.5"
-    "@react-types/overlays": "npm:^3.9.2"
-    "@react-types/searchfield": "npm:^3.6.6"
     "@react-types/shared": "npm:^3.32.1"
     "@react-types/table": "npm:^3.13.4"
-    "@react-types/textfield": "npm:^3.12.6"
     "@swc/helpers": "npm:^0.5.0"
     "@tailwindcss/postcss": "npm:^4.0.0"
     client-only: "npm:^0.0.1"

From 601d1d7e2cbb4c341d4e4edbe0f685c7a76f3db3 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Mon, 9 Mar 2026 10:39:41 -0700
Subject: [PATCH 34/68] fix deps

---
 packages/@spectrum-icons/color/package.json        |  2 +-
 packages/@spectrum-icons/express/package.json      |  2 +-
 .../@spectrum-icons/illustrations/package.json     |  2 +-
 packages/@spectrum-icons/ui/package.json           |  2 +-
 packages/@spectrum-icons/workflow/package.json     |  2 +-
 packages/dev/docs/package.json                     |  2 +-
 yarn.lock                                          | 14 +++++++-------
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/@spectrum-icons/color/package.json b/packages/@spectrum-icons/color/package.json
index 80f6f707bd7..eca8405814f 100644
--- a/packages/@spectrum-icons/color/package.json
+++ b/packages/@spectrum-icons/color/package.json
@@ -30,7 +30,7 @@
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   },
   "peerDependencies": {
-    "@adobe/react-spectrum": "^3.46.0",
+    "@adobe/react-spectrum": "^3.46.2",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@spectrum-icons/express/package.json b/packages/@spectrum-icons/express/package.json
index 0567c246c92..db958f71c7e 100644
--- a/packages/@spectrum-icons/express/package.json
+++ b/packages/@spectrum-icons/express/package.json
@@ -29,7 +29,7 @@
     "@spectrum-icons/build-tools": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@adobe/react-spectrum": "^3.46.0",
+    "@adobe/react-spectrum": "^3.46.2",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@spectrum-icons/illustrations/package.json b/packages/@spectrum-icons/illustrations/package.json
index 74ebf3f70b9..eb5d05487e7 100644
--- a/packages/@spectrum-icons/illustrations/package.json
+++ b/packages/@spectrum-icons/illustrations/package.json
@@ -27,7 +27,7 @@
     "@spectrum-icons/build-tools": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@adobe/react-spectrum": "^3.46.0",
+    "@adobe/react-spectrum": "^3.46.2",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@spectrum-icons/ui/package.json b/packages/@spectrum-icons/ui/package.json
index 8c36fed7221..5090021301c 100644
--- a/packages/@spectrum-icons/ui/package.json
+++ b/packages/@spectrum-icons/ui/package.json
@@ -31,7 +31,7 @@
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   },
   "peerDependencies": {
-    "@adobe/react-spectrum": "^3.46.0",
+    "@adobe/react-spectrum": "^3.46.2",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@spectrum-icons/workflow/package.json b/packages/@spectrum-icons/workflow/package.json
index 417a6c6534f..a70d6de364c 100644
--- a/packages/@spectrum-icons/workflow/package.json
+++ b/packages/@spectrum-icons/workflow/package.json
@@ -30,7 +30,7 @@
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   },
   "peerDependencies": {
-    "@adobe/react-spectrum": "^3.46.0",
+    "@adobe/react-spectrum": "^3.46.2",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/dev/docs/package.json b/packages/dev/docs/package.json
index 1f36eb84d21..cc55a041475 100644
--- a/packages/dev/docs/package.json
+++ b/packages/dev/docs/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "source": "src/index.js",
   "dependencies": {
-    "@adobe/react-spectrum": "^3.46.0",
+    "@adobe/react-spectrum": "^3.46.2",
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
     "@mdx-js/react": "next",
     "@react-aria/aria-modal-polyfill": "^3.1.0",
diff --git a/yarn.lock b/yarn.lock
index 54ccda3a9fa..3c1663a6965 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -88,7 +88,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@adobe/react-spectrum@npm:^3.46.0, @adobe/react-spectrum@workspace:packages/@adobe/react-spectrum":
+"@adobe/react-spectrum@npm:^3.46.2, @adobe/react-spectrum@workspace:packages/@adobe/react-spectrum":
   version: 0.0.0-use.local
   resolution: "@adobe/react-spectrum@workspace:packages/@adobe/react-spectrum"
   dependencies:
@@ -6857,7 +6857,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/docs@workspace:packages/dev/docs"
   dependencies:
-    "@adobe/react-spectrum": "npm:^3.46.0"
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@mdx-js/react": "npm:next"
     "@react-aria/aria-modal-polyfill": "npm:^3.1.0"
@@ -9005,7 +9005,7 @@ __metadata:
     "@swc/helpers": "npm:^0.5.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
-    "@adobe/react-spectrum": ^3.46.0
+    "@adobe/react-spectrum": ^3.46.2
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -9019,7 +9019,7 @@ __metadata:
     "@spectrum-icons/build-tools": "npm:3.0.0-alpha.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@adobe/react-spectrum": ^3.46.0
+    "@adobe/react-spectrum": ^3.46.2
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -9032,7 +9032,7 @@ __metadata:
     "@spectrum-icons/build-tools": "npm:3.0.0-alpha.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@adobe/react-spectrum": ^3.46.0
+    "@adobe/react-spectrum": ^3.46.2
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -9048,7 +9048,7 @@ __metadata:
     "@swc/helpers": "npm:^0.5.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
-    "@adobe/react-spectrum": ^3.46.0
+    "@adobe/react-spectrum": ^3.46.2
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -9063,7 +9063,7 @@ __metadata:
     "@swc/helpers": "npm:^0.5.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
-    "@adobe/react-spectrum": ^3.46.0
+    "@adobe/react-spectrum": ^3.46.2
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown

From 35561f91e8469cdfdee062d2d3c7480d31bf3594 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Mon, 9 Mar 2026 11:14:25 -0700
Subject: [PATCH 35/68] rename themes

---
 packages/@react-spectrum/theme-dark/src/index.ts                | 2 +-
 .../@react-spectrum/theme-dark/src/{theme.ts => theme-dark.ts}  | 0
 packages/@react-spectrum/theme-default/src/index.ts             | 2 +-
 .../theme-default/src/{theme.ts => theme-default.ts}            | 0
 packages/@react-spectrum/theme-express/src/index.ts             | 2 +-
 .../theme-express/src/{theme.ts => theme-express.ts}            | 0
 packages/@react-spectrum/theme-light/src/index.ts               | 2 +-
 .../theme-light/src/{theme.ts => theme-light.ts}                | 0
 8 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/@react-spectrum/theme-dark/src/{theme.ts => theme-dark.ts} (100%)
 rename packages/@react-spectrum/theme-default/src/{theme.ts => theme-default.ts} (100%)
 rename packages/@react-spectrum/theme-express/src/{theme.ts => theme-express.ts} (100%)
 rename packages/@react-spectrum/theme-light/src/{theme.ts => theme-light.ts} (100%)

diff --git a/packages/@react-spectrum/theme-dark/src/index.ts b/packages/@react-spectrum/theme-dark/src/index.ts
index 8c298606749..6428a375c45 100644
--- a/packages/@react-spectrum/theme-dark/src/index.ts
+++ b/packages/@react-spectrum/theme-dark/src/index.ts
@@ -11,4 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-export {theme} from './theme';
+export {theme} from './theme-dark';
diff --git a/packages/@react-spectrum/theme-dark/src/theme.ts b/packages/@react-spectrum/theme-dark/src/theme-dark.ts
similarity index 100%
rename from packages/@react-spectrum/theme-dark/src/theme.ts
rename to packages/@react-spectrum/theme-dark/src/theme-dark.ts
diff --git a/packages/@react-spectrum/theme-default/src/index.ts b/packages/@react-spectrum/theme-default/src/index.ts
index 8c298606749..bd34382105b 100644
--- a/packages/@react-spectrum/theme-default/src/index.ts
+++ b/packages/@react-spectrum/theme-default/src/index.ts
@@ -11,4 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-export {theme} from './theme';
+export {theme} from './theme-default';
diff --git a/packages/@react-spectrum/theme-default/src/theme.ts b/packages/@react-spectrum/theme-default/src/theme-default.ts
similarity index 100%
rename from packages/@react-spectrum/theme-default/src/theme.ts
rename to packages/@react-spectrum/theme-default/src/theme-default.ts
diff --git a/packages/@react-spectrum/theme-express/src/index.ts b/packages/@react-spectrum/theme-express/src/index.ts
index 8c298606749..084025584d2 100644
--- a/packages/@react-spectrum/theme-express/src/index.ts
+++ b/packages/@react-spectrum/theme-express/src/index.ts
@@ -11,4 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-export {theme} from './theme';
+export {theme} from './theme-express';
diff --git a/packages/@react-spectrum/theme-express/src/theme.ts b/packages/@react-spectrum/theme-express/src/theme-express.ts
similarity index 100%
rename from packages/@react-spectrum/theme-express/src/theme.ts
rename to packages/@react-spectrum/theme-express/src/theme-express.ts
diff --git a/packages/@react-spectrum/theme-light/src/index.ts b/packages/@react-spectrum/theme-light/src/index.ts
index 8c298606749..4cd189fe0f1 100644
--- a/packages/@react-spectrum/theme-light/src/index.ts
+++ b/packages/@react-spectrum/theme-light/src/index.ts
@@ -11,4 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-export {theme} from './theme';
+export {theme} from './theme-light';
diff --git a/packages/@react-spectrum/theme-light/src/theme.ts b/packages/@react-spectrum/theme-light/src/theme-light.ts
similarity index 100%
rename from packages/@react-spectrum/theme-light/src/theme.ts
rename to packages/@react-spectrum/theme-light/src/theme-light.ts

From 8391d36dd08467a3dfb1c1385436e0896c88b956 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Mon, 9 Mar 2026 11:14:33 -0700
Subject: [PATCH 36/68] add additional public exports

---
 scripts/migrateDeps.mjs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index 0ea06006a72..1585157f6d1 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -83,6 +83,14 @@ standalone.add('ImageCoordinator');
 standalone.add('NotificationBadge');
 standalone.add('SkeletonCollection');
 
+standalone.add('useOverlayTrigger');
+standalone.add('useId');
+standalone.add('useToolbar');
+
+standalone.add('theme-default');
+standalone.add('theme-dark');
+standalone.add('theme-light');
+
 // these are questionable.
 standalone.add('ColorThumb');
 standalone.add('FieldError');
@@ -164,11 +172,11 @@ let parentFile = {
   'useSubmenuTriggerState': 'useMenuTriggerState',
   // 'types': '',
   'useTableColumnResizeState': 'useTableState',
-  // 'Layout': 'useVirtualizerState',
-  // 'LayoutInfo': 'useVirtualizerState',
-  // 'Point': 'useVirtualizerState',
-  // 'Rect': 'useVirtualizerState',
-  // 'Size': 'useVirtualizerState',
+  'Layout': 'Virtualizer',
+  'LayoutInfo': 'Virtualizer',
+  'Point': 'Virtualizer',
+  'Rect': 'Virtualizer',
+  'Size': 'Virtualizer',
   'DateSegmentType': 'useDateFieldState',
   'DragAndDrop': 'useDragAndDrop',
   parseColor: 'Color',

From fa10c1f3e4951a390a663561ef79a52f01573883 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Mon, 9 Mar 2026 11:20:11 -0700
Subject: [PATCH 37/68] fix

---
 .../theme-dark/src/{theme-dark.ts => darkTheme.ts}     |  2 +-
 packages/@react-spectrum/theme-dark/src/index.ts       |  2 +-
 .../src/{theme-default.ts => defaultTheme.ts}          |  2 +-
 packages/@react-spectrum/theme-default/src/index.ts    |  2 +-
 .../src/{theme-express.ts => expressTheme.ts}          |  2 +-
 packages/@react-spectrum/theme-express/src/index.ts    |  2 +-
 packages/@react-spectrum/theme-light/src/index.ts      |  2 +-
 .../theme-light/src/{theme-light.ts => lightTheme.ts}  |  2 +-
 scripts/migrateDeps.mjs                                | 10 ++++------
 9 files changed, 12 insertions(+), 14 deletions(-)
 rename packages/@react-spectrum/theme-dark/src/{theme-dark.ts => darkTheme.ts} (97%)
 rename packages/@react-spectrum/theme-default/src/{theme-default.ts => defaultTheme.ts} (96%)
 rename packages/@react-spectrum/theme-express/src/{theme-express.ts => expressTheme.ts} (96%)
 rename packages/@react-spectrum/theme-light/src/{theme-light.ts => lightTheme.ts} (97%)

diff --git a/packages/@react-spectrum/theme-dark/src/theme-dark.ts b/packages/@react-spectrum/theme-dark/src/darkTheme.ts
similarity index 97%
rename from packages/@react-spectrum/theme-dark/src/theme-dark.ts
rename to packages/@react-spectrum/theme-dark/src/darkTheme.ts
index 6013c41b012..e018aad4458 100644
--- a/packages/@react-spectrum/theme-dark/src/theme-dark.ts
+++ b/packages/@react-spectrum/theme-dark/src/darkTheme.ts
@@ -19,7 +19,7 @@ import large from '@adobe/spectrum-css-temp/vars/spectrum-large.css';
 import medium from '@adobe/spectrum-css-temp/vars/spectrum-medium.css';
 import {Theme} from '@react-types/provider';
 
-export let theme: Theme = {
+export let darkTheme: Theme = {
   global,
   light: dark,
   dark: darkest,
diff --git a/packages/@react-spectrum/theme-dark/src/index.ts b/packages/@react-spectrum/theme-dark/src/index.ts
index 6428a375c45..f9ff824d616 100644
--- a/packages/@react-spectrum/theme-dark/src/index.ts
+++ b/packages/@react-spectrum/theme-dark/src/index.ts
@@ -11,4 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-export {theme} from './theme-dark';
+export {darkTheme as theme} from './darkTheme';
diff --git a/packages/@react-spectrum/theme-default/src/theme-default.ts b/packages/@react-spectrum/theme-default/src/defaultTheme.ts
similarity index 96%
rename from packages/@react-spectrum/theme-default/src/theme-default.ts
rename to packages/@react-spectrum/theme-default/src/defaultTheme.ts
index 39ce13f51ff..906e005a524 100644
--- a/packages/@react-spectrum/theme-default/src/theme-default.ts
+++ b/packages/@react-spectrum/theme-default/src/defaultTheme.ts
@@ -19,7 +19,7 @@ import light from '@adobe/spectrum-css-temp/vars/spectrum-light.css';
 import medium from '@adobe/spectrum-css-temp/vars/spectrum-medium.css';
 import {Theme} from '@react-types/provider';
 
-export let theme: Theme = {
+export let defaultTheme: Theme = {
   global,
   light,
   dark: darkest,
diff --git a/packages/@react-spectrum/theme-default/src/index.ts b/packages/@react-spectrum/theme-default/src/index.ts
index bd34382105b..9e157aefa20 100644
--- a/packages/@react-spectrum/theme-default/src/index.ts
+++ b/packages/@react-spectrum/theme-default/src/index.ts
@@ -11,4 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-export {theme} from './theme-default';
+export {defaultTheme as theme} from './defaultTheme';
diff --git a/packages/@react-spectrum/theme-express/src/theme-express.ts b/packages/@react-spectrum/theme-express/src/expressTheme.ts
similarity index 96%
rename from packages/@react-spectrum/theme-express/src/theme-express.ts
rename to packages/@react-spectrum/theme-express/src/expressTheme.ts
index 4c73b931185..95082fea4eb 100644
--- a/packages/@react-spectrum/theme-express/src/theme-express.ts
+++ b/packages/@react-spectrum/theme-express/src/expressTheme.ts
@@ -16,7 +16,7 @@ import {theme as defaultTheme} from '@react-spectrum/theme-default';
 import express from '@adobe/spectrum-css-temp/vars/express.css';
 import {Theme} from '@react-types/provider';
 
-export let theme: Theme = {
+export let expressTheme: Theme = {
   ...defaultTheme,
   global: {
     ...defaultTheme.global,
diff --git a/packages/@react-spectrum/theme-express/src/index.ts b/packages/@react-spectrum/theme-express/src/index.ts
index 084025584d2..02916d6214c 100644
--- a/packages/@react-spectrum/theme-express/src/index.ts
+++ b/packages/@react-spectrum/theme-express/src/index.ts
@@ -11,4 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-export {theme} from './theme-express';
+export {expressTheme as theme} from './expressTheme';
diff --git a/packages/@react-spectrum/theme-light/src/index.ts b/packages/@react-spectrum/theme-light/src/index.ts
index 4cd189fe0f1..cef7fefd6f4 100644
--- a/packages/@react-spectrum/theme-light/src/index.ts
+++ b/packages/@react-spectrum/theme-light/src/index.ts
@@ -11,4 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-export {theme} from './theme-light';
+export {lightTheme as theme} from './lightTheme';
diff --git a/packages/@react-spectrum/theme-light/src/theme-light.ts b/packages/@react-spectrum/theme-light/src/lightTheme.ts
similarity index 97%
rename from packages/@react-spectrum/theme-light/src/theme-light.ts
rename to packages/@react-spectrum/theme-light/src/lightTheme.ts
index e745342da6c..035f35575b2 100644
--- a/packages/@react-spectrum/theme-light/src/theme-light.ts
+++ b/packages/@react-spectrum/theme-light/src/lightTheme.ts
@@ -19,7 +19,7 @@ import lightest from '@adobe/spectrum-css-temp/vars/spectrum-lightest.css';
 import medium from '@adobe/spectrum-css-temp/vars/spectrum-medium.css';
 import {Theme} from '@react-types/provider';
 
-export let theme: Theme = {
+export let lightTheme: Theme = {
   global,
   light: lightest,
   dark: darkest,
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index 1585157f6d1..81a98d4e828 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -86,10 +86,11 @@ standalone.add('SkeletonCollection');
 standalone.add('useOverlayTrigger');
 standalone.add('useId');
 standalone.add('useToolbar');
+standalone.add('Virtualizer');
 
-standalone.add('theme-default');
-standalone.add('theme-dark');
-standalone.add('theme-light');
+standalone.add('defaultTheme');
+standalone.add('darkTheme');
+standalone.add('lightTheme');
 
 // these are questionable.
 standalone.add('ColorThumb');
@@ -101,9 +102,6 @@ standalone.add('OverlayArrow');
 standalone.add('SelectionIndicator');
 standalone.add('SharedElementTransition');
 standalone.add('pressScale');
-standalone.add('theme-default');
-standalone.add('theme-light');
-standalone.add('theme-dark');
 
 // Documented but not in the monopackage.
 standalone.delete('useAutocomplete');

From 079a3a4d579c54ad8d740f1b9cf356f10a9d10b6 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Mon, 9 Mar 2026 12:15:31 -0700
Subject: [PATCH 38/68] fix

---
 packages/react-aria-components/src/Heading.tsx |  4 ++--
 scripts/migrateDeps.mjs                        | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/react-aria-components/src/Heading.tsx b/packages/react-aria-components/src/Heading.tsx
index d37fa244e3d..52c20fb91db 100644
--- a/packages/react-aria-components/src/Heading.tsx
+++ b/packages/react-aria-components/src/Heading.tsx
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {dom, ContextValue, DOMRenderProps, useContextProps} from './utils';
-import React, {ForwardedRef, forwardRef, HTMLAttributes} from 'react';
+import {ContextValue, dom, DOMRenderProps, useContextProps} from './utils';
+import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes} from 'react';
 
 export interface HeadingProps extends HTMLAttributes<HTMLElement>, DOMRenderProps<'h1', undefined> {
   level?: number
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index 81a98d4e828..ee9750464b1 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -737,7 +737,7 @@ function getRenamedSpecifier(specifier, from, importedName, relative = true) {
 
   let isPrivate = importedName == null || privateNames.has(importedName);
   if (
-    (monopackage === 'react-aria' && name === 'Virtualizer') ||
+    ((monopackage === 'react-aria' || monopackage === 'react-stately') && (name === 'Virtualizer' || parentFile[name] === 'Virtualizer')) ||
     (monopackage === '@adobe/react-spectrum' && (name === 'CardView' || name === 'Card' || name === 'Overlay' || name === 'Popover' || name === 'Modal' || name === 'StepList' || name === 'SearchAutocomplete' || name === 'Label'))
   ) {
     isPrivate = true;
@@ -797,7 +797,13 @@ function createPublicExports(file, monopackage, scope, pkg) {
         unmatched.push(n);
       }
 
-      node.specifiers = node.specifiers.filter(s => importMap[monopackage][s.exported.name]);
+      node.specifiers = node.specifiers.filter(s => {
+        if (s.exported.name === 'theme') {
+          s.exported = s.local;
+          return true;
+        }
+        return importMap[monopackage][s.exported.name];
+      });
       if (node.source.value.startsWith('./') && node.specifiers.length > 0) {
         let source = node.source.value.slice(2);
         node.source.value = pkg ? `../src/${pkg}/${source}` : `../src/${source}`;
@@ -814,11 +820,12 @@ function createPublicExports(file, monopackage, scope, pkg) {
 
   for (let source in groups) {
     groups[source][0].comments = ast.program.body[0].leadingComments;
+    let f = `packages/${monopackage}/exports/${path.basename(source)}.ts`;
     let content = recast.print({
       type: 'Program',
       body: groups[source]
     }, {objectCurlySpacing: false, quote: 'single'}).code;
-    fs.writeFileSync(`packages/${monopackage}/exports/${path.basename(source)}.ts`, content);
+    fs.writeFileSync(f, content);
   }
 
   if (scope) {

From 4f6b618d878a79a2c281a67dd860138ba99e2211 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Mon, 9 Mar 2026 12:56:41 -0700
Subject: [PATCH 39/68] fix

---
 .../datepicker/src/IncompleteDate.ts               | 14 +++++++-------
 packages/react-aria/.gitignore                     |  2 +-
 scripts/migrateDeps.mjs                            | 12 ++++++++++++
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/packages/@react-stately/datepicker/src/IncompleteDate.ts b/packages/@react-stately/datepicker/src/IncompleteDate.ts
index 35fd7bbd6a9..79253ee3080 100644
--- a/packages/@react-stately/datepicker/src/IncompleteDate.ts
+++ b/packages/@react-stately/datepicker/src/IncompleteDate.ts
@@ -11,8 +11,8 @@
  */
 
 import {AnyDateTime, Calendar, CalendarDate, ZonedDateTime} from '@internationalized/date';
+import {DateSegmentType} from './useDateFieldState';
 import {DateValue} from '@react-types/datepicker';
-import {SegmentType} from './useDateFieldState';
 
 type HourCycle = 'h12' | 'h11' | 'h23' | 'h24';
 
@@ -74,12 +74,12 @@ export class IncompleteDate {
   }
 
   /** Checks whether all the specified segments have a value. */
-  isComplete(segments: SegmentType[]) {
+  isComplete(segments: DateSegmentType[]) {
     return segments.every(segment => this[segment] != null);
   }
 
   /** Checks whether the given date value matches this value for the specified segments. */
-  validate(dt: DateValue, segments: SegmentType[]) {
+  validate(dt: DateValue, segments: DateSegmentType[]) {
     return segments.every(segment => {
       if ((segment === 'hour' || segment === 'dayPeriod') && 'hour' in dt) {
         let [dayPeriod, hour] = toHourCycle(dt.hour, this.hourCycle);
@@ -90,12 +90,12 @@ export class IncompleteDate {
   }
 
   /** Checks if the date is empty (i.e. all specified segments are null). */
-  isCleared(segments: SegmentType[]): boolean {
+  isCleared(segments: DateSegmentType[]): boolean {
     return segments.every(segment => this[segment] === null);
   }
 
   /** Sets the given field. */
-  set(field: SegmentType, value: number | string, placeholder: DateValue): IncompleteDate {
+  set(field: DateSegmentType, value: number | string, placeholder: DateValue): IncompleteDate {
     let result = this.copy();
     result[field] = value;
     if (field === 'hour' && result.dayPeriod == null && 'hour' in placeholder) {
@@ -113,7 +113,7 @@ export class IncompleteDate {
   }
 
   /** Sets the given field to null. */
-  clear(field: SegmentType): IncompleteDate {
+  clear(field: DateSegmentType): IncompleteDate {
     let result = this.copy();
     // @ts-ignore
     result[field] = null;
@@ -127,7 +127,7 @@ export class IncompleteDate {
   }
 
   /** Increments or decrements the given field. If it is null, then it is set to the placeholder value. */
-  cycle(field: SegmentType, amount: number, placeholder: DateValue, displaySegments: SegmentType[]): IncompleteDate {
+  cycle(field: DateSegmentType, amount: number, placeholder: DateValue, displaySegments: DateSegmentType[]): IncompleteDate {
     let res = this.copy();
 
     // If field is null, default to placeholder.
diff --git a/packages/react-aria/.gitignore b/packages/react-aria/.gitignore
index 5669308ee0f..58d7e6e5ccb 100644
--- a/packages/react-aria/.gitignore
+++ b/packages/react-aria/.gitignore
@@ -1 +1 @@
-i18n
+/i18n
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index ee9750464b1..68fbcf8062a 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -735,6 +735,18 @@ function getRenamedSpecifier(specifier, from, importedName, relative = true) {
     return `${monopackage}/${name}`;
   }
 
+  if (specifier === '@react-spectrum/theme-default') {
+    return '@adobe/react-spectrum/defaultTheme';
+  }
+
+  if (specifier === '@react-spectrum/theme-dark') {
+    return '@adobe/react-spectrum/darkTheme';
+  }
+
+  if (specifier === '@react-spectrum/theme-light') {
+    return '@adobe/react-spectrum/lightTheme';
+  }
+
   let isPrivate = importedName == null || privateNames.has(importedName);
   if (
     ((monopackage === 'react-aria' || monopackage === 'react-stately') && (name === 'Virtualizer' || parentFile[name] === 'Virtualizer')) ||

From b342060398a7aea24baefb36d742ab2187d216b7 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Mon, 9 Mar 2026 15:58:52 -0700
Subject: [PATCH 40/68] fix TableView

---
 .../@react-spectrum/table/src/TableView.tsx   | 134 ++++++++++++++----
 .../table/src/TableViewBase.tsx               |   2 +-
 .../table/src/TableViewWithoutExpanding.tsx   |  44 ++++++
 .../table/src/TableViewWrapper.tsx            | 108 --------------
 .../table/src/TreeGridTableView.tsx           |   2 +-
 packages/@react-spectrum/table/src/index.ts   |   8 +-
 scripts/migrateDeps.mjs                       |  52 +++++--
 7 files changed, 198 insertions(+), 152 deletions(-)
 create mode 100644 packages/@react-spectrum/table/src/TableViewWithoutExpanding.tsx
 delete mode 100644 packages/@react-spectrum/table/src/TableViewWrapper.tsx

diff --git a/packages/@react-spectrum/table/src/TableView.tsx b/packages/@react-spectrum/table/src/TableView.tsx
index 967f88eb104..7bf912f9eee 100644
--- a/packages/@react-spectrum/table/src/TableView.tsx
+++ b/packages/@react-spectrum/table/src/TableView.tsx
@@ -10,35 +10,113 @@
  * governing permissions and limitations under the License.
  */
 
-import {DOMRef} from '@react-types/shared';
-import React, {ReactElement, useState} from 'react';
-import {SpectrumTableProps} from './TableViewWrapper';
-import {TableViewBase} from './TableViewBase';
-import {useTableState} from '@react-stately/table';
+import type {AriaLabelingProps, DisabledBehavior, DOMProps, DOMRef, Key, SpectrumSelectionProps, StyleProps} from '@react-types/shared';
+import {
+  Cell,
+  Column,
+  Row,
+  Section,
+  TableBody,
+  TableHeader
+} from '@react-stately/table';
+import type {ColumnSize, SpectrumColumnProps, TableProps} from '@react-types/table';
+import type {DragAndDropHooks} from '@react-spectrum/dnd';
+import React, {JSX, ReactElement} from 'react';
+import {tableNestedRows} from '@react-stately/flags';
+import {TableViewWithoutExpanding} from './TableViewWithoutExpanding';
+import {TreeGridTableView} from './TreeGridTableView';
 
-interface TableProps<T> extends Omit<SpectrumTableProps<T>, 'UNSTABLE_allowsExpandableRows'> {}
+export interface SpectrumTableProps<T> extends TableProps<T>, SpectrumSelectionProps, DOMProps, AriaLabelingProps, StyleProps {
+  /**
+   * Sets the amount of vertical padding within each cell.
+   * @default 'regular'
+   */
+  density?: 'compact' | 'regular' | 'spacious',
+  /**
+   * Sets the overflow behavior for the cell contents.
+   * @default 'truncate'
+   */
+  overflowMode?: 'wrap' | 'truncate',
+  /** Whether the TableView should be displayed with a quiet style. */
+  isQuiet?: boolean,
+  /** Sets what the TableView should render when there is no content to display. */
+  renderEmptyState?: () => JSX.Element,
+  /**
+   * Whether `disabledKeys` applies to all interactions, or only selection.
+   * @default "selection"
+   */
+  disabledBehavior?: DisabledBehavior,
+  /** Handler that is called when a user performs an action on a row. */
+  onAction?: (key: Key) => void,
+  /**
+   * Handler that is called when a user starts a column resize.
+   */
+  onResizeStart?: (widths: Map<Key, ColumnSize>) => void,
+  /**
+   * Handler that is called when a user performs a column resize.
+   * Can be used with the width property on columns to put the column widths into
+   * a controlled state.
+   */
+  onResize?: (widths: Map<Key, ColumnSize>) => void,
+  /**
+   * Handler that is called after a user performs a column resize.
+   * Can be used to store the widths of columns for another future session.
+   */
+  onResizeEnd?: (widths: Map<Key, ColumnSize>) => void,
+  /**
+   * The drag and drop hooks returned by `useDragAndDrop` used to enable drag and drop behavior for the TableView.
+   * @version beta
+   */
+  dragAndDropHooks?: DragAndDropHooks<NoInfer<T>>['dragAndDropHooks'],
+  /**
+   * Whether the TableView should support expandable rows. Requires the feature flag to be enabled first, see https://react-spectrum.adobe.com/react-spectrum/TableView.html#expandable-rows.
+   * @version alpha
+   * @private
+   */
+  UNSTABLE_allowsExpandableRows?: boolean,
+  /**
+   * The currently expanded keys in the collection (controlled). Requires the feature flag to be
+   * enabled along with UNSTABLE_allowsExpandableRows, see https://react-spectrum.adobe.com/react-spectrum/TableView.html#expandable-rows.
+   * @version alpha
+   * @private
+   */
+  UNSTABLE_expandedKeys?: 'all' | Iterable<Key>,
+  /**
+   * The initial expanded keys in the collection (uncontrolled). Requires the feature flag to be
+   * enabled along with UNSTABLE_allowsExpandableRows, see https://react-spectrum.adobe.com/react-spectrum/TableView.html#expandable-rows.
+   * @version alpha
+   * @private
+   */
+  UNSTABLE_defaultExpandedKeys?: 'all' | Iterable<Key>,
+  /**
+   * Handler that is called when items are expanded or collapsed. Requires the feature flag to be
+   * enabled along with UNSTABLE_allowsExpandableRows, see https://react-spectrum.adobe.com/react-spectrum/TableView.html#expandable-rows.
+   * @version alpha
+   * @private
+   */
+  UNSTABLE_onExpandedChange?: (keys: Set<Key>) => any
+}
 
-export const TableView = React.forwardRef(function TableView<T extends object>(props: TableProps<T>, ref: DOMRef<HTMLDivElement>) {
-  let {
-    selectionStyle,
-    dragAndDropHooks
-  } = props;
-  let [showSelectionCheckboxes, setShowSelectionCheckboxes] = useState(selectionStyle !== 'highlight');
-  let isTableDraggable = !!dragAndDropHooks?.useDraggableCollectionState;
-  let state = useTableState({
-    ...props,
-    showSelectionCheckboxes,
-    showDragButtons: isTableDraggable,
-    selectionBehavior: props.selectionStyle === 'highlight' ? 'replace' : 'toggle'
-  });
-
-  // If the selection behavior changes in state, we need to update showSelectionCheckboxes here due to the circular dependency...
-  let shouldShowCheckboxes = state.selectionManager.selectionBehavior !== 'replace';
-  if (shouldShowCheckboxes !== showSelectionCheckboxes) {
-    setShowSelectionCheckboxes(shouldShowCheckboxes);
+/**
+ * Tables are containers for displaying information. They allow users to quickly scan, sort, compare, and take action on large amounts of data.
+ */
+const TableView = React.forwardRef(function TableView<T extends object>(props: SpectrumTableProps<T>, ref: DOMRef<HTMLDivElement>) {
+  let {UNSTABLE_allowsExpandableRows, ...otherProps} = props;
+  if (tableNestedRows() && UNSTABLE_allowsExpandableRows) {
+    return <TreeGridTableView {...otherProps} ref={ref} />;
+  } else {
+    return <TableViewWithoutExpanding {...otherProps} ref={ref} />;
   }
+}) as <T>(props: SpectrumTableProps<T> & {ref?: DOMRef<HTMLDivElement>}) => ReactElement;
+export {TableView};
 
-  return (
-    <TableViewBase {...props} state={state} ref={ref} />
-  );
-}) as <T>(props: TableProps<T> & {ref?: DOMRef<HTMLDivElement>}) => ReactElement;
+// Override TS for Column to support spectrum specific props.
+const SpectrumColumn = Column as <T>(props: SpectrumColumnProps<T>) => JSX.Element;
+export {SpectrumColumn as Column};
+export {
+  Cell,
+  Row,
+  Section,
+  TableBody,
+  TableHeader
+};
diff --git a/packages/@react-spectrum/table/src/TableViewBase.tsx b/packages/@react-spectrum/table/src/TableViewBase.tsx
index 371e288f4aa..c02232a128e 100644
--- a/packages/@react-spectrum/table/src/TableViewBase.tsx
+++ b/packages/@react-spectrum/table/src/TableViewBase.tsx
@@ -45,7 +45,7 @@ import React, {DOMAttributes, HTMLAttributes, ReactElement, ReactNode, useCallba
 import {Resizer, ResizeStateContext} from './Resizer';
 import {RootDropIndicator} from './RootDropIndicator';
 import {DragPreview as SpectrumDragPreview} from './DragPreview';
-import {SpectrumTableProps} from './TableViewWrapper';
+import {SpectrumTableProps} from './TableView';
 import styles from '@adobe/spectrum-css-temp/components/table/vars.css';
 import stylesOverrides from './table.css';
 import {TableState, TreeGridState, useTableColumnResizeState} from '@react-stately/table';
diff --git a/packages/@react-spectrum/table/src/TableViewWithoutExpanding.tsx b/packages/@react-spectrum/table/src/TableViewWithoutExpanding.tsx
new file mode 100644
index 00000000000..a6b003d3249
--- /dev/null
+++ b/packages/@react-spectrum/table/src/TableViewWithoutExpanding.tsx
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2023 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+import {DOMRef} from '@react-types/shared';
+import React, {ReactElement, useState} from 'react';
+import {SpectrumTableProps} from './TableView';
+import {TableViewBase} from './TableViewBase';
+import {useTableState} from '@react-stately/table';
+
+interface TableProps<T> extends Omit<SpectrumTableProps<T>, 'UNSTABLE_allowsExpandableRows'> {}
+
+export const TableViewWithoutExpanding = React.forwardRef(function TableView<T extends object>(props: TableProps<T>, ref: DOMRef<HTMLDivElement>) {
+  let {
+    selectionStyle,
+    dragAndDropHooks
+  } = props;
+  let [showSelectionCheckboxes, setShowSelectionCheckboxes] = useState(selectionStyle !== 'highlight');
+  let isTableDraggable = !!dragAndDropHooks?.useDraggableCollectionState;
+  let state = useTableState({
+    ...props,
+    showSelectionCheckboxes,
+    showDragButtons: isTableDraggable,
+    selectionBehavior: props.selectionStyle === 'highlight' ? 'replace' : 'toggle'
+  });
+
+  // If the selection behavior changes in state, we need to update showSelectionCheckboxes here due to the circular dependency...
+  let shouldShowCheckboxes = state.selectionManager.selectionBehavior !== 'replace';
+  if (shouldShowCheckboxes !== showSelectionCheckboxes) {
+    setShowSelectionCheckboxes(shouldShowCheckboxes);
+  }
+
+  return (
+    <TableViewBase {...props} state={state} ref={ref} />
+  );
+}) as <T>(props: TableProps<T> & {ref?: DOMRef<HTMLDivElement>}) => ReactElement;
diff --git a/packages/@react-spectrum/table/src/TableViewWrapper.tsx b/packages/@react-spectrum/table/src/TableViewWrapper.tsx
deleted file mode 100644
index 431fbbadf51..00000000000
--- a/packages/@react-spectrum/table/src/TableViewWrapper.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2023 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-import type {AriaLabelingProps, DisabledBehavior, DOMProps, DOMRef, Key, SpectrumSelectionProps, StyleProps} from '@react-types/shared';
-import {Column} from '@react-stately/table';
-import type {ColumnSize, SpectrumColumnProps, TableProps} from '@react-types/table';
-import type {DragAndDropHooks} from '@react-spectrum/dnd';
-import React, {JSX, ReactElement} from 'react';
-import {tableNestedRows} from '@react-stately/flags';
-import {TableView} from './TableView';
-import {TreeGridTableView} from './TreeGridTableView';
-
-export interface SpectrumTableProps<T> extends TableProps<T>, SpectrumSelectionProps, DOMProps, AriaLabelingProps, StyleProps {
-  /**
-   * Sets the amount of vertical padding within each cell.
-   * @default 'regular'
-   */
-  density?: 'compact' | 'regular' | 'spacious',
-  /**
-   * Sets the overflow behavior for the cell contents.
-   * @default 'truncate'
-   */
-  overflowMode?: 'wrap' | 'truncate',
-  /** Whether the TableView should be displayed with a quiet style. */
-  isQuiet?: boolean,
-  /** Sets what the TableView should render when there is no content to display. */
-  renderEmptyState?: () => JSX.Element,
-  /**
-   * Whether `disabledKeys` applies to all interactions, or only selection.
-   * @default "selection"
-   */
-  disabledBehavior?: DisabledBehavior,
-  /** Handler that is called when a user performs an action on a row. */
-  onAction?: (key: Key) => void,
-  /**
-   * Handler that is called when a user starts a column resize.
-   */
-  onResizeStart?: (widths: Map<Key, ColumnSize>) => void,
-  /**
-   * Handler that is called when a user performs a column resize.
-   * Can be used with the width property on columns to put the column widths into
-   * a controlled state.
-   */
-  onResize?: (widths: Map<Key, ColumnSize>) => void,
-  /**
-   * Handler that is called after a user performs a column resize.
-   * Can be used to store the widths of columns for another future session.
-   */
-  onResizeEnd?: (widths: Map<Key, ColumnSize>) => void,
-  /**
-   * The drag and drop hooks returned by `useDragAndDrop` used to enable drag and drop behavior for the TableView.
-   * @version beta
-   */
-  dragAndDropHooks?: DragAndDropHooks<NoInfer<T>>['dragAndDropHooks'],
-  /**
-   * Whether the TableView should support expandable rows. Requires the feature flag to be enabled first, see https://react-spectrum.adobe.com/react-spectrum/TableView.html#expandable-rows.
-   * @version alpha
-   * @private
-   */
-  UNSTABLE_allowsExpandableRows?: boolean,
-  /**
-   * The currently expanded keys in the collection (controlled). Requires the feature flag to be
-   * enabled along with UNSTABLE_allowsExpandableRows, see https://react-spectrum.adobe.com/react-spectrum/TableView.html#expandable-rows.
-   * @version alpha
-   * @private
-   */
-  UNSTABLE_expandedKeys?: 'all' | Iterable<Key>,
-  /**
-   * The initial expanded keys in the collection (uncontrolled). Requires the feature flag to be
-   * enabled along with UNSTABLE_allowsExpandableRows, see https://react-spectrum.adobe.com/react-spectrum/TableView.html#expandable-rows.
-   * @version alpha
-   * @private
-   */
-  UNSTABLE_defaultExpandedKeys?: 'all' | Iterable<Key>,
-  /**
-   * Handler that is called when items are expanded or collapsed. Requires the feature flag to be
-   * enabled along with UNSTABLE_allowsExpandableRows, see https://react-spectrum.adobe.com/react-spectrum/TableView.html#expandable-rows.
-   * @version alpha
-   * @private
-   */
-  UNSTABLE_onExpandedChange?: (keys: Set<Key>) => any
-}
-
-/**
- * Tables are containers for displaying information. They allow users to quickly scan, sort, compare, and take action on large amounts of data.
- */
-const TableViewWrapper = React.forwardRef(function TableViewWrapper<T extends object>(props: SpectrumTableProps<T>, ref: DOMRef<HTMLDivElement>) {
-  let {UNSTABLE_allowsExpandableRows, ...otherProps} = props;
-  if (tableNestedRows() && UNSTABLE_allowsExpandableRows) {
-    return <TreeGridTableView {...otherProps} ref={ref} />;
-  } else {
-    return <TableView {...otherProps} ref={ref} />;
-  }
-}) as <T>(props: SpectrumTableProps<T> & {ref?: DOMRef<HTMLDivElement>}) => ReactElement;
-export {TableViewWrapper as TableView};
-
-// Override TS for Column to support spectrum specific props.
-const SpectrumColumn = Column as <T>(props: SpectrumColumnProps<T>) => JSX.Element;
-export {SpectrumColumn as Column};
diff --git a/packages/@react-spectrum/table/src/TreeGridTableView.tsx b/packages/@react-spectrum/table/src/TreeGridTableView.tsx
index c3a4b466a9d..629496b5bdc 100644
--- a/packages/@react-spectrum/table/src/TreeGridTableView.tsx
+++ b/packages/@react-spectrum/table/src/TreeGridTableView.tsx
@@ -12,7 +12,7 @@
 
 import {DOMRef} from '@react-types/shared';
 import React, {ReactElement, useState} from 'react';
-import {SpectrumTableProps} from './TableViewWrapper';
+import {SpectrumTableProps} from './TableView';
 import {TableViewBase} from './TableViewBase';
 import {UNSTABLE_useTreeGridState} from '@react-stately/table';
 
diff --git a/packages/@react-spectrum/table/src/index.ts b/packages/@react-spectrum/table/src/index.ts
index 07f96704ebb..81e411f8b65 100644
--- a/packages/@react-spectrum/table/src/index.ts
+++ b/packages/@react-spectrum/table/src/index.ts
@@ -12,15 +12,15 @@
 
 /// <reference types="css-module-types" />
 
-export {TableView, Column} from './TableViewWrapper';
-
 export {
+  TableView,
   TableHeader,
   TableBody,
+  Column,
   Section,
   Row,
   Cell
-} from '@react-stately/table';
+} from './TableView';
 
 export type {SpectrumColumnProps, TableHeaderProps, TableBodyProps, RowProps, CellProps} from '@react-types/table';
-export type {SpectrumTableProps} from './TableViewWrapper';
+export type {SpectrumTableProps} from './TableView';
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index 68fbcf8062a..753aa707779 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -178,7 +178,10 @@ let parentFile = {
   'DateSegmentType': 'useDateFieldState',
   'DragAndDrop': 'useDragAndDrop',
   parseColor: 'Color',
-  useLocale: 'I18nProvider'
+  useLocale: 'I18nProvider',
+  ColorEditor: 'ColorPicker',
+  SubmenuTrigger: 'Menu',
+  ContextualHelpTrigger: 'Menu'
 };
 
 // Names that are included in public files but not exported by monopackages.
@@ -649,14 +652,36 @@ function getImportStatements(node, file, relative = true) {
   let groups = {};
   for (let specifier of node.specifiers) {
     let importedName = specifier.type === 'ImportSpecifier' ? specifier.imported.name : specifier.local.name;
-    if (!importedName || !importMap[source][importedName]) {
+    if (!importedName) {
       continue;
     }
+    let local = node.type === 'ImportDeclaration' ? specifier.local : specifier.exported;
     let importSource = source;
-    let [src, imported] = importMap[source][importedName];
-    while (importMap[src] && importMap[src][imported]) {
-      importSource = src;
-      [src, imported] = importMap[src][imported];
+    let src, imported;
+    if (source === '@react-spectrum/theme-default') {
+      src = '@adobe/react-spectrum/defaultTheme';
+      imported = 'defaultTheme';
+      local = file.includes('@react-spectrum') ? t.identifier('theme') : local;
+    } else if (source === '@react-spectrum/theme-dark') {
+      src = '@adobe/react-spectrum/darkTheme';
+      imported = 'darkTheme';
+      local = file.includes('@react-spectrum') ? t.identifier('theme') : local;
+    } else if (source === '@react-spectrum/theme-light') {
+      src = '@adobe/react-spectrum/lightTheme';
+      imported = 'lightTheme';
+      local = file.includes('@react-spectrum') ? t.identifier('theme') : local;
+    } else if (source === '@react-spectrum/theme-express') {
+      src = '@adobe/react-spectrum/private/theme-express/expressTheme';
+      imported = 'expressTheme';
+      local = file.includes('@react-spectrum') ? t.identifier('theme') : local;
+    } else if (!importMap[source][importedName]) {
+      continue;
+    } else {
+      [src, imported] = importMap[source][importedName];
+      while (importMap[src] && importMap[src][imported]) {
+        importSource = src;
+        [src, imported] = importMap[src][imported];
+      }
     }
 
     if (src.startsWith('./')) {
@@ -665,9 +690,9 @@ function getImportStatements(node, file, relative = true) {
     }
     groups[src] ||= [];
     if (node.type === 'ImportDeclaration') {
-      groups[src].push(t.importSpecifier(specifier.local, t.identifier(imported)));
+      groups[src].push(t.importSpecifier(local, t.identifier(imported)));
     } else if (node.type === 'ExportNamedDeclaration') {
-      groups[src].push(t.exportSpecifier(t.identifier(imported), specifier.exported));
+      groups[src].push(t.exportSpecifier(t.identifier(imported), local));
     }
   }
   
@@ -760,6 +785,8 @@ function getRenamedSpecifier(specifier, from, importedName, relative = true) {
     subpath = name;
   } else if (parentFile[name] && !isPrivate) {
     subpath = parentFile[name];
+  } else if (name === 'Column' && monopackage === '@adobe/react-spectrum') {
+    subpath = 'TableView';
   } else if (pkg === monopackage) {
     subpath = `private/${name}`;
   } else {
@@ -831,11 +858,16 @@ function createPublicExports(file, monopackage, scope, pkg) {
   }
 
   for (let source in groups) {
-    groups[source][0].comments = ast.program.body[0].leadingComments;
     let f = `packages/${monopackage}/exports/${path.basename(source)}.ts`;
+    let body = groups[source];
+    if (monopackage === 'react-aria-components') {
+      body = [ast.program.body[0], ...body]; // import 'client-only';
+    } else {
+      groups[source][0].comments = ast.program.body[0].leadingComments;
+    }
     let content = recast.print({
       type: 'Program',
-      body: groups[source]
+      body
     }, {objectCurlySpacing: false, quote: 'single'}).code;
     fs.writeFileSync(f, content);
   }

From 847d7efb550f5f8409e1c3d535008640496fc514 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Mon, 9 Mar 2026 17:25:34 -0700
Subject: [PATCH 41/68] add unmatched exports to all groups

---
 scripts/migrateDeps.mjs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index 753aa707779..f3d0ef26af5 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -181,7 +181,8 @@ let parentFile = {
   useLocale: 'I18nProvider',
   ColorEditor: 'ColorPicker',
   SubmenuTrigger: 'Menu',
-  ContextualHelpTrigger: 'Menu'
+  ContextualHelpTrigger: 'Menu',
+  MenuTrigger: 'Menu'
 };
 
 // Names that are included in public files but not exported by monopackages.
@@ -857,6 +858,14 @@ function createPublicExports(file, monopackage, scope, pkg) {
     }
   }
 
+  if (scope && unmatched.length) {
+    for (let node of unmatched) {
+      for (let key in groups) {
+        groups[key].push(node);
+      }
+    }
+  }
+
   for (let source in groups) {
     let f = `packages/${monopackage}/exports/${path.basename(source)}.ts`;
     let body = groups[source];

From 5c9e198677732d5c57e90d95a9a1efb2ca3c041d Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Mon, 9 Mar 2026 17:28:19 -0700
Subject: [PATCH 42/68] fix

---
 packages/@react-spectrum/s2/src/ListView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@react-spectrum/s2/src/ListView.tsx b/packages/@react-spectrum/s2/src/ListView.tsx
index b749a5a4404..c75b8aec232 100644
--- a/packages/@react-spectrum/s2/src/ListView.tsx
+++ b/packages/@react-spectrum/s2/src/ListView.tsx
@@ -50,7 +50,7 @@ import LinkOutIcon from '../ui-icons/LinkOut';
 import {ProgressCircle} from './ProgressCircle';
 import {Text, TextContext} from './Content';
 import {useActionBarContainer} from './ActionBar';
-import {useDOMRef} from '@react-spectrum/utils';
+import {useDOMRef} from './useDOMRef';
 import {useLocale, useLocalizedStringFormatter} from 'react-aria';
 import {useScale} from './utils';
 import {useSpectrumContextProps} from './useSpectrumContextProps';

From a81e89cc6dbf2d45dd5c6faffcb2c2420edbfdec Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 10 Mar 2026 13:16:31 -0700
Subject: [PATCH 43/68] enable package.json exports in docs resolver

---
 packages/dev/parcel-resolver-docs/DocsResolver.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/dev/parcel-resolver-docs/DocsResolver.js b/packages/dev/parcel-resolver-docs/DocsResolver.js
index 25d8db66b1c..b32060f23de 100644
--- a/packages/dev/parcel-resolver-docs/DocsResolver.js
+++ b/packages/dev/parcel-resolver-docs/DocsResolver.js
@@ -20,7 +20,8 @@ module.exports = new Resolver({
       fs: options.inputFS,
       projectRoot: options.projectRoot,
       extensions: ['ts', 'tsx', 'd.ts', 'js'],
-      mainFields: ['source', 'types', 'main']
+      mainFields: ['source', 'types', 'main'],
+      packageExports: true
     });
   },
   async resolve({dependency, options, specifier, config: resolver}) {

From 1995aeab24c9b11cc4d8be4b79f6a49604616a2d Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 10 Mar 2026 14:19:42 -0700
Subject: [PATCH 44/68] fix docs

---
 package.json                                  |  4 +--
 .../combobox/docs/ComboBox.mdx                |  2 +-
 .../labeledvalue/docs/types.ts                |  2 +-
 .../@react-spectrum/list/docs/ListView.mdx    |  2 +-
 .../@react-spectrum/listbox/docs/ListBox.mdx  |  2 +-
 packages/@react-spectrum/menu/docs/Menu.mdx   |  4 +--
 .../@react-spectrum/menu/docs/MenuTrigger.mdx |  2 +-
 .../@react-spectrum/picker/docs/Picker.mdx    |  2 +-
 .../@react-spectrum/table/docs/TableView.mdx  |  2 +-
 packages/@react-spectrum/tabs/docs/Tabs.mdx   |  2 +-
 .../@react-spectrum/tree/docs/TreeView.mdx    |  2 +-
 packages/@spectrum-icons/color/package.json   |  1 +
 packages/@spectrum-icons/express/package.json |  1 +
 .../illustrations/package.json                |  1 +
 packages/@spectrum-icons/ui/package.json      |  1 +
 .../@spectrum-icons/workflow/package.json     |  1 +
 .../dev/docs/pages/react-aria/testing.mdx     | 10 +++----
 packages/dev/parcel-namer-docs/DocsNamer.js   |  4 +--
 .../react-aria-components/docs/ComboBox.mdx   |  2 +-
 .../react-aria-components/docs/GridList.mdx   |  2 +-
 .../react-aria-components/docs/ListBox.mdx    |  2 +-
 packages/react-aria-components/docs/Menu.mdx  |  2 +-
 .../react-aria-components/docs/Select.mdx     |  2 +-
 packages/react-aria-components/docs/Table.mdx |  2 +-
 packages/react-aria-components/docs/Tabs.mdx  |  2 +-
 packages/react-aria-components/docs/Tree.mdx  |  2 +-
 .../docs/Virtualizer.mdx                      |  2 +-
 scripts/migrateDeps.mjs                       | 29 ++++++++++++++++++-
 28 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index 3b1bf163db6..b12df3f8a2c 100644
--- a/package.json
+++ b/package.json
@@ -27,8 +27,8 @@
     "start:s2": "NODE_ENV=storybook storybook dev -p 6006 --ci -c '.storybook-s2'",
     "build:storybook-s2": "NODE_ENV=storybook storybook build -c .storybook-s2 -o dist/$(git rev-parse HEAD)/storybook-s2",
     "build:s2-storybook-docs": "NODE_ENV=storybook storybook build -c .storybook-s2 --docs",
-    "start:docs": "DOCS_ENV=dev parcel 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/dev/docs/pages/{react-spectrum,releases}/**/*.mdx'",
-    "build:docs": "DOCS_ENV=staging parcel build 'packages/@react-{spectrum,aria,stately}/*/docs/*.mdx' 'packages/dev/docs/pages/{react-spectrum,releases}/**/*.mdx'",
+    "start:docs": "DOCS_ENV=dev parcel 'packages/{@adobe/react-spectrum,react-aria,react-stately}/docs/**/*.mdx' 'packages/dev/docs/pages/{react-spectrum,releases}/**/*.mdx'",
+    "build:docs": "DOCS_ENV=staging parcel build 'packages/{@adobe/react-spectrum,react-aria,react-stately}/docs/**/*.mdx' 'packages/dev/docs/pages/{react-spectrum,releases}/**/*.mdx'",
     "start:s2-docs": "yarn workspace @react-spectrum/s2-docs start",
     "build:s2-docs": "yarn workspace @react-spectrum/s2-docs build",
     "check:s2-docs-build": "node packages/dev/s2-docs/scripts/validateS2DocsBuild.mjs",
diff --git a/packages/@react-spectrum/combobox/docs/ComboBox.mdx b/packages/@react-spectrum/combobox/docs/ComboBox.mdx
index d1266219b3d..7c4e54b76fe 100644
--- a/packages/@react-spectrum/combobox/docs/ComboBox.mdx
+++ b/packages/@react-spectrum/combobox/docs/ComboBox.mdx
@@ -11,7 +11,7 @@ import {Layout} from '@react-spectrum/docs';
 export default Layout;
 
 import docs from 'docs:@react-spectrum/combobox';
-import comboboxUtils from 'docs:@react-aria/test-utils/src/combobox.ts';
+import comboboxUtils from 'docs:@react-aria/test-utils';
 import packageData from '@react-spectrum/combobox/package.json';
 import {HeaderInfo, PropTable, PageDescription, ClassAPI, VersionBadge} from '@react-spectrum/docs';
 
diff --git a/packages/@react-spectrum/labeledvalue/docs/types.ts b/packages/@react-spectrum/labeledvalue/docs/types.ts
index 8724027ba71..e9e96e35ba8 100644
--- a/packages/@react-spectrum/labeledvalue/docs/types.ts
+++ b/packages/@react-spectrum/labeledvalue/docs/types.ts
@@ -1,5 +1,5 @@
 // @ts-ignore
-import {DateTime, LabeledValueBaseProps} from '@react-spectrum/labeledvalue/src/LabeledValue';
+import {DateTime, LabeledValueBaseProps} from '../src/LabeledValue';
 import {RangeValue} from '@react-types/shared';
 import {ReactElement} from 'react';
 
diff --git a/packages/@react-spectrum/list/docs/ListView.mdx b/packages/@react-spectrum/list/docs/ListView.mdx
index 2b5e03caee1..f774d1e866d 100644
--- a/packages/@react-spectrum/list/docs/ListView.mdx
+++ b/packages/@react-spectrum/list/docs/ListView.mdx
@@ -14,7 +14,7 @@ import Anatomy from './anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import docs from 'docs:@react-spectrum/list';
 import dndDocs from 'docs:@react-spectrum/dnd';
-import gridlistUtil from 'docs:@react-aria/test-utils/src/gridlist.ts';
+import gridlistUtil from 'docs:@react-aria/test-utils';
 import {HeaderInfo, PropTable, PageDescription, TypeLink, ClassAPI, VersionBadge} from '@react-spectrum/docs';
 import {Keyboard} from '@react-spectrum/text';
 import packageData from '@react-spectrum/list/package.json';
diff --git a/packages/@react-spectrum/listbox/docs/ListBox.mdx b/packages/@react-spectrum/listbox/docs/ListBox.mdx
index ed2b3c03d45..28bb88b9c72 100644
--- a/packages/@react-spectrum/listbox/docs/ListBox.mdx
+++ b/packages/@react-spectrum/listbox/docs/ListBox.mdx
@@ -13,7 +13,7 @@ export default Layout;
 import docs from 'docs:@react-spectrum/listbox';
 import {HeaderInfo, PropTable, PageDescription, ClassAPI, VersionBadge} from '@react-spectrum/docs';
 import packageData from '@react-spectrum/listbox/package.json';
-import listboxUtils from 'docs:@react-aria/test-utils/src/listbox.ts';
+import listboxUtils from 'docs:@react-aria/test-utils';
 
 ```jsx import
 import {ListBox, Section, Item} from '@react-spectrum/listbox';
diff --git a/packages/@react-spectrum/menu/docs/Menu.mdx b/packages/@react-spectrum/menu/docs/Menu.mdx
index 3efac3ebe5e..e1801703777 100644
--- a/packages/@react-spectrum/menu/docs/Menu.mdx
+++ b/packages/@react-spectrum/menu/docs/Menu.mdx
@@ -10,8 +10,8 @@ governing permissions and limitations under the License. */}
 import {Layout} from '@react-spectrum/docs';
 export default Layout;
 
-import contextualHelpTriggerTypes from 'docs:@react-spectrum/menu/src/ContextualHelpTrigger.tsx';
-import submenuTriggerTypes from 'docs:@react-spectrum/menu/src/SubmenuTrigger.tsx';
+import contextualHelpTriggerTypes from 'docs:@react-spectrum/menu';
+import submenuTriggerTypes from 'docs:@react-spectrum/menu';
 import docs from 'docs:@react-spectrum/menu';
 import {HeaderInfo, PropTable, PageDescription} from '@react-spectrum/docs';
 import packageData from '@react-spectrum/menu/package.json';
diff --git a/packages/@react-spectrum/menu/docs/MenuTrigger.mdx b/packages/@react-spectrum/menu/docs/MenuTrigger.mdx
index 2afd8d765c6..eb3d403692f 100644
--- a/packages/@react-spectrum/menu/docs/MenuTrigger.mdx
+++ b/packages/@react-spectrum/menu/docs/MenuTrigger.mdx
@@ -11,7 +11,7 @@ import {Layout} from '@react-spectrum/docs';
 export default Layout;
 
 import docs from 'docs:@react-spectrum/menu';
-import menuUtil from 'docs:@react-aria/test-utils/src/menu.ts';
+import menuUtil from 'docs:@react-aria/test-utils';
 import {HeaderInfo, PropTable, PageDescription, ClassAPI, VersionBadge} from '@react-spectrum/docs';
 import packageData from '@react-spectrum/menu/package.json';
 import {Keyboard} from '@react-spectrum/text';
diff --git a/packages/@react-spectrum/picker/docs/Picker.mdx b/packages/@react-spectrum/picker/docs/Picker.mdx
index f55397dd966..f522760486d 100644
--- a/packages/@react-spectrum/picker/docs/Picker.mdx
+++ b/packages/@react-spectrum/picker/docs/Picker.mdx
@@ -11,7 +11,7 @@ import {Layout} from '@react-spectrum/docs';
 export default Layout;
 
 import docs from 'docs:@react-spectrum/picker';
-import selectUtil from 'docs:@react-aria/test-utils/src/select.ts';
+import selectUtil from 'docs:@react-aria/test-utils';
 import {HeaderInfo, PropTable, PageDescription, ClassAPI, VersionBadge} from '@react-spectrum/docs';
 import packageData from '@react-spectrum/picker/package.json';
 
diff --git a/packages/@react-spectrum/table/docs/TableView.mdx b/packages/@react-spectrum/table/docs/TableView.mdx
index 5cf26a1ff55..73cd57e0afc 100644
--- a/packages/@react-spectrum/table/docs/TableView.mdx
+++ b/packages/@react-spectrum/table/docs/TableView.mdx
@@ -12,7 +12,7 @@ export default Layout;
 
 import docs from 'docs:@react-spectrum/table';
 import dndDocs from 'docs:@react-spectrum/dnd';
-import tableUtil from 'docs:@react-aria/test-utils/src/table.ts';
+import tableUtil from 'docs:@react-aria/test-utils';
 import tableTypes from 'docs:@react-types/table/src/index.d.ts';
 import {HeaderInfo, PropTable, PageDescription, TypeLink, VersionBadge, ClassAPI} from '@react-spectrum/docs';
 import {Keyboard} from '@react-spectrum/text';
diff --git a/packages/@react-spectrum/tabs/docs/Tabs.mdx b/packages/@react-spectrum/tabs/docs/Tabs.mdx
index db86aaf8aac..1d28a009f2b 100644
--- a/packages/@react-spectrum/tabs/docs/Tabs.mdx
+++ b/packages/@react-spectrum/tabs/docs/Tabs.mdx
@@ -14,7 +14,7 @@ import docs from 'docs:@react-spectrum/tabs';
 import utilsDocs from 'docs:@react-aria/utils';
 import {HeaderInfo, PropTable, PageDescription, TypeLink, ClassAPI, VersionBadge} from '@react-spectrum/docs';
 import packageData from '@react-spectrum/tabs/package.json';
-import tabsUtils from 'docs:@react-aria/test-utils/src/tabs.ts';
+import tabsUtils from 'docs:@react-aria/test-utils';
 
 ```jsx import
 import {ActionGroup} from '@react-spectrum/actiongroup';
diff --git a/packages/@react-spectrum/tree/docs/TreeView.mdx b/packages/@react-spectrum/tree/docs/TreeView.mdx
index ce5575d5bcd..d9b7328adf4 100644
--- a/packages/@react-spectrum/tree/docs/TreeView.mdx
+++ b/packages/@react-spectrum/tree/docs/TreeView.mdx
@@ -11,7 +11,7 @@ import {Layout} from '@react-spectrum/docs';
 export default Layout;
 
 import docs from 'docs:@react-spectrum/tree';
-import treeUtils from 'docs:@react-aria/test-utils/src/tree.ts';
+import treeUtils from 'docs:@react-aria/test-utils';
 import {HeaderInfo, PropTable, PageDescription, TypeLink, VersionBadge, ClassAPI} from '@react-spectrum/docs';
 import {Keyboard} from '@react-spectrum/text';
 import packageData from '@react-spectrum/tree/package.json';
diff --git a/packages/@spectrum-icons/color/package.json b/packages/@spectrum-icons/color/package.json
index eca8405814f..2536b8680c0 100644
--- a/packages/@spectrum-icons/color/package.json
+++ b/packages/@spectrum-icons/color/package.json
@@ -8,6 +8,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "exports": {
+    "./package.json": "./package.json",
     "./*": {
       "types": "./*.d.ts",
       "import": "./*.module.mjs",
diff --git a/packages/@spectrum-icons/express/package.json b/packages/@spectrum-icons/express/package.json
index db958f71c7e..c31da42b33f 100644
--- a/packages/@spectrum-icons/express/package.json
+++ b/packages/@spectrum-icons/express/package.json
@@ -8,6 +8,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "exports": {
+    "./package.json": "./package.json",
     "./*": {
       "types": "./*.d.ts",
       "import": "./*.module.mjs",
diff --git a/packages/@spectrum-icons/illustrations/package.json b/packages/@spectrum-icons/illustrations/package.json
index eb5d05487e7..205ba3f4248 100644
--- a/packages/@spectrum-icons/illustrations/package.json
+++ b/packages/@spectrum-icons/illustrations/package.json
@@ -8,6 +8,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "exports": {
+    "./package.json": "./package.json",
     "./*": {
       "types": "./*.d.ts",
       "import": "./*.module.mjs",
diff --git a/packages/@spectrum-icons/ui/package.json b/packages/@spectrum-icons/ui/package.json
index 5090021301c..c5647543a20 100644
--- a/packages/@spectrum-icons/ui/package.json
+++ b/packages/@spectrum-icons/ui/package.json
@@ -8,6 +8,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "exports": {
+    "./package.json": "./package.json",
     "./*": {
       "types": "./*.d.ts",
       "import": "./*.module.mjs",
diff --git a/packages/@spectrum-icons/workflow/package.json b/packages/@spectrum-icons/workflow/package.json
index a70d6de364c..e6e7f6e850b 100644
--- a/packages/@spectrum-icons/workflow/package.json
+++ b/packages/@spectrum-icons/workflow/package.json
@@ -8,6 +8,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "exports": {
+    "./package.json": "./package.json",
     "./*": {
       "types": "./*.d.ts",
       "import": "./*.module.mjs",
diff --git a/packages/dev/docs/pages/react-aria/testing.mdx b/packages/dev/docs/pages/react-aria/testing.mdx
index aab35a898ec..f571ef54227 100644
--- a/packages/dev/docs/pages/react-aria/testing.mdx
+++ b/packages/dev/docs/pages/react-aria/testing.mdx
@@ -10,11 +10,11 @@ governing permissions and limitations under the License. */}
 import {Layout, VersionBadge} from '@react-spectrum/docs';
 export default Layout;
 import testUtilDocs from 'docs:@react-aria/test-utils';
-import combobox from 'docs:@react-aria/test-utils/src/combobox.ts';
-import gridlist from 'docs:@react-aria/test-utils/src/gridlist.ts';
-import menu from 'docs:@react-aria/test-utils/src/menu.ts';
-import select from 'docs:@react-aria/test-utils/src/select.ts';
-import table from 'docs:@react-aria/test-utils/src/table.ts';
+import combobox from 'docs:@react-aria/test-utils';
+import gridlist from 'docs:@react-aria/test-utils';
+import menu from 'docs:@react-aria/test-utils';
+import select from 'docs:@react-aria/test-utils';
+import table from 'docs:@react-aria/test-utils';
 import {ClassAPI, FunctionAPI, InterfaceType, TypeContext, TypeLink} from '@react-spectrum/docs';
 
 ---
diff --git a/packages/dev/parcel-namer-docs/DocsNamer.js b/packages/dev/parcel-namer-docs/DocsNamer.js
index 62410da7c17..6cfc187e375 100644
--- a/packages/dev/parcel-namer-docs/DocsNamer.js
+++ b/packages/dev/parcel-namer-docs/DocsNamer.js
@@ -75,8 +75,8 @@ module.exports = new Namer({
 
       // move @react-spectrum pages under /v3 aka components and stuff
       let namespace = parts[1].replace(/^@/, '');
-      if (namespace === 'react-spectrum') {
-        namespace = 'v3';
+      if (namespace === 'adobe') {
+        return `v3/${basename}`;
       }
 
       if (namespace === 'react-aria') {
diff --git a/packages/react-aria-components/docs/ComboBox.mdx b/packages/react-aria-components/docs/ComboBox.mdx
index 4998aad7793..30b302628f1 100644
--- a/packages/react-aria-components/docs/ComboBox.mdx
+++ b/packages/react-aria-components/docs/ComboBox.mdx
@@ -12,7 +12,7 @@ export default Layout;
 
 import docs from 'docs:react-aria-components';
 import statelyDocs from 'docs:@react-stately/combobox';
-import comboboxUtils from 'docs:@react-aria/test-utils/src/combobox.ts';
+import comboboxUtils from 'docs:@react-aria/test-utils';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable, ClassAPI, VersionBadge} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
diff --git a/packages/react-aria-components/docs/GridList.mdx b/packages/react-aria-components/docs/GridList.mdx
index bdf21081e2f..904d5aa7806 100644
--- a/packages/react-aria-components/docs/GridList.mdx
+++ b/packages/react-aria-components/docs/GridList.mdx
@@ -12,7 +12,7 @@ export default Layout;
 
 import docs from 'docs:react-aria-components';
 import sharedDocs from 'docs:@react-types/shared';
-import gridlistUtil from 'docs:@react-aria/test-utils/src/gridlist.ts';
+import gridlistUtil from 'docs:@react-aria/test-utils';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable, ClassAPI, VersionBadge} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
diff --git a/packages/react-aria-components/docs/ListBox.mdx b/packages/react-aria-components/docs/ListBox.mdx
index dae009ba866..2467be7be0c 100644
--- a/packages/react-aria-components/docs/ListBox.mdx
+++ b/packages/react-aria-components/docs/ListBox.mdx
@@ -25,7 +25,7 @@ import Collections from '@react-spectrum/docs/pages/assets/component-illustratio
 import Selection from '@react-spectrum/docs/pages/assets/component-illustrations/Selection.svg';
 import DragAndDrop from '@react-spectrum/docs/pages/assets/component-illustrations/DragAndDrop.svg';
 import {StarterKits} from '@react-spectrum/docs/src/StarterKits';
-import listboxUtils from 'docs:@react-aria/test-utils/src/listbox.ts';
+import listboxUtils from 'docs:@react-aria/test-utils';
 
 ---
 category: Collections
diff --git a/packages/react-aria-components/docs/Menu.mdx b/packages/react-aria-components/docs/Menu.mdx
index 231b8a6de6a..a9d8f923f5d 100644
--- a/packages/react-aria-components/docs/Menu.mdx
+++ b/packages/react-aria-components/docs/Menu.mdx
@@ -11,7 +11,7 @@ import {Layout} from '@react-spectrum/docs';
 export default Layout;
 
 import docs from 'docs:react-aria-components';
-import menuUtil from 'docs:@react-aria/test-utils/src/menu.ts';
+import menuUtil from 'docs:@react-aria/test-utils';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable, ClassAPI, VersionBadge} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
diff --git a/packages/react-aria-components/docs/Select.mdx b/packages/react-aria-components/docs/Select.mdx
index 1fbab7bb376..1ef1318eef6 100644
--- a/packages/react-aria-components/docs/Select.mdx
+++ b/packages/react-aria-components/docs/Select.mdx
@@ -12,7 +12,7 @@ export default Layout;
 
 import docs from 'docs:react-aria-components';
 import statelyDocs from 'docs:@react-stately/select';
-import selectUtil from 'docs:@react-aria/test-utils/src/select.ts';
+import selectUtil from 'docs:@react-aria/test-utils';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable, ClassAPI, VersionBadge} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
diff --git a/packages/react-aria-components/docs/Table.mdx b/packages/react-aria-components/docs/Table.mdx
index fc2f3c52e57..6dc90486c98 100644
--- a/packages/react-aria-components/docs/Table.mdx
+++ b/packages/react-aria-components/docs/Table.mdx
@@ -12,7 +12,7 @@ export default Layout;
 
 import docs from 'docs:react-aria-components';
 import sharedDocs from 'docs:@react-types/shared';
-import tableUtil from 'docs:@react-aria/test-utils/src/table.ts';
+import tableUtil from 'docs:@react-aria/test-utils';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable, ClassAPI, VersionBadge} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
diff --git a/packages/react-aria-components/docs/Tabs.mdx b/packages/react-aria-components/docs/Tabs.mdx
index fedeb18bed2..45807c1d514 100644
--- a/packages/react-aria-components/docs/Tabs.mdx
+++ b/packages/react-aria-components/docs/Tabs.mdx
@@ -24,7 +24,7 @@ import {ExampleList} from '@react-spectrum/docs/src/ExampleList';
 import Collections from '@react-spectrum/docs/pages/assets/component-illustrations/Collections.svg';
 import Selection from '@react-spectrum/docs/pages/assets/component-illustrations/Selection.svg';
 import {StarterKits} from '@react-spectrum/docs/src/StarterKits';
-import tabsUtils from 'docs:@react-aria/test-utils/src/tabs.ts';
+import tabsUtils from 'docs:@react-aria/test-utils';
 
 ---
 category: Navigation
diff --git a/packages/react-aria-components/docs/Tree.mdx b/packages/react-aria-components/docs/Tree.mdx
index 992f9d623bc..1edc481464a 100644
--- a/packages/react-aria-components/docs/Tree.mdx
+++ b/packages/react-aria-components/docs/Tree.mdx
@@ -26,7 +26,7 @@ import Selection from '@react-spectrum/docs/pages/assets/component-illustrations
 import DragAndDrop from '@react-spectrum/docs/pages/assets/component-illustrations/DragAndDrop.svg';
 import Checkbox from '@react-spectrum/docs/pages/assets/component-illustrations/Checkbox.svg';
 import Button from '@react-spectrum/docs/pages/assets/component-illustrations/Button.svg';
-import treeUtils from 'docs:@react-aria/test-utils/src/tree.ts';
+import treeUtils from 'docs:@react-aria/test-utils';
 import {StarterKits} from '@react-spectrum/docs/src/StarterKits';
 
 ---
diff --git a/packages/react-aria-components/docs/Virtualizer.mdx b/packages/react-aria-components/docs/Virtualizer.mdx
index 8e8713a004c..96906b58f07 100644
--- a/packages/react-aria-components/docs/Virtualizer.mdx
+++ b/packages/react-aria-components/docs/Virtualizer.mdx
@@ -22,7 +22,7 @@ import {ExampleList} from '@react-spectrum/docs/src/ExampleList';
 import {Keyboard} from '@react-spectrum/text';
 import Collections from '@react-spectrum/docs/pages/assets/component-illustrations/Collections.svg';
 import {StarterKits} from '@react-spectrum/docs/src/StarterKits';
-import listboxUtils from 'docs:@react-aria/test-utils/src/listbox.ts';
+import listboxUtils from 'docs:@react-aria/test-utils';
 import {InlineAlert, Content, Heading} from '@adobe/react-spectrum';
 
 ---
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index f3d0ef26af5..fd792ad43e6 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -225,7 +225,7 @@ for (let pkg of ['react-aria', 'react-stately', 'react-aria-components', '@react
     }
     let p = `${specifier}/${s.slice(2)}`;
     publicFiles.add(p);    
-  }
+}
 }
 
 migrateScope('@react-aria', 'react-aria');
@@ -239,6 +239,10 @@ rewriteMonopackageImports('packages/@internationalized/number/test/NumberParser.
 
 writePrivateExports();
 
+for (let f of fs.globSync('packages/dev/s2-docs/pages/**/*.mdx')) {
+  rewriteMdx(f);
+}
+
 function migrateScope(scope, monopackage) {
   prepareMonopackage(monopackage);
 
@@ -273,6 +277,7 @@ function prepareMonopackage(monopackage) {
       import: './dist/exports/index.mjs',
       require: './dist/exports/index.cjs'
     },
+    './package.json': './package.json',
     './*': {
       source: './exports/*.ts',
       types: './dist/types/exports/*.d.ts',
@@ -365,6 +370,13 @@ function migratePackage(scope, name, monopackage) {
     types: false // TODO: i18n package
   };
 
+  if (!packageJSON.exports['.']) {
+    packageJSON.exports = {
+      '.': {...packageJSON.exports}
+    };
+  }
+  packageJSON.exports['./package.json'] = './package.json';
+
   Object.assign(packageJSON.peerDependencies ??= {}, {
     react: '^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1',
     'react-dom': '^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1'
@@ -428,6 +440,7 @@ function migrateToMonopackage(pkg) {
   packageJSON.module = './dist/exports/index.mjs';
   packageJSON.exports['.'].import = './dist/exports/index.mjs';
 
+  packageJSON.exports['./package.json'] = './package.json';
   packageJSON.exports['./*'] = {
     source: './exports/*.ts',
     types: './dist/types/exports/*.d.ts',
@@ -495,6 +508,7 @@ function buildImportMap(file) {
 
 function rewriteMonopackageImports(file, pkg, subpath) {
   if (path.extname(file) === '.mdx') {
+    rewriteMdx(file);
     return;
   }
 
@@ -648,6 +662,19 @@ function rewriteMonopackageImports(file, pkg, subpath) {
   fs.writeFileSync(file, content);
 }
 
+function rewriteMdx(file) {
+  let contents = fs.readFileSync(file, 'utf8');
+  contents = contents.replace(/\/packages\/@(react-aria|react-spectrum|react-stately)\/(.+?)\/docs\/(.+\.svg)/g, (_, scope, pkg, file) => {
+    let monopackage = scope === 'react-spectrum' ? '@adobe/react-spectrum' : scope;
+    return `/packages/${monopackage}/docs/${pkg}/${file}`;
+  }).replace(/(['"])@(react-aria|react-spectrum|react-stately)\/(.+?)\/docs\/(.+\.svg)/g, (_, q, scope, pkg, file) => {
+    let monopackage = scope === 'react-spectrum' ? '@adobe/react-spectrum' : scope;
+    return `${q}/packages/${monopackage}/docs/${pkg}/${file}`;
+  });
+
+  fs.writeFileSync(file, contents);
+}
+
 function getImportStatements(node, file, relative = true) {
   let source = node.source.value;
   let groups = {};

From dd84e96f6cb7fac5bc404feb41291a1dce4f4eca Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 10 Mar 2026 16:11:37 -0700
Subject: [PATCH 45/68] test cjs build too

---
 .circleci/config.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8e0309e3364..d2cdca6d379 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -390,7 +390,7 @@ jobs:
       - store_artifacts:
           path: ~/junit
 
-  test-esm:
+  test-build:
     executor: rsp-2xlarge
     steps:
       - restore_cache:
@@ -401,6 +401,7 @@ jobs:
           command: |
             make build
             node --loader ./scripts/esm-support/loader.mjs ./scripts/esm-support/testESM.mjs
+            node scripts/testCJS.cjs
 
   lint:
     executor: rsp-xlarge
@@ -921,7 +922,7 @@ workflows:
       - test-ssr-18:
           requires:
             - install-18
-      - test-esm:
+      - test-build:
           requires:
             - install
       - lint:
@@ -1014,7 +1015,7 @@ workflows:
             - test-17
             - test-ssr-18
             - test-18
-            - test-esm
+            - test-build
             - storybook
             - storybook-s2
       - deploy-s3-stage:

From 53fa89c0f5e7d8654418eb75cb0f1399f924094f Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 10 Mar 2026 16:20:59 -0700
Subject: [PATCH 46/68] disable no-duplicate-imports lint rule temporarily

---
 eslint.config.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 1e64a1cdc75..4dc5f5df3d4 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -189,7 +189,7 @@ export default [{
         "no-nested-ternary": ERROR,
         "no-multiple-empty-lines": ERROR,
         "no-unneeded-ternary": ERROR,
-        "no-duplicate-imports": ERROR,
+        // "no-duplicate-imports": ERROR,
         "react/display-name": OFF,
         "react/jsx-curly-spacing": [ERROR, "never"],
         "react/jsx-indent-props": [ERROR, ERROR],

From 3afe518fd81ea4560c53bc87d2c4183d691e074d Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 10 Mar 2026 16:22:26 -0700
Subject: [PATCH 47/68] turn on verdaccio

---
 .circleci/comment.js | 4 ++--
 .circleci/config.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/comment.js b/.circleci/comment.js
index fc238675dfe..fb9906eb906 100644
--- a/.circleci/comment.js
+++ b/.circleci/comment.js
@@ -10,7 +10,7 @@ async function run() {
   let pr;
   // If we aren't running on a PR commit, double check if this is a branch created for a fork. If so, we'll need to
   // comment the build link on the fork.
-  if (!process.env.CIRCLE_PULL_REQUEST) {
+  if (true) {
     try {
       const commit = await octokit.git.getCommit({
         owner: 'adobe',
@@ -41,7 +41,7 @@ async function run() {
             break;
           }
         }
-      } else if (!process.env.CIRCLE_PULL_REQUEST) {
+      } else if (true) {
         // If it isn't a PR commit, then we are on main. Create a comment for the test app and docs build
         await octokit.repos.createCommitComment({
           owner: 'adobe',
diff --git a/.circleci/config.yml b/.circleci/config.yml
index d2cdca6d379..5eaa4e69338 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -966,9 +966,9 @@ workflows:
             branches:
               only: main
       - verdaccio:
-          filters:
-            branches:
-              only: main
+          # filters:
+          #   branches:
+          #     only: main
           requires:
             - install
       - v-rsp-cra-18:

From b994a09e1e0565bce8885cf435f838d44728d258 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 10 Mar 2026 16:32:17 -0700
Subject: [PATCH 48/68] fix icons

---
 packages/@spectrum-icons/color/scripts/generateIcons.cjs | 3 ++-
 .../@spectrum-icons/express/scripts/generateIcons.cjs    | 3 ++-
 .../@spectrum-icons/workflow/scripts/generateIcons.cjs   | 3 ++-
 packages/dev/parcel-namer-s2/S2Namer.js                  | 9 +++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/@spectrum-icons/color/scripts/generateIcons.cjs b/packages/@spectrum-icons/color/scripts/generateIcons.cjs
index 3bfc90a593c..0c24eb7c77f 100644
--- a/packages/@spectrum-icons/color/scripts/generateIcons.cjs
+++ b/packages/@spectrum-icons/color/scripts/generateIcons.cjs
@@ -23,7 +23,8 @@ function template(iconName) {
   }
   return (
 `import {${iconName} as IconComponent} from '@adobe/react-spectrum-workflow-color/dist/${iconRename}.js';
-import {Icon, IconPropsWithoutChildren} from '@@adobe/react-spectrum/private/icon/Icon';
+import {Icon} from '@adobe/react-spectrum/Icon';
+import type {IconPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Icon';
 import React, {JSX} from 'react';
 
 export default function ${iconRename}(props: IconPropsWithoutChildren): JSX.Element {
diff --git a/packages/@spectrum-icons/express/scripts/generateIcons.cjs b/packages/@spectrum-icons/express/scripts/generateIcons.cjs
index a78da0f419c..97eb0dff6d4 100644
--- a/packages/@spectrum-icons/express/scripts/generateIcons.cjs
+++ b/packages/@spectrum-icons/express/scripts/generateIcons.cjs
@@ -29,7 +29,8 @@ for (let file of fs.readdirSync(dir)) {
   }
 
   let jsx = compileSVG(path.join(dir, file));
-  let wrapper = `import {Icon, IconPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Icon';
+  let wrapper = `import {Icon} from '@adobe/react-spectrum/Icon';
+import type {IconPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Icon';
 import React, {JSX} from 'react';
 
 ${jsx}
diff --git a/packages/@spectrum-icons/workflow/scripts/generateIcons.cjs b/packages/@spectrum-icons/workflow/scripts/generateIcons.cjs
index f2f816a4f74..fe9210882b5 100644
--- a/packages/@spectrum-icons/workflow/scripts/generateIcons.cjs
+++ b/packages/@spectrum-icons/workflow/scripts/generateIcons.cjs
@@ -23,7 +23,8 @@ function template(iconName) {
   }
   return (
 `import {${iconName} as IconComponent} from '@adobe/react-spectrum-workflow/dist/${importName}.js';
-import {Icon, IconPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Icon';
+import {Icon} from '@adobe/react-spectrum/Icon';
+import type {IconPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Icon';
 import React, {JSX} from 'react';
 
 export default function ${iconRename}(props: IconPropsWithoutChildren): JSX.Element {
diff --git a/packages/dev/parcel-namer-s2/S2Namer.js b/packages/dev/parcel-namer-s2/S2Namer.js
index b62d7270007..a2fafdcc57d 100644
--- a/packages/dev/parcel-namer-s2/S2Namer.js
+++ b/packages/dev/parcel-namer-s2/S2Namer.js
@@ -17,7 +17,6 @@ module.exports = new Namer({
   name({bundle}) {
     let mainAsset = bundle.getMainEntry();
 
-    // if (mainAsset?.filePath.includes('@react-spectrum/s2') || !mainAsset?.filePath.includes('react-spectrum/packages')) {
     if (bundle.needsStableName && bundle.target.distEntry) {
       return bundle.target.distEntry;
     }
@@ -26,7 +25,8 @@ module.exports = new Namer({
       ext = bundle.env.outputFormat === 'esmodule' ? '.mjs' : '.cjs';
     }
     let originalExt = path.extname(mainAsset.filePath);
-    let name = path.basename(mainAsset.filePath, originalExt).replace(/\*/g, 'intlStrings');
+    let basename = path.basename(mainAsset.filePath, originalExt).replace(/\*/g, 'intlStrings');
+    let name = basename;
     let m = mainAsset.filePath.match(/spectrum-illustrations\/(linear|gradient\/generic\d)/);
     if (m) {
       if (originalExt === '.svg') {
@@ -34,7 +34,8 @@ module.exports = new Namer({
       }
       return m[1] + '/' + name + ext;
     } else if (mainAsset.filePath.includes('/exports/')) {
-      name = 'exports/' + name;
+      let index = mainAsset.filePath.indexOf('/exports/');
+      name = path.dirname(mainAsset.filePath.slice(index + 1)) + '/' + name;
     } else if (bundle.target.distDir.endsWith('/dist')) {
       let index = mainAsset.filePath.indexOf('/src/');
       if (index >= 0) {
@@ -50,7 +51,7 @@ module.exports = new Namer({
     }
 
     if (mainAsset.filePath.includes('@adobe/spectrum-css-temp')) {
-      name = mainAsset.filePath.split(path.sep).at(-2) + '_' + name;
+      name = 'private/' + mainAsset.filePath.split(path.sep).at(-2) + '_' + basename;
     }
     if (path.extname(mainAsset.filePath) === '.css' && mainAsset.type === 'js') {
       // CSS module

From d125b535b3fe33a9b9a80060959adaa68cfdc80b Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 10 Mar 2026 20:12:08 -0700
Subject: [PATCH 49/68] fix some circular dependencies

---
 .../react-spectrum/test/ActionGroup.test.tsx  | 37 -------------------
 scripts/migrateDeps.mjs                       | 32 +++++++++-------
 2 files changed, 19 insertions(+), 50 deletions(-)
 delete mode 100644 packages/@adobe/react-spectrum/test/ActionGroup.test.tsx

diff --git a/packages/@adobe/react-spectrum/test/ActionGroup.test.tsx b/packages/@adobe/react-spectrum/test/ActionGroup.test.tsx
deleted file mode 100644
index 414c4f1c4f1..00000000000
--- a/packages/@adobe/react-spectrum/test/ActionGroup.test.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-import {ActionGroup, Item} from '@adobe/react-spectrum';
-import {Provider} from '@react-spectrum/provider';
-import React from 'react';
-import {render} from '@react-spectrum/test-utils-internal';
-import scaleMedium from '@adobe/spectrum-css-temp/vars/spectrum-medium-unique.css';
-import themeLight from '@adobe/spectrum-css-temp/vars/spectrum-light-unique.css';
-
-let theme = {
-  light: themeLight,
-  medium: scaleMedium
-};
-
-it('should work', () => {
-  render(
-    <Provider theme={theme}>
-      <ActionGroup>
-        <Item>Item A</Item>
-        <Item>Item B</Item>
-      </ActionGroup>
-    </Provider>
-  );
-
-  // TODO: Put some meaningful basic assertion here (maybe a snapshot test?) to validate thinks aren't totally broken.
-  expect(true).toEqual(true);
-});
diff --git a/scripts/migrateDeps.mjs b/scripts/migrateDeps.mjs
index fd792ad43e6..689a0199c26 100644
--- a/scripts/migrateDeps.mjs
+++ b/scripts/migrateDeps.mjs
@@ -640,10 +640,10 @@ function rewriteMonopackageImports(file, pkg, subpath) {
       // Hard coding special cases here
       switch (node.arguments[0].value) {
         case '@react-aria/live-announcer':
-          node.arguments[0].value = file.startsWith('packages/react-aria') ? '../../src/live-announcer/LiveAnnouncer' : 'react-aria/src/live-announcer/LiveAnnouncer';
+          node.arguments[0].value = file.startsWith('packages/react-aria/') ? '../../src/live-announcer/LiveAnnouncer' : 'react-aria/src/live-announcer/LiveAnnouncer';
           break;
         case '@react-aria/utils/src/scrollIntoView':
-          node.arguments[0].value = file.startsWith('packages/react-aria') ? '../../src/utils/scrollIntoView' : 'react-aria/src/utils/scrollIntoView';
+          node.arguments[0].value = file.startsWith('packages/react-aria/') ? '../../src/utils/scrollIntoView' : 'react-aria/src/utils/scrollIntoView';
           break;
         case '@react-aria/utils':
           node.arguments[0].value = '../../src/utils/focusWithoutScrolling';
@@ -687,19 +687,19 @@ function getImportStatements(node, file, relative = true) {
     let importSource = source;
     let src, imported;
     if (source === '@react-spectrum/theme-default') {
-      src = '@adobe/react-spectrum/defaultTheme';
+      src = file.includes('@adobe/react-spectrum') ? path.relative(path.dirname(file), 'packages/@adobe/react-spectrum/src/theme-default/defaultTheme') : '@adobe/react-spectrum/defaultTheme';
       imported = 'defaultTheme';
       local = file.includes('@react-spectrum') ? t.identifier('theme') : local;
     } else if (source === '@react-spectrum/theme-dark') {
-      src = '@adobe/react-spectrum/darkTheme';
+      src = file.includes('@adobe/react-spectrum') ? path.relative(path.dirname(file), 'packages/@adobe/react-spectrum/src/theme-dark/darkTheme') : '@adobe/react-spectrum/darkTheme';
       imported = 'darkTheme';
       local = file.includes('@react-spectrum') ? t.identifier('theme') : local;
     } else if (source === '@react-spectrum/theme-light') {
-      src = '@adobe/react-spectrum/lightTheme';
+      src = file.includes('@adobe/react-spectrum') ? path.relative(path.dirname(file), 'packages/@adobe/react-spectrum/src/theme-light/lightTheme') : '@adobe/react-spectrum/lightTheme';
       imported = 'lightTheme';
       local = file.includes('@react-spectrum') ? t.identifier('theme') : local;
     } else if (source === '@react-spectrum/theme-express') {
-      src = '@adobe/react-spectrum/private/theme-express/expressTheme';
+      src = file.includes('@adobe/react-spectrum') ? path.relative(path.dirname(file), 'packages/@adobe/react-spectrum/src/theme-express/expressTheme') : '@adobe/react-spectrum/private/theme-express/expressTheme';
       imported = 'expressTheme';
       local = file.includes('@react-spectrum') ? t.identifier('theme') : local;
     } else if (!importMap[source][importedName]) {
@@ -857,11 +857,7 @@ function createPublicExports(file, monopackage, scope, pkg) {
           specifiers.push(...node.specifiers);
         }
       } else {
-        let n = t.cloneNode(node, true);
-        if (n.source.value.startsWith('../')) {
-          n.source.value = `${monopackage}/private/${n.source.value.slice(3)}`;
-        }
-        unmatched.push(n);
+        unmatched.push(node);
       }
 
       node.specifiers = node.specifiers.filter(s => {
@@ -888,7 +884,11 @@ function createPublicExports(file, monopackage, scope, pkg) {
   if (scope && unmatched.length) {
     for (let node of unmatched) {
       for (let key in groups) {
-        groups[key].push(node);
+        let n = t.cloneNode(node, true);
+        if (n.source.value.startsWith('../')) {
+          n.source.value = path.relative(`packages/${monopackage}/exports`, `packages/${monopackage}/src/${n.source.value.slice(3)}`);
+        }
+        groups[key].push(n);
       }
     }
   }
@@ -920,7 +920,13 @@ function createPublicExports(file, monopackage, scope, pkg) {
       decl.exportKind = 'type';
       imports.push(...getImportStatements(decl, `packages/${scope}/${pkg}/src/index.ts`, false));
     }
-    imports.push(...unmatched);
+    for (let node of unmatched) {
+      let n = t.cloneNode(node, true);
+      if (n.source.value.startsWith('../')) {
+        n.source.value = `${monopackage}/private/${n.source.value.slice(3)}`;
+      }
+      imports.push(n);
+    }
 
     imports[0].comments = ast.program.body[0].leadingComments;
     let index = recast.print({

From 2357e883a6482dbd1ee03f140dcacb27cd8c92f8 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Fri, 13 Mar 2026 13:10:03 -0700
Subject: [PATCH 50/68] run migration script

---
 .../accordion}/Accordion.stories.tsx          |   4 +-
 .../actionbar}/ActionBar.stories.tsx          |   4 +-
 .../actiongroup}/ActionGroup.stories.tsx      |   6 +-
 .../SearchAutocomplete.stories.tsx            |   2 +-
 .../chromatic-fc/avatar}/Avatar.stories.tsx   |   4 +-
 .../chromatic-fc/badge}/Badge.stories.tsx     |   6 +-
 .../breadcrumbs}/Breadcrumbs.stories.tsx      |   4 +-
 .../button}/ActionButton.stories.tsx          |   8 +-
 .../chromatic-fc/button}/Button.stories.tsx   |   8 +-
 .../button}/LogicButton.stories.tsx           |   4 +-
 .../button}/ToggleButton.stories.tsx          |   9 +-
 .../calendar}/Calendar.stories.tsx            |   4 +-
 .../calendar}/CalendarCell.stories.tsx        |   4 +-
 .../chromatic-fc/card}/Card.stories.tsx       |   6 +-
 .../chromatic-fc/card}/CardView.stories.tsx   |   4 +-
 .../chromatic-fc/card}/QuietCard.stories.tsx  |   4 +-
 .../checkbox}/Checkbox.stories.tsx            |   8 +-
 .../chromatic-fc/tree}/TreeView.stories.tsx   |  10 +-
 .../accordion}/Accordion.stories.tsx          |   8 +-
 .../accordion}/Disclosure.stories.tsx         |   2 +-
 .../actionbar}/ActionBar.stories.tsx          |   4 +-
 .../actiongroup}/ActionGroup.stories.tsx      |  12 +-
 .../SearchAutocomplete.stories.tsx            |   5 +-
 .../SearchAutocompleteRTL.stories.tsx         |   0
 .../chromatic/avatar}/Avatar.stories.tsx      |   2 +-
 .../chromatic/badge}/Badge.stories.tsx        |   6 +-
 .../breadcrumbs}/Breadcrumbs.stories.tsx      |   4 +-
 .../button}/ActionButton.stories.tsx          |   8 +-
 .../button}/ActionButtonLanguages.stories.tsx |   8 +-
 .../chromatic/button}/Button.stories.tsx      |  16 +-
 .../chromatic/button}/LogicButton.stories.tsx |   6 +-
 .../button}/ToggleButton.stories.tsx          |   8 +-
 .../buttongroup}/ButtonGroup.stories.tsx      |   8 +-
 .../chromatic/calendar}/Calendar.stories.tsx  |   2 +-
 .../calendar}/CalendarCell.stories.tsx        |   6 +-
 .../calendar}/RangeCalendar.stories.tsx       |   4 +-
 .../chromatic/card}/Card.stories.tsx          |  17 +-
 .../chromatic/card}/CardView.stories.tsx      |  16 +-
 .../card}/HorizontalCard.stories.tsx          |   2 +-
 .../chromatic/card}/QuietCard.stories.tsx     |   2 +-
 .../chromatic/checkbox}/Checkbox.stories.tsx  |   6 +-
 .../checkbox}/CheckboxGroup.stories.tsx       |   9 +-
 .../chromatic/color}/ColorArea.stories.tsx    |  11 +-
 .../chromatic/color}/ColorField.stories.tsx   |  10 +-
 .../color}/ColorFieldExpress.stories.tsx      |   0
 .../chromatic/color}/ColorSlider.stories.tsx  |  10 +-
 .../chromatic/combobox}/ComboBox.stories.tsx  |  12 +-
 .../combobox}/ComboBoxRTL.stories.tsx         |   0
 .../datepicker}/DateField.stories.tsx         |  10 +-
 .../datepicker}/DatePicker.stories.tsx        |   8 +-
 .../datepicker}/DateRangePicker.stories.tsx   |   8 +-
 .../datepicker}/TimeField.stories.tsx         |   8 +-
 .../chromatic/dialog}/AlertDialog.stories.tsx |   6 +-
 .../chromatic/dialog}/Dialog.stories.tsx      |  32 +-
 .../dialog}/DialogExpress.stories.tsx         |   2 +-
 .../dialog}/DialogLanguages.stories.tsx       |  28 +-
 .../chromatic/dialog}/intlMessages.json       |   0
 .../chromatic/divider}/Divider.stories.tsx    |   4 +-
 .../chromatic/dropzone}/DropZone.stories.tsx  |  12 +-
 .../chromatic/form}/Form.stories.tsx          |  27 +-
 .../chromatic/form}/FormLanguages.stories.tsx |  39 ++-
 .../chromatic/form}/FormLongLabel.stories.tsx |  23 +-
 .../chromatic/form}/intlMessages.json         |   0
 .../IllustratedMessage.Languages.stories.tsx  |   8 +-
 .../IllustratedMessage.stories.tsx            |   8 +-
 .../inlinealert}/InlineAlert.stories.tsx      |   6 +-
 .../chromatic/label}/HelpText.stories.tsx     |   4 +-
 .../chromatic/label}/Label.stories.tsx        |   4 +-
 .../labeledvalue}/LabeledValue.stories.tsx    |   8 +-
 .../chromatic/layout}/Flex.stories.tsx        |   4 +-
 .../chromatic/layout}/Grid.stories.tsx        |   4 +-
 .../chromatic/layout}/styles.css              |   0
 .../chromatic/link}/Link.stories.tsx          |   2 +-
 .../chromatic/list}/ListView.stories.tsx      |  20 +-
 .../chromatic/list}/ListViewRTL.stories.tsx   |   0
 .../chromatic/listbox}/ListBox.stories.tsx    |  10 +-
 .../listbox}/ListBoxLanguages.stories.tsx     |  12 +-
 .../chromatic/listbox}/intlMessages.json      |   0
 .../chromatic/menu}/MenuTrigger.stories.tsx   |  11 +-
 .../menu}/MenuTriggerExpress.stories.tsx      |   0
 .../menu}/MenuTriggerLanguages.stories.tsx    |  15 +-
 .../menu}/MenuTriggerRTL.stories.tsx          |   0
 .../chromatic/menu}/Submenu.stories.tsx       |  12 +-
 .../chromatic/menu}/Submenu.storiesRTL.tsx    |   0
 .../chromatic/menu}/intlMessages.json         |   0
 .../chromatic/meter}/Meter.stories.tsx        |   2 +-
 .../numberfield}/NumberField.stories.tsx      |  14 +-
 .../picker}/Picker.Languages.stories.tsx      |   5 +-
 .../chromatic/picker}/Picker.stories.tsx      |  13 +-
 .../progress}/ProgressBar.stories.tsx         |   2 +-
 .../progress}/ProgressCircle.stories.tsx      |   2 +-
 .../chromatic/provider}/Provider.stories.tsx  |  28 +-
 .../chromatic/provider}/custom-theme.css      |   0
 .../chromatic/radio}/Radio.stories.tsx        |  10 +-
 .../searchfield}/SearchField.stories.tsx      |  10 +-
 .../chromatic/slider}/RangeSlider.stories.tsx |   8 +-
 .../chromatic/slider}/Slider.stories.tsx      |   8 +-
 .../statuslight}/StatusLight.stories.tsx      |   6 +-
 .../StatusLightLanguages.stories.tsx          |   6 +-
 .../chromatic/steplist}/StepList.stories.tsx  |   4 +-
 .../chromatic/switch}/Switch.stories.tsx      |   5 +-
 .../chromatic/table}/TableView.stories.tsx    |  14 +-
 .../chromatic/table}/TableViewRTL.stories.tsx |   0
 .../table}/TreeGridTable.stories.tsx          |  16 +-
 .../table}/TreeGridTableRTL.stories.tsx       |   0
 .../chromatic/tabs}/Tabs.stories.tsx          |   7 +-
 .../chromatic/tag}/TagGroup.stories.tsx       |   7 +-
 .../chromatic/textfield}/TextArea.stories.tsx |   9 +-
 .../textfield}/TextAreaLanguages.stories.tsx  |   2 +-
 .../textfield}/Textfield.stories.tsx          |   9 +-
 .../textfield}/TextfieldLanguages.stories.tsx |   4 +-
 .../chromatic/toast}/Toast.stories.tsx        |   4 +-
 .../chromatic/tooltip}/Tooltip.stories.tsx    |   2 +-
 .../tooltip}/TooltipTrigger.stories.tsx       |   6 +-
 .../TooltipTriggerExpress.stories.tsx         |   2 +-
 .../tooltip}/TooltipTriggerRTL.stories.tsx    |   2 +-
 .../chromatic/tree}/TreeView.stories.tsx      |  18 +-
 .../chromatic/view}/View.stories.tsx          |   4 +-
 .../chromatic/well}/Well.stories.tsx          |   2 +-
 .../docs/accordion}/Accordion.mdx             |   0
 .../docs/accordion}/Disclosure.mdx            |   0
 .../docs/actionbar}/ActionBar.mdx             |   0
 .../docs/actionbar}/ActionBarAnatomy.svg      |   0
 .../docs/actiongroup}/ActionGroup.mdx         |   0
 .../docs/autocomplete}/SearchAutocomplete.mdx |   0
 .../react-spectrum/docs/avatar}/Avatar.mdx    |   0
 .../react-spectrum/docs/badge}/Badge.mdx      |   0
 .../docs/breadcrumbs}/Breadcrumbs.mdx         |   0
 .../docs/button}/ActionButton.mdx             |   0
 .../react-spectrum/docs/button}/Button.mdx    |   0
 .../docs/button}/LogicButton.mdx              |   0
 .../docs/button}/ToggleButton.mdx             |   0
 .../docs/buttongroup}/ButtonGroup.mdx         |   0
 .../docs/calendar}/Calendar.mdx               |   0
 .../docs/calendar}/RangeCalendar.mdx          |   0
 .../docs/card}/Card.mdx.placeholder           |   0
 .../docs/checkbox}/Checkbox.mdx               |   0
 .../docs/checkbox}/CheckboxGroup.mdx          |   0
 .../react-spectrum/docs/color}/ColorArea.mdx  |   0
 .../react-spectrum/docs/color}/ColorField.mdx |   0
 .../docs/color}/ColorPicker.mdx               |   0
 .../docs/color}/ColorSlider.mdx               |   0
 .../docs/color}/ColorSwatch.mdx               |   0
 .../docs/color}/ColorSwatchPicker.mdx         |   0
 .../react-spectrum/docs/color}/ColorWheel.mdx |   0
 .../docs/combobox}/ComboBox.mdx               |   0
 .../docs/contextualhelp}/ContextualHelp.mdx   |   0
 .../docs/datepicker}/DateField.mdx            |   0
 .../docs/datepicker}/DatePicker.mdx           |   0
 .../docs/datepicker}/DateRangePicker.mdx      |   0
 .../docs/datepicker}/TimeField.mdx            |   0
 .../docs/dialog}/AlertDialog.mdx              |   0
 .../react-spectrum/docs/dialog}/Dialog.mdx    |   0
 .../docs/dialog}/DialogContainer.mdx          |   0
 .../docs/dialog}/DialogTrigger.mdx            |   0
 .../docs/dialog}/images/DialogAnatomy.svg     |   0
 .../react-spectrum/docs/divider}/Divider.mdx  |   0
 .../react-spectrum/docs/dnd}/dnd.mdx          |  12 +-
 .../docs/dropzone}/DropZone.mdx               |   0
 .../docs/filetrigger}/FileTrigger.mdx         |   0
 .../react-spectrum/docs/form}/Form.mdx        |   0
 .../docs/icon}/custom-icons.mdx               |   0
 .../docs/icon}/workflow-icons.mdx             |   0
 .../IllustratedMessage.mdx                    |   0
 .../react-spectrum/docs/image}/Image.mdx      |   0
 .../docs/inlinealert}/InlineAlert.mdx         |   0
 .../docs/labeledvalue}/LabeledValue.mdx       |   0
 .../docs/labeledvalue}/types.ts               |   2 +-
 .../react-spectrum/docs/layout}/Flex.mdx      |   0
 .../react-spectrum/docs/layout}/Grid.mdx      |   0
 .../react-spectrum/docs/link}/Link.mdx        |   0
 .../react-spectrum/docs/list}/ListView.mdx    |   0
 .../react-spectrum/docs/list}/anatomy.svg     |   0
 .../react-spectrum/docs/listbox}/ListBox.mdx  |   0
 .../react-spectrum/docs/menu}/ActionMenu.mdx  |   0
 .../react-spectrum/docs/menu}/Menu.mdx        |   0
 .../react-spectrum/docs/menu}/MenuTrigger.mdx |   0
 .../react-spectrum/docs/meter}/Meter.mdx      |   0
 .../docs/numberfield}/NumberField.mdx         |   0
 .../react-spectrum/docs/picker}/Picker.mdx    |   0
 .../docs/progress}/ProgressBar.mdx            |   0
 .../docs/progress}/ProgressCircle.mdx         |   0
 .../docs/provider}/Provider.mdx               |   0
 .../react-spectrum/docs/radio}/RadioGroup.mdx |   0
 .../docs/searchfield}/SearchField.mdx         |   0
 .../docs/slider}/RangeSlider.mdx              |   0
 .../react-spectrum/docs/slider}/Slider.mdx    |   0
 .../docs/statuslight}/StatusLight.mdx         |   0
 .../docs/steplist}/StepList.mdx               |   0
 .../react-spectrum/docs/switch}/Switch.mdx    |   0
 .../react-spectrum/docs/table}/TableView.mdx  |   0
 .../react-spectrum/docs/tabs}/Tabs.mdx        |   0
 .../react-spectrum/docs/tag}/TagGroup.mdx     |   0
 .../react-spectrum/docs/text}/Heading.mdx     |   0
 .../react-spectrum/docs/text}/Keyboard.mdx    |   0
 .../react-spectrum/docs/text}/Text.mdx        |   0
 .../docs/textfield}/TextArea.mdx              |   0
 .../docs/textfield}/TextField.mdx             |   0
 .../react-spectrum/docs/toast}/Toast.mdx      |   0
 .../react-spectrum/docs/tooltip}/Tooltip.mdx  |   0
 .../react-spectrum/docs/tree}/TreeView.mdx    |   0
 .../react-spectrum/docs/view}/Content.mdx     |   0
 .../react-spectrum/docs/view}/Footer.mdx      |   0
 .../react-spectrum/docs/view}/Header.mdx      |   0
 .../react-spectrum/docs/view}/View.mdx        |   0
 .../react-spectrum/docs/well}/Well.mdx        |   0
 .../react-spectrum/exports/Accordion.ts       |  14 +
 .../react-spectrum/exports/ActionBar.ts       |  17 ++
 .../react-spectrum/exports/ActionButton.ts    |  14 +
 .../react-spectrum/exports/ActionGroup.ts     |  15 +
 .../react-spectrum/exports/ActionMenu.ts      |  18 ++
 .../react-spectrum/exports/AlertDialog.ts     |  17 ++
 .../react-spectrum/exports/Avatar.ts}         |   5 +-
 .../react-spectrum/exports/Badge.ts}          |   5 +-
 .../react-spectrum/exports/Breadcrumbs.ts     |  15 +
 .../@adobe/react-spectrum/exports/Button.ts   |  14 +
 .../react-spectrum/exports/ButtonGroup.ts     |  14 +
 .../@adobe/react-spectrum/exports/Calendar.ts |  16 +
 .../@adobe/react-spectrum/exports/Checkbox.ts |  14 +
 .../react-spectrum/exports/CheckboxGroup.ts   |  14 +
 .../react-spectrum/exports/ColorArea.ts       |  17 ++
 .../react-spectrum/exports/ColorField.ts      |  17 ++
 .../react-spectrum/exports/ColorPicker.ts     |  20 ++
 .../react-spectrum/exports/ColorSlider.ts     |  17 ++
 .../react-spectrum/exports/ColorSwatch.ts     |  18 ++
 .../exports/ColorSwatchPicker.ts              |  18 ++
 .../react-spectrum/exports/ColorWheel.ts      |  17 ++
 .../@adobe/react-spectrum/exports/ComboBox.ts |  18 ++
 .../@adobe/react-spectrum/exports/Content.ts  |  14 +
 .../react-spectrum/exports/ContextualHelp.ts} |   3 +-
 .../react-spectrum/exports/DateField.ts       |  16 +
 .../react-spectrum/exports/DatePicker.ts      |  16 +
 .../react-spectrum/exports/DateRangePicker.ts |  16 +
 .../@adobe/react-spectrum/exports/Dialog.ts   |  17 ++
 .../react-spectrum/exports/DialogContainer.ts |  20 ++
 .../react-spectrum/exports/DialogTrigger.ts   |  17 ++
 .../@adobe/react-spectrum/exports/Divider.ts  |  16 +
 .../react-spectrum/exports/DropZone.ts}       |   5 +-
 .../@adobe/react-spectrum/exports/Flex.ts     |  17 ++
 .../@adobe/react-spectrum/exports/Footer.ts   |  14 +
 .../@adobe/react-spectrum/exports/Form.ts     |  16 +
 .../@adobe/react-spectrum/exports/Grid.ts     |  17 ++
 .../@adobe/react-spectrum/exports/Header.ts   |  14 +
 .../@adobe/react-spectrum/exports/Heading.ts  |  16 +
 .../@adobe/react-spectrum/exports/Icon.ts     |  17 ++
 .../exports/IllustratedMessage.ts             |  16 +
 .../@adobe/react-spectrum/exports/Image.ts    |  16 +
 .../react-spectrum/exports/InlineAlert.ts}    |   5 +-
 .../@adobe/react-spectrum/exports/Keyboard.ts |  16 +
 .../react-spectrum/exports/LabeledValue.ts}   |   5 +-
 .../@adobe/react-spectrum/exports/Link.ts     |  16 +
 .../@adobe/react-spectrum/exports/ListBox.ts  |  18 ++
 .../react-spectrum/exports/ListView.ts}       |   4 +-
 .../react-spectrum/exports/LogicButton.ts     |  14 +
 .../@adobe/react-spectrum/exports/Menu.ts     |  22 ++
 .../react-spectrum/exports/MenuTrigger.ts     |  18 ++
 .../@adobe/react-spectrum/exports/Meter.ts    |  16 +
 .../react-spectrum/exports/NumberField.ts     |  16 +
 .../@adobe/react-spectrum/exports/Picker.ts   |  18 ++
 .../react-spectrum/exports/ProgressBar.ts     |  16 +
 .../react-spectrum/exports/ProgressCircle.ts  |  16 +
 .../@adobe/react-spectrum/exports/Provider.ts |  17 ++
 .../react-spectrum/exports/RadioGroup.ts      |  18 ++
 .../react-spectrum/exports/RangeCalendar.ts   |  16 +
 .../react-spectrum/exports/RangeSlider.ts     |  16 +
 .../react-spectrum/exports/SearchField.ts     |  16 +
 .../@adobe/react-spectrum/exports/Slider.ts   |  16 +
 .../react-spectrum/exports/StatusLight.ts     |  16 +
 .../@adobe/react-spectrum/exports/Switch.ts   |  16 +
 .../react-spectrum/exports/TableView.ts       |  27 ++
 .../@adobe/react-spectrum/exports/Tabs.ts     |  17 ++
 .../@adobe/react-spectrum/exports/TagGroup.ts |  15 +
 .../@adobe/react-spectrum/exports/Text.ts     |  16 +
 .../@adobe/react-spectrum/exports/TextArea.ts |  16 +
 .../react-spectrum/exports/TextField.ts       |  16 +
 .../react-spectrum/exports/TimeField.ts       |  16 +
 .../@adobe/react-spectrum/exports/Toast.ts    |  17 ++
 .../react-spectrum/exports/ToggleButton.ts    |  14 +
 .../@adobe/react-spectrum/exports/Tooltip.ts  |  17 ++
 .../@adobe/react-spectrum/exports/TreeView.ts |  17 ++
 .../@adobe/react-spectrum/exports/View.ts     |  14 +
 .../@adobe/react-spectrum/exports/Well.ts     |  14 +
 .../react-spectrum/exports/darkTheme.ts       |  14 +
 .../react-spectrum/exports/defaultTheme.ts    |  14 +
 .../@adobe/react-spectrum/exports/index.ts    | 194 ++++++++++++
 .../react-spectrum/exports/lightTheme.ts      |  14 +
 .../autocomplete/SearchAutocomplete.ts        |   1 +
 .../exports/private/button/ClearButton.ts     |   1 +
 .../exports/private/button/FieldButton.ts     |   1 +
 .../exports/private/card/Card.ts              |   1 +
 .../exports/private/card/CardView.ts          |   1 +
 .../exports/private/card/GalleryLayout.ts     |   1 +
 .../exports/private/card/GridLayout.ts        |   1 +
 .../exports/private/card/WaterfallLayout.ts   |   1 +
 .../exports/private/form/Form.ts              |   1 +
 .../exports/private/icon/Icon.ts              |   1 +
 .../exports/private/icon/Illustration.ts      |   1 +
 .../exports/private/icon/UIIcon.ts            |   1 +
 .../exports/private/label/Field.ts            |   1 +
 .../exports/private/label/HelpText.ts         |   1 +
 .../exports/private/label/Label.ts            |   1 +
 .../exports/private/listbox/ListBoxBase.ts    |   1 +
 .../exports/private/overlays/Modal.ts         |   1 +
 .../private/overlays/OpenTransition.ts        |   1 +
 .../exports/private/overlays/Overlay.ts       |   1 +
 .../exports/private/overlays/Popover.ts       |   1 +
 .../exports/private/overlays/Tray.ts          |   1 +
 .../private/progress/ProgressBarBase.ts       |   1 +
 .../exports/private/provider/Provider.ts      |   1 +
 .../exports/private/steplist/StepList.ts      |   1 +
 .../private/textfield/TextFieldBase.ts        |   1 +
 .../private/theme-express/expressTheme.ts     |   1 +
 .../private/utils/BreakpointProvider.ts       |   1 +
 .../exports/private/utils/Slots.ts            |   1 +
 .../exports/private/utils/classNames.ts       |   1 +
 .../private/utils/getWrappedElement.ts        |   1 +
 .../exports/private/utils/styleProps.ts       |   1 +
 .../exports/private/utils/useDOMRef.ts        |   1 +
 .../exports/private/utils/useHasChild.ts      |   1 +
 .../private/utils/useIsMobileDevice.ts        |   1 +
 .../exports/private/utils/useMediaQuery.ts    |   1 +
 .../react-spectrum/exports/useDragAndDrop.ts  |  19 ++
 .../react-spectrum/intl/actionbar}/ar-AE.json |   0
 .../react-spectrum/intl/actionbar}/bg-BG.json |   0
 .../react-spectrum/intl/actionbar}/cs-CZ.json |   0
 .../react-spectrum/intl/actionbar}/da-DK.json |   0
 .../react-spectrum/intl/actionbar}/de-DE.json |   0
 .../react-spectrum/intl/actionbar}/el-GR.json |   0
 .../react-spectrum/intl/actionbar}/en-US.json |   0
 .../react-spectrum/intl/actionbar}/es-ES.json |   0
 .../react-spectrum/intl/actionbar}/et-EE.json |   0
 .../react-spectrum/intl/actionbar}/fi-FI.json |   0
 .../react-spectrum/intl/actionbar}/fr-FR.json |   0
 .../react-spectrum/intl/actionbar}/he-IL.json |   0
 .../react-spectrum/intl/actionbar}/hr-HR.json |   0
 .../react-spectrum/intl/actionbar}/hu-HU.json |   0
 .../react-spectrum/intl/actionbar}/it-IT.json |   0
 .../react-spectrum/intl/actionbar}/ja-JP.json |   0
 .../react-spectrum/intl/actionbar}/ko-KR.json |   0
 .../react-spectrum/intl/actionbar}/lt-LT.json |   0
 .../react-spectrum/intl/actionbar}/lv-LV.json |   0
 .../react-spectrum/intl/actionbar}/nb-NO.json |   0
 .../react-spectrum/intl/actionbar}/nl-NL.json |   0
 .../react-spectrum/intl/actionbar}/pl-PL.json |   0
 .../react-spectrum/intl/actionbar}/pt-BR.json |   0
 .../react-spectrum/intl/actionbar}/pt-PT.json |   0
 .../react-spectrum/intl/actionbar}/ro-RO.json |   0
 .../react-spectrum/intl/actionbar}/ru-RU.json |   0
 .../react-spectrum/intl/actionbar}/sk-SK.json |   0
 .../react-spectrum/intl/actionbar}/sl-SI.json |   0
 .../react-spectrum/intl/actionbar}/sr-SP.json |   0
 .../react-spectrum/intl/actionbar}/sv-SE.json |   0
 .../react-spectrum/intl/actionbar}/tr-TR.json |   0
 .../react-spectrum/intl/actionbar}/uk-UA.json |   0
 .../react-spectrum/intl/actionbar}/zh-CN.json |   0
 .../react-spectrum/intl/actionbar}/zh-TW.json |   0
 .../intl/actiongroup}/ar-AE.json              |   0
 .../intl/actiongroup}/bg-BG.json              |   0
 .../intl/actiongroup}/cs-CZ.json              |   0
 .../intl/actiongroup}/da-DK.json              |   0
 .../intl/actiongroup}/de-DE.json              |   0
 .../intl/actiongroup}/el-GR.json              |   0
 .../intl/actiongroup}/en-US.json              |   0
 .../intl/actiongroup}/es-ES.json              |   0
 .../intl/actiongroup}/et-EE.json              |   0
 .../intl/actiongroup}/fi-FI.json              |   0
 .../intl/actiongroup}/fr-FR.json              |   0
 .../intl/actiongroup}/he-IL.json              |   0
 .../intl/actiongroup}/hr-HR.json              |   0
 .../intl/actiongroup}/hu-HU.json              |   0
 .../intl/actiongroup}/it-IT.json              |   0
 .../intl/actiongroup}/ja-JP.json              |   0
 .../intl/actiongroup}/ko-KR.json              |   0
 .../intl/actiongroup}/lt-LT.json              |   0
 .../intl/actiongroup}/lv-LV.json              |   0
 .../intl/actiongroup}/nb-NO.json              |   0
 .../intl/actiongroup}/nl-NL.json              |   0
 .../intl/actiongroup}/pl-PL.json              |   0
 .../intl/actiongroup}/pt-BR.json              |   0
 .../intl/actiongroup}/pt-PT.json              |   0
 .../intl/actiongroup}/ro-RO.json              |   0
 .../intl/actiongroup}/ru-RU.json              |   0
 .../intl/actiongroup}/sk-SK.json              |   0
 .../intl/actiongroup}/sl-SI.json              |   0
 .../intl/actiongroup}/sr-SP.json              |   0
 .../intl/actiongroup}/sv-SE.json              |   0
 .../intl/actiongroup}/tr-TR.json              |   0
 .../intl/actiongroup}/uk-UA.json              |   0
 .../intl/actiongroup}/zh-CN.json              |   0
 .../intl/actiongroup}/zh-TW.json              |   0
 .../intl/autocomplete}/ar-AE.json             |   0
 .../intl/autocomplete}/bg-BG.json             |   0
 .../intl/autocomplete}/cs-CZ.json             |   0
 .../intl/autocomplete}/da-DK.json             |   0
 .../intl/autocomplete}/de-DE.json             |   0
 .../intl/autocomplete}/el-GR.json             |   0
 .../intl/autocomplete}/en-US.json             |   0
 .../intl/autocomplete}/es-ES.json             |   0
 .../intl/autocomplete}/et-EE.json             |   0
 .../intl/autocomplete}/fi-FI.json             |   0
 .../intl/autocomplete}/fr-FR.json             |   0
 .../intl/autocomplete}/he-IL.json             |   0
 .../intl/autocomplete}/hr-HR.json             |   0
 .../intl/autocomplete}/hu-HU.json             |   0
 .../intl/autocomplete}/it-IT.json             |   0
 .../intl/autocomplete}/ja-JP.json             |   0
 .../intl/autocomplete}/ko-KR.json             |   0
 .../intl/autocomplete}/lt-LT.json             |   0
 .../intl/autocomplete}/lv-LV.json             |   0
 .../intl/autocomplete}/nb-NO.json             |   0
 .../intl/autocomplete}/nl-NL.json             |   0
 .../intl/autocomplete}/pl-PL.json             |   0
 .../intl/autocomplete}/pt-BR.json             |   0
 .../intl/autocomplete}/pt-PT.json             |   0
 .../intl/autocomplete}/ro-RO.json             |   0
 .../intl/autocomplete}/ru-RU.json             |   0
 .../intl/autocomplete}/sk-SK.json             |   0
 .../intl/autocomplete}/sl-SI.json             |   0
 .../intl/autocomplete}/sr-SP.json             |   0
 .../intl/autocomplete}/sv-SE.json             |   0
 .../intl/autocomplete}/tr-TR.json             |   0
 .../intl/autocomplete}/uk-UA.json             |   0
 .../intl/autocomplete}/zh-CN.json             |   0
 .../intl/autocomplete}/zh-TW.json             |   0
 .../react-spectrum/intl/button}/ar-AE.json    |   0
 .../react-spectrum/intl/button}/bg-BG.json    |   0
 .../react-spectrum/intl/button}/cs-CZ.json    |   0
 .../react-spectrum/intl/button}/da-DK.json    |   0
 .../react-spectrum/intl/button}/de-DE.json    |   0
 .../react-spectrum/intl/button}/el-GR.json    |   0
 .../react-spectrum/intl/button}/en-US.json    |   0
 .../react-spectrum/intl/button}/es-ES.json    |   0
 .../react-spectrum/intl/button}/et-EE.json    |   0
 .../react-spectrum/intl/button}/fi-FI.json    |   0
 .../react-spectrum/intl/button}/fr-FR.json    |   0
 .../react-spectrum/intl/button}/he-IL.json    |   0
 .../react-spectrum/intl/button}/hr-HR.json    |   0
 .../react-spectrum/intl/button}/hu-HU.json    |   0
 .../react-spectrum/intl/button}/it-IT.json    |   0
 .../react-spectrum/intl/button}/ja-JP.json    |   0
 .../react-spectrum/intl/button}/ko-KR.json    |   0
 .../react-spectrum/intl/button}/lt-LT.json    |   0
 .../react-spectrum/intl/button}/lv-LV.json    |   0
 .../react-spectrum/intl/button}/nb-NO.json    |   0
 .../react-spectrum/intl/button}/nl-NL.json    |   0
 .../react-spectrum/intl/button}/pl-PL.json    |   0
 .../react-spectrum/intl/button}/pt-BR.json    |   0
 .../react-spectrum/intl/button}/pt-PT.json    |   0
 .../react-spectrum/intl/button}/ro-RO.json    |   0
 .../react-spectrum/intl/button}/ru-RU.json    |   0
 .../react-spectrum/intl/button}/sk-SK.json    |   0
 .../react-spectrum/intl/button}/sl-SI.json    |   0
 .../react-spectrum/intl/button}/sr-SP.json    |   0
 .../react-spectrum/intl/button}/sv-SE.json    |   0
 .../react-spectrum/intl/button}/tr-TR.json    |   0
 .../react-spectrum/intl/button}/uk-UA.json    |   0
 .../react-spectrum/intl/button}/zh-CN.json    |   0
 .../react-spectrum/intl/button}/zh-TW.json    |   0
 .../react-spectrum/intl/calendar}/ar-AE.json  |   0
 .../react-spectrum/intl/calendar}/bg-BG.json  |   0
 .../react-spectrum/intl/calendar}/cs-CZ.json  |   0
 .../react-spectrum/intl/calendar}/da-DK.json  |   0
 .../react-spectrum/intl/calendar}/de-DE.json  |   0
 .../react-spectrum/intl/calendar}/el-GR.json  |   0
 .../react-spectrum/intl/calendar}/en-US.json  |   0
 .../react-spectrum/intl/calendar}/es-ES.json  |   0
 .../react-spectrum/intl/calendar}/et-EE.json  |   0
 .../react-spectrum/intl/calendar}/fi-FI.json  |   0
 .../react-spectrum/intl/calendar}/fr-FR.json  |   0
 .../react-spectrum/intl/calendar}/he-IL.json  |   0
 .../react-spectrum/intl/calendar}/hr-HR.json  |   0
 .../react-spectrum/intl/calendar}/hu-HU.json  |   0
 .../react-spectrum/intl/calendar}/it-IT.json  |   0
 .../react-spectrum/intl/calendar}/ja-JP.json  |   0
 .../react-spectrum/intl/calendar}/ko-KR.json  |   0
 .../react-spectrum/intl/calendar}/lt-LT.json  |   0
 .../react-spectrum/intl/calendar}/lv-LV.json  |   0
 .../react-spectrum/intl/calendar}/nb-NO.json  |   0
 .../react-spectrum/intl/calendar}/nl-NL.json  |   0
 .../react-spectrum/intl/calendar}/pl-PL.json  |   0
 .../react-spectrum/intl/calendar}/pt-BR.json  |   0
 .../react-spectrum/intl/calendar}/pt-PT.json  |   0
 .../react-spectrum/intl/calendar}/ro-RO.json  |   0
 .../react-spectrum/intl/calendar}/ru-RU.json  |   0
 .../react-spectrum/intl/calendar}/sk-SK.json  |   0
 .../react-spectrum/intl/calendar}/sl-SI.json  |   0
 .../react-spectrum/intl/calendar}/sr-SP.json  |   0
 .../react-spectrum/intl/calendar}/sv-SE.json  |   0
 .../react-spectrum/intl/calendar}/tr-TR.json  |   0
 .../react-spectrum/intl/calendar}/uk-UA.json  |   0
 .../react-spectrum/intl/calendar}/zh-CN.json  |   0
 .../react-spectrum/intl/calendar}/zh-TW.json  |   0
 .../react-spectrum/intl/card}/ar-AE.json      |   0
 .../react-spectrum/intl/card}/bg-BG.json      |   0
 .../react-spectrum/intl/card}/cs-CZ.json      |   0
 .../react-spectrum/intl/card}/da-DK.json      |   0
 .../react-spectrum/intl/card}/de-DE.json      |   0
 .../react-spectrum/intl/card}/el-GR.json      |   0
 .../react-spectrum/intl/card}/en-US.json      |   0
 .../react-spectrum/intl/card}/es-ES.json      |   0
 .../react-spectrum/intl/card}/et-EE.json      |   0
 .../react-spectrum/intl/card}/fi-FI.json      |   0
 .../react-spectrum/intl/card}/fr-FR.json      |   0
 .../react-spectrum/intl/card}/he-IL.json      |   0
 .../react-spectrum/intl/card}/hr-HR.json      |   0
 .../react-spectrum/intl/card}/hu-HU.json      |   0
 .../react-spectrum/intl/card}/it-IT.json      |   0
 .../react-spectrum/intl/card}/ja-JP.json      |   0
 .../react-spectrum/intl/card}/ko-KR.json      |   0
 .../react-spectrum/intl/card}/lt-LT.json      |   0
 .../react-spectrum/intl/card}/lv-LV.json      |   0
 .../react-spectrum/intl/card}/nb-NO.json      |   0
 .../react-spectrum/intl/card}/nl-NL.json      |   0
 .../react-spectrum/intl/card}/pl-PL.json      |   0
 .../react-spectrum/intl/card}/pt-BR.json      |   0
 .../react-spectrum/intl/card}/pt-PT.json      |   0
 .../react-spectrum/intl/card}/ro-RO.json      |   0
 .../react-spectrum/intl/card}/ru-RU.json      |   0
 .../react-spectrum/intl/card}/sk-SK.json      |   0
 .../react-spectrum/intl/card}/sl-SI.json      |   0
 .../react-spectrum/intl/card}/sr-SP.json      |   0
 .../react-spectrum/intl/card}/sv-SE.json      |   0
 .../react-spectrum/intl/card}/tr-TR.json      |   0
 .../react-spectrum/intl/card}/uk-UA.json      |   0
 .../react-spectrum/intl/card}/zh-CN.json      |   0
 .../react-spectrum/intl/card}/zh-TW.json      |   0
 .../react-spectrum/intl/color}/ar-AE.json     |   0
 .../react-spectrum/intl/color}/bg-BG.json     |   0
 .../react-spectrum/intl/color}/cs-CZ.json     |   0
 .../react-spectrum/intl/color}/da-DK.json     |   0
 .../react-spectrum/intl/color}/de-DE.json     |   0
 .../react-spectrum/intl/color}/el-GR.json     |   0
 .../react-spectrum/intl/color}/en-US.json     |   0
 .../react-spectrum/intl/color}/es-ES.json     |   0
 .../react-spectrum/intl/color}/et-EE.json     |   0
 .../react-spectrum/intl/color}/fi-FI.json     |   0
 .../react-spectrum/intl/color}/fr-FR.json     |   0
 .../react-spectrum/intl/color}/he-IL.json     |   0
 .../react-spectrum/intl/color}/hr-HR.json     |   0
 .../react-spectrum/intl/color}/hu-HU.json     |   0
 .../react-spectrum/intl/color}/it-IT.json     |   0
 .../react-spectrum/intl/color}/ja-JP.json     |   0
 .../react-spectrum/intl/color}/ko-KR.json     |   0
 .../react-spectrum/intl/color}/lt-LT.json     |   0
 .../react-spectrum/intl/color}/lv-LV.json     |   0
 .../react-spectrum/intl/color}/nb-NO.json     |   0
 .../react-spectrum/intl/color}/nl-NL.json     |   0
 .../react-spectrum/intl/color}/pl-PL.json     |   0
 .../react-spectrum/intl/color}/pt-BR.json     |   0
 .../react-spectrum/intl/color}/pt-PT.json     |   0
 .../react-spectrum/intl/color}/ro-RO.json     |   0
 .../react-spectrum/intl/color}/ru-RU.json     |   0
 .../react-spectrum/intl/color}/sk-SK.json     |   0
 .../react-spectrum/intl/color}/sl-SI.json     |   0
 .../react-spectrum/intl/color}/sr-SP.json     |   0
 .../react-spectrum/intl/color}/sv-SE.json     |   0
 .../react-spectrum/intl/color}/tr-TR.json     |   0
 .../react-spectrum/intl/color}/uk-UA.json     |   0
 .../react-spectrum/intl/color}/zh-CN.json     |   0
 .../react-spectrum/intl/color}/zh-TW.json     |   0
 .../react-spectrum/intl/combobox}/ar-AE.json  |   0
 .../react-spectrum/intl/combobox}/bg-BG.json  |   0
 .../react-spectrum/intl/combobox}/cs-CZ.json  |   0
 .../react-spectrum/intl/combobox}/da-DK.json  |   0
 .../react-spectrum/intl/combobox}/de-DE.json  |   0
 .../react-spectrum/intl/combobox}/el-GR.json  |   0
 .../react-spectrum/intl/combobox}/en-US.json  |   0
 .../react-spectrum/intl/combobox}/es-ES.json  |   0
 .../react-spectrum/intl/combobox}/et-EE.json  |   0
 .../react-spectrum/intl/combobox}/fi-FI.json  |   0
 .../react-spectrum/intl/combobox}/fr-FR.json  |   0
 .../react-spectrum/intl/combobox}/he-IL.json  |   0
 .../react-spectrum/intl/combobox}/hr-HR.json  |   0
 .../react-spectrum/intl/combobox}/hu-HU.json  |   0
 .../react-spectrum/intl/combobox}/it-IT.json  |   0
 .../react-spectrum/intl/combobox}/ja-JP.json  |   0
 .../react-spectrum/intl/combobox}/ko-KR.json  |   0
 .../react-spectrum/intl/combobox}/lt-LT.json  |   0
 .../react-spectrum/intl/combobox}/lv-LV.json  |   0
 .../react-spectrum/intl/combobox}/nb-NO.json  |   0
 .../react-spectrum/intl/combobox}/nl-NL.json  |   0
 .../react-spectrum/intl/combobox}/pl-PL.json  |   0
 .../react-spectrum/intl/combobox}/pt-BR.json  |   0
 .../react-spectrum/intl/combobox}/pt-PT.json  |   0
 .../react-spectrum/intl/combobox}/ro-RO.json  |   0
 .../react-spectrum/intl/combobox}/ru-RU.json  |   0
 .../react-spectrum/intl/combobox}/sk-SK.json  |   0
 .../react-spectrum/intl/combobox}/sl-SI.json  |   0
 .../react-spectrum/intl/combobox}/sr-SP.json  |   0
 .../react-spectrum/intl/combobox}/sv-SE.json  |   0
 .../react-spectrum/intl/combobox}/tr-TR.json  |   0
 .../react-spectrum/intl/combobox}/uk-UA.json  |   0
 .../react-spectrum/intl/combobox}/zh-CN.json  |   0
 .../react-spectrum/intl/combobox}/zh-TW.json  |   0
 .../intl/contextualhelp}/ar-AE.json           |   0
 .../intl/contextualhelp}/bg-BG.json           |   0
 .../intl/contextualhelp}/cs-CZ.json           |   0
 .../intl/contextualhelp}/da-DK.json           |   0
 .../intl/contextualhelp}/de-DE.json           |   0
 .../intl/contextualhelp}/el-GR.json           |   0
 .../intl/contextualhelp}/en-US.json           |   0
 .../intl/contextualhelp}/es-ES.json           |   0
 .../intl/contextualhelp}/et-EE.json           |   0
 .../intl/contextualhelp}/fi-FI.json           |   0
 .../intl/contextualhelp}/fr-FR.json           |   0
 .../intl/contextualhelp}/he-IL.json           |   0
 .../intl/contextualhelp}/hr-HR.json           |   0
 .../intl/contextualhelp}/hu-HU.json           |   0
 .../intl/contextualhelp}/it-IT.json           |   0
 .../intl/contextualhelp}/ja-JP.json           |   0
 .../intl/contextualhelp}/ko-KR.json           |   0
 .../intl/contextualhelp}/lt-LT.json           |   0
 .../intl/contextualhelp}/lv-LV.json           |   0
 .../intl/contextualhelp}/nb-NO.json           |   0
 .../intl/contextualhelp}/nl-NL.json           |   0
 .../intl/contextualhelp}/pl-PL.json           |   0
 .../intl/contextualhelp}/pt-BR.json           |   0
 .../intl/contextualhelp}/pt-PT.json           |   0
 .../intl/contextualhelp}/ro-RO.json           |   0
 .../intl/contextualhelp}/ru-RU.json           |   0
 .../intl/contextualhelp}/sk-SK.json           |   0
 .../intl/contextualhelp}/sl-SI.json           |   0
 .../intl/contextualhelp}/sr-SP.json           |   0
 .../intl/contextualhelp}/sv-SE.json           |   0
 .../intl/contextualhelp}/tr-TR.json           |   0
 .../intl/contextualhelp}/uk-UA.json           |   0
 .../intl/contextualhelp}/zh-CN.json           |   0
 .../intl/contextualhelp}/zh-TW.json           |   0
 .../intl/datepicker}/ar-AE.json               |   0
 .../intl/datepicker}/bg-BG.json               |   0
 .../intl/datepicker}/cs-CZ.json               |   0
 .../intl/datepicker}/da-DK.json               |   0
 .../intl/datepicker}/de-DE.json               |   0
 .../intl/datepicker}/el-GR.json               |   0
 .../intl/datepicker}/en-US.json               |   0
 .../intl/datepicker}/es-ES.json               |   0
 .../intl/datepicker}/et-EE.json               |   0
 .../intl/datepicker}/fi-FI.json               |   0
 .../intl/datepicker}/fr-FR.json               |   0
 .../intl/datepicker}/he-IL.json               |   0
 .../intl/datepicker}/hr-HR.json               |   0
 .../intl/datepicker}/hu-HU.json               |   0
 .../intl/datepicker}/it-IT.json               |   0
 .../intl/datepicker}/ja-JP.json               |   0
 .../intl/datepicker}/ko-KR.json               |   0
 .../intl/datepicker}/lt-LT.json               |   0
 .../intl/datepicker}/lv-LV.json               |   0
 .../intl/datepicker}/nb-NO.json               |   0
 .../intl/datepicker}/nl-NL.json               |   0
 .../intl/datepicker}/pl-PL.json               |   0
 .../intl/datepicker}/pt-BR.json               |   0
 .../intl/datepicker}/pt-PT.json               |   0
 .../intl/datepicker}/ro-RO.json               |   0
 .../intl/datepicker}/ru-RU.json               |   0
 .../intl/datepicker}/sk-SK.json               |   0
 .../intl/datepicker}/sl-SI.json               |   0
 .../intl/datepicker}/sr-SP.json               |   0
 .../intl/datepicker}/sv-SE.json               |   0
 .../intl/datepicker}/tr-TR.json               |   0
 .../intl/datepicker}/uk-UA.json               |   0
 .../intl/datepicker}/zh-CN.json               |   0
 .../intl/datepicker}/zh-TW.json               |   0
 .../react-spectrum/intl/dialog}/ar-AE.json    |   0
 .../react-spectrum/intl/dialog}/bg-BG.json    |   0
 .../react-spectrum/intl/dialog}/cs-CZ.json    |   0
 .../react-spectrum/intl/dialog}/da-DK.json    |   0
 .../react-spectrum/intl/dialog}/de-DE.json    |   0
 .../react-spectrum/intl/dialog}/el-GR.json    |   0
 .../react-spectrum/intl/dialog}/en-US.json    |   0
 .../react-spectrum/intl/dialog}/es-ES.json    |   0
 .../react-spectrum/intl/dialog}/et-EE.json    |   0
 .../react-spectrum/intl/dialog}/fi-FI.json    |   0
 .../react-spectrum/intl/dialog}/fr-FR.json    |   0
 .../react-spectrum/intl/dialog}/he-IL.json    |   0
 .../react-spectrum/intl/dialog}/hr-HR.json    |   0
 .../react-spectrum/intl/dialog}/hu-HU.json    |   0
 .../react-spectrum/intl/dialog}/it-IT.json    |   0
 .../react-spectrum/intl/dialog}/ja-JP.json    |   0
 .../react-spectrum/intl/dialog}/ko-KR.json    |   0
 .../react-spectrum/intl/dialog}/lt-LT.json    |   0
 .../react-spectrum/intl/dialog}/lv-LV.json    |   0
 .../react-spectrum/intl/dialog}/nb-NO.json    |   0
 .../react-spectrum/intl/dialog}/nl-NL.json    |   0
 .../react-spectrum/intl/dialog}/pl-PL.json    |   0
 .../react-spectrum/intl/dialog}/pt-BR.json    |   0
 .../react-spectrum/intl/dialog}/pt-PT.json    |   0
 .../react-spectrum/intl/dialog}/ro-RO.json    |   0
 .../react-spectrum/intl/dialog}/ru-RU.json    |   0
 .../react-spectrum/intl/dialog}/sk-SK.json    |   0
 .../react-spectrum/intl/dialog}/sl-SI.json    |   0
 .../react-spectrum/intl/dialog}/sr-SP.json    |   0
 .../react-spectrum/intl/dialog}/sv-SE.json    |   0
 .../react-spectrum/intl/dialog}/tr-TR.json    |   0
 .../react-spectrum/intl/dialog}/uk-UA.json    |   0
 .../react-spectrum/intl/dialog}/zh-CN.json    |   0
 .../react-spectrum/intl/dialog}/zh-TW.json    |   0
 .../react-spectrum/intl/dropzone}/ar-AE.json  |   0
 .../react-spectrum/intl/dropzone}/bg-BG.json  |   0
 .../react-spectrum/intl/dropzone}/cs-CZ.json  |   0
 .../react-spectrum/intl/dropzone}/da-DK.json  |   0
 .../react-spectrum/intl/dropzone}/de-DE.json  |   0
 .../react-spectrum/intl/dropzone}/el-GR.json  |   0
 .../react-spectrum/intl/dropzone}/en-US.json  |   0
 .../react-spectrum/intl/dropzone}/es-ES.json  |   0
 .../react-spectrum/intl/dropzone}/et-EE.json  |   0
 .../react-spectrum/intl/dropzone}/fi-FI.json  |   0
 .../react-spectrum/intl/dropzone}/fr-FR.json  |   0
 .../react-spectrum/intl/dropzone}/he-IL.json  |   0
 .../react-spectrum/intl/dropzone}/hr-HR.json  |   0
 .../react-spectrum/intl/dropzone}/hu-HU.json  |   0
 .../react-spectrum/intl/dropzone}/it-IT.json  |   0
 .../react-spectrum/intl/dropzone}/ja-JP.json  |   0
 .../react-spectrum/intl/dropzone}/ko-KR.json  |   0
 .../react-spectrum/intl/dropzone}/lt-LT.json  |   0
 .../react-spectrum/intl/dropzone}/lv-LV.json  |   0
 .../react-spectrum/intl/dropzone}/nb-NO.json  |   0
 .../react-spectrum/intl/dropzone}/nl-NL.json  |   0
 .../react-spectrum/intl/dropzone}/pl-PL.json  |   0
 .../react-spectrum/intl/dropzone}/pt-BR.json  |   0
 .../react-spectrum/intl/dropzone}/pt-PT.json  |   0
 .../react-spectrum/intl/dropzone}/ro-RO.json  |   0
 .../react-spectrum/intl/dropzone}/ru-RU.json  |   0
 .../react-spectrum/intl/dropzone}/sk-SK.json  |   0
 .../react-spectrum/intl/dropzone}/sl-SI.json  |   0
 .../react-spectrum/intl/dropzone}/sr-SP.json  |   0
 .../react-spectrum/intl/dropzone}/sv-SE.json  |   0
 .../react-spectrum/intl/dropzone}/tr-TR.json  |   0
 .../react-spectrum/intl/dropzone}/uk-UA.json  |   0
 .../react-spectrum/intl/dropzone}/zh-CN.json  |   0
 .../react-spectrum/intl/dropzone}/zh-TW.json  |   0
 .../intl/inlinealert}/ar-AE.json              |   0
 .../intl/inlinealert}/bg-BG.json              |   0
 .../intl/inlinealert}/cs-CZ.json              |   0
 .../intl/inlinealert}/da-DK.json              |   0
 .../intl/inlinealert}/de-DE.json              |   0
 .../intl/inlinealert}/el-GR.json              |   0
 .../intl/inlinealert}/en-US.json              |   0
 .../intl/inlinealert}/es-ES.json              |   0
 .../intl/inlinealert}/et-EE.json              |   0
 .../intl/inlinealert}/fi-FI.json              |   0
 .../intl/inlinealert}/fr-FR.json              |   0
 .../intl/inlinealert}/he-IL.json              |   0
 .../intl/inlinealert}/hr-HR.json              |   0
 .../intl/inlinealert}/hu-HU.json              |   0
 .../react-spectrum/intl/inlinealert}/index.js |   0
 .../intl/inlinealert}/it-IT.json              |   0
 .../intl/inlinealert}/ja-JP.json              |   0
 .../intl/inlinealert}/ko-KR.json              |   0
 .../intl/inlinealert}/lt-LT.json              |   0
 .../intl/inlinealert}/lv-LV.json              |   0
 .../intl/inlinealert}/nb-NO.json              |   0
 .../intl/inlinealert}/nl-NL.json              |   0
 .../intl/inlinealert}/pl-PL.json              |   0
 .../intl/inlinealert}/pt-BR.json              |   0
 .../intl/inlinealert}/pt-PT.json              |   0
 .../intl/inlinealert}/ro-RO.json              |   0
 .../intl/inlinealert}/ru-RU.json              |   0
 .../intl/inlinealert}/sk-SK.json              |   0
 .../intl/inlinealert}/sl-SI.json              |   0
 .../intl/inlinealert}/sr-SP.json              |   0
 .../intl/inlinealert}/sv-SE.json              |   0
 .../intl/inlinealert}/tr-TR.json              |   0
 .../intl/inlinealert}/uk-UA.json              |   0
 .../intl/inlinealert}/zh-CN.json              |   0
 .../intl/inlinealert}/zh-TW.json              |   0
 .../react-spectrum/intl/label}/ar-AE.json     |   0
 .../react-spectrum/intl/label}/bg-BG.json     |   0
 .../react-spectrum/intl/label}/cs-CZ.json     |   0
 .../react-spectrum/intl/label}/da-DK.json     |   0
 .../react-spectrum/intl/label}/de-DE.json     |   0
 .../react-spectrum/intl/label}/el-GR.json     |   0
 .../react-spectrum/intl/label}/en-US.json     |   0
 .../react-spectrum/intl/label}/es-ES.json     |   0
 .../react-spectrum/intl/label}/et-EE.json     |   0
 .../react-spectrum/intl/label}/fi-FI.json     |   0
 .../react-spectrum/intl/label}/fr-FR.json     |   0
 .../react-spectrum/intl/label}/he-IL.json     |   0
 .../react-spectrum/intl/label}/hr-HR.json     |   0
 .../react-spectrum/intl/label}/hu-HU.json     |   0
 .../react-spectrum/intl/label}/it-IT.json     |   0
 .../react-spectrum/intl/label}/ja-JP.json     |   0
 .../react-spectrum/intl/label}/ko-KR.json     |   0
 .../react-spectrum/intl/label}/lt-LT.json     |   0
 .../react-spectrum/intl/label}/lv-LV.json     |   0
 .../react-spectrum/intl/label}/nb-NO.json     |   0
 .../react-spectrum/intl/label}/nl-NL.json     |   0
 .../react-spectrum/intl/label}/pl-PL.json     |   0
 .../react-spectrum/intl/label}/pt-BR.json     |   0
 .../react-spectrum/intl/label}/pt-PT.json     |   0
 .../react-spectrum/intl/label}/ro-RO.json     |   0
 .../react-spectrum/intl/label}/ru-RU.json     |   0
 .../react-spectrum/intl/label}/sk-SK.json     |   0
 .../react-spectrum/intl/label}/sl-SI.json     |   0
 .../react-spectrum/intl/label}/sr-SP.json     |   0
 .../react-spectrum/intl/label}/sv-SE.json     |   0
 .../react-spectrum/intl/label}/tr-TR.json     |   0
 .../react-spectrum/intl/label}/uk-UA.json     |   0
 .../react-spectrum/intl/label}/zh-CN.json     |   0
 .../react-spectrum/intl/label}/zh-TW.json     |   0
 .../react-spectrum/intl/list}/ar-AE.json      |   0
 .../react-spectrum/intl/list}/bg-BG.json      |   0
 .../react-spectrum/intl/list}/cs-CZ.json      |   0
 .../react-spectrum/intl/list}/da-DK.json      |   0
 .../react-spectrum/intl/list}/de-DE.json      |   0
 .../react-spectrum/intl/list}/el-GR.json      |   0
 .../react-spectrum/intl/list}/en-US.json      |   0
 .../react-spectrum/intl/list}/es-ES.json      |   0
 .../react-spectrum/intl/list}/et-EE.json      |   0
 .../react-spectrum/intl/list}/fi-FI.json      |   0
 .../react-spectrum/intl/list}/fr-FR.json      |   0
 .../react-spectrum/intl/list}/he-IL.json      |   0
 .../react-spectrum/intl/list}/hr-HR.json      |   0
 .../react-spectrum/intl/list}/hu-HU.json      |   0
 .../react-spectrum/intl/list}/it-IT.json      |   0
 .../react-spectrum/intl/list}/ja-JP.json      |   0
 .../react-spectrum/intl/list}/ko-KR.json      |   0
 .../react-spectrum/intl/list}/lt-LT.json      |   0
 .../react-spectrum/intl/list}/lv-LV.json      |   0
 .../react-spectrum/intl/list}/nb-NO.json      |   0
 .../react-spectrum/intl/list}/nl-NL.json      |   0
 .../react-spectrum/intl/list}/pl-PL.json      |   0
 .../react-spectrum/intl/list}/pt-BR.json      |   0
 .../react-spectrum/intl/list}/pt-PT.json      |   0
 .../react-spectrum/intl/list}/ro-RO.json      |   0
 .../react-spectrum/intl/list}/ru-RU.json      |   0
 .../react-spectrum/intl/list}/sk-SK.json      |   0
 .../react-spectrum/intl/list}/sl-SI.json      |   0
 .../react-spectrum/intl/list}/sr-SP.json      |   0
 .../react-spectrum/intl/list}/sv-SE.json      |   0
 .../react-spectrum/intl/list}/tr-TR.json      |   0
 .../react-spectrum/intl/list}/uk-UA.json      |   0
 .../react-spectrum/intl/list}/zh-CN.json      |   0
 .../react-spectrum/intl/list}/zh-TW.json      |   0
 .../react-spectrum/intl/listbox}/ar-AE.json   |   0
 .../react-spectrum/intl/listbox}/bg-BG.json   |   0
 .../react-spectrum/intl/listbox}/cs-CZ.json   |   0
 .../react-spectrum/intl/listbox}/da-DK.json   |   0
 .../react-spectrum/intl/listbox}/de-DE.json   |   0
 .../react-spectrum/intl/listbox}/el-GR.json   |   0
 .../react-spectrum/intl/listbox}/en-US.json   |   0
 .../react-spectrum/intl/listbox}/es-ES.json   |   0
 .../react-spectrum/intl/listbox}/et-EE.json   |   0
 .../react-spectrum/intl/listbox}/fi-FI.json   |   0
 .../react-spectrum/intl/listbox}/fr-FR.json   |   0
 .../react-spectrum/intl/listbox}/he-IL.json   |   0
 .../react-spectrum/intl/listbox}/hr-HR.json   |   0
 .../react-spectrum/intl/listbox}/hu-HU.json   |   0
 .../react-spectrum/intl/listbox}/it-IT.json   |   0
 .../react-spectrum/intl/listbox}/ja-JP.json   |   0
 .../react-spectrum/intl/listbox}/ko-KR.json   |   0
 .../react-spectrum/intl/listbox}/lt-LT.json   |   0
 .../react-spectrum/intl/listbox}/lv-LV.json   |   0
 .../react-spectrum/intl/listbox}/nb-NO.json   |   0
 .../react-spectrum/intl/listbox}/nl-NL.json   |   0
 .../react-spectrum/intl/listbox}/pl-PL.json   |   0
 .../react-spectrum/intl/listbox}/pt-BR.json   |   0
 .../react-spectrum/intl/listbox}/pt-PT.json   |   0
 .../react-spectrum/intl/listbox}/ro-RO.json   |   0
 .../react-spectrum/intl/listbox}/ru-RU.json   |   0
 .../react-spectrum/intl/listbox}/sk-SK.json   |   0
 .../react-spectrum/intl/listbox}/sl-SI.json   |   0
 .../react-spectrum/intl/listbox}/sr-SP.json   |   0
 .../react-spectrum/intl/listbox}/sv-SE.json   |   0
 .../react-spectrum/intl/listbox}/tr-TR.json   |   0
 .../react-spectrum/intl/listbox}/uk-UA.json   |   0
 .../react-spectrum/intl/listbox}/zh-CN.json   |   0
 .../react-spectrum/intl/listbox}/zh-TW.json   |   0
 .../react-spectrum/intl/menu}/ar-AE.json      |   0
 .../react-spectrum/intl/menu}/bg-BG.json      |   0
 .../react-spectrum/intl/menu}/cs-CZ.json      |   0
 .../react-spectrum/intl/menu}/da-DK.json      |   0
 .../react-spectrum/intl/menu}/de-DE.json      |   0
 .../react-spectrum/intl/menu}/el-GR.json      |   0
 .../react-spectrum/intl/menu}/en-US.json      |   0
 .../react-spectrum/intl/menu}/es-ES.json      |   0
 .../react-spectrum/intl/menu}/et-EE.json      |   0
 .../react-spectrum/intl/menu}/fi-FI.json      |   0
 .../react-spectrum/intl/menu}/fr-FR.json      |   0
 .../react-spectrum/intl/menu}/he-IL.json      |   0
 .../react-spectrum/intl/menu}/hr-HR.json      |   0
 .../react-spectrum/intl/menu}/hu-HU.json      |   0
 .../react-spectrum/intl/menu}/it-IT.json      |   0
 .../react-spectrum/intl/menu}/ja-JP.json      |   0
 .../react-spectrum/intl/menu}/ko-KR.json      |   0
 .../react-spectrum/intl/menu}/lt-LT.json      |   0
 .../react-spectrum/intl/menu}/lv-LV.json      |   0
 .../react-spectrum/intl/menu}/nb-NO.json      |   0
 .../react-spectrum/intl/menu}/nl-NL.json      |   0
 .../react-spectrum/intl/menu}/pl-PL.json      |   0
 .../react-spectrum/intl/menu}/pt-BR.json      |   0
 .../react-spectrum/intl/menu}/pt-PT.json      |   0
 .../react-spectrum/intl/menu}/ro-RO.json      |   0
 .../react-spectrum/intl/menu}/ru-RU.json      |   0
 .../react-spectrum/intl/menu}/sk-SK.json      |   0
 .../react-spectrum/intl/menu}/sl-SI.json      |   0
 .../react-spectrum/intl/menu}/sr-SP.json      |   0
 .../react-spectrum/intl/menu}/sv-SE.json      |   0
 .../react-spectrum/intl/menu}/tr-TR.json      |   0
 .../react-spectrum/intl/menu}/uk-UA.json      |   0
 .../react-spectrum/intl/menu}/zh-CN.json      |   0
 .../react-spectrum/intl/menu}/zh-TW.json      |   0
 .../react-spectrum/intl/picker}/ar-AE.json    |   0
 .../react-spectrum/intl/picker}/bg-BG.json    |   0
 .../react-spectrum/intl/picker}/cs-CZ.json    |   0
 .../react-spectrum/intl/picker}/da-DK.json    |   0
 .../react-spectrum/intl/picker}/de-DE.json    |   0
 .../react-spectrum/intl/picker}/el-GR.json    |   0
 .../react-spectrum/intl/picker}/en-US.json    |   0
 .../react-spectrum/intl/picker}/es-ES.json    |   0
 .../react-spectrum/intl/picker}/et-EE.json    |   0
 .../react-spectrum/intl/picker}/fi-FI.json    |   0
 .../react-spectrum/intl/picker}/fr-FR.json    |   0
 .../react-spectrum/intl/picker}/he-IL.json    |   0
 .../react-spectrum/intl/picker}/hr-HR.json    |   0
 .../react-spectrum/intl/picker}/hu-HU.json    |   0
 .../react-spectrum/intl/picker}/it-IT.json    |   0
 .../react-spectrum/intl/picker}/ja-JP.json    |   0
 .../react-spectrum/intl/picker}/ko-KR.json    |   0
 .../react-spectrum/intl/picker}/lt-LT.json    |   0
 .../react-spectrum/intl/picker}/lv-LV.json    |   0
 .../react-spectrum/intl/picker}/nb-NO.json    |   0
 .../react-spectrum/intl/picker}/nl-NL.json    |   0
 .../react-spectrum/intl/picker}/pl-PL.json    |   0
 .../react-spectrum/intl/picker}/pt-BR.json    |   0
 .../react-spectrum/intl/picker}/pt-PT.json    |   0
 .../react-spectrum/intl/picker}/ro-RO.json    |   0
 .../react-spectrum/intl/picker}/ru-RU.json    |   0
 .../react-spectrum/intl/picker}/sk-SK.json    |   0
 .../react-spectrum/intl/picker}/sl-SI.json    |   0
 .../react-spectrum/intl/picker}/sr-SP.json    |   0
 .../react-spectrum/intl/picker}/sv-SE.json    |   0
 .../react-spectrum/intl/picker}/tr-TR.json    |   0
 .../react-spectrum/intl/picker}/uk-UA.json    |   0
 .../react-spectrum/intl/picker}/zh-CN.json    |   0
 .../react-spectrum/intl/picker}/zh-TW.json    |   0
 .../react-spectrum/intl/slider}/ar-AE.json    |   0
 .../react-spectrum/intl/slider}/bg-BG.json    |   0
 .../react-spectrum/intl/slider}/cs-CZ.json    |   0
 .../react-spectrum/intl/slider}/da-DK.json    |   0
 .../react-spectrum/intl/slider}/de-DE.json    |   0
 .../react-spectrum/intl/slider}/el-GR.json    |   0
 .../react-spectrum/intl/slider}/en-US.json    |   0
 .../react-spectrum/intl/slider}/es-ES.json    |   0
 .../react-spectrum/intl/slider}/et-EE.json    |   0
 .../react-spectrum/intl/slider}/fi-FI.json    |   0
 .../react-spectrum/intl/slider}/fr-FR.json    |   0
 .../react-spectrum/intl/slider}/he-IL.json    |   0
 .../react-spectrum/intl/slider}/hr-HR.json    |   0
 .../react-spectrum/intl/slider}/hu-HU.json    |   0
 .../react-spectrum/intl/slider}/it-IT.json    |   0
 .../react-spectrum/intl/slider}/ja-JP.json    |   0
 .../react-spectrum/intl/slider}/ko-KR.json    |   0
 .../react-spectrum/intl/slider}/lt-LT.json    |   0
 .../react-spectrum/intl/slider}/lv-LV.json    |   0
 .../react-spectrum/intl/slider}/nb-NO.json    |   0
 .../react-spectrum/intl/slider}/nl-NL.json    |   0
 .../react-spectrum/intl/slider}/pl-PL.json    |   0
 .../react-spectrum/intl/slider}/pt-BR.json    |   0
 .../react-spectrum/intl/slider}/pt-PT.json    |   0
 .../react-spectrum/intl/slider}/ro-RO.json    |   0
 .../react-spectrum/intl/slider}/ru-RU.json    |   0
 .../react-spectrum/intl/slider}/sk-SK.json    |   0
 .../react-spectrum/intl/slider}/sl-SI.json    |   0
 .../react-spectrum/intl/slider}/sr-SP.json    |   0
 .../react-spectrum/intl/slider}/sv-SE.json    |   0
 .../react-spectrum/intl/slider}/tr-TR.json    |   0
 .../react-spectrum/intl/slider}/uk-UA.json    |   0
 .../react-spectrum/intl/slider}/zh-CN.json    |   0
 .../react-spectrum/intl/slider}/zh-TW.json    |   0
 .../react-spectrum/intl/steplist}/ar-AE.json  |   0
 .../react-spectrum/intl/steplist}/bg-BG.json  |   0
 .../react-spectrum/intl/steplist}/cs-CZ.json  |   0
 .../react-spectrum/intl/steplist}/da-DK.json  |   0
 .../react-spectrum/intl/steplist}/de-DE.json  |   0
 .../react-spectrum/intl/steplist}/el-GR.json  |   0
 .../react-spectrum/intl/steplist}/en-US.json  |   0
 .../react-spectrum/intl/steplist}/es-ES.json  |   0
 .../react-spectrum/intl/steplist}/et-EE.json  |   0
 .../react-spectrum/intl/steplist}/fi-FI.json  |   0
 .../react-spectrum/intl/steplist}/fr-FR.json  |   0
 .../react-spectrum/intl/steplist}/he-IL.json  |   0
 .../react-spectrum/intl/steplist}/hr-HR.json  |   0
 .../react-spectrum/intl/steplist}/hu-HU.json  |   0
 .../react-spectrum/intl/steplist}/it-IT.json  |   0
 .../react-spectrum/intl/steplist}/ja-JP.json  |   0
 .../react-spectrum/intl/steplist}/ko-KR.json  |   0
 .../react-spectrum/intl/steplist}/lt-LT.json  |   0
 .../react-spectrum/intl/steplist}/lv-LV.json  |   0
 .../react-spectrum/intl/steplist}/nb-NO.json  |   0
 .../react-spectrum/intl/steplist}/nl-NL.json  |   0
 .../react-spectrum/intl/steplist}/pl-PL.json  |   0
 .../react-spectrum/intl/steplist}/pt-BR.json  |   0
 .../react-spectrum/intl/steplist}/pt-PT.json  |   0
 .../react-spectrum/intl/steplist}/ro-RO.json  |   0
 .../react-spectrum/intl/steplist}/ru-RU.json  |   0
 .../react-spectrum/intl/steplist}/sk-SK.json  |   0
 .../react-spectrum/intl/steplist}/sl-SI.json  |   0
 .../react-spectrum/intl/steplist}/sr-SP.json  |   0
 .../react-spectrum/intl/steplist}/sv-SE.json  |   0
 .../react-spectrum/intl/steplist}/tr-TR.json  |   0
 .../react-spectrum/intl/steplist}/uk-UA.json  |   0
 .../react-spectrum/intl/steplist}/zh-CN.json  |   0
 .../react-spectrum/intl/steplist}/zh-TW.json  |   0
 .../react-spectrum/intl/table}/ar-AE.json     |   0
 .../react-spectrum/intl/table}/bg-BG.json     |   0
 .../react-spectrum/intl/table}/cs-CZ.json     |   0
 .../react-spectrum/intl/table}/da-DK.json     |   0
 .../react-spectrum/intl/table}/de-DE.json     |   0
 .../react-spectrum/intl/table}/el-GR.json     |   0
 .../react-spectrum/intl/table}/en-US.json     |   0
 .../react-spectrum/intl/table}/es-ES.json     |   0
 .../react-spectrum/intl/table}/et-EE.json     |   0
 .../react-spectrum/intl/table}/fi-FI.json     |   0
 .../react-spectrum/intl/table}/fr-FR.json     |   0
 .../react-spectrum/intl/table}/he-IL.json     |   0
 .../react-spectrum/intl/table}/hr-HR.json     |   0
 .../react-spectrum/intl/table}/hu-HU.json     |   0
 .../react-spectrum/intl/table}/it-IT.json     |   0
 .../react-spectrum/intl/table}/ja-JP.json     |   0
 .../react-spectrum/intl/table}/ko-KR.json     |   0
 .../react-spectrum/intl/table}/lt-LT.json     |   0
 .../react-spectrum/intl/table}/lv-LV.json     |   0
 .../react-spectrum/intl/table}/nb-NO.json     |   0
 .../react-spectrum/intl/table}/nl-NL.json     |   0
 .../react-spectrum/intl/table}/pl-PL.json     |   0
 .../react-spectrum/intl/table}/pt-BR.json     |   0
 .../react-spectrum/intl/table}/pt-PT.json     |   0
 .../react-spectrum/intl/table}/ro-RO.json     |   0
 .../react-spectrum/intl/table}/ru-RU.json     |   0
 .../react-spectrum/intl/table}/sk-SK.json     |   0
 .../react-spectrum/intl/table}/sl-SI.json     |   0
 .../react-spectrum/intl/table}/sr-SP.json     |   0
 .../react-spectrum/intl/table}/sv-SE.json     |   0
 .../react-spectrum/intl/table}/tr-TR.json     |   0
 .../react-spectrum/intl/table}/uk-UA.json     |   0
 .../react-spectrum/intl/table}/zh-CN.json     |   0
 .../react-spectrum/intl/table}/zh-TW.json     |   0
 .../react-spectrum/intl/tag}/ar-AE.json       |   0
 .../react-spectrum/intl/tag}/bg-BG.json       |   0
 .../react-spectrum/intl/tag}/cs-CZ.json       |   0
 .../react-spectrum/intl/tag}/da-DK.json       |   0
 .../react-spectrum/intl/tag}/de-DE.json       |   0
 .../react-spectrum/intl/tag}/el-GR.json       |   0
 .../react-spectrum/intl/tag}/en-US.json       |   0
 .../react-spectrum/intl/tag}/es-ES.json       |   0
 .../react-spectrum/intl/tag}/et-EE.json       |   0
 .../react-spectrum/intl/tag}/fi-FI.json       |   0
 .../react-spectrum/intl/tag}/fr-FR.json       |   0
 .../react-spectrum/intl/tag}/he-IL.json       |   0
 .../react-spectrum/intl/tag}/hr-HR.json       |   0
 .../react-spectrum/intl/tag}/hu-HU.json       |   0
 .../react-spectrum/intl/tag}/it-IT.json       |   0
 .../react-spectrum/intl/tag}/ja-JP.json       |   0
 .../react-spectrum/intl/tag}/ko-KR.json       |   0
 .../react-spectrum/intl/tag}/lt-LT.json       |   0
 .../react-spectrum/intl/tag}/lv-LV.json       |   0
 .../react-spectrum/intl/tag}/nb-NO.json       |   0
 .../react-spectrum/intl/tag}/nl-NL.json       |   0
 .../react-spectrum/intl/tag}/pl-PL.json       |   0
 .../react-spectrum/intl/tag}/pt-BR.json       |   0
 .../react-spectrum/intl/tag}/pt-PT.json       |   0
 .../react-spectrum/intl/tag}/ro-RO.json       |   0
 .../react-spectrum/intl/tag}/ru-RU.json       |   0
 .../react-spectrum/intl/tag}/sk-SK.json       |   0
 .../react-spectrum/intl/tag}/sl-SI.json       |   0
 .../react-spectrum/intl/tag}/sr-SP.json       |   0
 .../react-spectrum/intl/tag}/sv-SE.json       |   0
 .../react-spectrum/intl/tag}/tr-TR.json       |   0
 .../react-spectrum/intl/tag}/uk-UA.json       |   0
 .../react-spectrum/intl/tag}/zh-CN.json       |   0
 .../react-spectrum/intl/tag}/zh-TW.json       |   0
 .../react-spectrum/intl/textfield}/ar-AE.json |   0
 .../react-spectrum/intl/textfield}/bg-BG.json |   0
 .../react-spectrum/intl/textfield}/cs-CZ.json |   0
 .../react-spectrum/intl/textfield}/da-DK.json |   0
 .../react-spectrum/intl/textfield}/de-DE.json |   0
 .../react-spectrum/intl/textfield}/el-GR.json |   0
 .../react-spectrum/intl/textfield}/en-US.json |   0
 .../react-spectrum/intl/textfield}/es-ES.json |   0
 .../react-spectrum/intl/textfield}/et-EE.json |   0
 .../react-spectrum/intl/textfield}/fi-FI.json |   0
 .../react-spectrum/intl/textfield}/fr-FR.json |   0
 .../react-spectrum/intl/textfield}/he-IL.json |   0
 .../react-spectrum/intl/textfield}/hr-HR.json |   0
 .../react-spectrum/intl/textfield}/hu-HU.json |   0
 .../react-spectrum/intl/textfield}/it-IT.json |   0
 .../react-spectrum/intl/textfield}/ja-JP.json |   0
 .../react-spectrum/intl/textfield}/ko-KR.json |   0
 .../react-spectrum/intl/textfield}/lt-LT.json |   0
 .../react-spectrum/intl/textfield}/lv-LV.json |   0
 .../react-spectrum/intl/textfield}/nb-NO.json |   0
 .../react-spectrum/intl/textfield}/nl-NL.json |   0
 .../react-spectrum/intl/textfield}/pl-PL.json |   0
 .../react-spectrum/intl/textfield}/pt-BR.json |   0
 .../react-spectrum/intl/textfield}/pt-PT.json |   0
 .../react-spectrum/intl/textfield}/ro-RO.json |   0
 .../react-spectrum/intl/textfield}/ru-RU.json |   0
 .../react-spectrum/intl/textfield}/sk-SK.json |   0
 .../react-spectrum/intl/textfield}/sl-SI.json |   0
 .../react-spectrum/intl/textfield}/sr-SP.json |   0
 .../react-spectrum/intl/textfield}/sv-SE.json |   0
 .../react-spectrum/intl/textfield}/tr-TR.json |   0
 .../react-spectrum/intl/textfield}/uk-UA.json |   0
 .../react-spectrum/intl/textfield}/zh-CN.json |   0
 .../react-spectrum/intl/textfield}/zh-TW.json |   0
 .../react-spectrum/intl/toast}/ar-AE.json     |   0
 .../react-spectrum/intl/toast}/bg-BG.json     |   0
 .../react-spectrum/intl/toast}/cs-CZ.json     |   0
 .../react-spectrum/intl/toast}/da-DK.json     |   0
 .../react-spectrum/intl/toast}/de-DE.json     |   0
 .../react-spectrum/intl/toast}/el-GR.json     |   0
 .../react-spectrum/intl/toast}/en-US.json     |   0
 .../react-spectrum/intl/toast}/es-ES.json     |   0
 .../react-spectrum/intl/toast}/et-EE.json     |   0
 .../react-spectrum/intl/toast}/fi-FI.json     |   0
 .../react-spectrum/intl/toast}/fr-FR.json     |   0
 .../react-spectrum/intl/toast}/he-IL.json     |   0
 .../react-spectrum/intl/toast}/hr-HR.json     |   0
 .../react-spectrum/intl/toast}/hu-HU.json     |   0
 .../react-spectrum/intl/toast}/it-IT.json     |   0
 .../react-spectrum/intl/toast}/ja-JP.json     |   0
 .../react-spectrum/intl/toast}/ko-KR.json     |   0
 .../react-spectrum/intl/toast}/lt-LT.json     |   0
 .../react-spectrum/intl/toast}/lv-LV.json     |   0
 .../react-spectrum/intl/toast}/nb-NO.json     |   0
 .../react-spectrum/intl/toast}/nl-NL.json     |   0
 .../react-spectrum/intl/toast}/pl-PL.json     |   0
 .../react-spectrum/intl/toast}/pt-BR.json     |   0
 .../react-spectrum/intl/toast}/pt-PT.json     |   0
 .../react-spectrum/intl/toast}/ro-RO.json     |   0
 .../react-spectrum/intl/toast}/ru-RU.json     |   0
 .../react-spectrum/intl/toast}/sk-SK.json     |   0
 .../react-spectrum/intl/toast}/sl-SI.json     |   0
 .../react-spectrum/intl/toast}/sr-SP.json     |   0
 .../react-spectrum/intl/toast}/sv-SE.json     |   0
 .../react-spectrum/intl/toast}/tr-TR.json     |   0
 .../react-spectrum/intl/toast}/uk-UA.json     |   0
 .../react-spectrum/intl/toast}/zh-CN.json     |   0
 .../react-spectrum/intl/toast}/zh-TW.json     |   0
 packages/@adobe/react-spectrum/package.json   | 174 ++++++-----
 .../src/accordion}/Accordion.tsx              |  21 +-
 .../src/actionbar}/ActionBar.tsx              |  27 +-
 .../src/actionbar}/ActionBarContainer.tsx     |   9 +-
 .../src/actionbar}/actionbar.css              |   0
 .../src/actiongroup}/ActionGroup.tsx          |  57 ++--
 .../MobileSearchAutocomplete.tsx              |  51 ++--
 .../src/autocomplete}/SearchAutocomplete.tsx  |  40 +--
 .../src/autocomplete}/searchautocomplete.css  |   0
 .../react-spectrum/src/avatar}/Avatar.tsx     |  10 +-
 .../react-spectrum/src/badge}/Badge.tsx       |  12 +-
 .../src/breadcrumbs}/BreadcrumbItem.tsx       |  12 +-
 .../src/breadcrumbs}/Breadcrumbs.tsx          |  18 +-
 .../src/button}/ActionButton.tsx              |  18 +-
 .../react-spectrum/src/button}/Button.tsx     |  35 +--
 .../src/button}/ClearButton.tsx               |  12 +-
 .../src/button}/FieldButton.tsx               |  13 +-
 .../src/button}/LogicButton.tsx               |  15 +-
 .../src/button}/ToggleButton.tsx              |  20 +-
 .../src/buttongroup}/ButtonGroup.tsx          |  20 +-
 .../react-spectrum/src/calendar}/Calendar.tsx |  10 +-
 .../src/calendar}/CalendarBase.tsx            |  18 +-
 .../src/calendar}/CalendarCell.tsx            |  14 +-
 .../src/calendar}/CalendarMonth.tsx           |   6 +-
 .../src/calendar}/RangeCalendar.tsx           |  10 +-
 .../react-spectrum/src/card}/BaseLayout.tsx   |  10 +-
 .../react-spectrum/src/card}/Card.tsx         |   2 +-
 .../react-spectrum/src/card}/CardBase.tsx     |  23 +-
 .../react-spectrum/src/card}/CardView.tsx     |  30 +-
 .../src/card}/CardViewContext.tsx             |   0
 .../src/card}/GalleryLayout.tsx               |   4 +-
 .../react-spectrum/src/card}/GridLayout.tsx   |   6 +-
 .../src/card}/WaterfallLayout.tsx             |   7 +-
 .../react-spectrum/src/checkbox}/Checkbox.tsx |  21 +-
 .../src/checkbox}/CheckboxGroup.tsx           |  13 +-
 .../react-spectrum/src/checkbox}/context.ts   |   2 +-
 .../react-spectrum/src/color}/ColorArea.tsx   |  18 +-
 .../react-spectrum/src/color}/ColorEditor.tsx |  11 +-
 .../react-spectrum/src/color}/ColorField.tsx  |  18 +-
 .../react-spectrum/src/color}/ColorPicker.tsx |  14 +-
 .../react-spectrum/src/color}/ColorSlider.tsx |  22 +-
 .../react-spectrum/src/color}/ColorSwatch.tsx |   9 +-
 .../src/color}/ColorSwatchPicker.tsx          |   9 +-
 .../react-spectrum/src/color}/ColorThumb.tsx  |  10 +-
 .../react-spectrum/src/color}/ColorWheel.tsx  |  19 +-
 .../react-spectrum/src/color}/colorfield.css  |   0
 .../react-spectrum/src/combobox}/ComboBox.tsx |  47 ++-
 .../src/combobox}/MobileComboBox.tsx          |  52 ++--
 .../react-spectrum/src/combobox}/combobox.css |   0
 .../src/contextualhelp}/ContextualHelp.tsx    |  16 +-
 .../src/datepicker}/DateField.tsx             |  14 +-
 .../src/datepicker}/DatePicker.tsx            |  33 ++-
 .../src/datepicker}/DatePickerField.tsx       |   8 +-
 .../src/datepicker}/DatePickerSegment.tsx     |   6 +-
 .../src/datepicker}/DateRangePicker.tsx       |  34 ++-
 .../react-spectrum/src/datepicker}/Input.tsx  |  11 +-
 .../src/datepicker}/TimeField.tsx             |  14 +-
 .../react-spectrum/src/datepicker}/styles.css |   0
 .../react-spectrum/src/datepicker}/utils.tsx  |  17 +-
 .../src/dialog}/AlertDialog.tsx               |  20 +-
 .../react-spectrum/src/dialog}/Dialog.tsx     |  29 +-
 .../src/dialog}/DialogContainer.tsx           |   4 +-
 .../src/dialog}/DialogTrigger.tsx             |  12 +-
 .../react-spectrum/src/dialog}/context.ts     |   0
 .../src/dialog}/useDialogContainer.ts         |   0
 .../react-spectrum/src/divider}/Divider.tsx   |   8 +-
 .../react-spectrum/src/dnd}/useDragAndDrop.ts |  30 +-
 .../react-spectrum/src/dropzone}/DropZone.tsx |  18 +-
 .../react-spectrum/src/form}/Form.tsx         |  10 +-
 .../react-spectrum/src/icon}/Icon.tsx         |   9 +-
 .../react-spectrum/src/icon}/Illustration.tsx |   5 +-
 .../react-spectrum/src/icon}/UIIcon.tsx       |   9 +-
 .../IllustratedMessage.tsx                    |   9 +-
 .../react-spectrum/src/image}/Image.tsx       |  10 +-
 packages/@adobe/react-spectrum/src/index.ts   | 131 ---------
 .../src/inlinealert}/InlineAlert.tsx          |  19 +-
 .../react-spectrum/src/label}/Field.tsx       |  12 +-
 .../react-spectrum/src/label}/HelpText.tsx    |   4 +-
 .../react-spectrum/src/label}/Label.tsx       |  14 +-
 .../src/labeledvalue}/LabeledValue.tsx        |  11 +-
 .../react-spectrum/src/layout}/Flex.tsx       |   8 +-
 .../react-spectrum/src/layout}/Grid.tsx       |   7 +-
 .../react-spectrum/src/layout}/flex-gap.css   |   0
 .../react-spectrum/src/link}/Link.tsx         |  17 +-
 .../react-spectrum/src/list}/DragPreview.tsx  |   8 +-
 .../src/list}/InsertionIndicator.tsx          |   4 +-
 .../react-spectrum/src/list}/ListView.tsx     |  37 ++-
 .../react-spectrum/src/list}/ListViewItem.tsx |  32 +-
 .../src/list}/ListViewLayout.ts               |   7 +-
 .../src/list}/RootDropIndicator.tsx           |   2 +-
 .../react-spectrum/src/list}/styles.css       |   0
 .../react-spectrum/src/listbox}/ListBox.tsx   |   4 +-
 .../src/listbox}/ListBoxBase.tsx              |  29 +-
 .../src/listbox}/ListBoxContext.ts            |   2 +-
 .../src/listbox}/ListBoxLayout.ts             |   6 +-
 .../src/listbox}/ListBoxOption.tsx            |  16 +-
 .../src/listbox}/ListBoxSection.tsx           |  12 +-
 .../react-spectrum/src/menu}/ActionMenu.tsx   |  10 +-
 .../src/menu}/ContextualHelpTrigger.tsx       |  18 +-
 .../react-spectrum/src/menu}/Menu.tsx         |  28 +-
 .../react-spectrum/src/menu}/MenuItem.tsx     |  22 +-
 .../react-spectrum/src/menu}/MenuSection.tsx  |  10 +-
 .../react-spectrum/src/menu}/MenuTrigger.tsx  |  16 +-
 .../src/menu}/SubmenuTrigger.tsx              |  15 +-
 .../react-spectrum/src/menu}/context.ts       |   4 +-
 .../react-spectrum/src/menu}/overlays.css     |   0
 .../src/menu}/useCloseOnScroll.ts             |   2 +-
 .../react-spectrum/src/meter}/Meter.tsx       |   6 +-
 .../src/numberfield}/NumberField.tsx          |  24 +-
 .../src/numberfield}/StepButton.tsx           |  13 +-
 .../react-spectrum/src/overlays}/Modal.tsx    |  12 +-
 .../src/overlays}/OpenTransition.tsx          |   0
 .../react-spectrum/src/overlays}/Overlay.tsx  |   4 +-
 .../react-spectrum/src/overlays}/Popover.tsx  |  16 +-
 .../react-spectrum/src/overlays}/Tray.tsx     |  13 +-
 .../react-spectrum/src/overlays}/Underlay.tsx |   4 +-
 .../react-spectrum/src/overlays}/overlays.css |   0
 .../react-spectrum/src/picker}/Picker.tsx     |  47 +--
 .../src/progress}/ProgressBar.tsx             |   4 +-
 .../src/progress}/ProgressBarBase.tsx         |   7 +-
 .../src/progress}/ProgressCircle.tsx          |   9 +-
 .../react-spectrum/src/provider}/Provider.tsx |  21 +-
 .../react-spectrum/src/provider}/context.ts   |   0
 .../src/provider}/mediaQueries.ts             |   2 +-
 .../react-spectrum/src/radio}/Radio.tsx       |  11 +-
 .../react-spectrum/src/radio}/RadioGroup.tsx  |  14 +-
 .../react-spectrum/src/radio}/context.ts      |   2 +-
 .../src/searchfield}/SearchField.tsx          |  16 +-
 .../src/slider}/RangeSlider.tsx               |   8 +-
 .../react-spectrum/src/slider}/Slider.tsx     |   6 +-
 .../react-spectrum/src/slider}/SliderBase.tsx |  14 +-
 .../src/slider}/SliderThumb.tsx               |  14 +-
 .../src/statuslight}/StatusLight.tsx          |   9 +-
 .../react-spectrum/src/steplist}/StepList.tsx |  11 +-
 .../src/steplist}/StepListContext.ts          |   2 +-
 .../src/steplist}/StepListItem.tsx            |  19 +-
 .../react-spectrum/src/switch}/Switch.tsx     |  15 +-
 .../react-spectrum/src/table}/DragPreview.tsx |   4 +-
 .../src/table}/InsertionIndicator.tsx         |   4 +-
 .../react-spectrum/src/table}/Nubbin.tsx      |   0
 .../react-spectrum/src/table}/Resizer.tsx     |  19 +-
 .../src/table}/RootDropIndicator.tsx          |   2 +-
 .../react-spectrum/src/table}/TableView.tsx   |  18 +-
 .../src/table}/TableViewBase.tsx              |  74 +++--
 .../src/table}/TableViewLayout.ts             |   8 +-
 .../src/table}/TableViewWithoutExpanding.tsx  |   2 +-
 .../src/table}/TreeGridTableView.tsx          |   2 +-
 .../table}/cursors/Cur_MoveHorizontal_9_9.svg |   0
 .../src/table}/cursors/Cur_MoveToLeft_9_9.svg |   0
 .../table}/cursors/Cur_MoveToRight_9_9.svg    |   0
 .../react-spectrum/src/table}/table.css       |   0
 .../react-spectrum/src/tabs}/Tabs.tsx         |  32 +-
 .../react-spectrum/src/tag}/Tag.tsx           |  19 +-
 .../react-spectrum/src/tag}/TagGroup.tsx      |  32 +-
 .../react-spectrum/src/text}/Heading.tsx      |   9 +-
 .../react-spectrum/src/text}/Keyboard.tsx     |   6 +-
 .../react-spectrum/src/text}/Text.tsx         |   6 +-
 .../src/textfield}/TextArea.tsx               |  12 +-
 .../src/textfield}/TextField.tsx              |   6 +-
 .../src/textfield}/TextFieldBase.tsx          |  16 +-
 .../src/theme-dark}/darkTheme.ts              |   0
 .../src/theme-default}/defaultTheme.ts        |   0
 .../src/theme-express}/expressTheme.ts        |   2 +-
 .../src/theme-light}/lightTheme.ts            |   0
 .../react-spectrum/src/toast}/Toast.tsx       |  20 +-
 .../src/toast}/ToastContainer.tsx             |   8 +-
 .../react-spectrum/src/toast}/Toaster.tsx     |  16 +-
 .../src/toast}/toastContainer.css             |   0
 .../react-spectrum/src/tooltip}/Tooltip.tsx   |   8 +-
 .../src/tooltip}/TooltipTrigger.tsx           |  12 +-
 .../react-spectrum/src/tooltip}/context.ts    |   2 +-
 .../react-spectrum/src/tree}/TreeView.tsx     |  47 +--
 .../src/utils}/BreakpointProvider.tsx         |   2 +-
 .../react-spectrum/src/utils}/Slots.tsx       |   2 +-
 .../react-spectrum/src/utils}/classNames.ts   |   0
 .../src/utils}/getWrappedElement.tsx          |   0
 .../react-spectrum/src/utils}/styleProps.ts   |   2 +-
 .../react-spectrum/src/utils}/useDOMRef.ts    |   0
 .../react-spectrum/src/utils}/useHasChild.ts  |   2 +-
 .../src/utils}/useIsMobileDevice.ts           |   2 +-
 .../src/utils}/useMediaQuery.ts               |   2 +-
 .../react-spectrum/src/view}/Content.tsx      |   7 +-
 .../react-spectrum/src/view}/Footer.tsx       |   7 +-
 .../react-spectrum/src/view}/Header.tsx       |   7 +-
 .../react-spectrum/src/view}/View.tsx         |   7 +-
 .../react-spectrum/src/well}/Well.tsx         |   7 +-
 .../stories/accordion}/Accordion.stories.tsx  |   8 +-
 .../stories/accordion}/Disclosure.stories.tsx |   2 +-
 .../stories/actionbar}/ActionBar.stories.tsx  |   4 +-
 .../stories/actionbar}/Example.tsx            |  11 +-
 .../actiongroup}/ActionGroup.stories.tsx      |  13 +-
 .../stories/actiongroup}/Toolbar.stories.tsx  |  17 +-
 .../stories/actiongroup}/toolbar.css          |   0
 .../SearchAutocomplete.stories.tsx            |  13 +-
 .../stories/avatar}/Avatar.stories.tsx        |   2 +-
 .../stories/badge}/Badge.stories.tsx          |   4 +-
 .../breadcrumbs}/Breadcrumbs.stories.tsx      |   4 +-
 .../stories/button}/ActionButton.stories.tsx  |   8 +-
 .../stories/button}/Button.stories.tsx        |  13 +-
 .../stories/button}/LogicButton.stories.tsx   |   2 +-
 .../stories/button}/ToggleButton.stories.tsx  |   6 +-
 .../buttongroup}/ButtonGroup.stories.tsx      |   6 +-
 .../stories/calendar}/Calendar.stories.tsx    |  18 +-
 .../calendar}/RangeCalendar.stories.tsx       |  10 +-
 .../calendar}/RangeCalendarCell.stories.tsx   |   4 +-
 .../stories/card}/Card.stories.tsx            |  20 +-
 .../stories/card}/GalleryCardView.stories.tsx |   9 +-
 .../stories/card}/GridCardView.stories.tsx    |  32 +-
 .../stories/card}/HorizontalCard.stories.tsx  |  14 +-
 .../stories/card}/QuietCard.stories.tsx       |  18 +-
 .../card}/WaterfallCardView.stories.tsx       |   9 +-
 .../react-spectrum/stories/card}/assets.css   |   0
 .../stories/card}/images/starry_sky.jpeg      | Bin
 .../react-spectrum/stories/card}/utils.ts     |   0
 .../stories/checkbox}/Checkbox.stories.tsx    |   6 +-
 .../checkbox}/CheckboxGroup.stories.tsx       |   8 +-
 .../stories/color}/ColorArea.stories.tsx      |  13 +-
 .../stories/color}/ColorField.stories.tsx     |  17 +-
 .../stories/color}/ColorPicker.stories.tsx    |  11 +-
 .../stories/color}/ColorSlider.stories.tsx    |  16 +-
 .../stories/color}/ColorSwatch.stories.tsx    |   2 +-
 .../color}/ColorSwatchPicker.stories.tsx      |   4 +-
 .../stories/color}/ColorThumb.stories.tsx     |   4 +-
 .../stories/color}/ColorWheel.stories.tsx     |   8 +-
 .../stories/combobox}/ComboBox.stories.tsx    |  33 ++-
 .../ContextualHelp.stories.tsx                |  11 +-
 .../stories/datepicker}/DateField.stories.tsx |  18 +-
 .../datepicker}/DatePicker.stories.tsx        |  24 +-
 .../datepicker}/DateRangePicker.stories.tsx   |  18 +-
 .../DateRangePickerStyling.stories.tsx        |   8 +-
 .../stories/datepicker}/TimeField.stories.tsx |   2 +-
 .../datepicker}/TimeFieldStyling.stories.tsx  |   8 +-
 .../stories/dialog}/AlertDialog.stories.tsx   |   5 +-
 .../stories/dialog}/Dialog.stories.tsx        |  35 ++-
 .../dialog}/DialogContainer.stories.tsx       |   2 +-
 .../dialog}/DialogContainerExamples.tsx       |  22 +-
 .../stories/dialog}/DialogTrigger.stories.tsx |  39 ++-
 .../stories/divider}/Divider.stories.tsx      |   4 +-
 .../stories/dropzone}/DropZone.stories.tsx    |  23 +-
 .../stories/dropzone}/FileTrigger.stories.tsx |   6 +-
 .../stories/dropzone}/styles.css              |   0
 .../stories/form}/Form.stories.tsx            |  59 ++--
 .../react-spectrum/stories/form}/data.ts      |   0
 .../stories/icon}/Icon.stories.tsx            |   2 +-
 .../IllustratedMessage.stories.tsx            |   6 +-
 .../stories/image}/Image.stories.tsx          |   2 +-
 .../inlinealert}/InlineAlert.stories.tsx      |   8 +-
 .../stories/label}/HelpText.stories.tsx       |   8 +-
 .../stories/label}/Label.stories.tsx          |   4 +-
 .../labeledvalue}/LabeledValue.stories.tsx    |  10 +-
 .../stories/layout}/Flex.stories.tsx          |   4 +-
 .../stories/layout}/Grid.stories.tsx          |   4 +-
 .../react-spectrum/stories/layout}/styles.css |   0
 .../stories/link}/Link.stories.tsx            |   2 +-
 .../stories/list}/ListView.stories.tsx        |  36 ++-
 .../stories/list}/ListViewActions.stories.tsx |  13 +-
 .../stories/list}/ListViewDnD.stories.tsx     |   8 +-
 .../stories/list}/ListViewDnDExamples.tsx     |  15 +-
 .../stories/list}/ListViewDnDUtil.stories.tsx |   6 +-
 .../stories/list}/ListViewDnDUtilExamples.tsx |  13 +-
 .../list}/ListViewSelection.stories.tsx       |  11 +-
 .../stories/listbox}/ListBox.stories.tsx      |  22 +-
 .../stories/menu}/ActionMenu.stories.tsx      |  13 +-
 .../stories/menu}/MenuTrigger.stories.tsx     |  23 +-
 .../stories/menu}/Submenu.stories.tsx         |  20 +-
 .../stories/meter}/Meter.stories.tsx          |   2 +-
 .../numberfield}/NumberField.stories.tsx      |  20 +-
 .../stories/overlays}/Modal.stories.tsx       |  22 +-
 .../stories/picker}/Picker.stories.tsx        |  21 +-
 .../stories/progress}/ProgressBar.stories.tsx |   3 +-
 .../progress}/ProgressCircle.stories.tsx      |   3 +-
 .../stories/provider}/Provider.stories.tsx    |  31 +-
 .../stories/provider}/custom-theme.css        |   0
 .../stories/radio}/Radio.stories.tsx          |  11 +-
 .../searchfield}/SearchField.stories.tsx      |  15 +-
 .../stories/slider}/RangeSlider.stories.tsx   |   8 +-
 .../stories/slider}/Slider.stories.tsx        |  10 +-
 .../statuslight}/StatusLight.stories.tsx      |   2 +-
 .../stories/steplist}/StepList.stories.tsx    |  14 +-
 .../stories/switch}/Switch.stories.tsx        |   6 +-
 .../stories/table}/CRUDExample.tsx            |  35 ++-
 .../stories/table}/ControllingResize.tsx      |   6 +-
 .../stories/table}/HidingColumns.tsx          |   8 +-
 .../table}/HidingColumnsAllowsResizing.tsx    |   8 +-
 .../stories/table}/Performance.tsx            |  17 +-
 .../stories/table}/Table.stories.tsx          |  42 +--
 .../stories/table}/TableDnD.stories.tsx       |  10 +-
 .../stories/table}/TableDnDExamples.tsx       |  12 +-
 .../stories/table}/TableDnDUtil.stories.tsx   |   6 +-
 .../stories/table}/TableDnDUtilExamples.tsx   |  11 +-
 .../stories/table}/TreeGridTable.stories.tsx  |  10 +-
 .../stories/tabs}/Tabs.stories.tsx            |  18 +-
 .../stories/tag}/TagGroup.stories.tsx         |  14 +-
 .../stories/textfield}/TextArea.stories.tsx   |  14 +-
 .../stories/textfield}/Textfield.stories.tsx  |   8 +-
 .../stories/toast}/Toast.stories.tsx          |  25 +-
 .../stories/tooltip}/Tooltip.stories.tsx      |   2 +-
 .../tooltip}/TooltipTrigger.stories.tsx       |  13 +-
 .../stories/tree}/TreeView.stories.tsx        |  16 +-
 .../stories/view}/View.stories.tsx            |   2 +-
 .../stories/well}/Well.stories.tsx            |   2 +-
 .../test/accordion}/Accordion.ssr.test.js     |   0
 .../test/accordion}/Accordion.test.js         |   6 +-
 .../test/actionbar}/ActionBar.test.js         |  12 +-
 .../test/actiongroup}/ActionGroup.ssr.test.js |   0
 .../test/actiongroup}/ActionGroup.test.js     |  18 +-
 .../test/actiongroup}/Toolbar.test.tsx        |  18 +-
 .../autocomplete}/SearchAutocomplete.test.js  |  16 +-
 .../test/avatar}/Avatar.test.js               |   2 +-
 .../test/badge}/Badge.ssr.test.js             |   0
 .../react-spectrum/test/badge}/Badge.test.js  |   4 +-
 .../test/breadcrumbs}/BreadcrumbItem.test.js  |   2 +-
 .../test/breadcrumbs}/Breadcrumbs.ssr.test.js |   0
 .../test/breadcrumbs}/Breadcrumbs.test.js     |   8 +-
 .../test/button}/ActionButton.test.js         |   2 +-
 .../test/button}/Button.ssr.test.js           |   0
 .../test/button}/Button.test.js               |  12 +-
 .../test/button}/ClearButton.test.js          |   2 +-
 .../test/button}/ToggleButton.test.js         |   2 +-
 .../test/buttongroup}/ButtonGroup.ssr.test.js |   0
 .../test/buttongroup}/ButtonGroup.test.js     |   8 +-
 .../test/calendar}/Calendar.ssr.test.js       |   0
 .../test/calendar}/Calendar.test.js           |   8 +-
 .../test/calendar}/CalendarBase.test.js       |   7 +-
 .../test/calendar}/RangeCalendar.test.js      |   8 +-
 .../react-spectrum/test/card}/Card.test.js    |   6 +-
 .../test/card}/CardView.test.js               |  23 +-
 .../test/checkbox}/Checkbox.ssr.test.js       |   0
 .../test/checkbox}/Checkbox.test.js           |  10 +-
 .../test/checkbox}/CheckboxGroup.test.js      |  11 +-
 .../test/color}/ColorArea.test.tsx            |   8 +-
 .../test/color}/ColorField.test.js            |  14 +-
 .../test/color}/ColorPicker.test.js           |   7 +-
 .../test/color}/ColorSlider.test.tsx          |   4 +-
 .../test/color}/ColorSwatchPicker.test.js     |   5 +-
 .../test/color}/ColorWheel.test.tsx           |   6 +-
 .../test/combobox}/ComboBox.test.js           |  25 +-
 .../contextualhelp}/ContextualHelp.test.js    |  12 +-
 .../test/datepicker}/DateField.test.js        |  10 +-
 .../test/datepicker}/DatePicker.ssr.test.js   |   0
 .../test/datepicker}/DatePicker.test.js       |  10 +-
 .../test/datepicker}/DatePickerBase.test.js   |   7 +-
 .../test/datepicker}/DateRangePicker.test.js  |  10 +-
 .../test/datepicker}/TimeField.test.js        |  10 +-
 .../test/dialog}/AlertDialog.test.js          |   6 +-
 .../test/dialog}/Dialog.ssr.test.js           |   0
 .../test/dialog}/Dialog.test.js               |  10 +-
 .../test/dialog}/DialogContainer.test.js      |  25 +-
 .../test/dialog}/DialogTrigger.test.js        |  22 +-
 .../test/divider}/Divider.ssr.test.js         |   0
 .../test/divider}/Divider.test.js             |   2 +-
 .../test/dropzone}/DropZone.test.js           |  18 +-
 .../test/form}/Form.ssr.test.js               |   0
 .../react-spectrum/test/form}/Form.test.js    |  18 +-
 .../react-spectrum/test/icon}/Icon.test.js    |   2 +-
 .../test/icon}/Illustration.test.js           |   2 +-
 .../react-spectrum/test/icon}/UIIcon.test.js  |   2 +-
 .../IllustratedMessage.ssr.test.js            |   0
 .../IllustratedMessage.test.js                |   6 +-
 .../react-spectrum/test/image}/Image.test.js  |   2 +-
 .../test/inlinealert}/InlineAlert.test.js     |   6 +-
 .../react-spectrum/test/label}/Field.test.js  |   9 +-
 .../test/labeledvalue}/LabeledValue.test.js   |   2 +-
 .../test/layout}/Flex.ssr.test.js             |   0
 .../test/layout}/Grid.ssr.test.js             |   0
 .../react-spectrum/test/layout}/Grid.test.js  |   2 +-
 .../test/link}/Link.ssr.test.js               |   0
 .../react-spectrum/test/link}/Link.test.js    |   9 +-
 .../test/list}/ListView.ssr.test.js           |   0
 .../test/list}/ListView.test.js               |  23 +-
 .../test/list}/ListViewDnd.test.js            |  31 +-
 .../test/listbox}/ListBox.ssr.test.js         |   0
 .../test/listbox}/ListBox.test.js             |  14 +-
 .../test/menu}/ActionMenu.test.js             |  10 +-
 .../test/menu}/Menu.ssr.test.js               |   0
 .../react-spectrum/test/menu}/Menu.test.js    |  19 +-
 .../test/menu}/MenuTrigger.ssr.test.js        |   0
 .../test/menu}/MenuTrigger.test.js            |  26 +-
 .../test/menu}/SubMenuTrigger.test.tsx        |   6 +-
 .../test/meter}/Meter.ssr.test.js             |   0
 .../react-spectrum/test/meter}/Meter.test.js  |   2 +-
 .../test/numberfield}/NumberField.ssr.test.js |   0
 .../test/numberfield}/NumberField.test.js     |  18 +-
 .../test/overlays}/Modal.test.js              |   8 +-
 .../test/overlays}/Overlay.test.js            |   6 +-
 .../test/overlays}/Popover.test.js            |  10 +-
 .../test/overlays}/Tray.test.js               |  10 +-
 .../test/picker}/Picker.ssr.test.js           |   0
 .../test/picker}/Picker.test.js               |  18 +-
 .../test/picker}/TempUtilTest.test.js         |  14 +-
 .../react-spectrum/test/picker}/data.js       |   0
 .../test/progress}/ProgressBar.ssr.test.js    |   0
 .../test/progress}/ProgressBar.test.js        |   2 +-
 .../test/progress}/ProgressCircle.ssr.test.js |   0
 .../test/progress}/ProgressCircle.test.js     |   2 +-
 .../test/provider}/Provider.ssr.test.js       |   0
 .../test/provider}/Provider.test.tsx          |  15 +-
 .../test/provider}/mediaQueries.test.ts       |   2 +-
 .../test/radio}/Radio.ssr.test.js             |   0
 .../react-spectrum/test/radio}/Radio.test.js  |  11 +-
 .../test/searchfield}/SearchField.ssr.test.js |   0
 .../test/searchfield}/SearchField.test.js     |   2 +-
 .../test/slider}/RangeSlider.test.tsx         |   6 +-
 .../test/slider}/Slider.test.tsx              |   6 +-
 .../react-spectrum/test/slider}/utils.ts      |   0
 .../test/statuslight}/StatusLight.ssr.test.js |   0
 .../test/statuslight}/StatusLight.test.js     |   2 +-
 .../test/steplist}/StepList.test.tsx          |   8 +-
 .../test/switch}/Switch.ssr.test.js           |   0
 .../test/switch}/Switch.test.js               |   2 +-
 .../test/table}/Table.ssr.test.js             |   0
 .../react-spectrum/test/table}/Table.test.js  |   0
 .../test/table}/TableDnd.test.js              |  28 +-
 .../test/table}/TableNestedRows.test.js       |  12 +-
 .../test/table}/TableSizing.test.tsx          |  20 +-
 .../react-spectrum/test/table}/TableTests.js  |  43 +--
 .../test/table}/TestTableUtils.test.tsx       |   6 +-
 .../test/table}/TreeGridTable.test.tsx        |  16 +-
 .../react-spectrum/test/tabs}/Tabs.test.js    |   9 +-
 .../test/tag}/TagGroup.ssr.test.js            |   0
 .../react-spectrum/test/tag}/TagGroup.test.js |  14 +-
 .../test/text}/Heading.ssr.test.js            |   0
 .../test/text}/Keyboard.ssr.test.js           |   0
 .../test/text}/Text.ssr.test.js               |   0
 .../test/textfield}/TextArea.ssr.test.js      |   0
 .../test/textfield}/TextArea.test.js          |   2 +-
 .../test/textfield}/TextField.ssr.test.js     |   0
 .../test/textfield}/TextField.test.js         |  13 +-
 .../test/toast}/ToastContainer.ssr.test.js    |   0
 .../test/toast}/ToastContainer.test.js        |   8 +-
 .../test/tooltip}/Tooltip.test.js             |   2 +-
 .../test/tooltip}/TooltipTrigger.test.js      |  11 +-
 .../test/tree}/TreeView.ssr.test.tsx          |   0
 .../test/tree}/TreeView.test.tsx              |  18 +-
 .../react-spectrum/test/utils}/Slots.test.js  |   8 +-
 .../test/utils}/styleProps.test.js            |   2 +-
 .../test/view}/Content.ssr.test.js            |   0
 .../test/view}/Footer.ssr.test.js             |   0
 .../test/view}/Header.ssr.test.js             |   0
 .../test/view}/View.ssr.test.js               |   0
 .../react-spectrum/test/view}/View.test.js    |   2 +-
 .../test/well}/Well.ssr.test.js               |   0
 .../react-spectrum/test/well}/Well.test.js    |   2 +-
 packages/@internationalized/date/package.json |  10 +-
 .../@internationalized/message/package.json   |  10 +-
 .../@internationalized/number/package.json    |  10 +-
 .../number/test/NumberParser.test.js          |   2 +-
 .../@internationalized/string/package.json    |  10 +-
 packages/@react-aria/actiongroup/package.json |  29 +-
 packages/@react-aria/actiongroup/src/index.ts |  11 +-
 .../aria-modal-polyfill/package.json          |  26 +-
 .../aria-modal-polyfill/src/index.ts          |   2 +-
 packages/@react-aria/autocomplete/index.ts    |  13 -
 .../@react-aria/autocomplete/package.json     |  34 +--
 .../@react-aria/autocomplete/src/index.ts     |  10 +-
 packages/@react-aria/breadcrumbs/package.json |  26 +-
 packages/@react-aria/breadcrumbs/src/index.ts |   7 +-
 packages/@react-aria/button/index.ts          |  13 -
 packages/@react-aria/button/package.json      |  28 +-
 packages/@react-aria/button/src/index.ts      |  13 +-
 packages/@react-aria/calendar/index.ts        |  13 -
 packages/@react-aria/calendar/package.json    |  29 +-
 packages/@react-aria/calendar/src/index.ts    |  12 +-
 packages/@react-aria/checkbox/index.ts        |  13 -
 packages/@react-aria/checkbox/package.json    |  32 +-
 packages/@react-aria/checkbox/src/index.ts    |  10 +-
 packages/@react-aria/collections/package.json |  26 +-
 packages/@react-aria/collections/src/index.ts |  12 +-
 packages/@react-aria/color/index.ts           |  13 -
 packages/@react-aria/color/package.json       |  34 +--
 packages/@react-aria/color/src/index.ts       |  23 +-
 packages/@react-aria/combobox/package.json    |  37 +--
 packages/@react-aria/combobox/src/index.ts    |   5 +-
 packages/@react-aria/datepicker/index.ts      |  13 -
 packages/@react-aria/datepicker/package.json  |  33 +--
 packages/@react-aria/datepicker/src/index.ts  |  17 +-
 packages/@react-aria/dialog/index.ts          |  13 -
 packages/@react-aria/dialog/package.json      |  26 +-
 packages/@react-aria/dialog/src/index.ts      |   5 +-
 packages/@react-aria/disclosure/index.ts      |  13 -
 packages/@react-aria/disclosure/package.json  |  27 +-
 packages/@react-aria/disclosure/src/index.ts  |   5 +-
 packages/@react-aria/dnd/index.ts             |  13 -
 packages/@react-aria/dnd/package.json         |  31 +-
 packages/@react-aria/dnd/src/index.ts         |  71 +----
 packages/@react-aria/focus/index.ts           |  13 -
 packages/@react-aria/focus/package.json       |  25 +-
 packages/@react-aria/focus/src/index.ts       |  27 +-
 packages/@react-aria/form/package.json        |  27 +-
 packages/@react-aria/form/src/index.ts        |   2 +-
 packages/@react-aria/grid/package.json        |  33 +--
 packages/@react-aria/grid/src/index.ts        |  32 +-
 packages/@react-aria/gridlist/package.json    |  32 +-
 packages/@react-aria/gridlist/src/index.ts    |  11 +-
 packages/@react-aria/i18n/index.ts            |  13 -
 packages/@react-aria/i18n/package.json        |  23 +-
 packages/@react-aria/i18n/src/index.ts        |  27 +-
 packages/@react-aria/interactions/index.ts    |  13 -
 .../@react-aria/interactions/package.json     |  27 +-
 .../@react-aria/interactions/src/index.ts     |  61 ++--
 packages/@react-aria/label/index.ts           |  13 -
 packages/@react-aria/label/package.json       |  24 +-
 packages/@react-aria/label/src/index.ts       |   8 +-
 packages/@react-aria/landmark/package.json    |  24 +-
 packages/@react-aria/landmark/src/index.ts    |   7 +-
 packages/@react-aria/link/index.ts            |  13 -
 packages/@react-aria/link/package.json        |  25 +-
 packages/@react-aria/link/src/index.ts        |   5 +-
 packages/@react-aria/listbox/index.ts         |  13 -
 packages/@react-aria/listbox/package.json     |  30 +-
 packages/@react-aria/listbox/src/index.ts     |  11 +-
 packages/@react-aria/live-announcer/index.ts  |  13 -
 .../@react-aria/live-announcer/package.json   |  27 +-
 .../@react-aria/live-announcer/src/index.ts   |   2 +-
 packages/@react-aria/menu/index.ts            |  13 -
 packages/@react-aria/menu/package.json        |  34 +--
 packages/@react-aria/menu/src/index.ts        |  13 +-
 packages/@react-aria/meter/index.ts           |  13 -
 packages/@react-aria/meter/package.json       |  24 +-
 packages/@react-aria/meter/src/index.ts       |   5 +-
 packages/@react-aria/numberfield/index.ts     |  13 -
 packages/@react-aria/numberfield/package.json |  32 +-
 packages/@react-aria/numberfield/src/index.ts |   5 +-
 packages/@react-aria/overlays/index.ts        |  13 -
 packages/@react-aria/overlays/package.json    |  32 +-
 packages/@react-aria/overlays/src/index.ts    |  39 ++-
 packages/@react-aria/progress/index.ts        |  13 -
 packages/@react-aria/progress/package.json    |  26 +-
 packages/@react-aria/progress/src/index.ts    |   5 +-
 packages/@react-aria/radio/index.ts           |  13 -
 packages/@react-aria/radio/package.json       |  31 +-
 packages/@react-aria/radio/src/index.ts       |   7 +-
 packages/@react-aria/searchfield/index.ts     |  13 -
 packages/@react-aria/searchfield/package.json |  28 +-
 packages/@react-aria/searchfield/src/index.ts |   5 +-
 packages/@react-aria/select/index.ts          |  13 -
 packages/@react-aria/select/package.json      |  34 +--
 packages/@react-aria/select/src/index.ts      |   7 +-
 packages/@react-aria/selection/index.ts       |  13 -
 packages/@react-aria/selection/package.json   |  29 +-
 packages/@react-aria/selection/src/index.ts   |  20 +-
 packages/@react-aria/separator/index.ts       |  13 -
 packages/@react-aria/separator/package.json   |  24 +-
 packages/@react-aria/separator/src/index.ts   |   5 +-
 packages/@react-aria/slider/index.ts          |  13 -
 packages/@react-aria/slider/package.json      |  29 +-
 packages/@react-aria/slider/src/index.ts      |   7 +-
 packages/@react-aria/spinbutton/index.ts      |  13 -
 packages/@react-aria/spinbutton/package.json  |  26 +-
 packages/@react-aria/spinbutton/src/index.ts  |   5 +-
 packages/@react-aria/ssr/index.ts             |  13 -
 packages/@react-aria/ssr/package.json         |  30 +-
 packages/@react-aria/ssr/src/index.ts         |   6 +-
 packages/@react-aria/steplist/index.ts        |  13 -
 packages/@react-aria/steplist/package.json    |  28 +-
 packages/@react-aria/steplist/src/index.ts    |   8 +-
 packages/@react-aria/switch/index.ts          |  13 -
 packages/@react-aria/switch/package.json      |  26 +-
 packages/@react-aria/switch/src/index.ts      |   5 +-
 packages/@react-aria/table/index.ts           |  13 -
 packages/@react-aria/table/package.json       |  35 +--
 packages/@react-aria/table/src/index.ts       |  20 +-
 packages/@react-aria/tabs/index.ts            |  13 -
 packages/@react-aria/tabs/package.json        |  29 +-
 packages/@react-aria/tabs/src/index.ts        |   9 +-
 packages/@react-aria/tag/index.ts             |  13 -
 packages/@react-aria/tag/package.json         |  31 +-
 packages/@react-aria/tag/src/index.ts         |   6 +-
 packages/@react-aria/test-utils/package.json  |  10 +-
 packages/@react-aria/textfield/index.ts       |  13 -
 packages/@react-aria/textfield/package.json   |  30 +-
 packages/@react-aria/textfield/src/index.ts   |   8 +-
 packages/@react-aria/toast/index.ts           |  13 -
 packages/@react-aria/toast/package.json       |  29 +-
 packages/@react-aria/toast/src/index.ts       |   6 +-
 packages/@react-aria/toggle/index.ts          |  13 -
 packages/@react-aria/toggle/package.json      |  27 +-
 packages/@react-aria/toggle/src/index.ts      |   7 +-
 packages/@react-aria/toolbar/package.json     |  26 +-
 packages/@react-aria/toolbar/src/index.ts     |   5 +-
 packages/@react-aria/tooltip/index.ts         |  13 -
 packages/@react-aria/tooltip/package.json     |  27 +-
 packages/@react-aria/tooltip/src/index.ts     |   7 +-
 packages/@react-aria/tree/index.ts            |  13 -
 packages/@react-aria/tree/package.json        |  29 +-
 packages/@react-aria/tree/src/index.ts        |   8 +-
 packages/@react-aria/utils/index.ts           |  13 -
 packages/@react-aria/utils/package.json       |  27 +-
 packages/@react-aria/utils/src/index.ts       |  89 +++---
 packages/@react-aria/virtualizer/index.ts     |  13 -
 packages/@react-aria/virtualizer/package.json |  28 +-
 packages/@react-aria/virtualizer/src/index.ts |  15 +-
 packages/@react-aria/visually-hidden/index.ts |  13 -
 .../@react-aria/visually-hidden/package.json  |  25 +-
 .../@react-aria/visually-hidden/src/index.ts  |   5 +-
 packages/@react-spectrum/accordion/index.ts   |  13 -
 .../@react-spectrum/accordion/package.json    |  35 +--
 .../@react-spectrum/accordion/src/index.ts    |   5 +-
 packages/@react-spectrum/actionbar/index.ts   |  13 -
 .../@react-spectrum/actionbar/package.json    |  45 +--
 .../@react-spectrum/actionbar/src/index.ts    |   6 +-
 packages/@react-spectrum/actiongroup/index.ts |  13 -
 .../@react-spectrum/actiongroup/package.json  |  46 +--
 .../@react-spectrum/actiongroup/src/index.ts  |   5 +-
 .../@react-spectrum/autocomplete/package.json |  54 +---
 .../@react-spectrum/autocomplete/src/index.ts |   8 +-
 packages/@react-spectrum/avatar/package.json  |  35 +--
 packages/@react-spectrum/avatar/src/index.ts  |   3 +-
 packages/@react-spectrum/badge/package.json   |  36 +--
 packages/@react-spectrum/badge/src/index.ts   |   3 +-
 packages/@react-spectrum/breadcrumbs/index.ts |  13 -
 .../@react-spectrum/breadcrumbs/package.json  |  43 +--
 .../@react-spectrum/breadcrumbs/src/index.ts  |   5 +-
 packages/@react-spectrum/button/index.ts      |  13 -
 packages/@react-spectrum/button/package.json  |  43 +--
 packages/@react-spectrum/button/src/index.ts  |  13 +-
 packages/@react-spectrum/buttongroup/index.ts |  13 -
 .../@react-spectrum/buttongroup/package.json  |  35 +--
 .../@react-spectrum/buttongroup/src/index.ts  |   3 +-
 packages/@react-spectrum/calendar/index.ts    |  13 -
 .../@react-spectrum/calendar/package.json     |  44 +--
 .../@react-spectrum/calendar/src/index.ts     |   5 +-
 packages/@react-spectrum/card/index.ts        |  13 -
 packages/@react-spectrum/card/package.json    |  47 +--
 packages/@react-spectrum/card/src/index.ts    |  18 +-
 packages/@react-spectrum/checkbox/index.ts    |  13 -
 .../@react-spectrum/checkbox/package.json     |  42 +--
 .../@react-spectrum/checkbox/src/index.ts     |   5 +-
 packages/@react-spectrum/color/index.ts       |  13 -
 packages/@react-spectrum/color/package.json   |  48 +--
 packages/@react-spectrum/color/src/index.ts   |  25 +-
 packages/@react-spectrum/combobox/index.ts    |  13 -
 .../@react-spectrum/combobox/package.json     |  54 +---
 .../@react-spectrum/combobox/src/index.ts     |   6 +-
 .../@react-spectrum/contextualhelp/index.ts   |  13 -
 .../contextualhelp/package.json               |  38 +--
 .../contextualhelp/src/index.ts               |   3 +-
 packages/@react-spectrum/datepicker/index.ts  |  13 -
 .../@react-spectrum/datepicker/package.json   |  48 +--
 .../@react-spectrum/datepicker/src/index.ts   |   9 +-
 packages/@react-spectrum/dialog/index.ts      |  13 -
 packages/@react-spectrum/dialog/package.json  |  48 +--
 packages/@react-spectrum/dialog/src/index.ts  |  12 +-
 packages/@react-spectrum/divider/index.ts     |  13 -
 packages/@react-spectrum/divider/package.json |  34 +--
 packages/@react-spectrum/divider/src/index.ts |   3 +-
 packages/@react-spectrum/dnd/package.json     |  36 +--
 packages/@react-spectrum/dnd/src/index.ts     |  32 +-
 packages/@react-spectrum/dropzone/index.ts    |  12 -
 .../@react-spectrum/dropzone/package.json     |  36 +--
 .../@react-spectrum/dropzone/src/index.ts     |   5 +-
 packages/@react-spectrum/filetrigger/index.ts |  12 -
 .../@react-spectrum/filetrigger/package.json  |  32 +-
 .../@react-spectrum/filetrigger/src/index.ts  |   4 +-
 packages/@react-spectrum/form/index.ts        |  13 -
 packages/@react-spectrum/form/package.json    |  37 +--
 packages/@react-spectrum/form/src/index.ts    |   4 +-
 packages/@react-spectrum/icon/index.ts        |  13 -
 packages/@react-spectrum/icon/package.json    |  35 +--
 packages/@react-spectrum/icon/src/index.ts    |  13 +-
 .../illustratedmessage/index.ts               |  13 -
 .../illustratedmessage/package.json           |  36 +--
 .../illustratedmessage/src/index.ts           |   3 +-
 packages/@react-spectrum/image/index.ts       |  13 -
 packages/@react-spectrum/image/package.json   |  35 +--
 packages/@react-spectrum/image/src/index.ts   |   3 +-
 packages/@react-spectrum/inlinealert/index.ts |  13 -
 .../@react-spectrum/inlinealert/package.json  |  38 +--
 .../@react-spectrum/inlinealert/src/index.ts  |   5 +-
 packages/@react-spectrum/label/index.ts       |  13 -
 packages/@react-spectrum/label/package.json   |  38 +--
 packages/@react-spectrum/label/src/index.ts   |   7 +-
 .../@react-spectrum/labeledvalue/index.ts     |  13 -
 .../@react-spectrum/labeledvalue/package.json |  37 +--
 .../@react-spectrum/labeledvalue/src/index.ts |   5 +-
 packages/@react-spectrum/layout/index.ts      |  13 -
 packages/@react-spectrum/layout/package.json  |  35 +--
 packages/@react-spectrum/layout/src/index.ts  |   5 +-
 packages/@react-spectrum/link/index.ts        |  13 -
 packages/@react-spectrum/link/package.json    |  38 +--
 packages/@react-spectrum/link/src/index.ts    |   3 +-
 packages/@react-spectrum/list/index.ts        |  13 -
 packages/@react-spectrum/list/package.json    |  53 +---
 packages/@react-spectrum/list/src/index.ts    |   7 +-
 packages/@react-spectrum/listbox/index.ts     |  13 -
 packages/@react-spectrum/listbox/package.json |  48 +--
 packages/@react-spectrum/listbox/src/index.ts |   8 +-
 packages/@react-spectrum/menu/index.ts        |  13 -
 packages/@react-spectrum/menu/package.json    |  50 +---
 packages/@react-spectrum/menu/src/index.ts    |  15 +-
 packages/@react-spectrum/meter/index.ts       |  13 -
 packages/@react-spectrum/meter/package.json   |  36 +--
 packages/@react-spectrum/meter/src/index.ts   |   3 +-
 packages/@react-spectrum/numberfield/index.ts |  13 -
 .../@react-spectrum/numberfield/package.json  |  45 +--
 .../@react-spectrum/numberfield/src/index.ts  |   3 +-
 packages/@react-spectrum/overlays/index.ts    |  13 -
 .../@react-spectrum/overlays/package.json     |  39 +--
 .../@react-spectrum/overlays/src/index.ts     |  11 +-
 packages/@react-spectrum/picker/index.ts      |  13 -
 packages/@react-spectrum/picker/package.json  |  48 +--
 packages/@react-spectrum/picker/src/index.ts  |   6 +-
 packages/@react-spectrum/progress/index.ts    |  13 -
 .../@react-spectrum/progress/package.json     |  36 +--
 .../@react-spectrum/progress/src/index.ts     |   7 +-
 packages/@react-spectrum/provider/index.ts    |  13 -
 .../@react-spectrum/provider/package.json     |  36 +--
 .../@react-spectrum/provider/src/index.ts     |   4 +-
 packages/@react-spectrum/radio/index.ts       |  13 -
 packages/@react-spectrum/radio/package.json   |  41 +--
 packages/@react-spectrum/radio/src/index.ts   |   4 +-
 .../s2/chromatic/Accordion.stories.tsx        |  11 +-
 .../s2/chromatic/ActionButton.stories.tsx     |   6 +-
 .../chromatic/ActionButtonGroup.stories.tsx   |   5 +-
 .../s2/chromatic/ActionMenu.stories.tsx       |   2 +-
 .../s2/chromatic/ActionMenuRTL.stories.tsx    |   2 +-
 .../s2/chromatic/AlertDialog.stories.tsx      |   2 +-
 .../s2/chromatic/AlertDialogRTL.stories.tsx   |   2 +-
 .../s2/chromatic/Avatar.stories.tsx           |   2 +-
 .../s2/chromatic/AvatarGroup.stories.tsx      |   2 +-
 .../s2/chromatic/Badge.stories.tsx            |   2 +-
 .../s2/chromatic/Breadcrumbs.stories.tsx      |   2 +-
 .../s2/chromatic/BreadcrumbsRTL.stories.tsx   |   2 +-
 .../s2/chromatic/Button.stories.tsx           |   4 +-
 .../s2/chromatic/ButtonGroup.stories.tsx      |   5 +-
 .../s2/chromatic/Calendar.stories.tsx         |   4 +-
 .../s2/chromatic/Card.stories.tsx             |  22 +-
 .../s2/chromatic/CardView.stories.tsx         |   6 +-
 .../s2/chromatic/Checkbox.stories.tsx         |   2 +-
 .../s2/chromatic/CheckboxGroup.stories.tsx    |   6 +-
 .../s2/chromatic/ColorArea.stories.tsx        |   2 +-
 .../s2/chromatic/ColorField.stories.tsx       |   2 +-
 .../s2/chromatic/ColorSlider.stories.tsx      |   5 +-
 .../s2/chromatic/Combobox.stories.tsx         |   2 +-
 .../s2/chromatic/ComboboxRTL.stories.tsx      |   2 +-
 .../s2/chromatic/ContextualHelp.stories.tsx   |   2 +-
 .../chromatic/ContextualHelpRTL.stories.tsx   |   2 +-
 .../s2/chromatic/DateField.stories.tsx        |   2 +-
 .../s2/chromatic/DatePicker.stories.tsx       |   2 +-
 .../s2/chromatic/DateRangePicker.stories.tsx  |   2 +-
 .../s2/chromatic/Dialog.stories.tsx           |   2 +-
 .../s2/chromatic/DialogRTL.stories.tsx        |   2 +-
 .../s2/chromatic/Disclosure.stories.tsx       |   4 +-
 .../s2/chromatic/Divider.stories.tsx          |   2 +-
 .../s2/chromatic/DropZone.stories.tsx         |  14 +-
 .../s2/chromatic/Fonts.stories.tsx            |   2 +-
 .../s2/chromatic/Forms.stories.tsx            |  56 ++--
 .../chromatic/IllustratedMessage.stories.tsx  |   6 +-
 .../s2/chromatic/InlineAlert.stories.tsx      |   5 +-
 .../@react-spectrum/s2/chromatic/Link.tsx     |   2 +-
 .../s2/chromatic/LinkButton.stories.tsx       |   4 +-
 .../s2/chromatic/ListView.stories.tsx         |  10 +-
 .../s2/chromatic/Menu.stories.tsx             |   2 +-
 .../s2/chromatic/MenuRTL.stories.tsx          |   2 +-
 .../s2/chromatic/NumberField.stories.tsx      |  14 +-
 .../s2/chromatic/Picker.stories.tsx           |   2 +-
 .../s2/chromatic/PickerRTL.stories.tsx        |   2 +-
 .../s2/chromatic/Popover.stories.tsx          |   2 +-
 .../s2/chromatic/ProgressBar.stories.tsx      |   2 +-
 .../s2/chromatic/ProgressCircle.stories.tsx   |   2 +-
 .../s2/chromatic/RadioGroup.stories.tsx       |  15 +-
 .../s2/chromatic/RangeCalendar.stories.tsx    |   4 +-
 .../s2/chromatic/RangeSlider.stories.tsx      |   2 +-
 .../s2/chromatic/SearchField.stories.tsx      |  14 +-
 .../s2/chromatic/SegmentedControl.stories.tsx |   3 +-
 .../s2/chromatic/SelectBoxGroup.stories.tsx   |   3 +-
 .../s2/chromatic/StatusLight.stories.tsx      |   2 +-
 .../s2/chromatic/Switch.stories.tsx           |   2 +-
 .../s2/chromatic/TableView.stories.tsx        |   9 +-
 .../s2/chromatic/Tabs.stories.tsx             |   6 +-
 .../s2/chromatic/TagGroup.stories.tsx         |  18 +-
 .../s2/chromatic/TextField.stories.tsx        |   5 +-
 .../s2/chromatic/TimeField.stories.tsx        |   2 +-
 .../s2/chromatic/Toast.stories.tsx            |   4 +-
 .../s2/chromatic/ToggleButton.stories.tsx     |   3 +-
 .../chromatic/ToggleButtonGroup.stories.tsx   |   4 +-
 .../s2/chromatic/Tooltip.stories.tsx          |   2 +-
 .../s2/chromatic/TooltipRTL.stories.tsx       |   2 +-
 .../s2/chromatic/TreeView.stories.tsx         |  17 +-
 .../@react-spectrum/s2/exports/Accordion.ts   |   3 +
 .../@react-spectrum/s2/exports/ActionBar.ts   |   2 +
 .../s2/exports/ActionButton.ts                |   2 +
 .../s2/exports/ActionButtonGroup.ts           |   2 +
 .../@react-spectrum/s2/exports/ActionMenu.ts  |   2 +
 .../@react-spectrum/s2/exports/AlertDialog.ts |   2 +
 packages/@react-spectrum/s2/exports/Avatar.ts |   2 +
 .../@react-spectrum/s2/exports/AvatarGroup.ts |   2 +
 packages/@react-spectrum/s2/exports/Badge.ts  |   2 +
 .../@react-spectrum/s2/exports/Breadcrumbs.ts |   2 +
 packages/@react-spectrum/s2/exports/Button.ts |   2 +
 .../@react-spectrum/s2/exports/ButtonGroup.ts |   2 +
 .../@react-spectrum/s2/exports/Calendar.ts    |   2 +
 packages/@react-spectrum/s2/exports/Card.ts   |   2 +
 .../@react-spectrum/s2/exports/CardView.ts    |   2 +
 .../@react-spectrum/s2/exports/Checkbox.ts    |   2 +
 .../s2/exports/CheckboxGroup.ts               |   2 +
 .../@react-spectrum/s2/exports/CloseButton.ts |   2 +
 .../@react-spectrum/s2/exports/ColorArea.ts   |   2 +
 .../@react-spectrum/s2/exports/ColorField.ts  |   2 +
 .../@react-spectrum/s2/exports/ColorSlider.ts |   2 +
 .../@react-spectrum/s2/exports/ColorSwatch.ts |   2 +
 .../s2/exports/ColorSwatchPicker.ts           |   2 +
 .../@react-spectrum/s2/exports/ColorWheel.ts  |   2 +
 .../@react-spectrum/s2/exports/ComboBox.ts    |   2 +
 .../@react-spectrum/s2/exports/Content.ts     |   1 +
 .../s2/exports/ContextualHelp.ts              |   2 +
 .../s2/exports/CustomDialog.ts                |   2 +
 .../@react-spectrum/s2/exports/DateField.ts   |   2 +
 .../@react-spectrum/s2/exports/DatePicker.ts  |   2 +
 .../s2/exports/DateRangePicker.ts             |   2 +
 packages/@react-spectrum/s2/exports/Dialog.ts |   2 +
 .../s2/exports/DialogContainer.ts             |   2 +
 .../s2/exports/DialogTrigger.ts               |   2 +
 .../@react-spectrum/s2/exports/Disclosure.ts  |   2 +
 .../@react-spectrum/s2/exports/Divider.ts     |   2 +
 .../@react-spectrum/s2/exports/DropZone.ts    |   2 +
 packages/@react-spectrum/s2/exports/Form.ts   |   2 +
 .../s2/exports/FullscreenDialog.ts            |   2 +
 packages/@react-spectrum/s2/exports/Icon.ts   |   2 +
 .../s2/exports/IllustratedMessage.ts          |   1 +
 packages/@react-spectrum/s2/exports/Image.ts  |   2 +
 .../s2/exports/ImageCoordinator.ts            |   2 +
 .../@react-spectrum/s2/exports/InlineAlert.ts |   2 +
 packages/@react-spectrum/s2/exports/Link.ts   |   2 +
 .../@react-spectrum/s2/exports/ListView.ts    |   2 +
 packages/@react-spectrum/s2/exports/Menu.ts   |   2 +
 packages/@react-spectrum/s2/exports/Meter.ts  |   2 +
 .../s2/exports/NotificationBadge.ts           |   2 +
 .../@react-spectrum/s2/exports/NumberField.ts |   1 +
 packages/@react-spectrum/s2/exports/Picker.ts |   2 +
 .../@react-spectrum/s2/exports/Popover.ts     |   2 +
 .../@react-spectrum/s2/exports/ProgressBar.ts |   2 +
 .../s2/exports/ProgressCircle.ts              |   2 +
 .../@react-spectrum/s2/exports/Provider.ts    |   2 +
 .../@react-spectrum/s2/exports/RadioGroup.ts  |   2 +
 .../s2/exports/RangeCalendar.ts               |   2 +
 .../@react-spectrum/s2/exports/RangeSlider.ts |   2 +
 .../@react-spectrum/s2/exports/SearchField.ts |   2 +
 .../s2/exports/SegmentedControl.ts            |   2 +
 .../s2/exports/SelectBoxGroup.ts              |   2 +
 .../@react-spectrum/s2/exports/Skeleton.ts    |   2 +
 .../s2/exports/SkeletonCollection.ts          |   2 +
 packages/@react-spectrum/s2/exports/Slider.ts |   2 +
 .../@react-spectrum/s2/exports/StatusLight.ts |   2 +
 packages/@react-spectrum/s2/exports/Switch.ts |   2 +
 .../@react-spectrum/s2/exports/TableView.ts   |   2 +
 packages/@react-spectrum/s2/exports/Tabs.ts   |   2 +
 .../@react-spectrum/s2/exports/TagGroup.ts    |   2 +
 .../@react-spectrum/s2/exports/TextField.ts   |   2 +
 .../@react-spectrum/s2/exports/TimeField.ts   |   2 +
 packages/@react-spectrum/s2/exports/Toast.ts  |   2 +
 .../s2/exports/ToggleButton.ts                |   2 +
 .../s2/exports/ToggleButtonGroup.ts           |   2 +
 .../@react-spectrum/s2/exports/Tooltip.ts     |   2 +
 .../@react-spectrum/s2/exports/TreeView.ts    |   3 +
 .../s2/{src => exports}/index.ts              |  23 +-
 .../@react-spectrum/s2/exports/pressScale.ts  |   1 +
 packages/@react-spectrum/s2/index.ts          |  13 -
 packages/@react-spectrum/s2/package.json      |  66 +++--
 .../gradient/generic1/3D.tsx                  |   2 +-
 .../gradient/generic1/3Dasset.tsx             |   2 +-
 .../gradient/generic1/AIGenerate.tsx          |   2 +-
 .../gradient/generic1/AIGenerateImage.tsx     |   2 +-
 .../gradient/generic1/AIchat.tsx              |   2 +-
 .../gradient/generic1/Accessibility.tsx       |   2 +-
 .../gradient/generic1/Animation.tsx           |   2 +-
 .../gradient/generic1/Apps.tsx                |   2 +-
 .../gradient/generic1/Artboard.tsx            |   2 +-
 .../gradient/generic1/Assets.tsx              |   2 +-
 .../gradient/generic1/AudioWave.tsx           |   2 +-
 .../gradient/generic1/BadgeVerified.tsx       |   2 +-
 .../gradient/generic1/Bell.tsx                |   2 +-
 .../gradient/generic1/Bolt.tsx                |   2 +-
 .../gradient/generic1/Brand.tsx               |   2 +-
 .../gradient/generic1/Briefcase.tsx           |   2 +-
 .../gradient/generic1/BrightnessContrast.tsx  |   2 +-
 .../gradient/generic1/Browser.tsx             |   2 +-
 .../gradient/generic1/Brush.tsx               |   2 +-
 .../gradient/generic1/BuildTable.tsx          |   2 +-
 .../gradient/generic1/Buildings.tsx           |   2 +-
 .../gradient/generic1/Calendar.tsx            |   2 +-
 .../gradient/generic1/Camera.tsx              |   2 +-
 .../gradient/generic1/CardTapPayment.tsx      |   2 +-
 .../gradient/generic1/Channel.tsx             |   2 +-
 .../gradient/generic1/ChartAreaStack.tsx      |   2 +-
 .../gradient/generic1/Chatbubble.tsx          |   2 +-
 .../gradient/generic1/Checkmark.tsx           |   2 +-
 .../gradient/generic1/Clipboard.tsx           |   2 +-
 .../gradient/generic1/Clock.tsx               |   2 +-
 .../gradient/generic1/Cloud.tsx               |   2 +-
 .../gradient/generic1/CloudUpload.tsx         |   2 +-
 .../gradient/generic1/CodeBrackets.tsx        |   2 +-
 .../gradient/generic1/Color.tsx               |   2 +-
 .../gradient/generic1/CommentText.tsx         |   2 +-
 .../gradient/generic1/Confetti.tsx            |   2 +-
 .../gradient/generic1/Conversationbubbles.tsx |   2 +-
 .../gradient/generic1/Crop.tsx                |   2 +-
 .../gradient/generic1/Cursor.tsx              |   2 +-
 .../gradient/generic1/Cut.tsx                 |   2 +-
 .../gradient/generic1/Data.tsx                |   2 +-
 .../gradient/generic1/DataAnalytics.tsx       |   2 +-
 .../gradient/generic1/Desktop.tsx             |   2 +-
 .../gradient/generic1/Diamond.tsx             |   2 +-
 .../gradient/generic1/Document.tsx            |   2 +-
 .../gradient/generic1/Download.tsx            |   2 +-
 .../gradient/generic1/DropToUpload.tsx        |   2 +-
 .../gradient/generic1/Education.tsx           |   2 +-
 .../gradient/generic1/Effects.tsx             |   2 +-
 .../gradient/generic1/Emoji.tsx               |   2 +-
 .../gradient/generic1/EmptyStateExport.tsx    |   2 +-
 .../gradient/generic1/Explosion.tsx           |   2 +-
 .../gradient/generic1/ExportTo.tsx            |   2 +-
 .../gradient/generic1/Exposure.tsx            |   2 +-
 .../gradient/generic1/FileImage.tsx           |   2 +-
 .../gradient/generic1/FileShared.tsx          |   2 +-
 .../gradient/generic1/FileText.tsx            |   2 +-
 .../gradient/generic1/FileVideo.tsx           |   2 +-
 .../gradient/generic1/FileZip.tsx             |   2 +-
 .../gradient/generic1/Filmstrip.tsx           |   2 +-
 .../gradient/generic1/Filter.tsx              |   2 +-
 .../gradient/generic1/Filters.tsx             |   2 +-
 .../gradient/generic1/Fireworks.tsx           |   2 +-
 .../gradient/generic1/Flag.tsx                |   2 +-
 .../gradient/generic1/FlagCheckmark.tsx       |   2 +-
 .../gradient/generic1/FlagCross.tsx           |   2 +-
 .../gradient/generic1/FolderClose.tsx         |   2 +-
 .../gradient/generic1/FolderOpen.tsx          |   2 +-
 .../gradient/generic1/FolderShared.tsx        |   2 +-
 .../gradient/generic1/GearSetting.tsx         |   2 +-
 .../gradient/generic1/Gift.tsx                |   2 +-
 .../gradient/generic1/Globe.tsx               |   2 +-
 .../gradient/generic1/GlobeGrid.tsx           |   2 +-
 .../gradient/generic1/GraphBarChart.tsx       |   2 +-
 .../gradient/generic1/Hand.tsx                |   2 +-
 .../gradient/generic1/Handshake.tsx           |   2 +-
 .../gradient/generic1/Heart.tsx               |   2 +-
 .../gradient/generic1/HelpCircle.tsx          |   2 +-
 .../gradient/generic1/Home.tsx                |   2 +-
 .../gradient/generic1/Illustration.tsx        |   2 +-
 .../gradient/generic1/Image.tsx               |   2 +-
 .../gradient/generic1/ImageStack.tsx          |   2 +-
 .../gradient/generic1/InfiniteLooping.tsx     |   2 +-
 .../gradient/generic1/Information.tsx         |   2 +-
 .../gradient/generic1/Interaction.tsx         |   2 +-
 .../gradient/generic1/Laptop.tsx              |   2 +-
 .../gradient/generic1/Layers.tsx              |   2 +-
 .../gradient/generic1/Libraries.tsx           |   2 +-
 .../gradient/generic1/Lightbulb.tsx           |   2 +-
 .../gradient/generic1/LightbulbRays.tsx       |   2 +-
 .../gradient/generic1/Lighten.tsx             |   2 +-
 .../gradient/generic1/Link.tsx                |   2 +-
 .../gradient/generic1/Location.tsx            |   2 +-
 .../gradient/generic1/LockClose.tsx           |   2 +-
 .../gradient/generic1/LockOpen.tsx            |   2 +-
 .../gradient/generic1/Logo.tsx                |   2 +-
 .../gradient/generic1/MagicWand.tsx           |   2 +-
 .../gradient/generic1/MailClose.tsx           |   2 +-
 .../gradient/generic1/MailOpen.tsx            |   2 +-
 .../gradient/generic1/Market.tsx              |   2 +-
 .../gradient/generic1/MegaphonePromote.tsx    |   2 +-
 .../gradient/generic1/MegaphonePromote2.tsx   |   2 +-
 .../gradient/generic1/Mention.tsx             |   2 +-
 .../gradient/generic1/Microphone.tsx          |   2 +-
 .../gradient/generic1/Minimize.tsx            |   2 +-
 .../gradient/generic1/MovieCamera.tsx         |   2 +-
 .../gradient/generic1/MusicNote.tsx           |   2 +-
 .../gradient/generic1/NoElements.tsx          |   2 +-
 .../gradient/generic1/Paperairplane.tsx       |   2 +-
 .../gradient/generic1/Paperclip.tsx           |   2 +-
 .../gradient/generic1/Pause.tsx               |   2 +-
 .../gradient/generic1/Pencil.tsx              |   2 +-
 .../gradient/generic1/Phone.tsx               |   2 +-
 .../gradient/generic1/PieChart.tsx            |   2 +-
 .../gradient/generic1/PiggyBank.tsx           |   2 +-
 .../gradient/generic1/Pin.tsx                 |   2 +-
 .../gradient/generic1/Play.tsx                |   2 +-
 .../gradient/generic1/PlayTriangle.tsx        |   2 +-
 .../gradient/generic1/Plugin.tsx              |   2 +-
 .../gradient/generic1/Prompt.tsx              |   2 +-
 .../gradient/generic1/Properties.tsx          |   2 +-
 .../gradient/generic1/Redo.tsx                |   2 +-
 .../gradient/generic1/Remix.tsx               |   2 +-
 .../gradient/generic1/Replace.tsx             |   2 +-
 .../gradient/generic1/Revert.tsx              |   2 +-
 .../gradient/generic1/Ribbon.tsx              |   2 +-
 .../gradient/generic1/Rocket.tsx              |   2 +-
 .../gradient/generic1/RotateCCW.tsx           |   2 +-
 .../gradient/generic1/RotateCW.tsx            |   2 +-
 .../gradient/generic1/Ruler.tsx               |   2 +-
 .../gradient/generic1/Search.tsx              |   2 +-
 .../gradient/generic1/Segmentation.tsx        |   2 +-
 .../gradient/generic1/Server.tsx              |   2 +-
 .../gradient/generic1/Shapes.tsx              |   2 +-
 .../gradient/generic1/ShoppingBag.tsx         |   2 +-
 .../gradient/generic1/ShoppingCart.tsx        |   2 +-
 .../gradient/generic1/Sparkles.tsx            |   2 +-
 .../gradient/generic1/SpeedFast.tsx           |   2 +-
 .../gradient/generic1/StampClone.tsx          |   2 +-
 .../gradient/generic1/Star.tsx                |   2 +-
 .../gradient/generic1/StepForward.tsx         |   2 +-
 .../gradient/generic1/Switch.tsx              |   2 +-
 .../gradient/generic1/Tablet.tsx              |   2 +-
 .../gradient/generic1/Tag.tsx                 |   2 +-
 .../gradient/generic1/Targeted.tsx            |   2 +-
 .../gradient/generic1/Text.tsx                |   2 +-
 .../gradient/generic1/ThreeArrowsCircle.tsx   |   2 +-
 .../gradient/generic1/ThumbsUp.tsx            |   2 +-
 .../gradient/generic1/Transform.tsx           |   2 +-
 .../gradient/generic1/Translate.tsx           |   2 +-
 .../gradient/generic1/Trash.tsx               |   2 +-
 .../gradient/generic1/Trophy.tsx              |   2 +-
 .../gradient/generic1/Update.tsx              |   2 +-
 .../gradient/generic1/Upload.tsx              |   2 +-
 .../gradient/generic1/User.tsx                |   2 +-
 .../gradient/generic1/UserAvatar.tsx          |   2 +-
 .../gradient/generic1/UserGroup.tsx           |   2 +-
 .../gradient/generic1/VectorDraw.tsx          |   2 +-
 .../gradient/generic1/Video.tsx               |   2 +-
 .../gradient/generic1/Volume.tsx              |   2 +-
 .../gradient/generic1/VolumeOne.tsx           |   2 +-
 .../gradient/generic1/Wallet.tsx              |   2 +-
 .../gradient/generic2/3D.tsx                  |   2 +-
 .../gradient/generic2/3Dasset.tsx             |   2 +-
 .../gradient/generic2/AIGenerate.tsx          |   2 +-
 .../gradient/generic2/AIGenerateImage.tsx     |   2 +-
 .../gradient/generic2/AIchat.tsx              |   2 +-
 .../gradient/generic2/Accessibility.tsx       |   2 +-
 .../gradient/generic2/Animation.tsx           |   2 +-
 .../gradient/generic2/Apps.tsx                |   2 +-
 .../gradient/generic2/Artboard.tsx            |   2 +-
 .../gradient/generic2/Assets.tsx              |   2 +-
 .../gradient/generic2/AudioWave.tsx           |   2 +-
 .../gradient/generic2/BadgeVerified.tsx       |   2 +-
 .../gradient/generic2/Bell.tsx                |   2 +-
 .../gradient/generic2/Bolt.tsx                |   2 +-
 .../gradient/generic2/Brand.tsx               |   2 +-
 .../gradient/generic2/Briefcase.tsx           |   2 +-
 .../gradient/generic2/BrightnessContrast.tsx  |   2 +-
 .../gradient/generic2/Browser.tsx             |   2 +-
 .../gradient/generic2/Brush.tsx               |   2 +-
 .../gradient/generic2/BuildTable.tsx          |   2 +-
 .../gradient/generic2/Buildings.tsx           |   2 +-
 .../gradient/generic2/Calendar.tsx            |   2 +-
 .../gradient/generic2/Camera.tsx              |   2 +-
 .../gradient/generic2/CardTapPayment.tsx      |   2 +-
 .../gradient/generic2/Channel.tsx             |   2 +-
 .../gradient/generic2/ChartAreaStack.tsx      |   2 +-
 .../gradient/generic2/Chatbubble.tsx          |   2 +-
 .../gradient/generic2/Checkmark.tsx           |   2 +-
 .../gradient/generic2/Clipboard.tsx           |   2 +-
 .../gradient/generic2/Clock.tsx               |   2 +-
 .../gradient/generic2/Cloud.tsx               |   2 +-
 .../gradient/generic2/CloudUpload.tsx         |   2 +-
 .../gradient/generic2/CodeBrackets.tsx        |   2 +-
 .../gradient/generic2/Color.tsx               |   2 +-
 .../gradient/generic2/CommentText.tsx         |   2 +-
 .../gradient/generic2/Confetti.tsx            |   2 +-
 .../gradient/generic2/Conversationbubbles.tsx |   2 +-
 .../gradient/generic2/Crop.tsx                |   2 +-
 .../gradient/generic2/Cursor.tsx              |   2 +-
 .../gradient/generic2/Cut.tsx                 |   2 +-
 .../gradient/generic2/Data.tsx                |   2 +-
 .../gradient/generic2/DataAnalytics.tsx       |   2 +-
 .../gradient/generic2/Desktop.tsx             |   2 +-
 .../gradient/generic2/Diamond.tsx             |   2 +-
 .../gradient/generic2/Document.tsx            |   2 +-
 .../gradient/generic2/Download.tsx            |   2 +-
 .../gradient/generic2/DropToUpload.tsx        |   2 +-
 .../gradient/generic2/Education.tsx           |   2 +-
 .../gradient/generic2/Effects.tsx             |   2 +-
 .../gradient/generic2/Emoji.tsx               |   2 +-
 .../gradient/generic2/EmptyStateExport.tsx    |   2 +-
 .../gradient/generic2/Explosion.tsx           |   2 +-
 .../gradient/generic2/ExportTo.tsx            |   2 +-
 .../gradient/generic2/Exposure.tsx            |   2 +-
 .../gradient/generic2/FileImage.tsx           |   2 +-
 .../gradient/generic2/FileShared.tsx          |   2 +-
 .../gradient/generic2/FileText.tsx            |   2 +-
 .../gradient/generic2/FileVideo.tsx           |   2 +-
 .../gradient/generic2/FileZip.tsx             |   2 +-
 .../gradient/generic2/Filmstrip.tsx           |   2 +-
 .../gradient/generic2/Filter.tsx              |   2 +-
 .../gradient/generic2/Filters.tsx             |   2 +-
 .../gradient/generic2/Fireworks.tsx           |   2 +-
 .../gradient/generic2/Flag.tsx                |   2 +-
 .../gradient/generic2/FlagCheckmark.tsx       |   2 +-
 .../gradient/generic2/FlagCross.tsx           |   2 +-
 .../gradient/generic2/FolderClose.tsx         |   2 +-
 .../gradient/generic2/FolderOpen.tsx          |   2 +-
 .../gradient/generic2/FolderShared.tsx        |   2 +-
 .../gradient/generic2/GearSetting.tsx         |   2 +-
 .../gradient/generic2/Gift.tsx                |   2 +-
 .../gradient/generic2/Globe.tsx               |   2 +-
 .../gradient/generic2/GlobeGrid.tsx           |   2 +-
 .../gradient/generic2/GraphBarChart.tsx       |   2 +-
 .../gradient/generic2/Hand.tsx                |   2 +-
 .../gradient/generic2/Handshake.tsx           |   2 +-
 .../gradient/generic2/Heart.tsx               |   2 +-
 .../gradient/generic2/HelpCircle.tsx          |   2 +-
 .../gradient/generic2/Home.tsx                |   2 +-
 .../gradient/generic2/Illustration.tsx        |   2 +-
 .../gradient/generic2/Image.tsx               |   2 +-
 .../gradient/generic2/ImageStack.tsx          |   2 +-
 .../gradient/generic2/InfiniteLooping.tsx     |   2 +-
 .../gradient/generic2/Information.tsx         |   2 +-
 .../gradient/generic2/Interaction.tsx         |   2 +-
 .../gradient/generic2/Laptop.tsx              |   2 +-
 .../gradient/generic2/Layers.tsx              |   2 +-
 .../gradient/generic2/Libraries.tsx           |   2 +-
 .../gradient/generic2/Lightbulb.tsx           |   2 +-
 .../gradient/generic2/LightbulbRays.tsx       |   2 +-
 .../gradient/generic2/Lighten.tsx             |   2 +-
 .../gradient/generic2/Link.tsx                |   2 +-
 .../gradient/generic2/Location.tsx            |   2 +-
 .../gradient/generic2/LockClose.tsx           |   2 +-
 .../gradient/generic2/LockOpen.tsx            |   2 +-
 .../gradient/generic2/Logo.tsx                |   2 +-
 .../gradient/generic2/MagicWand.tsx           |   2 +-
 .../gradient/generic2/MailClose.tsx           |   2 +-
 .../gradient/generic2/MailOpen.tsx            |   2 +-
 .../gradient/generic2/Market.tsx              |   2 +-
 .../gradient/generic2/MegaphonePromote.tsx    |   2 +-
 .../gradient/generic2/MegaphonePromote2.tsx   |   2 +-
 .../gradient/generic2/Mention.tsx             |   2 +-
 .../gradient/generic2/Microphone.tsx          |   2 +-
 .../gradient/generic2/Minimize.tsx            |   2 +-
 .../gradient/generic2/MovieCamera.tsx         |   2 +-
 .../gradient/generic2/MusicNote.tsx           |   2 +-
 .../gradient/generic2/NoElements.tsx          |   2 +-
 .../gradient/generic2/Paperairplane.tsx       |   2 +-
 .../gradient/generic2/Paperclip.tsx           |   2 +-
 .../gradient/generic2/Pause.tsx               |   2 +-
 .../gradient/generic2/Pencil.tsx              |   2 +-
 .../gradient/generic2/Phone.tsx               |   2 +-
 .../gradient/generic2/PieChart.tsx            |   2 +-
 .../gradient/generic2/PiggyBank.tsx           |   2 +-
 .../gradient/generic2/Pin.tsx                 |   2 +-
 .../gradient/generic2/Play.tsx                |   2 +-
 .../gradient/generic2/PlayTriangle.tsx        |   2 +-
 .../gradient/generic2/Plugin.tsx              |   2 +-
 .../gradient/generic2/Prompt.tsx              |   2 +-
 .../gradient/generic2/Properties.tsx          |   2 +-
 .../gradient/generic2/Redo.tsx                |   2 +-
 .../gradient/generic2/Remix.tsx               |   2 +-
 .../gradient/generic2/Replace.tsx             |   2 +-
 .../gradient/generic2/Revert.tsx              |   2 +-
 .../gradient/generic2/Ribbon.tsx              |   2 +-
 .../gradient/generic2/Rocket.tsx              |   2 +-
 .../gradient/generic2/RotateCCW.tsx           |   2 +-
 .../gradient/generic2/RotateCW.tsx            |   2 +-
 .../gradient/generic2/Ruler.tsx               |   2 +-
 .../gradient/generic2/Search.tsx              |   2 +-
 .../gradient/generic2/Segmentation.tsx        |   2 +-
 .../gradient/generic2/Server.tsx              |   2 +-
 .../gradient/generic2/Shapes.tsx              |   2 +-
 .../gradient/generic2/ShoppingBag.tsx         |   2 +-
 .../gradient/generic2/ShoppingCart.tsx        |   2 +-
 .../gradient/generic2/Sparkles.tsx            |   2 +-
 .../gradient/generic2/SpeedFast.tsx           |   2 +-
 .../gradient/generic2/StampClone.tsx          |   2 +-
 .../gradient/generic2/Star.tsx                |   2 +-
 .../gradient/generic2/StepForward.tsx         |   2 +-
 .../gradient/generic2/Switch.tsx              |   2 +-
 .../gradient/generic2/Tablet.tsx              |   2 +-
 .../gradient/generic2/Tag.tsx                 |   2 +-
 .../gradient/generic2/Targeted.tsx            |   2 +-
 .../gradient/generic2/Text.tsx                |   2 +-
 .../gradient/generic2/ThreeArrowsCircle.tsx   |   2 +-
 .../gradient/generic2/ThumbsUp.tsx            |   2 +-
 .../gradient/generic2/Transform.tsx           |   2 +-
 .../gradient/generic2/Translate.tsx           |   2 +-
 .../gradient/generic2/Trash.tsx               |   2 +-
 .../gradient/generic2/Trophy.tsx              |   2 +-
 .../gradient/generic2/Update.tsx              |   2 +-
 .../gradient/generic2/Upload.tsx              |   2 +-
 .../gradient/generic2/User.tsx                |   2 +-
 .../gradient/generic2/UserAvatar.tsx          |   2 +-
 .../gradient/generic2/UserGroup.tsx           |   2 +-
 .../gradient/generic2/VectorDraw.tsx          |   2 +-
 .../gradient/generic2/Video.tsx               |   2 +-
 .../gradient/generic2/Volume.tsx              |   2 +-
 .../gradient/generic2/VolumeOne.tsx           |   2 +-
 .../gradient/generic2/Wallet.tsx              |   2 +-
 .../s2/spectrum-illustrations/linear/3D.tsx   |   2 +-
 .../spectrum-illustrations/linear/3Dasset.tsx |   2 +-
 .../spectrum-illustrations/linear/AIChat.tsx  |   2 +-
 .../linear/AIGenerate.tsx                     |   2 +-
 .../linear/AIGenerateImage.tsx                |   2 +-
 .../linear/Accessibility.tsx                  |   2 +-
 .../linear/Addproject.tsx                     |   2 +-
 .../linear/AlertNotice.tsx                    |   2 +-
 .../linear/Animation.tsx                      |   2 +-
 .../s2/spectrum-illustrations/linear/Apps.tsx |   2 +-
 .../linear/ArrowDown.tsx                      |   2 +-
 .../linear/ArrowLeft.tsx                      |   2 +-
 .../linear/ArrowRight.tsx                     |   2 +-
 .../spectrum-illustrations/linear/ArrowUp.tsx |   2 +-
 .../linear/Artboard.tsx                       |   2 +-
 .../spectrum-illustrations/linear/Assets.tsx  |   2 +-
 .../linear/AudioWave.tsx                      |   2 +-
 .../linear/BadgeVerified.tsx                  |   2 +-
 .../s2/spectrum-illustrations/linear/Bell.tsx |   2 +-
 .../s2/spectrum-illustrations/linear/Bolt.tsx |   2 +-
 .../spectrum-illustrations/linear/Brand.tsx   |   2 +-
 .../linear/Briefcase.tsx                      |   2 +-
 .../linear/BrightnessContrast.tsx             |   2 +-
 .../spectrum-illustrations/linear/Browser.tsx |   2 +-
 .../linear/BrowserError.tsx                   |   2 +-
 .../linear/BrowserNotCompatible.tsx           |   2 +-
 .../spectrum-illustrations/linear/Brush.tsx   |   2 +-
 .../s2/spectrum-illustrations/linear/Bug.tsx  |   2 +-
 .../linear/BuildTable.tsx                     |   2 +-
 .../linear/Buildings.tsx                      |   2 +-
 .../linear/Calendar.tsx                       |   2 +-
 .../spectrum-illustrations/linear/Camera.tsx  |   2 +-
 .../linear/CardTapPayment.tsx                 |   2 +-
 .../spectrum-illustrations/linear/Channel.tsx |   2 +-
 .../linear/ChartAreaStack.tsx                 |   2 +-
 .../linear/Chatbubble.tsx                     |   2 +-
 .../spectrum-illustrations/linear/Check.tsx   |   2 +-
 .../linear/Clipboard.tsx                      |   2 +-
 .../spectrum-illustrations/linear/Clock.tsx   |   2 +-
 .../spectrum-illustrations/linear/Close.tsx   |   2 +-
 .../spectrum-illustrations/linear/Cloud.tsx   |   2 +-
 .../linear/CloudStateDisconnected.tsx         |   2 +-
 .../linear/CloudStateError.tsx                |   2 +-
 .../linear/CloudUpload.tsx                    |   2 +-
 .../linear/CodeBrackets.tsx                   |   2 +-
 .../spectrum-illustrations/linear/Color.tsx   |   2 +-
 .../linear/CommentText.tsx                    |   2 +-
 .../linear/ConfettiCelebration.tsx            |   2 +-
 .../linear/Conversationbubbles.tsx            |   2 +-
 .../s2/spectrum-illustrations/linear/Crop.tsx |   2 +-
 .../spectrum-illustrations/linear/Cursor.tsx  |   2 +-
 .../s2/spectrum-illustrations/linear/Cut.tsx  |   2 +-
 .../s2/spectrum-illustrations/linear/Data.tsx |   2 +-
 .../linear/DataAnalytics.tsx                  |   2 +-
 .../spectrum-illustrations/linear/Desktop.tsx |   2 +-
 .../spectrum-illustrations/linear/Diamond.tsx |   2 +-
 .../linear/Document.tsx                       |   2 +-
 .../linear/Download.tsx                       |   2 +-
 .../linear/DropToUpload.tsx                   |   2 +-
 .../linear/Education.tsx                      |   2 +-
 .../spectrum-illustrations/linear/Effects.tsx |   2 +-
 .../linear/Emoji160.tsx                       |   2 +-
 .../linear/EmptyStateExport.tsx               |   2 +-
 .../spectrum-illustrations/linear/Error.tsx   |   2 +-
 .../linear/Explosion.tsx                      |   2 +-
 .../linear/ExportTo.tsx                       |   2 +-
 .../linear/Exposure.tsx                       |   2 +-
 .../linear/FileAlert.tsx                      |   2 +-
 .../linear/FileImage.tsx                      |   2 +-
 .../linear/FileText.tsx                       |   2 +-
 .../linear/FileVideo.tsx                      |   2 +-
 .../spectrum-illustrations/linear/FileZip.tsx |   2 +-
 .../linear/Filmstrip.tsx                      |   2 +-
 .../spectrum-illustrations/linear/Filter.tsx  |   2 +-
 .../spectrum-illustrations/linear/Filters.tsx |   2 +-
 .../linear/Fireworks.tsx                      |   2 +-
 .../s2/spectrum-illustrations/linear/Flag.tsx |   2 +-
 .../linear/FlagCheckmark.tsx                  |   2 +-
 .../linear/FlagCross.tsx                      |   2 +-
 .../linear/FolderClose.tsx                    |   2 +-
 .../linear/FolderOpen.tsx                     |   2 +-
 .../linear/FolderShared.tsx                   |   2 +-
 .../linear/GearSetting.tsx                    |   2 +-
 .../s2/spectrum-illustrations/linear/Gift.tsx |   2 +-
 .../spectrum-illustrations/linear/Globe.tsx   |   2 +-
 .../linear/GlobeGrid.tsx                      |   2 +-
 .../linear/GraphBarChart.tsx                  |   2 +-
 .../s2/spectrum-illustrations/linear/Hand.tsx |   2 +-
 .../linear/Handshake.tsx                      |   2 +-
 .../spectrum-illustrations/linear/Heart.tsx   |   2 +-
 .../linear/HelpCircle.tsx                     |   2 +-
 .../s2/spectrum-illustrations/linear/Home.tsx |   2 +-
 .../linear/Illustration.tsx                   |   2 +-
 .../spectrum-illustrations/linear/Image.tsx   |   2 +-
 .../linear/ImageStack.tsx                     |   2 +-
 .../linear/InfiniteLooping.tsx                |   2 +-
 .../linear/Information.tsx                    |   2 +-
 .../linear/Interaction.tsx                    |   2 +-
 .../spectrum-illustrations/linear/Laptop.tsx  |   2 +-
 .../spectrum-illustrations/linear/Layers.tsx  |   2 +-
 .../linear/Libraries.tsx                      |   2 +-
 .../linear/Lightbulb.tsx                      |   2 +-
 .../linear/LightbulbRays.tsx                  |   2 +-
 .../spectrum-illustrations/linear/Lighten.tsx |   2 +-
 .../s2/spectrum-illustrations/linear/Link.tsx |   2 +-
 .../linear/Location.tsx                       |   2 +-
 .../linear/LockClose.tsx                      |   2 +-
 .../linear/LockOpen.tsx                       |   2 +-
 .../s2/spectrum-illustrations/linear/Logo.tsx |   2 +-
 .../linear/MagicWand.tsx                      |   2 +-
 .../linear/MailClose.tsx                      |   2 +-
 .../linear/MailOpen.tsx                       |   2 +-
 .../spectrum-illustrations/linear/Market.tsx  |   2 +-
 .../linear/MegaphonePromote.tsx               |   2 +-
 .../linear/MegaphonePromoteExpressive.tsx     |   2 +-
 .../spectrum-illustrations/linear/Mention.tsx |   2 +-
 .../linear/Microphone.tsx                     |   2 +-
 .../linear/MicrophoneOff.tsx                  |   2 +-
 .../linear/Minimize.tsx                       |   2 +-
 .../linear/MovieCamera.tsx                    |   2 +-
 .../linear/MusicNote.tsx                      |   2 +-
 .../linear/NoBrands.tsx                       |   2 +-
 .../linear/NoComment.tsx                      |   2 +-
 .../linear/NoComments.tsx                     |   2 +-
 .../linear/NoElements.tsx                     |   2 +-
 .../spectrum-illustrations/linear/NoFile.tsx  |   2 +-
 .../linear/NoFilter.tsx                       |   2 +-
 .../spectrum-illustrations/linear/NoImage.tsx |   2 +-
 .../linear/NoInternetConnection.tsx           |   2 +-
 .../linear/NoLibraries.tsx                    |   2 +-
 .../linear/NoLibrariesBrands.tsx              |   2 +-
 .../linear/NoReviewLinks.tsx                  |   2 +-
 .../linear/NoSearchResults.tsx                |   2 +-
 .../linear/NoSharedFile.tsx                   |   2 +-
 .../linear/Paperairplane.tsx                  |   2 +-
 .../linear/Paperclip.tsx                      |   2 +-
 .../spectrum-illustrations/linear/Pause.tsx   |   2 +-
 .../spectrum-illustrations/linear/Pencil.tsx  |   2 +-
 .../spectrum-illustrations/linear/Phone.tsx   |   2 +-
 .../linear/PieChart.tsx                       |   2 +-
 .../linear/PiggyBank.tsx                      |   2 +-
 .../s2/spectrum-illustrations/linear/Pin.tsx  |   2 +-
 .../s2/spectrum-illustrations/linear/Play.tsx |   2 +-
 .../linear/PlayTriangle.tsx                   |   2 +-
 .../spectrum-illustrations/linear/Plugin.tsx  |   2 +-
 .../spectrum-illustrations/linear/Prompt.tsx  |   2 +-
 .../linear/Properties.tsx                     |   2 +-
 .../s2/spectrum-illustrations/linear/Redo.tsx |   2 +-
 .../spectrum-illustrations/linear/Remix.tsx   |   2 +-
 .../spectrum-illustrations/linear/Replace.tsx |   2 +-
 .../linear/ReportAbuse.tsx                    |   2 +-
 .../spectrum-illustrations/linear/Revert.tsx  |   2 +-
 .../spectrum-illustrations/linear/Ribbon.tsx  |   2 +-
 .../spectrum-illustrations/linear/Rocket.tsx  |   2 +-
 .../linear/RotateCCW.tsx                      |   2 +-
 .../linear/RotateCW.tsx                       |   2 +-
 .../spectrum-illustrations/linear/Ruler.tsx   |   2 +-
 .../spectrum-illustrations/linear/Search.tsx  |   2 +-
 .../linear/Segmentation.tsx                   |   2 +-
 .../spectrum-illustrations/linear/Server.tsx  |   2 +-
 .../spectrum-illustrations/linear/Shapes.tsx  |   2 +-
 .../linear/ShoppingBag.tsx                    |   2 +-
 .../linear/ShoppingCart.tsx                   |   2 +-
 .../linear/SocialPost.tsx                     |   2 +-
 .../linear/Sparkles.tsx                       |   2 +-
 .../linear/SpeedFast.tsx                      |   2 +-
 .../linear/StampClone.tsx                     |   2 +-
 .../s2/spectrum-illustrations/linear/Star.tsx |   2 +-
 .../linear/StepForward.tsx                    |   2 +-
 .../linear/Stopwatch.tsx                      |   2 +-
 .../spectrum-illustrations/linear/Switch.tsx  |   2 +-
 .../spectrum-illustrations/linear/Tablet.tsx  |   2 +-
 .../s2/spectrum-illustrations/linear/Tag.tsx  |   2 +-
 .../linear/Targeted.tsx                       |   2 +-
 .../s2/spectrum-illustrations/linear/Text.tsx |   2 +-
 .../linear/ThreeArrowsCircle.tsx              |   2 +-
 .../linear/ThumbsDown.tsx                     |   2 +-
 .../linear/ThumbsUp.tsx                       |   2 +-
 .../linear/Transform.tsx                      |   2 +-
 .../linear/Translate.tsx                      |   2 +-
 .../spectrum-illustrations/linear/Trash.tsx   |   2 +-
 .../spectrum-illustrations/linear/Trophy.tsx  |   2 +-
 .../spectrum-illustrations/linear/Update.tsx  |   2 +-
 .../spectrum-illustrations/linear/Upload.tsx  |   2 +-
 .../s2/spectrum-illustrations/linear/User.tsx |   2 +-
 .../linear/UserAvatar.tsx                     |   2 +-
 .../linear/UserGroup.tsx                      |   2 +-
 .../linear/VectorDraw.tsx                     |   2 +-
 .../spectrum-illustrations/linear/Video.tsx   |   2 +-
 .../spectrum-illustrations/linear/Volume.tsx  |   2 +-
 .../linear/VolumeOff.tsx                      |   2 +-
 .../linear/VolumeOne.tsx                      |   2 +-
 .../spectrum-illustrations/linear/Wallet.tsx  |   2 +-
 .../spectrum-illustrations/linear/Warning.tsx |   2 +-
 packages/@react-spectrum/s2/src/Accordion.tsx |   3 +-
 packages/@react-spectrum/s2/src/ActionBar.tsx |  17 +-
 .../@react-spectrum/s2/src/ActionButton.tsx   |   8 +-
 .../s2/src/ActionButtonGroup.tsx              |   3 +-
 .../@react-spectrum/s2/src/ActionMenu.tsx     |   6 +-
 .../@react-spectrum/s2/src/AlertDialog.tsx    |   6 +-
 packages/@react-spectrum/s2/src/Avatar.tsx    |   4 +-
 .../@react-spectrum/s2/src/AvatarGroup.tsx    |   6 +-
 packages/@react-spectrum/s2/src/Badge.tsx     |   5 +-
 .../@react-spectrum/s2/src/Breadcrumbs.tsx    |  26 +-
 packages/@react-spectrum/s2/src/Button.tsx    |   9 +-
 .../@react-spectrum/s2/src/ButtonGroup.tsx    |   7 +-
 packages/@react-spectrum/s2/src/Calendar.tsx  |  32 +-
 packages/@react-spectrum/s2/src/Card.tsx      |   7 +-
 packages/@react-spectrum/s2/src/CardView.tsx  |  21 +-
 packages/@react-spectrum/s2/src/Checkbox.tsx  |   9 +-
 .../@react-spectrum/s2/src/CheckboxGroup.tsx  |   7 +-
 .../@react-spectrum/s2/src/ClearButton.tsx    |   6 +-
 .../@react-spectrum/s2/src/CloseButton.tsx    |   5 +-
 packages/@react-spectrum/s2/src/CoachMark.tsx |  27 +-
 packages/@react-spectrum/s2/src/ColorArea.tsx |  10 +-
 .../@react-spectrum/s2/src/ColorField.tsx     |  10 +-
 .../@react-spectrum/s2/src/ColorHandle.tsx    |   5 +-
 .../@react-spectrum/s2/src/ColorSlider.tsx    |  21 +-
 .../@react-spectrum/s2/src/ColorSwatch.tsx    |  12 +-
 .../s2/src/ColorSwatchPicker.tsx              |   8 +-
 .../@react-spectrum/s2/src/ColorWheel.tsx     |   7 +-
 packages/@react-spectrum/s2/src/ComboBox.tsx  |  44 +--
 packages/@react-spectrum/s2/src/Content.tsx   |   9 +-
 .../@react-spectrum/s2/src/ContextualHelp.tsx |  12 +-
 .../@react-spectrum/s2/src/CustomDialog.tsx   |  17 +-
 packages/@react-spectrum/s2/src/DateField.tsx |  11 +-
 .../@react-spectrum/s2/src/DatePicker.tsx     |  30 +-
 .../s2/src/DateRangePicker.tsx                |  20 +-
 packages/@react-spectrum/s2/src/Dialog.tsx    |  17 +-
 .../s2/src/DialogContainer.tsx                |   4 +-
 .../@react-spectrum/s2/src/DialogTrigger.tsx  |   7 +-
 .../@react-spectrum/s2/src/Disclosure.tsx     |  16 +-
 packages/@react-spectrum/s2/src/Divider.tsx   |   4 +-
 packages/@react-spectrum/s2/src/DropZone.tsx  |  11 +-
 packages/@react-spectrum/s2/src/Field.tsx     |  14 +-
 packages/@react-spectrum/s2/src/Fonts.tsx     |   2 +-
 packages/@react-spectrum/s2/src/Form.tsx      |   2 +-
 .../s2/src/FullscreenDialog.tsx               |  17 +-
 packages/@react-spectrum/s2/src/Icon.tsx      |   2 +-
 .../s2/src/IllustratedMessage.tsx             |   4 +-
 packages/@react-spectrum/s2/src/Image.tsx     |   4 +-
 .../@react-spectrum/s2/src/InlineAlert.tsx    |   8 +-
 packages/@react-spectrum/s2/src/Link.tsx      |   5 +-
 packages/@react-spectrum/s2/src/ListBox.tsx   |   2 +-
 packages/@react-spectrum/s2/src/ListView.tsx  |  42 ++-
 packages/@react-spectrum/s2/src/Menu.tsx      |  28 +-
 packages/@react-spectrum/s2/src/Meter.tsx     |   8 +-
 packages/@react-spectrum/s2/src/Modal.tsx     |   3 +-
 .../s2/src/NotificationBadge.tsx              |   7 +-
 .../@react-spectrum/s2/src/NumberField.tsx    |  23 +-
 packages/@react-spectrum/s2/src/Picker.tsx    |  51 ++--
 packages/@react-spectrum/s2/src/Popover.tsx   |  18 +-
 .../@react-spectrum/s2/src/ProgressBar.tsx    |  10 +-
 .../@react-spectrum/s2/src/ProgressCircle.tsx |   4 +-
 packages/@react-spectrum/s2/src/Provider.tsx  |   5 +-
 .../@react-spectrum/s2/src/RadioGroup.tsx     |   7 +-
 .../@react-spectrum/s2/src/RangeCalendar.tsx  |  18 +-
 .../@react-spectrum/s2/src/RangeSlider.tsx    |  13 +-
 .../@react-spectrum/s2/src/SearchField.tsx    |  11 +-
 .../s2/src/SegmentedControl.tsx               |   8 +-
 .../@react-spectrum/s2/src/SelectBoxGroup.tsx |  12 +-
 packages/@react-spectrum/s2/src/Skeleton.tsx  |   3 +-
 .../s2/src/SkeletonCollection.tsx             |   4 +-
 packages/@react-spectrum/s2/src/Slider.tsx    |  10 +-
 .../@react-spectrum/s2/src/StatusLight.tsx    |   4 +-
 packages/@react-spectrum/s2/src/Switch.tsx    |  11 +-
 packages/@react-spectrum/s2/src/TableView.tsx |  70 ++---
 packages/@react-spectrum/s2/src/Tabs.tsx      |  25 +-
 .../@react-spectrum/s2/src/TabsPicker.tsx     |  23 +-
 packages/@react-spectrum/s2/src/TagGroup.tsx  |  29 +-
 packages/@react-spectrum/s2/src/TextField.tsx |  18 +-
 packages/@react-spectrum/s2/src/TimeField.tsx |  12 +-
 packages/@react-spectrum/s2/src/Toast.tsx     |  35 ++-
 .../@react-spectrum/s2/src/ToggleButton.tsx   |   3 +-
 .../s2/src/ToggleButtonGroup.tsx              |   8 +-
 packages/@react-spectrum/s2/src/Toolbar.tsx   |   2 +-
 packages/@react-spectrum/s2/src/Tooltip.tsx   |   9 +-
 packages/@react-spectrum/s2/src/TreeView.tsx  |  49 ++--
 packages/@react-spectrum/s2/src/pressScale.ts |   2 +-
 .../@react-spectrum/s2/src/useMediaQuery.ts   |   2 +-
 .../s2/src/useSpectrumContextProps.ts         |   7 +-
 .../s2/stories/Accordion.stories.tsx          |  13 +-
 .../s2/stories/ActionBar.stories.tsx          |   6 +-
 .../s2/stories/ActionButton.stories.tsx       |   9 +-
 .../s2/stories/ActionButtonGroup.stories.tsx  |   5 +-
 .../s2/stories/ActionMenu.stories.tsx         |   4 +-
 .../s2/stories/AlertDialog.stories.tsx        |   5 +-
 .../s2/stories/Avatar.stories.tsx             |   2 +-
 .../s2/stories/AvatarGroup.stories.tsx        |   5 +-
 .../s2/stories/Badge.stories.tsx              |   4 +-
 .../s2/stories/Breadcrumbs.stories.tsx        |   2 +-
 .../s2/stories/Button.stories.tsx             |   3 +-
 .../s2/stories/ButtonGroup.stories.tsx        |   5 +-
 .../s2/stories/Calendar.stories.tsx           |   6 +-
 .../s2/stories/Card.stories.tsx               |  23 +-
 .../s2/stories/CardView.stories.tsx           |  30 +-
 .../s2/stories/Checkbox.stories.tsx           |   2 +-
 .../s2/stories/CheckboxGroup.stories.tsx      |  16 +-
 .../s2/stories/CoachMark.stories.tsx          |  24 +-
 .../s2/stories/ColorField.stories.tsx         |  14 +-
 .../s2/stories/ComboBox.stories.tsx           |  15 +-
 .../s2/stories/ContextualHelp.stories.tsx     |   3 +-
 .../s2/stories/CustomDialog.stories.tsx       |  13 +-
 .../s2/stories/DateField.stories.tsx          |   8 +-
 .../s2/stories/DatePicker.stories.tsx         |   8 +-
 .../s2/stories/DateRangePicker.stories.tsx    |   8 +-
 .../s2/stories/Dialog.stories.tsx             |  11 +-
 .../s2/stories/Disclosure.stories.tsx         |   4 +-
 .../s2/stories/Divider.stories.tsx            |   2 +-
 .../s2/stories/DropZone.stories.tsx           |  14 +-
 .../s2/stories/Form.stories.tsx               |  56 ++--
 .../s2/stories/FullscreenDialog.stories.tsx   |   7 +-
 .../s2/stories/Icon.stories.tsx               |   2 +-
 .../s2/stories/IllustratedMessage.stories.tsx |   6 +-
 .../s2/stories/InlineAlert.stories.tsx        |   5 +-
 .../s2/stories/Link.stories.tsx               |   2 +-
 .../s2/stories/LinkButton.stories.tsx         |   3 +-
 .../s2/stories/ListView.stories.tsx           |  17 +-
 .../s2/stories/Menu.stories.tsx               |  19 +-
 .../s2/stories/NotificationBadge.stories.tsx  |   2 +-
 .../s2/stories/NumberField.stories.tsx        |  18 +-
 .../s2/stories/Picker.stories.tsx             |  26 +-
 .../s2/stories/Popover.stories.tsx            |  21 +-
 .../s2/stories/ProgressBar.stories.tsx        |   2 +-
 .../s2/stories/ProgressCircle.stories.tsx     |   2 +-
 .../s2/stories/RadioGroup.stories.tsx         |  15 +-
 .../s2/stories/RangeCalendar.stories.tsx      |   8 +-
 .../s2/stories/RangeSlider.stories.tsx        |   2 +-
 .../s2/stories/SearchField.stories.tsx        |  13 +-
 .../s2/stories/SegmentedControl.stories.tsx   |   3 +-
 .../s2/stories/SelectBoxGroup.stories.tsx     |   3 +-
 .../s2/stories/StatusLight.stories.tsx        |   2 +-
 .../s2/stories/StyleMacro.stories.tsx         |   2 +-
 .../s2/stories/Switch.stories.tsx             |   2 +-
 .../s2/stories/TableView.stories.tsx          |  38 +--
 .../s2/stories/Tabs.stories.tsx               |   6 +-
 .../s2/stories/TagGroup.stories.tsx           |  18 +-
 .../s2/stories/TextField.stories.tsx          |   5 +-
 .../s2/stories/TimeField.stories.tsx          |   8 +-
 .../s2/stories/Toast.stories.tsx              |   8 +-
 .../s2/stories/ToggleButton.stories.tsx       |   3 +-
 .../s2/stories/ToggleButtonGroup.stories.tsx  |   4 +-
 .../s2/stories/Tooltip.stories.tsx            |   6 +-
 .../s2/stories/TreeView.stories.tsx           |  43 +--
 packages/@react-spectrum/s2/stories/utils.tsx |   9 +-
 .../s2/test/ActionButtonGroup.test.tsx        |   5 +-
 .../s2/test/CheckboxGroup.test.tsx            |   5 +-
 .../s2/test/CoachMark.test.tsx                |  19 +-
 .../@react-spectrum/s2/test/Combobox.test.tsx |  11 +-
 .../s2/test/CustomDialog.test.tsx             |   5 +-
 .../s2/test/EditableTableView.test.tsx        |  25 +-
 .../@react-spectrum/s2/test/Image.test.tsx    |   4 +-
 .../@react-spectrum/s2/test/Menu.test.tsx     |  15 +-
 .../@react-spectrum/s2/test/Picker.test.tsx   |   4 +-
 .../s2/test/RadioGroup.test.tsx               |   5 +-
 .../s2/test/SearchField.test.tsx              |   6 +-
 .../s2/test/SelectBoxGroup.test.tsx           |   3 +-
 .../s2/test/TableView.test.tsx                |  22 +-
 .../@react-spectrum/s2/test/TagGroup.test.tsx |   2 +-
 .../s2/test/TextField.test.tsx                |   2 +-
 .../s2/test/ToggleButtonGroup.test.tsx        |   4 +-
 .../@react-spectrum/s2/test/TreeView.test.tsx |  12 +-
 packages/@react-spectrum/searchfield/index.ts |  13 -
 .../@react-spectrum/searchfield/package.json  |  40 +--
 .../@react-spectrum/searchfield/src/index.ts  |   3 +-
 packages/@react-spectrum/slider/index.ts      |  13 -
 packages/@react-spectrum/slider/package.json  |  42 +--
 packages/@react-spectrum/slider/src/index.ts  |   5 +-
 packages/@react-spectrum/statuslight/index.ts |  13 -
 .../@react-spectrum/statuslight/package.json  |  35 +--
 .../@react-spectrum/statuslight/src/index.ts  |   3 +-
 packages/@react-spectrum/steplist/index.ts    |  13 -
 .../@react-spectrum/steplist/package.json     |  43 +--
 .../@react-spectrum/steplist/src/index.ts     |   7 +-
 .../@react-spectrum/story-utils/package.json  |  18 +-
 packages/@react-spectrum/switch/index.ts      |  13 -
 packages/@react-spectrum/switch/package.json  |  39 +--
 packages/@react-spectrum/switch/src/index.ts  |   3 +-
 packages/@react-spectrum/table/index.ts       |  13 -
 packages/@react-spectrum/table/package.json   |  55 +---
 packages/@react-spectrum/table/src/index.ts   |  13 +-
 packages/@react-spectrum/tabs/index.ts        |  13 -
 packages/@react-spectrum/tabs/package.json    |  45 +--
 packages/@react-spectrum/tabs/src/index.ts    |   5 +-
 packages/@react-spectrum/tag/index.ts         |  13 -
 packages/@react-spectrum/tag/package.json     |  47 +--
 packages/@react-spectrum/tag/src/index.ts     |   7 +-
 .../@react-spectrum/test-utils/package.json   |  10 +-
 packages/@react-spectrum/text/index.ts        |  13 -
 packages/@react-spectrum/text/package.json    |  35 +--
 packages/@react-spectrum/text/src/index.ts    |   7 +-
 packages/@react-spectrum/textfield/index.ts   |  13 -
 .../@react-spectrum/textfield/package.json    |  43 +--
 .../@react-spectrum/textfield/src/index.ts    |   7 +-
 packages/@react-spectrum/theme-dark/index.ts  |  13 -
 .../@react-spectrum/theme-dark/package.json   |  34 +--
 .../@react-spectrum/theme-dark/src/index.ts   |   2 +-
 .../@react-spectrum/theme-default/index.ts    |  13 -
 .../theme-default/package.json                |  34 +--
 .../theme-default/src/index.ts                |   2 +-
 .../@react-spectrum/theme-express/index.ts    |  13 -
 .../theme-express/package.json                |  35 +--
 .../theme-express/src/index.ts                |   2 +-
 packages/@react-spectrum/theme-light/index.ts |  13 -
 .../@react-spectrum/theme-light/package.json  |  34 +--
 .../@react-spectrum/theme-light/src/index.ts  |   2 +-
 packages/@react-spectrum/toast/index.ts       |  13 -
 packages/@react-spectrum/toast/package.json   |  42 +--
 packages/@react-spectrum/toast/src/index.ts   |   4 +-
 packages/@react-spectrum/tooltip/index.ts     |  13 -
 packages/@react-spectrum/tooltip/package.json |  41 +--
 packages/@react-spectrum/tooltip/src/index.ts |   4 +-
 packages/@react-spectrum/tree/index.ts        |  13 -
 packages/@react-spectrum/tree/package.json    |  40 +--
 packages/@react-spectrum/tree/src/index.ts    |   7 +-
 packages/@react-spectrum/utils/index.ts       |  13 -
 packages/@react-spectrum/utils/package.json   |  27 +-
 packages/@react-spectrum/utils/src/index.ts   |  34 +--
 packages/@react-spectrum/view/index.ts        |  13 -
 packages/@react-spectrum/view/package.json    |  35 +--
 packages/@react-spectrum/view/src/index.ts    |   9 +-
 packages/@react-spectrum/well/index.ts        |  13 -
 packages/@react-spectrum/well/package.json    |  34 +--
 packages/@react-spectrum/well/src/index.ts    |   3 +-
 .../@react-stately/autocomplete/package.json  |  27 +-
 .../@react-stately/autocomplete/src/index.ts  |   4 +-
 packages/@react-stately/calendar/index.ts     |  13 -
 packages/@react-stately/calendar/package.json |  27 +-
 packages/@react-stately/calendar/src/index.ts |  10 +-
 packages/@react-stately/checkbox/index.ts     |  13 -
 packages/@react-stately/checkbox/package.json |  28 +-
 packages/@react-stately/checkbox/src/index.ts |   5 +-
 packages/@react-stately/collections/index.ts  |  13 -
 .../@react-stately/collections/package.json   |  26 +-
 .../@react-stately/collections/src/index.ts   |  15 +-
 packages/@react-stately/color/index.ts        |  13 -
 packages/@react-stately/color/package.json    |  30 +-
 packages/@react-stately/color/src/index.ts    |  25 +-
 packages/@react-stately/combobox/index.ts     |  13 -
 packages/@react-stately/combobox/package.json |  31 +-
 packages/@react-stately/combobox/src/index.ts |   4 +-
 packages/@react-stately/data/index.ts         |  13 -
 packages/@react-stately/data/package.json     |  26 +-
 packages/@react-stately/data/src/index.ts     |  12 +-
 packages/@react-stately/datepicker/index.ts   |  13 -
 .../@react-stately/datepicker/package.json    |  29 +-
 .../@react-stately/datepicker/src/index.ts    |  18 +-
 packages/@react-stately/disclosure/index.ts   |  13 -
 .../@react-stately/disclosure/package.json    |  27 +-
 .../@react-stately/disclosure/src/index.ts    |   8 +-
 packages/@react-stately/dnd/index.ts          |  13 -
 packages/@react-stately/dnd/package.json      |  27 +-
 packages/@react-stately/dnd/src/index.ts      |   9 +-
 packages/@react-stately/flags/index.ts        |  13 -
 packages/@react-stately/flags/package.json    |  27 +-
 packages/@react-stately/flags/src/index.ts    |   2 +-
 packages/@react-stately/form/index.ts         |  13 -
 packages/@react-stately/form/package.json     |  26 +-
 packages/@react-stately/form/src/index.ts     |   5 +-
 packages/@react-stately/grid/index.ts         |  13 -
 packages/@react-stately/grid/package.json     |  28 +-
 packages/@react-stately/grid/src/index.ts     |   6 +-
 packages/@react-stately/layout/index.ts       |  13 -
 packages/@react-stately/layout/package.json   |  26 +-
 packages/@react-stately/layout/src/index.ts   |  17 +-
 packages/@react-stately/list/index.ts         |  13 -
 packages/@react-stately/list/package.json     |  29 +-
 packages/@react-stately/list/src/index.ts     |  11 +-
 packages/@react-stately/menu/index.ts         |  13 -
 packages/@react-stately/menu/package.json     |  27 +-
 packages/@react-stately/menu/src/index.ts     |   7 +-
 packages/@react-stately/numberfield/index.ts  |  13 -
 .../@react-stately/numberfield/package.json   |  28 +-
 .../@react-stately/numberfield/src/index.ts   |   5 +-
 packages/@react-stately/overlays/index.ts     |  13 -
 packages/@react-stately/overlays/package.json |  27 +-
 packages/@react-stately/overlays/src/index.ts |   5 +-
 packages/@react-stately/radio/index.ts        |  13 -
 packages/@react-stately/radio/package.json    |  28 +-
 packages/@react-stately/radio/src/index.ts    |   5 +-
 packages/@react-stately/searchfield/index.ts  |  13 -
 .../@react-stately/searchfield/package.json   |  27 +-
 .../@react-stately/searchfield/src/index.ts   |   5 +-
 packages/@react-stately/select/index.ts       |  13 -
 packages/@react-stately/select/package.json   |  30 +-
 packages/@react-stately/select/src/index.ts   |   5 +-
 packages/@react-stately/selection/index.ts    |  13 -
 .../@react-stately/selection/package.json     |  28 +-
 .../@react-stately/selection/src/index.ts     |   9 +-
 packages/@react-stately/slider/index.ts       |  13 -
 packages/@react-stately/slider/package.json   |  27 +-
 packages/@react-stately/slider/src/index.ts   |   5 +-
 packages/@react-stately/steplist/index.ts     |  13 -
 packages/@react-stately/steplist/package.json |  28 +-
 packages/@react-stately/steplist/src/index.ts |   5 +-
 packages/@react-stately/table/index.ts        |  13 -
 packages/@react-stately/table/package.json    |  31 +-
 packages/@react-stately/table/src/index.ts    |  29 +-
 packages/@react-stately/tabs/index.ts         |  13 -
 packages/@react-stately/tabs/package.json     |  27 +-
 packages/@react-stately/tabs/src/index.ts     |   5 +-
 packages/@react-stately/toast/index.ts        |  13 -
 packages/@react-stately/toast/package.json    |  26 +-
 packages/@react-stately/toast/src/index.ts    |   4 +-
 packages/@react-stately/toggle/index.ts       |  13 -
 packages/@react-stately/toggle/package.json   |  27 +-
 packages/@react-stately/toggle/src/index.ts   |   9 +-
 packages/@react-stately/tooltip/index.ts      |  13 -
 packages/@react-stately/tooltip/package.json  |  27 +-
 packages/@react-stately/tooltip/src/index.ts  |   5 +-
 packages/@react-stately/tree/index.ts         |  13 -
 packages/@react-stately/tree/package.json     |  29 +-
 packages/@react-stately/tree/src/index.ts     |   7 +-
 packages/@react-stately/utils/index.ts        |  13 -
 packages/@react-stately/utils/package.json    |  26 +-
 packages/@react-stately/utils/src/index.ts    |   5 +-
 packages/@react-stately/virtualizer/index.ts  |  13 -
 .../@react-stately/virtualizer/package.json   |  23 +-
 .../@react-stately/virtualizer/src/index.ts   |  20 +-
 .../s2-docs/pages/react-aria/Breadcrumbs.mdx  |   2 +-
 .../dev/s2-docs/pages/react-aria/Calendar.mdx |   2 +-
 .../dev/s2-docs/pages/react-aria/Checkbox.mdx |   2 +-
 .../pages/react-aria/CheckboxGroup.mdx        |   2 +-
 .../s2-docs/pages/react-aria/ColorArea.mdx    |   2 +-
 .../s2-docs/pages/react-aria/ColorField.mdx   |   2 +-
 .../s2-docs/pages/react-aria/ColorSlider.mdx  |   2 +-
 .../s2-docs/pages/react-aria/ColorWheel.mdx   |   2 +-
 .../s2-docs/pages/react-aria/DateField.mdx    |   2 +-
 .../s2-docs/pages/react-aria/DatePicker.mdx   |   2 +-
 .../pages/react-aria/DateRangePicker.mdx      |   2 +-
 .../dev/s2-docs/pages/react-aria/Meter.mdx    |   2 +-
 .../dev/s2-docs/pages/react-aria/Modal.mdx    |   2 +-
 .../s2-docs/pages/react-aria/NumberField.mdx  |   2 +-
 .../dev/s2-docs/pages/react-aria/Popover.mdx  |   2 +-
 .../s2-docs/pages/react-aria/ProgressBar.mdx  |   2 +-
 .../s2-docs/pages/react-aria/RadioGroup.mdx   |   2 +-
 .../pages/react-aria/RangeCalendar.mdx        |   2 +-
 .../s2-docs/pages/react-aria/SearchField.mdx  |   2 +-
 .../dev/s2-docs/pages/react-aria/Slider.mdx   |   2 +-
 .../dev/s2-docs/pages/react-aria/Switch.mdx   |   2 +-
 .../dev/s2-docs/pages/react-aria/Tabs.mdx     |   2 +-
 .../dev/s2-docs/pages/react-aria/TagGroup.mdx |   2 +-
 .../s2-docs/pages/react-aria/TextField.mdx    |   2 +-
 .../s2-docs/pages/react-aria/TimeField.mdx    |   2 +-
 .../dev/s2-docs/pages/react-aria/Toast.mdx    |   2 +-
 .../pages/react-aria/ToggleButtonGroup.mdx    |   2 +-
 .../dev/s2-docs/pages/react-aria/Toolbar.mdx  |   2 +-
 .../dev/s2-docs/pages/react-aria/Tooltip.mdx  |   2 +-
 .../pages/react-aria/blog/drag-and-drop.mdx   |   8 +-
 packages/dev/s2-docs/pages/react-aria/dnd.mdx |  12 +-
 packages/dev/s2-docs/src/ColorSearchView.tsx  |   2 +-
 packages/dev/s2-docs/src/Error.tsx            |   2 +-
 packages/dev/s2-docs/src/IconSearchView.tsx   |   2 +-
 .../dev/s2-docs/src/IllustrationCards.tsx     |   4 +-
 .../dev/s2-docs/src/TypographySearchView.tsx  |   2 +-
 packages/dev/s2-docs/src/searchUtils.tsx      |   2 +-
 .../docs/Breadcrumbs.mdx                      |   2 +-
 .../react-aria-components/docs/Button.mdx     |   2 +-
 .../react-aria-components/docs/Calendar.mdx   |   2 +-
 .../react-aria-components/docs/Checkbox.mdx   |   2 +-
 .../docs/CheckboxGroup.mdx                    |   2 +-
 .../react-aria-components/docs/ColorArea.mdx  |   2 +-
 .../react-aria-components/docs/ColorField.mdx |   2 +-
 .../docs/ColorSlider.mdx                      |   2 +-
 .../react-aria-components/docs/ColorWheel.mdx |   2 +-
 .../react-aria-components/docs/DateField.mdx  |   2 +-
 .../react-aria-components/docs/DatePicker.mdx |   2 +-
 .../docs/DateRangePicker.mdx                  |   2 +-
 .../react-aria-components/docs/Dialog.mdx     |   2 +-
 .../react-aria-components/docs/DropZone.mdx   |   2 +-
 .../docs/FileTrigger.mdx                      |   2 +-
 packages/react-aria-components/docs/Link.mdx  |   2 +-
 packages/react-aria-components/docs/Meter.mdx |   2 +-
 packages/react-aria-components/docs/Modal.mdx |   2 +-
 .../docs/NumberField.mdx                      |   2 +-
 .../react-aria-components/docs/Popover.mdx    |   2 +-
 .../docs/ProgressBar.mdx                      |   2 +-
 .../react-aria-components/docs/RadioGroup.mdx |   2 +-
 .../docs/RangeCalendar.mdx                    |   2 +-
 .../docs/SearchField.mdx                      |   2 +-
 .../react-aria-components/docs/Slider.mdx     |   2 +-
 .../react-aria-components/docs/Switch.mdx     |   2 +-
 packages/react-aria-components/docs/Tabs.mdx  |   2 +-
 .../react-aria-components/docs/TagGroup.mdx   |   2 +-
 .../react-aria-components/docs/TextField.mdx  |   2 +-
 .../react-aria-components/docs/TimeField.mdx  |   2 +-
 packages/react-aria-components/docs/Toast.mdx |   2 +-
 .../docs/ToggleButton.mdx                     |   2 +-
 .../docs/ToggleButtonGroup.mdx                |   2 +-
 .../react-aria-components/docs/Toolbar.mdx    |   2 +-
 .../react-aria-components/docs/Tooltip.mdx    |   2 +-
 .../exports/Autocomplete.ts                   |  19 ++
 .../exports/Breadcrumbs.ts                    |  18 ++
 .../react-aria-components/exports/Button.ts   |  18 ++
 .../react-aria-components/exports/Calendar.ts |  18 ++
 .../react-aria-components/exports/Checkbox.ts |  18 ++
 .../exports/Collection.ts                     |  18 ++
 .../exports/ColorArea.ts                      |  18 ++
 .../exports/ColorField.ts                     |  18 ++
 .../exports/ColorPicker.ts                    |  18 ++
 .../exports/ColorSlider.ts                    |  18 ++
 .../exports/ColorSwatch.ts                    |  18 ++
 .../exports/ColorSwatchPicker.ts              |  18 ++
 .../exports/ColorThumb.ts                     |  18 ++
 .../exports/ColorWheel.ts                     |  18 ++
 .../react-aria-components/exports/ComboBox.ts |  18 ++
 .../exports/DateField.ts                      |  18 ++
 .../exports/DatePicker.ts                     |  18 ++
 .../react-aria-components/exports/Dialog.ts   |  18 ++
 .../exports/Disclosure.ts                     |  18 ++
 .../react-aria-components/exports/DropZone.ts |  18 ++
 .../exports/FieldError.ts                     |  18 ++
 .../exports/FileTrigger.ts                    |  18 ++
 .../react-aria-components/exports/Form.ts     |  18 ++
 .../react-aria-components/exports/GridList.ts |  18 ++
 .../react-aria-components/exports/Group.ts    |  18 ++
 .../react-aria-components/exports/Header.ts   |  18 ++
 .../react-aria-components/exports/Heading.ts  |  18 ++
 .../react-aria-components/exports/Input.ts    |  18 ++
 .../react-aria-components/exports/Keyboard.ts |  17 ++
 .../react-aria-components/exports/Label.ts    |  18 ++
 .../react-aria-components/exports/Link.ts     |  18 ++
 .../react-aria-components/exports/ListBox.ts  |  18 ++
 .../react-aria-components/exports/Menu.ts     |  18 ++
 .../react-aria-components/exports/Meter.ts    |  18 ++
 .../react-aria-components/exports/Modal.ts    |  18 ++
 .../exports/NumberField.ts                    |  18 ++
 .../exports/OverlayArrow.ts                   |  18 ++
 .../react-aria-components/exports/Popover.ts  |  18 ++
 .../exports/ProgressBar.ts                    |  18 ++
 .../exports/RadioGroup.ts                     |  18 ++
 .../exports/SearchField.ts                    |  18 ++
 .../react-aria-components/exports/Select.ts   |  18 ++
 .../exports/SelectionIndicator.ts             |  18 ++
 .../exports/Separator.ts                      |  18 ++
 .../exports/SharedElementTransition.ts        |  18 ++
 .../react-aria-components/exports/Slider.ts   |  18 ++
 .../react-aria-components/exports/Switch.ts   |  18 ++
 .../react-aria-components/exports/Table.ts    |  18 ++
 .../react-aria-components/exports/Tabs.ts     |  18 ++
 .../react-aria-components/exports/TagGroup.ts |  18 ++
 .../react-aria-components/exports/Text.ts     |  18 ++
 .../react-aria-components/exports/TextArea.ts |  18 ++
 .../exports/TextField.ts                      |  18 ++
 .../react-aria-components/exports/Toast.ts    |  18 ++
 .../exports/ToggleButton.ts                   |  18 ++
 .../exports/ToggleButtonGroup.ts              |  18 ++
 .../react-aria-components/exports/Toolbar.ts  |  18 ++
 .../react-aria-components/exports/Tooltip.ts  |  18 ++
 .../react-aria-components/exports/Tree.ts     |  18 ++
 .../exports/Virtualizer.ts                    |  18 ++
 .../{src => exports}/index.ts                 |  79 ++++-
 .../exports/useDragAndDrop.ts                 |  18 ++
 .../react-aria-components/exports/utils.ts    |  18 ++
 packages/react-aria-components/index.ts       |  13 -
 packages/react-aria-components/package.json   |  88 ++++--
 .../src/Autocomplete.tsx                      |   8 +-
 .../react-aria-components/src/Breadcrumbs.tsx |  12 +-
 packages/react-aria-components/src/Button.tsx |  23 +-
 .../react-aria-components/src/Calendar.tsx    |  30 +-
 .../react-aria-components/src/Checkbox.tsx    |  17 +-
 .../react-aria-components/src/Collection.tsx  |  13 +-
 .../react-aria-components/src/ColorArea.tsx   |   8 +-
 .../react-aria-components/src/ColorField.tsx  |  10 +-
 .../react-aria-components/src/ColorPicker.tsx |  11 +-
 .../react-aria-components/src/ColorSlider.tsx |   9 +-
 .../react-aria-components/src/ColorSwatch.tsx |   7 +-
 .../src/ColorSwatchPicker.tsx                 |  11 +-
 .../react-aria-components/src/ColorThumb.tsx  |   8 +-
 .../react-aria-components/src/ColorWheel.tsx  |   6 +-
 .../react-aria-components/src/ComboBox.tsx    |  15 +-
 .../react-aria-components/src/DateField.tsx   |  22 +-
 .../react-aria-components/src/DatePicker.tsx  |  13 +-
 packages/react-aria-components/src/Dialog.tsx |  16 +-
 .../react-aria-components/src/Disclosure.tsx  |  19 +-
 .../react-aria-components/src/DragAndDrop.tsx |   8 +-
 .../react-aria-components/src/DropZone.tsx    |  18 +-
 .../react-aria-components/src/FieldError.tsx  |   2 +-
 .../react-aria-components/src/FileTrigger.tsx |   7 +-
 packages/react-aria-components/src/Form.tsx   |   2 +-
 .../react-aria-components/src/GridList.tsx    |  33 ++-
 packages/react-aria-components/src/Group.tsx  |   4 +-
 packages/react-aria-components/src/Header.tsx |   3 +-
 .../src/HiddenDateInput.tsx                   |   7 +-
 packages/react-aria-components/src/Input.tsx  |   7 +-
 packages/react-aria-components/src/Label.tsx  |   2 +-
 packages/react-aria-components/src/Link.tsx   |   9 +-
 .../react-aria-components/src/ListBox.tsx     |  29 +-
 packages/react-aria-components/src/Menu.tsx   |  25 +-
 packages/react-aria-components/src/Meter.tsx  |   9 +-
 packages/react-aria-components/src/Modal.tsx  |  16 +-
 .../react-aria-components/src/NumberField.tsx |   9 +-
 .../src/OverlayArrow.tsx                      |   4 +-
 .../react-aria-components/src/Popover.tsx     |  19 +-
 .../react-aria-components/src/ProgressBar.tsx |   9 +-
 .../react-aria-components/src/RadioGroup.tsx  |  15 +-
 .../react-aria-components/src/SearchField.tsx |  10 +-
 packages/react-aria-components/src/Select.tsx |  19 +-
 .../react-aria-components/src/Separator.tsx   |   9 +-
 .../src/SharedElementTransition.tsx           |   4 +-
 packages/react-aria-components/src/Slider.tsx |  14 +-
 packages/react-aria-components/src/Switch.tsx |  15 +-
 packages/react-aria-components/src/Table.tsx  |  59 +++-
 .../react-aria-components/src/TableLayout.ts  |   2 +-
 packages/react-aria-components/src/Tabs.tsx   |  20 +-
 .../react-aria-components/src/TagGroup.tsx    |  15 +-
 .../react-aria-components/src/TextArea.tsx    |   5 +-
 .../react-aria-components/src/TextField.tsx   |   8 +-
 packages/react-aria-components/src/Toast.tsx  |  16 +-
 .../src/ToggleButton.tsx                      |  13 +-
 .../src/ToggleButtonGroup.tsx                 |   8 +-
 .../react-aria-components/src/Toolbar.tsx     |   6 +-
 .../react-aria-components/src/Tooltip.tsx     |  15 +-
 packages/react-aria-components/src/Tree.tsx   | 196 +++++++------
 .../react-aria-components/src/Virtualizer.tsx |   7 +-
 .../src/useDragAndDrop.tsx                    |  35 ++-
 packages/react-aria-components/src/utils.tsx  |   7 +-
 .../stories/Autocomplete.stories.tsx          |  33 ++-
 .../stories/Breadcrumbs.stories.tsx           |   4 +-
 .../stories/Button.stories.tsx                |   7 +-
 .../stories/Calendar.stories.tsx              |  14 +-
 .../stories/Checkbox.stories.tsx              |   2 +-
 .../stories/CheckboxGroup.stories.tsx         |   6 +-
 .../stories/ColorArea.stories.tsx             |   6 +-
 .../stories/ColorField.stories.tsx            |   7 +-
 .../stories/ColorPicker.stories.tsx           |  10 +-
 .../stories/ColorSlider.stories.tsx           |   6 +-
 .../stories/ColorWheel.stories.tsx            |   4 +-
 .../stories/ComboBox.stories.tsx              |  14 +-
 .../stories/ComboBoxReproductions.stories.tsx |   8 +-
 .../stories/DateField.stories.tsx             |   8 +-
 .../stories/DatePicker.stories.tsx            |  13 +-
 .../stories/Disclosure.stories.tsx            |   4 +-
 .../stories/DisclosureGroup.stories.tsx       |   4 +-
 .../stories/Dropzone.stories.tsx              |  14 +-
 .../stories/FileTrigger.stories.tsx           |   4 +-
 .../stories/Form.stories.tsx                  |   9 +-
 .../stories/GridList.stories.tsx              |  53 ++--
 .../stories/Link.stories.tsx                  |   2 +-
 .../stories/ListBox.stories.tsx               |  21 +-
 .../stories/Menu.stories.tsx                  |  28 +-
 .../stories/Meter.stories.tsx                 |   4 +-
 .../stories/Modal.stories.tsx                 |  18 +-
 .../stories/NumberField.stories.tsx           |   8 +-
 .../stories/Popover.stories.tsx               |   7 +-
 .../stories/ProgressBar.stories.tsx           |   4 +-
 .../stories/RadioGroup.stories.tsx            |   8 +-
 .../stories/SearchField.stories.tsx           |   8 +-
 .../stories/Select.stories.tsx                |  19 +-
 .../stories/Slider.stories.tsx                |   4 +-
 .../stories/Switch.stories.tsx                |   4 +-
 .../stories/Table.stories.tsx                 |  39 ++-
 .../stories/Tabs.stories.tsx                  |  10 +-
 .../stories/TagGroup.stories.tsx              |   6 +-
 .../stories/TextField.stories.tsx             |  10 +-
 .../stories/TimeField.stories.tsx             |   3 +-
 .../stories/ToggleButton.stories.tsx          |   4 +-
 .../stories/Toolbar.stories.tsx               |  17 +-
 .../stories/Tooltip.stories.tsx               |   5 +-
 .../stories/Tree.stories.tsx                  |  29 +-
 .../stories/animations.stories.tsx            |  12 +-
 .../react-aria-components/stories/utils.tsx   |   6 +-
 .../test/Autocomplete.test.tsx                |  26 +-
 .../test/Breadcrumbs.test.js                  |   4 +-
 .../react-aria-components/test/Button.test.js |  11 +-
 .../test/Calendar.test.js                     |  15 +-
 .../test/Checkbox.test.js                     |   2 +-
 .../test/CheckboxGroup.test.js                |   5 +-
 .../test/ColorArea.test.js                    |   4 +-
 .../test/ColorField.test.js                   |   7 +-
 .../test/ColorPicker.test.js                  |   9 +-
 .../test/ColorSlider.test.js                  |   6 +-
 .../test/ColorSwatch.test.js                  |   2 +-
 .../test/ColorSwatchPicker.test.js            |   5 +-
 .../test/ColorWheel.test.js                   |   4 +-
 .../test/ComboBox.test.js                     |  13 +-
 .../test/DateField.test.js                    |   6 +-
 .../test/DatePicker.test.js                   |  12 +-
 .../test/DateRangePicker.test.js              |  28 +-
 .../react-aria-components/test/Dialog.test.js |  28 +-
 .../test/Disclosure.test.js                   |  17 +-
 .../test/DropZone.test.js                     |  10 +-
 .../test/FileTrigger.test.js                  |   5 +-
 .../react-aria-components/test/Form.test.js   |   7 +-
 .../test/GridList.test.js                     |  36 +--
 .../react-aria-components/test/Group.test.tsx |   2 +-
 .../test/HiddenDateInput.test.js              |   4 +-
 .../react-aria-components/test/Link.test.js   |   4 +-
 .../test/ListBox.test.js                      |  30 +-
 .../react-aria-components/test/Menu.test.tsx  |  16 +-
 .../react-aria-components/test/Meter.test.js  |   4 +-
 .../test/NumberField.test.js                  |  12 +-
 .../test/Popover.test.js                      |   8 +-
 .../test/ProgressBar.test.js                  |   4 +-
 .../test/RadioGroup.test.js                   |   8 +-
 .../test/RangeCalendar.test.tsx               |  14 +-
 .../test/SearchField.test.js                  |   7 +-
 .../react-aria-components/test/Select.test.js |   9 +-
 .../test/Separator.test.js                    |   2 +-
 .../react-aria-components/test/Slider.test.js |   3 +-
 .../react-aria-components/test/Switch.test.js |   2 +-
 .../react-aria-components/test/Table.test.js  |  31 +-
 .../react-aria-components/test/Tabs.test.js   |   4 +-
 .../test/TagGroup.test.js                     |   9 +-
 .../test/TextField.test.js                    |   7 +-
 .../test/TimeField.test.js                    |   5 +-
 .../react-aria-components/test/Toast.test.js  |  13 +-
 .../test/ToggleButton.test.js                 |   2 +-
 .../test/ToggleButtonGroup.test.js            |   3 +-
 .../test/Toolbar.test.tsx                     |   8 +-
 .../test/Tooltip.test.js                      |   8 +-
 .../react-aria-components/test/Tree.test.tsx  |  13 +-
 .../test/Treeble.test.js                      |   7 +-
 .../test/VirtualizedMenu.test.tsx             |   6 +-
 packages/react-aria-components/test/types.tsx |   2 +-
 .../docs/autocomplete}/anatomy.svg            |   0
 .../docs/autocomplete}/useAutocomplete.mdx    |   0
 .../docs/breadcrumbs}/anatomy.svg             |   0
 .../docs/breadcrumbs}/useBreadcrumbs.mdx      |   0
 .../docs/button}/ToggleButtonGroupAnatomy.svg |   0
 .../docs/button}/useButton.mdx                |   0
 .../docs/button}/useToggleButton.mdx          |   0
 .../docs/button}/useToggleButtonGroup.mdx     |   0
 .../docs/calendar}/calendar-anatomy.svg       |   0
 .../docs/calendar}/calendar-tailwind.png      | Bin
 .../docs/calendar}/css-modules.png            | Bin
 .../docs/calendar}/rangecalendar-anatomy.svg  |   0
 .../docs/calendar}/styled-components.png      | Bin
 .../docs/calendar}/tailwind.png               | Bin
 .../docs/calendar}/useCalendar.mdx            |   0
 .../docs/calendar}/useRangeCalendar.mdx       |   0
 .../docs/checkbox}/buttongroup-example.png    | Bin
 .../docs/checkbox}/checkbox-anatomy.svg       |   0
 .../docs/checkbox}/checkboxgroup-anatomy.svg  |   0
 .../docs/checkbox}/tailwind-example.png       | Bin
 .../docs/checkbox}/useCheckbox.mdx            |   0
 .../docs/checkbox}/useCheckboxGroup.mdx       |   0
 .../docs/color}/ColorAreaAnatomy.svg          |   0
 .../docs/color}/ColorFieldAnatomy.svg         |   0
 .../docs/color}/ColorSliderAnatomy.svg        |   0
 .../docs/color}/ColorWheelAnatomy.svg         |   0
 .../docs/color}/useColorArea.mdx              |   0
 .../docs/color}/useColorField.mdx             |   0
 .../docs/color}/useColorSlider.mdx            |   0
 .../docs/color}/useColorSwatch.mdx            |   0
 .../docs/color}/useColorWheel.mdx             |   0
 .../docs/combobox}/anatomy.svg                |   0
 .../docs/combobox}/chakra.png                 | Bin
 .../docs/combobox}/example.png                | Bin
 .../docs/combobox}/material.png               | Bin
 .../docs/combobox}/search.png                 | Bin
 .../docs/combobox}/styled-components.png      | Bin
 .../docs/combobox}/useComboBox.mdx            |   0
 .../docs/datepicker}/DateField-tailwind.png   | Bin
 .../docs/datepicker}/DatePicker-chakra.png    | Bin
 .../docs/datepicker}/DatePicker-tailwind.png  | Bin
 .../datepicker}/DateRangePicker-chakra.png    | Bin
 .../datepicker}/DateRangePicker-tailwind.png  | Bin
 .../docs/datepicker}/TimeField-tailwind.png   | Bin
 .../docs/datepicker}/datefield-anatomy.svg    |   0
 .../docs/datepicker}/datepicker-anatomy.svg   |   0
 .../datepicker}/daterangepicker-anatomy.svg   |   0
 .../docs/datepicker}/timefield-anatomy.svg    |   0
 .../docs/datepicker}/useDateField.mdx         |   0
 .../docs/datepicker}/useDatePicker.mdx        |   0
 .../docs/datepicker}/useDateRangePicker.mdx   |   0
 .../docs/datepicker}/useTimeField.mdx         |   0
 .../docs/dialog}/anatomy.svg                  |   0
 .../docs/dialog}/tailwind.png                 | Bin
 .../docs/dialog}/useDialog.mdx                |   0
 .../docs/disclosure}/anatomy.svg              |   0
 .../docs/disclosure}/useDisclosure.mdx        |   0
 .../docs => react-aria/docs/dnd}/Anatomy.svg  |   0
 .../docs/dnd}/BetweenDropPosition.svg         |   0
 .../docs/dnd}/DragAffordance.svg              |   0
 .../docs/dnd}/DragPreview.svg                 |   0
 .../docs/dnd}/DropOperation.svg               |   0
 .../docs/dnd}/OnDropPosition.svg              |   0
 .../docs/dnd}/RootDropPosition.svg            |   0
 .../docs/dnd}/useDraggableCollection.mdx      |   0
 .../docs/dnd}/useDroppableCollection.mdx      |   0
 .../docs/gridlist}/anatomy.svg                |   0
 .../docs/gridlist}/useGridList.mdx            |   0
 .../docs => react-aria/docs/link}/useLink.mdx |   0
 .../docs/listbox}/anatomy.svg                 |   0
 .../docs/listbox}/useListBox.mdx              |   0
 .../docs/menu}/menu-trigger-anatomy.svg       |   0
 .../docs/menu}/tailwind.png                   | Bin
 .../docs => react-aria/docs/menu}/useMenu.mdx |   0
 .../docs/meter}/anatomy.svg                   |   0
 .../docs/meter}/circular-example.png          | Bin
 .../docs/meter}/useMeter.mdx                  |   0
 .../docs/numberfield}/anatomy.svg             |   0
 .../docs/numberfield}/useNumberField.mdx      |   0
 .../docs/overlays}/modal-anatomy.svg          |   0
 .../docs/overlays}/popover-anatomy.svg        |   0
 .../docs/overlays}/useModalOverlay.mdx        |   0
 .../docs/overlays}/usePopover.mdx             |   0
 .../docs/progress}/anatomy.svg                |   0
 .../docs/progress}/useProgressBar.mdx         |   0
 .../docs/radio}/anatomy.svg                   |   0
 .../docs/radio}/buttongroup-example.png       | Bin
 .../docs/radio}/card-example.png              | Bin
 .../docs/radio}/swatch-example.png            | Bin
 .../docs/radio}/useRadioGroup.mdx             |   0
 .../docs/searchfield}/anatomy.svg             |   0
 .../docs/searchfield}/useSearchField.mdx      |   0
 .../docs/select}/anatomy.svg                  |   0
 .../docs/select}/example.png                  | Bin
 .../docs/select}/popup-example.png            | Bin
 .../docs/select}/styled-components.png        | Bin
 .../docs/select}/useSelect.mdx                |   0
 .../docs/separator}/useSeparator.mdx          |   0
 .../docs/slider}/anatomy.svg                  |   0
 .../docs/slider}/useSlider.mdx                |   0
 .../docs/switch}/anatomy.svg                  |   0
 .../docs/switch}/useSwitch.mdx                |   0
 .../docs/table}/Table-tailwind.png            | Bin
 .../docs/table}/TableAnatomy.svg              |   0
 .../docs/table}/useTable.mdx                  |   0
 .../docs => react-aria/docs/tabs}/anatomy.svg |   0
 .../docs/tabs}/animated-example.png           | Bin
 .../docs/tabs}/useTabList.mdx                 |   0
 .../docs => react-aria/docs/tag}/anatomy.svg  |   0
 .../docs => react-aria/docs/tag}/tailwind.png | Bin
 .../docs/tag}/useTagGroup.mdx                 |   0
 .../docs/textfield}/anatomy.svg               |   0
 .../docs/textfield}/useTextField.mdx          |   0
 .../docs/toast}/toast-anatomy.svg             |   0
 .../docs/toast}/useToast.mdx                  |   0
 .../docs/toolbar}/toolbar-anatomy.svg         |   0
 .../docs/toolbar}/useToolbar.mdx              |   0
 .../docs/tooltip}/anatomy.svg                 |   0
 .../docs/tooltip}/useTooltipTrigger.mdx       |   0
 packages/react-aria/exports/DragPreview.ts    |  15 +
 packages/react-aria/exports/FocusRing.ts      |  20 ++
 packages/react-aria/exports/FocusScope.ts     |  21 ++
 packages/react-aria/exports/I18nProvider.ts   |  17 ++
 .../exports/ListDropTargetDelegate.ts         |  14 +
 .../exports/ListKeyboardDelegate.ts}          |   2 +-
 packages/react-aria/exports/Overlay.ts        |  16 +
 packages/react-aria/exports/PortalProvider.ts |  15 +
 packages/react-aria/exports/SSRProvider.ts    |  13 +
 packages/react-aria/exports/VisuallyHidden.ts |  13 +
 packages/react-aria/exports/index.ts          | 275 ++++++++++++++++++
 packages/react-aria/exports/mergeProps.ts     |  13 +
 .../private/actiongroup/useActionGroup.ts     |   1 +
 .../private/actiongroup/useActionGroupItem.ts |   1 +
 .../aria-modal-polyfill/ariaModalPolyfill.ts  |   1 +
 .../private/autocomplete/useAutocomplete.ts   |   1 +
 .../autocomplete/useSearchAutocomplete.ts     |   1 +
 .../private/calendar/useCalendarBase.ts       |   1 +
 .../private/collections/BaseCollection.ts     |   1 +
 .../private/collections/CollectionBuilder.ts  |   1 +
 .../exports/private/collections/Hidden.ts     |   1 +
 .../private/collections/useCachedChildren.ts  |   1 +
 .../private/datepicker/useDisplayNames.ts     |   1 +
 .../exports/private/dnd/DragManager.ts        |   1 +
 .../react-aria/exports/private/dnd/utils.ts   |   1 +
 .../exports/private/focus/FocusScope.ts       |   1 +
 .../private/focus/useHasTabbableChild.ts      |   1 +
 .../exports/private/focus/virtualFocus.ts     |   1 +
 .../exports/private/form/useFormValidation.ts |   1 +
 .../private/grid/GridKeyboardDelegate.ts      |   1 +
 .../exports/private/grid/useGrid.ts           |   1 +
 .../exports/private/grid/useGridCell.ts       |   1 +
 .../exports/private/grid/useGridRow.ts        |   1 +
 .../exports/private/grid/useGridRowGroup.ts   |   1 +
 .../grid/useGridSelectionAnnouncement.ts      |   1 +
 .../private/grid/useGridSelectionCheckbox.ts  |   1 +
 .../grid/useHighlightSelectionDescription.ts  |   1 +
 .../i18n/useLocalizedStringFormatter.ts       |   1 +
 .../private/i18n/useMessageFormatter.ts       |   1 +
 .../react-aria/exports/private/i18n/utils.ts  |   1 +
 .../private/interactions/PressResponder.ts    |   1 +
 .../exports/private/interactions/Pressable.ts |   1 +
 .../private/interactions/focusSafely.ts       |   1 +
 .../private/interactions/useFocusVisible.ts   |   1 +
 .../private/interactions/useFocusable.ts      |   1 +
 .../interactions/useInteractOutside.ts        |   1 +
 .../private/interactions/useScrollWheel.ts    |   1 +
 .../exports/private/landmark/useLandmark.ts   |   1 +
 .../exports/private/listbox/utils.ts          |   1 +
 .../private/live-announcer/LiveAnnouncer.ts   |   1 +
 .../exports/private/overlays/Overlay.ts       |   1 +
 .../private/overlays/ariaHideOutside.ts       |   1 +
 .../exports/private/overlays/useModal.ts      |   1 +
 .../exports/private/overlays/useOverlay.ts    |   1 +
 .../private/overlays/useOverlayPosition.ts    |   1 +
 .../private/overlays/usePreventScroll.ts      |   1 +
 .../private/selection/DOMLayoutDelegate.ts    |   1 +
 .../selection/useSelectableCollection.ts      |   1 +
 .../private/selection/useSelectableItem.ts    |   1 +
 .../private/selection/useSelectableList.ts    |   1 +
 .../private/selection/useTypeSelect.ts        |   1 +
 .../private/spinbutton/useSpinButton.ts       |   1 +
 .../exports/private/ssr/SSRProvider.ts        |   1 +
 .../exports/private/steplist/useStepList.ts   |   1 +
 .../private/steplist/useStepListItem.ts       |   1 +
 .../textfield/useFormattedTextField.ts        |   1 +
 .../exports/private/toggle/useToggle.ts       |   1 +
 .../exports/private/toolbar/useToolbar.ts     |   1 +
 .../exports/private/tree/useTree.ts           |   1 +
 .../exports/private/tree/useTreeItem.ts       |   1 +
 .../exports/private/utils/animation.ts        |   1 +
 .../react-aria/exports/private/utils/chain.ts |   1 +
 .../exports/private/utils/constants.ts        |   1 +
 .../exports/private/utils/domHelpers.ts       |   1 +
 .../exports/private/utils/filterDOMProps.ts   |   1 +
 .../private/utils/focusWithoutScrolling.ts    |   1 +
 .../exports/private/utils/getNonce.ts         |   1 +
 .../exports/private/utils/getOffset.ts        |   1 +
 .../exports/private/utils/getScrollParent.ts  |   1 +
 .../exports/private/utils/getScrollParents.ts |   1 +
 .../exports/private/utils/inertValue.ts       |   1 +
 .../exports/private/utils/isFocusable.ts      |   1 +
 .../exports/private/utils/isScrollable.ts     |   1 +
 .../exports/private/utils/isVirtualEvent.ts   |   1 +
 .../exports/private/utils/keyboard.ts         |   1 +
 .../exports/private/utils/mergeRefs.ts        |   1 +
 .../exports/private/utils/openLink.ts         |   1 +
 .../exports/private/utils/platform.ts         |   1 +
 .../private/utils/runAfterTransition.ts       |   1 +
 .../exports/private/utils/scrollIntoView.ts   |   1 +
 .../private/utils/shadowdom/DOMFunctions.ts   |   1 +
 .../utils/shadowdom/ShadowTreeWalker.ts       |   1 +
 .../exports/private/utils/useDeepMemo.ts      |   1 +
 .../exports/private/utils/useDescription.ts   |   1 +
 .../exports/private/utils/useDrag1D.ts        |   1 +
 .../exports/private/utils/useEffectEvent.ts   |   1 +
 .../exports/private/utils/useEvent.ts         |   1 +
 .../exports/private/utils/useFormReset.ts     |   1 +
 .../private/utils/useGlobalListeners.ts       |   1 +
 .../react-aria/exports/private/utils/useId.ts |   1 +
 .../exports/private/utils/useLabels.ts        |   1 +
 .../exports/private/utils/useLayoutEffect.ts  |   1 +
 .../exports/private/utils/useLoadMore.ts      |   1 +
 .../private/utils/useLoadMoreSentinel.ts      |   1 +
 .../private/utils/useResizeObserver.ts        |   1 +
 .../exports/private/utils/useSyncRef.ts       |   1 +
 .../exports/private/utils/useUpdateEffect.ts  |   1 +
 .../private/utils/useUpdateLayoutEffect.ts    |   1 +
 .../exports/private/utils/useValueEffect.ts   |   1 +
 .../exports/private/utils/useViewportSize.ts  |   1 +
 .../exports/private/virtualizer/ScrollView.ts |   1 +
 .../private/virtualizer/Virtualizer.ts        |   1 +
 .../private/virtualizer/VirtualizerItem.ts    |   1 +
 .../private/virtualizer/useVirtualizerItem.ts |   1 +
 .../exports/private/virtualizer/utils.ts      |   1 +
 packages/react-aria/exports/useBreadcrumbs.ts |  16 +
 packages/react-aria/exports/useButton.ts      |  14 +
 packages/react-aria/exports/useCalendar.ts    |  20 ++
 packages/react-aria/exports/useCheckbox.ts    |  14 +
 .../react-aria/exports/useCheckboxGroup.ts    |  15 +
 packages/react-aria/exports/useClipboard.ts   |  15 +
 packages/react-aria/exports/useCollator.ts    |  16 +
 packages/react-aria/exports/useColorArea.ts   |  14 +
 packages/react-aria/exports/useColorField.ts  |  16 +
 packages/react-aria/exports/useColorSlider.ts |  14 +
 packages/react-aria/exports/useColorSwatch.ts |  14 +
 packages/react-aria/exports/useColorWheel.ts  |  14 +
 packages/react-aria/exports/useComboBox.ts    |  14 +
 packages/react-aria/exports/useDateField.ts   |  19 ++
 .../react-aria/exports/useDateFormatter.ts    |  17 ++
 packages/react-aria/exports/useDatePicker.ts  |  17 ++
 .../react-aria/exports/useDateRangePicker.ts  |  17 ++
 packages/react-aria/exports/useDialog.ts      |  14 +
 .../exports/useDisclosure.ts}                 |   4 +-
 packages/react-aria/exports/useDrag.ts        |  15 +
 .../exports/useDraggableCollection.ts         |  17 ++
 packages/react-aria/exports/useDrop.ts        |  15 +
 .../exports/useDroppableCollection.ts         |  19 ++
 packages/react-aria/exports/useField.ts       |  15 +
 packages/react-aria/exports/useFilter.ts      |  17 ++
 packages/react-aria/exports/useFocus.ts       |  16 +
 packages/react-aria/exports/useFocusRing.ts   |  20 ++
 .../react-aria/exports/useFocusVisible.ts     |  15 +
 packages/react-aria/exports/useFocusWithin.ts |  15 +
 packages/react-aria/exports/useGridList.ts    |  21 ++
 packages/react-aria/exports/useHover.ts       |  15 +
 .../index.ts => react-aria/exports/useId.ts}  |   4 +-
 packages/react-aria/exports/useKeyboard.ts    |  15 +
 packages/react-aria/exports/useLabel.ts       |  15 +
 .../exports/useLandmark.ts}                   |   3 +-
 packages/react-aria/exports/useLink.ts        |  13 +
 packages/react-aria/exports/useListBox.ts     |  20 ++
 .../react-aria/exports/useListFormatter.ts    |  16 +
 .../exports/useLocalizedStringFormatter.ts    |  16 +
 packages/react-aria/exports/useLongPress.ts   |  15 +
 packages/react-aria/exports/useMenu.ts        |  25 ++
 packages/react-aria/exports/useMeter.ts       |  14 +
 .../react-aria/exports/useModalOverlay.ts     |  14 +
 packages/react-aria/exports/useMove.ts        |  15 +
 packages/react-aria/exports/useNumberField.ts |  14 +
 .../react-aria/exports/useNumberFormatter.ts  |  16 +
 packages/react-aria/exports/useObjectRef.ts   |  13 +
 .../react-aria/exports/useOverlayTrigger.ts   |  14 +
 packages/react-aria/exports/usePopover.ts     |  14 +
 packages/react-aria/exports/usePress.ts       |  15 +
 packages/react-aria/exports/useProgressBar.ts |  14 +
 packages/react-aria/exports/useRadioGroup.ts  |  17 ++
 .../react-aria/exports/useRangeCalendar.ts    |  15 +
 packages/react-aria/exports/useSearchField.ts |  14 +
 packages/react-aria/exports/useSelect.ts      |  16 +
 packages/react-aria/exports/useSeparator.ts   |  13 +
 packages/react-aria/exports/useSlider.ts      |  18 ++
 packages/react-aria/exports/useSwitch.ts      |  16 +
 packages/react-aria/exports/useTabList.ts     |  19 ++
 packages/react-aria/exports/useTable.ts       |  30 ++
 packages/react-aria/exports/useTagGroup.ts    |  17 ++
 packages/react-aria/exports/useTextField.ts   |  15 +
 packages/react-aria/exports/useToast.ts       |  16 +
 .../react-aria/exports/useToggleButton.ts     |  14 +
 .../exports/useToggleButtonGroup.ts           |  14 +
 .../react-aria/exports/useTooltipTrigger.ts   |  16 +
 packages/react-aria/index.ts                  |  13 -
 .../intl/autocomplete}/ar-AE.json             |   0
 .../intl/autocomplete}/bg-BG.json             |   0
 .../intl/autocomplete}/cs-CZ.json             |   0
 .../intl/autocomplete}/da-DK.json             |   0
 .../intl/autocomplete}/de-DE.json             |   0
 .../intl/autocomplete}/el-GR.json             |   0
 .../intl/autocomplete}/en-US.json             |   0
 .../intl/autocomplete}/es-ES.json             |   0
 .../intl/autocomplete}/et-EE.json             |   0
 .../intl/autocomplete}/fi-FI.json             |   0
 .../intl/autocomplete}/fr-FR.json             |   0
 .../intl/autocomplete}/he-IL.json             |   0
 .../intl/autocomplete}/hr-HR.json             |   0
 .../intl/autocomplete}/hu-HU.json             |   0
 .../intl/autocomplete}/it-IT.json             |   0
 .../intl/autocomplete}/ja-JP.json             |   0
 .../intl/autocomplete}/ko-KR.json             |   0
 .../intl/autocomplete}/lt-LT.json             |   0
 .../intl/autocomplete}/lv-LV.json             |   0
 .../intl/autocomplete}/nb-NO.json             |   0
 .../intl/autocomplete}/nl-NL.json             |   0
 .../intl/autocomplete}/pl-PL.json             |   0
 .../intl/autocomplete}/pt-BR.json             |   0
 .../intl/autocomplete}/pt-PT.json             |   0
 .../intl/autocomplete}/ro-RO.json             |   0
 .../intl/autocomplete}/ru-RU.json             |   0
 .../intl/autocomplete}/sk-SK.json             |   0
 .../intl/autocomplete}/sl-SI.json             |   0
 .../intl/autocomplete}/sr-SP.json             |   0
 .../intl/autocomplete}/sv-SE.json             |   0
 .../intl/autocomplete}/tr-TR.json             |   0
 .../intl/autocomplete}/uk-UA.json             |   0
 .../intl/autocomplete}/zh-CN.json             |   0
 .../intl/autocomplete}/zh-TW.json             |   0
 .../intl/breadcrumbs}/ar-AE.json              |   0
 .../intl/breadcrumbs}/bg-BG.json              |   0
 .../intl/breadcrumbs}/cs-CZ.json              |   0
 .../intl/breadcrumbs}/da-DK.json              |   0
 .../intl/breadcrumbs}/de-DE.json              |   0
 .../intl/breadcrumbs}/el-GR.json              |   0
 .../intl/breadcrumbs}/en-US.json              |   0
 .../intl/breadcrumbs}/es-ES.json              |   0
 .../intl/breadcrumbs}/et-EE.json              |   0
 .../intl/breadcrumbs}/fi-FI.json              |   0
 .../intl/breadcrumbs}/fr-FR.json              |   0
 .../intl/breadcrumbs}/he-IL.json              |   0
 .../intl/breadcrumbs}/hr-HR.json              |   0
 .../intl/breadcrumbs}/hu-HU.json              |   0
 .../intl/breadcrumbs}/it-IT.json              |   0
 .../intl/breadcrumbs}/ja-JP.json              |   0
 .../intl/breadcrumbs}/ko-KR.json              |   0
 .../intl/breadcrumbs}/lt-LT.json              |   0
 .../intl/breadcrumbs}/lv-LV.json              |   0
 .../intl/breadcrumbs}/nb-NO.json              |   0
 .../intl/breadcrumbs}/nl-NL.json              |   0
 .../intl/breadcrumbs}/pl-PL.json              |   0
 .../intl/breadcrumbs}/pt-BR.json              |   0
 .../intl/breadcrumbs}/pt-PT.json              |   0
 .../intl/breadcrumbs}/ro-RO.json              |   0
 .../intl/breadcrumbs}/ru-RU.json              |   0
 .../intl/breadcrumbs}/sk-SK.json              |   0
 .../intl/breadcrumbs}/sl-SI.json              |   0
 .../intl/breadcrumbs}/sr-SP.json              |   0
 .../intl/breadcrumbs}/sv-SE.json              |   0
 .../intl/breadcrumbs}/tr-TR.json              |   0
 .../intl/breadcrumbs}/uk-UA.json              |   0
 .../intl/breadcrumbs}/zh-CN.json              |   0
 .../intl/breadcrumbs}/zh-TW.json              |   0
 .../intl/calendar}/ar-AE.json                 |   0
 .../intl/calendar}/bg-BG.json                 |   0
 .../intl/calendar}/cs-CZ.json                 |   0
 .../intl/calendar}/da-DK.json                 |   0
 .../intl/calendar}/de-DE.json                 |   0
 .../intl/calendar}/el-GR.json                 |   0
 .../intl/calendar}/en-US.json                 |   0
 .../intl/calendar}/es-ES.json                 |   0
 .../intl/calendar}/et-EE.json                 |   0
 .../intl/calendar}/fi-FI.json                 |   0
 .../intl/calendar}/fr-FR.json                 |   0
 .../intl/calendar}/he-IL.json                 |   0
 .../intl/calendar}/hr-HR.json                 |   0
 .../intl/calendar}/hu-HU.json                 |   0
 .../intl/calendar}/it-IT.json                 |   0
 .../intl/calendar}/ja-JP.json                 |   0
 .../intl/calendar}/ko-KR.json                 |   0
 .../intl/calendar}/lt-LT.json                 |   0
 .../intl/calendar}/lv-LV.json                 |   0
 .../intl/calendar}/nb-NO.json                 |   0
 .../intl/calendar}/nl-NL.json                 |   0
 .../intl/calendar}/pl-PL.json                 |   0
 .../intl/calendar}/pt-BR.json                 |   0
 .../intl/calendar}/pt-PT.json                 |   0
 .../intl/calendar}/ro-RO.json                 |   0
 .../intl/calendar}/ru-RU.json                 |   0
 .../intl/calendar}/sk-SK.json                 |   0
 .../intl/calendar}/sl-SI.json                 |   0
 .../intl/calendar}/sr-SP.json                 |   0
 .../intl/calendar}/sv-SE.json                 |   0
 .../intl/calendar}/tr-TR.json                 |   0
 .../intl/calendar}/uk-UA.json                 |   0
 .../intl/calendar}/zh-CN.json                 |   0
 .../intl/calendar}/zh-TW.json                 |   0
 .../intl => react-aria/intl/color}/ar-AE.json |   0
 .../intl => react-aria/intl/color}/bg-BG.json |   0
 .../intl => react-aria/intl/color}/cs-CZ.json |   0
 .../intl => react-aria/intl/color}/da-DK.json |   0
 .../intl => react-aria/intl/color}/de-DE.json |   0
 .../intl => react-aria/intl/color}/el-GR.json |   0
 .../intl => react-aria/intl/color}/en-US.json |   0
 .../intl => react-aria/intl/color}/es-ES.json |   0
 .../intl => react-aria/intl/color}/et-EE.json |   0
 .../intl => react-aria/intl/color}/fi-FI.json |   0
 .../intl => react-aria/intl/color}/fr-FR.json |   0
 .../intl => react-aria/intl/color}/he-IL.json |   0
 .../intl => react-aria/intl/color}/hr-HR.json |   0
 .../intl => react-aria/intl/color}/hu-HU.json |   0
 .../intl => react-aria/intl/color}/it-IT.json |   0
 .../intl => react-aria/intl/color}/ja-JP.json |   0
 .../intl => react-aria/intl/color}/ko-KR.json |   0
 .../intl => react-aria/intl/color}/lt-LT.json |   0
 .../intl => react-aria/intl/color}/lv-LV.json |   0
 .../intl => react-aria/intl/color}/nb-NO.json |   0
 .../intl => react-aria/intl/color}/nl-NL.json |   0
 .../intl => react-aria/intl/color}/pl-PL.json |   0
 .../intl => react-aria/intl/color}/pt-BR.json |   0
 .../intl => react-aria/intl/color}/pt-PT.json |   0
 .../intl => react-aria/intl/color}/ro-RO.json |   0
 .../intl => react-aria/intl/color}/ru-RU.json |   0
 .../intl => react-aria/intl/color}/sk-SK.json |   0
 .../intl => react-aria/intl/color}/sl-SI.json |   0
 .../intl => react-aria/intl/color}/sr-SP.json |   0
 .../intl => react-aria/intl/color}/sv-SE.json |   0
 .../intl => react-aria/intl/color}/tr-TR.json |   0
 .../intl => react-aria/intl/color}/uk-UA.json |   0
 .../intl => react-aria/intl/color}/zh-CN.json |   0
 .../intl => react-aria/intl/color}/zh-TW.json |   0
 .../intl/combobox}/ar-AE.json                 |   0
 .../intl/combobox}/bg-BG.json                 |   0
 .../intl/combobox}/cs-CZ.json                 |   0
 .../intl/combobox}/da-DK.json                 |   0
 .../intl/combobox}/de-DE.json                 |   0
 .../intl/combobox}/el-GR.json                 |   0
 .../intl/combobox}/en-US.json                 |   0
 .../intl/combobox}/es-ES.json                 |   0
 .../intl/combobox}/et-EE.json                 |   0
 .../intl/combobox}/fi-FI.json                 |   0
 .../intl/combobox}/fr-FR.json                 |   0
 .../intl/combobox}/he-IL.json                 |   0
 .../intl/combobox}/hr-HR.json                 |   0
 .../intl/combobox}/hu-HU.json                 |   0
 .../intl/combobox}/it-IT.json                 |   0
 .../intl/combobox}/ja-JP.json                 |   0
 .../intl/combobox}/ko-KR.json                 |   0
 .../intl/combobox}/lt-LT.json                 |   0
 .../intl/combobox}/lv-LV.json                 |   0
 .../intl/combobox}/nb-NO.json                 |   0
 .../intl/combobox}/nl-NL.json                 |   0
 .../intl/combobox}/pl-PL.json                 |   0
 .../intl/combobox}/pt-BR.json                 |   0
 .../intl/combobox}/pt-PT.json                 |   0
 .../intl/combobox}/ro-RO.json                 |   0
 .../intl/combobox}/ru-RU.json                 |   0
 .../intl/combobox}/sk-SK.json                 |   0
 .../intl/combobox}/sl-SI.json                 |   0
 .../intl/combobox}/sr-SP.json                 |   0
 .../intl/combobox}/sv-SE.json                 |   0
 .../intl/combobox}/tr-TR.json                 |   0
 .../intl/combobox}/uk-UA.json                 |   0
 .../intl/combobox}/zh-CN.json                 |   0
 .../intl/combobox}/zh-TW.json                 |   0
 .../intl/datepicker}/ar-AE.json               |   0
 .../intl/datepicker}/bg-BG.json               |   0
 .../intl/datepicker}/cs-CZ.json               |   0
 .../intl/datepicker}/da-DK.json               |   0
 .../intl/datepicker}/de-DE.json               |   0
 .../intl/datepicker}/el-GR.json               |   0
 .../intl/datepicker}/en-US.json               |   0
 .../intl/datepicker}/es-ES.json               |   0
 .../intl/datepicker}/et-EE.json               |   0
 .../intl/datepicker}/fi-FI.json               |   0
 .../intl/datepicker}/fr-FR.json               |   0
 .../intl/datepicker}/he-IL.json               |   0
 .../intl/datepicker}/hr-HR.json               |   0
 .../intl/datepicker}/hu-HU.json               |   0
 .../intl/datepicker}/it-IT.json               |   0
 .../intl/datepicker}/ja-JP.json               |   0
 .../intl/datepicker}/ko-KR.json               |   0
 .../intl/datepicker}/lt-LT.json               |   0
 .../intl/datepicker}/lv-LV.json               |   0
 .../intl/datepicker}/nb-NO.json               |   0
 .../intl/datepicker}/nl-NL.json               |   0
 .../intl/datepicker}/pl-PL.json               |   0
 .../intl/datepicker}/pt-BR.json               |   0
 .../intl/datepicker}/pt-PT.json               |   0
 .../intl/datepicker}/ro-RO.json               |   0
 .../intl/datepicker}/ru-RU.json               |   0
 .../intl/datepicker}/sk-SK.json               |   0
 .../intl/datepicker}/sl-SI.json               |   0
 .../intl/datepicker}/sr-SP.json               |   0
 .../intl/datepicker}/sv-SE.json               |   0
 .../intl/datepicker}/tr-TR.json               |   0
 .../intl/datepicker}/uk-UA.json               |   0
 .../intl/datepicker}/zh-CN.json               |   0
 .../intl/datepicker}/zh-TW.json               |   0
 .../intl => react-aria/intl/dnd}/ar-AE.json   |   0
 .../intl => react-aria/intl/dnd}/bg-BG.json   |   0
 .../intl => react-aria/intl/dnd}/cs-CZ.json   |   0
 .../intl => react-aria/intl/dnd}/da-DK.json   |   0
 .../intl => react-aria/intl/dnd}/de-DE.json   |   0
 .../intl => react-aria/intl/dnd}/el-GR.json   |   0
 .../intl => react-aria/intl/dnd}/en-US.json   |   0
 .../intl => react-aria/intl/dnd}/es-ES.json   |   0
 .../intl => react-aria/intl/dnd}/et-EE.json   |   0
 .../intl => react-aria/intl/dnd}/fi-FI.json   |   0
 .../intl => react-aria/intl/dnd}/fr-FR.json   |   0
 .../intl => react-aria/intl/dnd}/he-IL.json   |   0
 .../intl => react-aria/intl/dnd}/hr-HR.json   |   0
 .../intl => react-aria/intl/dnd}/hu-HU.json   |   0
 .../intl => react-aria/intl/dnd}/it-IT.json   |   0
 .../intl => react-aria/intl/dnd}/ja-JP.json   |   0
 .../intl => react-aria/intl/dnd}/ko-KR.json   |   0
 .../intl => react-aria/intl/dnd}/lt-LT.json   |   0
 .../intl => react-aria/intl/dnd}/lv-LV.json   |   0
 .../intl => react-aria/intl/dnd}/nb-NO.json   |   0
 .../intl => react-aria/intl/dnd}/nl-NL.json   |   0
 .../intl => react-aria/intl/dnd}/pl-PL.json   |   0
 .../intl => react-aria/intl/dnd}/pt-BR.json   |   0
 .../intl => react-aria/intl/dnd}/pt-PT.json   |   0
 .../intl => react-aria/intl/dnd}/ro-RO.json   |   0
 .../intl => react-aria/intl/dnd}/ru-RU.json   |   0
 .../intl => react-aria/intl/dnd}/sk-SK.json   |   0
 .../intl => react-aria/intl/dnd}/sl-SI.json   |   0
 .../intl => react-aria/intl/dnd}/sr-SP.json   |   0
 .../intl => react-aria/intl/dnd}/sv-SE.json   |   0
 .../intl => react-aria/intl/dnd}/tr-TR.json   |   0
 .../intl => react-aria/intl/dnd}/uk-UA.json   |   0
 .../intl => react-aria/intl/dnd}/zh-CN.json   |   0
 .../intl => react-aria/intl/dnd}/zh-TW.json   |   0
 .../intl => react-aria/intl/grid}/ar-AE.json  |   0
 .../intl => react-aria/intl/grid}/bg-BG.json  |   0
 .../intl => react-aria/intl/grid}/cs-CZ.json  |   0
 .../intl => react-aria/intl/grid}/da-DK.json  |   0
 .../intl => react-aria/intl/grid}/de-DE.json  |   0
 .../intl => react-aria/intl/grid}/el-GR.json  |   0
 .../intl => react-aria/intl/grid}/en-US.json  |   0
 .../intl => react-aria/intl/grid}/es-ES.json  |   0
 .../intl => react-aria/intl/grid}/et-EE.json  |   0
 .../intl => react-aria/intl/grid}/fi-FI.json  |   0
 .../intl => react-aria/intl/grid}/fr-FR.json  |   0
 .../intl => react-aria/intl/grid}/he-IL.json  |   0
 .../intl => react-aria/intl/grid}/hr-HR.json  |   0
 .../intl => react-aria/intl/grid}/hu-HU.json  |   0
 .../intl => react-aria/intl/grid}/it-IT.json  |   0
 .../intl => react-aria/intl/grid}/ja-JP.json  |   0
 .../intl => react-aria/intl/grid}/ko-KR.json  |   0
 .../intl => react-aria/intl/grid}/lt-LT.json  |   0
 .../intl => react-aria/intl/grid}/lv-LV.json  |   0
 .../intl => react-aria/intl/grid}/nb-NO.json  |   0
 .../intl => react-aria/intl/grid}/nl-NL.json  |   0
 .../intl => react-aria/intl/grid}/pl-PL.json  |   0
 .../intl => react-aria/intl/grid}/pt-BR.json  |   0
 .../intl => react-aria/intl/grid}/pt-PT.json  |   0
 .../intl => react-aria/intl/grid}/ro-RO.json  |   0
 .../intl => react-aria/intl/grid}/ru-RU.json  |   0
 .../intl => react-aria/intl/grid}/sk-SK.json  |   0
 .../intl => react-aria/intl/grid}/sl-SI.json  |   0
 .../intl => react-aria/intl/grid}/sr-SP.json  |   0
 .../intl => react-aria/intl/grid}/sv-SE.json  |   0
 .../intl => react-aria/intl/grid}/tr-TR.json  |   0
 .../intl => react-aria/intl/grid}/uk-UA.json  |   0
 .../intl => react-aria/intl/grid}/zh-CN.json  |   0
 .../intl => react-aria/intl/grid}/zh-TW.json  |   0
 .../intl/gridlist}/ar-AE.json                 |   0
 .../intl/gridlist}/bg-BG.json                 |   0
 .../intl/gridlist}/cs-CZ.json                 |   0
 .../intl/gridlist}/da-DK.json                 |   0
 .../intl/gridlist}/de-DE.json                 |   0
 .../intl/gridlist}/el-GR.json                 |   0
 .../intl/gridlist}/en-US.json                 |   0
 .../intl/gridlist}/es-ES.json                 |   0
 .../intl/gridlist}/et-EE.json                 |   0
 .../intl/gridlist}/fi-FI.json                 |   0
 .../intl/gridlist}/fr-FR.json                 |   0
 .../intl/gridlist}/he-IL.json                 |   0
 .../intl/gridlist}/hr-HR.json                 |   0
 .../intl/gridlist}/hu-HU.json                 |   0
 .../intl/gridlist}/it-IT.json                 |   0
 .../intl/gridlist}/ja-JP.json                 |   0
 .../intl/gridlist}/ko-KR.json                 |   0
 .../intl/gridlist}/lt-LT.json                 |   0
 .../intl/gridlist}/lv-LV.json                 |   0
 .../intl/gridlist}/nb-NO.json                 |   0
 .../intl/gridlist}/nl-NL.json                 |   0
 .../intl/gridlist}/pl-PL.json                 |   0
 .../intl/gridlist}/pt-BR.json                 |   0
 .../intl/gridlist}/pt-PT.json                 |   0
 .../intl/gridlist}/ro-RO.json                 |   0
 .../intl/gridlist}/ru-RU.json                 |   0
 .../intl/gridlist}/sk-SK.json                 |   0
 .../intl/gridlist}/sl-SI.json                 |   0
 .../intl/gridlist}/sr-SP.json                 |   0
 .../intl/gridlist}/sv-SE.json                 |   0
 .../intl/gridlist}/tr-TR.json                 |   0
 .../intl/gridlist}/uk-UA.json                 |   0
 .../intl/gridlist}/zh-CN.json                 |   0
 .../intl/gridlist}/zh-TW.json                 |   0
 .../intl => react-aria/intl/menu}/ar-AE.json  |   0
 .../intl => react-aria/intl/menu}/bg-BG.json  |   0
 .../intl => react-aria/intl/menu}/cs-CZ.json  |   0
 .../intl => react-aria/intl/menu}/da-DK.json  |   0
 .../intl => react-aria/intl/menu}/de-DE.json  |   0
 .../intl => react-aria/intl/menu}/el-GR.json  |   0
 .../intl => react-aria/intl/menu}/en-US.json  |   0
 .../intl => react-aria/intl/menu}/es-ES.json  |   0
 .../intl => react-aria/intl/menu}/et-EE.json  |   0
 .../intl => react-aria/intl/menu}/fi-FI.json  |   0
 .../intl => react-aria/intl/menu}/fr-FR.json  |   0
 .../intl => react-aria/intl/menu}/he-IL.json  |   0
 .../intl => react-aria/intl/menu}/hr-HR.json  |   0
 .../intl => react-aria/intl/menu}/hu-HU.json  |   0
 .../intl => react-aria/intl/menu}/it-IT.json  |   0
 .../intl => react-aria/intl/menu}/ja-JP.json  |   0
 .../intl => react-aria/intl/menu}/ko-KR.json  |   0
 .../intl => react-aria/intl/menu}/lt-LT.json  |   0
 .../intl => react-aria/intl/menu}/lv-LV.json  |   0
 .../intl => react-aria/intl/menu}/nb-NO.json  |   0
 .../intl => react-aria/intl/menu}/nl-NL.json  |   0
 .../intl => react-aria/intl/menu}/pl-PL.json  |   0
 .../intl => react-aria/intl/menu}/pt-BR.json  |   0
 .../intl => react-aria/intl/menu}/pt-PT.json  |   0
 .../intl => react-aria/intl/menu}/ro-RO.json  |   0
 .../intl => react-aria/intl/menu}/ru-RU.json  |   0
 .../intl => react-aria/intl/menu}/sk-SK.json  |   0
 .../intl => react-aria/intl/menu}/sl-SI.json  |   0
 .../intl => react-aria/intl/menu}/sr-SP.json  |   0
 .../intl => react-aria/intl/menu}/sv-SE.json  |   0
 .../intl => react-aria/intl/menu}/tr-TR.json  |   0
 .../intl => react-aria/intl/menu}/uk-UA.json  |   0
 .../intl => react-aria/intl/menu}/zh-CN.json  |   0
 .../intl => react-aria/intl/menu}/zh-TW.json  |   0
 .../intl/numberfield}/ar-AE.json              |   0
 .../intl/numberfield}/bg-BG.json              |   0
 .../intl/numberfield}/cs-CZ.json              |   0
 .../intl/numberfield}/da-DK.json              |   0
 .../intl/numberfield}/de-DE.json              |   0
 .../intl/numberfield}/el-GR.json              |   0
 .../intl/numberfield}/en-US.json              |   0
 .../intl/numberfield}/es-ES.json              |   0
 .../intl/numberfield}/et-EE.json              |   0
 .../intl/numberfield}/fi-FI.json              |   0
 .../intl/numberfield}/fr-FR.json              |   0
 .../intl/numberfield}/he-IL.json              |   0
 .../intl/numberfield}/hr-HR.json              |   0
 .../intl/numberfield}/hu-HU.json              |   0
 .../intl/numberfield}/it-IT.json              |   0
 .../intl/numberfield}/ja-JP.json              |   0
 .../intl/numberfield}/ko-KR.json              |   0
 .../intl/numberfield}/lt-LT.json              |   0
 .../intl/numberfield}/lv-LV.json              |   0
 .../intl/numberfield}/nb-NO.json              |   0
 .../intl/numberfield}/nl-NL.json              |   0
 .../intl/numberfield}/pl-PL.json              |   0
 .../intl/numberfield}/pt-BR.json              |   0
 .../intl/numberfield}/pt-PT.json              |   0
 .../intl/numberfield}/ro-RO.json              |   0
 .../intl/numberfield}/ru-RU.json              |   0
 .../intl/numberfield}/sk-SK.json              |   0
 .../intl/numberfield}/sl-SI.json              |   0
 .../intl/numberfield}/sr-SP.json              |   0
 .../intl/numberfield}/sv-SE.json              |   0
 .../intl/numberfield}/tr-TR.json              |   0
 .../intl/numberfield}/uk-UA.json              |   0
 .../intl/numberfield}/zh-CN.json              |   0
 .../intl/numberfield}/zh-TW.json              |   0
 .../intl/overlays}/ar-AE.json                 |   0
 .../intl/overlays}/bg-BG.json                 |   0
 .../intl/overlays}/cs-CZ.json                 |   0
 .../intl/overlays}/da-DK.json                 |   0
 .../intl/overlays}/de-DE.json                 |   0
 .../intl/overlays}/el-GR.json                 |   0
 .../intl/overlays}/en-US.json                 |   0
 .../intl/overlays}/es-ES.json                 |   0
 .../intl/overlays}/et-EE.json                 |   0
 .../intl/overlays}/fi-FI.json                 |   0
 .../intl/overlays}/fr-FR.json                 |   0
 .../intl/overlays}/he-IL.json                 |   0
 .../intl/overlays}/hr-HR.json                 |   0
 .../intl/overlays}/hu-HU.json                 |   0
 .../intl/overlays}/it-IT.json                 |   0
 .../intl/overlays}/ja-JP.json                 |   0
 .../intl/overlays}/ko-KR.json                 |   0
 .../intl/overlays}/lt-LT.json                 |   0
 .../intl/overlays}/lv-LV.json                 |   0
 .../intl/overlays}/nb-NO.json                 |   0
 .../intl/overlays}/nl-NL.json                 |   0
 .../intl/overlays}/pl-PL.json                 |   0
 .../intl/overlays}/pt-BR.json                 |   0
 .../intl/overlays}/pt-PT.json                 |   0
 .../intl/overlays}/ro-RO.json                 |   0
 .../intl/overlays}/ru-RU.json                 |   0
 .../intl/overlays}/sk-SK.json                 |   0
 .../intl/overlays}/sl-SI.json                 |   0
 .../intl/overlays}/sr-SP.json                 |   0
 .../intl/overlays}/sv-SE.json                 |   0
 .../intl/overlays}/tr-TR.json                 |   0
 .../intl/overlays}/uk-UA.json                 |   0
 .../intl/overlays}/zh-CN.json                 |   0
 .../intl/overlays}/zh-TW.json                 |   0
 .../intl/searchfield}/ar-AE.json              |   0
 .../intl/searchfield}/bg-BG.json              |   0
 .../intl/searchfield}/cs-CZ.json              |   0
 .../intl/searchfield}/da-DK.json              |   0
 .../intl/searchfield}/de-DE.json              |   0
 .../intl/searchfield}/el-GR.json              |   0
 .../intl/searchfield}/en-US.json              |   0
 .../intl/searchfield}/es-ES.json              |   0
 .../intl/searchfield}/et-EE.json              |   0
 .../intl/searchfield}/fi-FI.json              |   0
 .../intl/searchfield}/fr-FR.json              |   0
 .../intl/searchfield}/he-IL.json              |   0
 .../intl/searchfield}/hr-HR.json              |   0
 .../intl/searchfield}/hu-HU.json              |   0
 .../intl/searchfield}/it-IT.json              |   0
 .../intl/searchfield}/ja-JP.json              |   0
 .../intl/searchfield}/ko-KR.json              |   0
 .../intl/searchfield}/lt-LT.json              |   0
 .../intl/searchfield}/lv-LV.json              |   0
 .../intl/searchfield}/nb-NO.json              |   0
 .../intl/searchfield}/nl-NL.json              |   0
 .../intl/searchfield}/pl-PL.json              |   0
 .../intl/searchfield}/pt-BR.json              |   0
 .../intl/searchfield}/pt-PT.json              |   0
 .../intl/searchfield}/ro-RO.json              |   0
 .../intl/searchfield}/ru-RU.json              |   0
 .../intl/searchfield}/sk-SK.json              |   0
 .../intl/searchfield}/sl-SI.json              |   0
 .../intl/searchfield}/sr-SP.json              |   0
 .../intl/searchfield}/sv-SE.json              |   0
 .../intl/searchfield}/tr-TR.json              |   0
 .../intl/searchfield}/uk-UA.json              |   0
 .../intl/searchfield}/zh-CN.json              |   0
 .../intl/searchfield}/zh-TW.json              |   0
 .../intl/spinbutton}/ar-AE.json               |   0
 .../intl/spinbutton}/bg-BG.json               |   0
 .../intl/spinbutton}/cs-CZ.json               |   0
 .../intl/spinbutton}/da-DK.json               |   0
 .../intl/spinbutton}/de-DE.json               |   0
 .../intl/spinbutton}/el-GR.json               |   0
 .../intl/spinbutton}/en-US.json               |   0
 .../intl/spinbutton}/es-ES.json               |   0
 .../intl/spinbutton}/et-EE.json               |   0
 .../intl/spinbutton}/fi-FI.json               |   0
 .../intl/spinbutton}/fr-FR.json               |   0
 .../intl/spinbutton}/he-IL.json               |   0
 .../intl/spinbutton}/hr-HR.json               |   0
 .../intl/spinbutton}/hu-HU.json               |   0
 .../intl/spinbutton}/it-IT.json               |   0
 .../intl/spinbutton}/ja-JP.json               |   0
 .../intl/spinbutton}/ko-KR.json               |   0
 .../intl/spinbutton}/lt-LT.json               |   0
 .../intl/spinbutton}/lv-LV.json               |   0
 .../intl/spinbutton}/nb-NO.json               |   0
 .../intl/spinbutton}/nl-NL.json               |   0
 .../intl/spinbutton}/pl-PL.json               |   0
 .../intl/spinbutton}/pt-BR.json               |   0
 .../intl/spinbutton}/pt-PT.json               |   0
 .../intl/spinbutton}/ro-RO.json               |   0
 .../intl/spinbutton}/ru-RU.json               |   0
 .../intl/spinbutton}/sk-SK.json               |   0
 .../intl/spinbutton}/sl-SI.json               |   0
 .../intl/spinbutton}/sr-SP.json               |   0
 .../intl/spinbutton}/sv-SE.json               |   0
 .../intl/spinbutton}/tr-TR.json               |   0
 .../intl/spinbutton}/uk-UA.json               |   0
 .../intl/spinbutton}/zh-CN.json               |   0
 .../intl/spinbutton}/zh-TW.json               |   0
 .../intl/steplist}/ar-AE.json                 |   0
 .../intl/steplist}/bg-BG.json                 |   0
 .../intl/steplist}/cs-CZ.json                 |   0
 .../intl/steplist}/da-DK.json                 |   0
 .../intl/steplist}/de-DE.json                 |   0
 .../intl/steplist}/el-GR.json                 |   0
 .../intl/steplist}/en-US.json                 |   0
 .../intl/steplist}/es-ES.json                 |   0
 .../intl/steplist}/et-EE.json                 |   0
 .../intl/steplist}/fi-FI.json                 |   0
 .../intl/steplist}/fr-FR.json                 |   0
 .../intl/steplist}/he-IL.json                 |   0
 .../intl/steplist}/hr-HR.json                 |   0
 .../intl/steplist}/hu-HU.json                 |   0
 .../intl/steplist}/it-IT.json                 |   0
 .../intl/steplist}/ja-JP.json                 |   0
 .../intl/steplist}/ko-KR.json                 |   0
 .../intl/steplist}/lt-LT.json                 |   0
 .../intl/steplist}/lv-LV.json                 |   0
 .../intl/steplist}/nb-NO.json                 |   0
 .../intl/steplist}/nl-NL.json                 |   0
 .../intl/steplist}/pl-PL.json                 |   0
 .../intl/steplist}/pt-BR.json                 |   0
 .../intl/steplist}/pt-PT.json                 |   0
 .../intl/steplist}/ro-RO.json                 |   0
 .../intl/steplist}/ru-RU.json                 |   0
 .../intl/steplist}/sk-SK.json                 |   0
 .../intl/steplist}/sl-SI.json                 |   0
 .../intl/steplist}/sr-SP.json                 |   0
 .../intl/steplist}/sv-SE.json                 |   0
 .../intl/steplist}/tr-TR.json                 |   0
 .../intl/steplist}/uk-UA.json                 |   0
 .../intl/steplist}/zh-CN.json                 |   0
 .../intl/steplist}/zh-TW.json                 |   0
 .../intl => react-aria/intl/table}/ar-AE.json |   0
 .../intl => react-aria/intl/table}/bg-BG.json |   0
 .../intl => react-aria/intl/table}/cs-CZ.json |   0
 .../intl => react-aria/intl/table}/da-DK.json |   0
 .../intl => react-aria/intl/table}/de-DE.json |   0
 .../intl => react-aria/intl/table}/el-GR.json |   0
 .../intl => react-aria/intl/table}/en-US.json |   0
 .../intl => react-aria/intl/table}/es-ES.json |   0
 .../intl => react-aria/intl/table}/et-EE.json |   0
 .../intl => react-aria/intl/table}/fi-FI.json |   0
 .../intl => react-aria/intl/table}/fr-FR.json |   0
 .../intl => react-aria/intl/table}/he-IL.json |   0
 .../intl => react-aria/intl/table}/hr-HR.json |   0
 .../intl => react-aria/intl/table}/hu-HU.json |   0
 .../intl => react-aria/intl/table}/it-IT.json |   0
 .../intl => react-aria/intl/table}/ja-JP.json |   0
 .../intl => react-aria/intl/table}/ko-KR.json |   0
 .../intl => react-aria/intl/table}/lt-LT.json |   0
 .../intl => react-aria/intl/table}/lv-LV.json |   0
 .../intl => react-aria/intl/table}/nb-NO.json |   0
 .../intl => react-aria/intl/table}/nl-NL.json |   0
 .../intl => react-aria/intl/table}/pl-PL.json |   0
 .../intl => react-aria/intl/table}/pt-BR.json |   0
 .../intl => react-aria/intl/table}/pt-PT.json |   0
 .../intl => react-aria/intl/table}/ro-RO.json |   0
 .../intl => react-aria/intl/table}/ru-RU.json |   0
 .../intl => react-aria/intl/table}/sk-SK.json |   0
 .../intl => react-aria/intl/table}/sl-SI.json |   0
 .../intl => react-aria/intl/table}/sr-SP.json |   0
 .../intl => react-aria/intl/table}/sv-SE.json |   0
 .../intl => react-aria/intl/table}/tr-TR.json |   0
 .../intl => react-aria/intl/table}/uk-UA.json |   0
 .../intl => react-aria/intl/table}/zh-CN.json |   0
 .../intl => react-aria/intl/table}/zh-TW.json |   0
 .../intl => react-aria/intl/tag}/ar-AE.json   |   0
 .../intl => react-aria/intl/tag}/bg-BG.json   |   0
 .../intl => react-aria/intl/tag}/cs-CZ.json   |   0
 .../intl => react-aria/intl/tag}/da-DK.json   |   0
 .../intl => react-aria/intl/tag}/de-DE.json   |   0
 .../intl => react-aria/intl/tag}/el-GR.json   |   0
 .../intl => react-aria/intl/tag}/en-US.json   |   0
 .../intl => react-aria/intl/tag}/es-ES.json   |   0
 .../intl => react-aria/intl/tag}/et-EE.json   |   0
 .../intl => react-aria/intl/tag}/fi-FI.json   |   0
 .../intl => react-aria/intl/tag}/fr-FR.json   |   0
 .../intl => react-aria/intl/tag}/he-IL.json   |   0
 .../intl => react-aria/intl/tag}/hr-HR.json   |   0
 .../intl => react-aria/intl/tag}/hu-HU.json   |   0
 .../intl => react-aria/intl/tag}/it-IT.json   |   0
 .../intl => react-aria/intl/tag}/ja-JP.json   |   0
 .../intl => react-aria/intl/tag}/ko-KR.json   |   0
 .../intl => react-aria/intl/tag}/lt-LT.json   |   0
 .../intl => react-aria/intl/tag}/lv-LV.json   |   0
 .../intl => react-aria/intl/tag}/nb-NO.json   |   0
 .../intl => react-aria/intl/tag}/nl-NL.json   |   0
 .../intl => react-aria/intl/tag}/pl-PL.json   |   0
 .../intl => react-aria/intl/tag}/pt-BR.json   |   0
 .../intl => react-aria/intl/tag}/pt-PT.json   |   0
 .../intl => react-aria/intl/tag}/ro-RO.json   |   0
 .../intl => react-aria/intl/tag}/ru-RU.json   |   0
 .../intl => react-aria/intl/tag}/sk-SK.json   |   0
 .../intl => react-aria/intl/tag}/sl-SI.json   |   0
 .../intl => react-aria/intl/tag}/sr-SP.json   |   0
 .../intl => react-aria/intl/tag}/sv-SE.json   |   0
 .../intl => react-aria/intl/tag}/tr-TR.json   |   0
 .../intl => react-aria/intl/tag}/uk-UA.json   |   0
 .../intl => react-aria/intl/tag}/zh-CN.json   |   0
 .../intl => react-aria/intl/tag}/zh-TW.json   |   0
 .../intl => react-aria/intl/toast}/ar-AE.json |   0
 .../intl => react-aria/intl/toast}/bg-BG.json |   0
 .../intl => react-aria/intl/toast}/cs-CZ.json |   0
 .../intl => react-aria/intl/toast}/da-DK.json |   0
 .../intl => react-aria/intl/toast}/de-DE.json |   0
 .../intl => react-aria/intl/toast}/el-GR.json |   0
 .../intl => react-aria/intl/toast}/en-US.json |   0
 .../intl => react-aria/intl/toast}/es-ES.json |   0
 .../intl => react-aria/intl/toast}/et-EE.json |   0
 .../intl => react-aria/intl/toast}/fi-FI.json |   0
 .../intl => react-aria/intl/toast}/fr-FR.json |   0
 .../intl => react-aria/intl/toast}/he-IL.json |   0
 .../intl => react-aria/intl/toast}/hr-HR.json |   0
 .../intl => react-aria/intl/toast}/hu-HU.json |   0
 .../intl => react-aria/intl/toast}/it-IT.json |   0
 .../intl => react-aria/intl/toast}/ja-JP.json |   0
 .../intl => react-aria/intl/toast}/ko-KR.json |   0
 .../intl => react-aria/intl/toast}/lt-LT.json |   0
 .../intl => react-aria/intl/toast}/lv-LV.json |   0
 .../intl => react-aria/intl/toast}/nb-NO.json |   0
 .../intl => react-aria/intl/toast}/nl-NL.json |   0
 .../intl => react-aria/intl/toast}/pl-PL.json |   0
 .../intl => react-aria/intl/toast}/pt-BR.json |   0
 .../intl => react-aria/intl/toast}/pt-PT.json |   0
 .../intl => react-aria/intl/toast}/ro-RO.json |   0
 .../intl => react-aria/intl/toast}/ru-RU.json |   0
 .../intl => react-aria/intl/toast}/sk-SK.json |   0
 .../intl => react-aria/intl/toast}/sl-SI.json |   0
 .../intl => react-aria/intl/toast}/sr-SP.json |   0
 .../intl => react-aria/intl/toast}/sv-SE.json |   0
 .../intl => react-aria/intl/toast}/tr-TR.json |   0
 .../intl => react-aria/intl/toast}/uk-UA.json |   0
 .../intl => react-aria/intl/toast}/zh-CN.json |   0
 .../intl => react-aria/intl/toast}/zh-TW.json |   0
 .../intl => react-aria/intl/tree}/ar-AE.json  |   0
 .../intl => react-aria/intl/tree}/bg-BG.json  |   0
 .../intl => react-aria/intl/tree}/cs-CZ.json  |   0
 .../intl => react-aria/intl/tree}/da-DK.json  |   0
 .../intl => react-aria/intl/tree}/de-DE.json  |   0
 .../intl => react-aria/intl/tree}/el-GR.json  |   0
 .../intl => react-aria/intl/tree}/en-US.json  |   0
 .../intl => react-aria/intl/tree}/es-ES.json  |   0
 .../intl => react-aria/intl/tree}/et-EE.json  |   0
 .../intl => react-aria/intl/tree}/fi-FI.json  |   0
 .../intl => react-aria/intl/tree}/fr-FR.json  |   0
 .../intl => react-aria/intl/tree}/he-IL.json  |   0
 .../intl => react-aria/intl/tree}/hr-HR.json  |   0
 .../intl => react-aria/intl/tree}/hu-HU.json  |   0
 .../intl => react-aria/intl/tree}/it-IT.json  |   0
 .../intl => react-aria/intl/tree}/ja-JP.json  |   0
 .../intl => react-aria/intl/tree}/ko-KR.json  |   0
 .../intl => react-aria/intl/tree}/lt-LT.json  |   0
 .../intl => react-aria/intl/tree}/lv-LV.json  |   0
 .../intl => react-aria/intl/tree}/nb-NO.json  |   0
 .../intl => react-aria/intl/tree}/nl-NL.json  |   0
 .../intl => react-aria/intl/tree}/pl-PL.json  |   0
 .../intl => react-aria/intl/tree}/pt-BR.json  |   0
 .../intl => react-aria/intl/tree}/pt-PT.json  |   0
 .../intl => react-aria/intl/tree}/ro-RO.json  |   0
 .../intl => react-aria/intl/tree}/ru-RU.json  |   0
 .../intl => react-aria/intl/tree}/sk-SK.json  |   0
 .../intl => react-aria/intl/tree}/sl-SI.json  |   0
 .../intl => react-aria/intl/tree}/sr-SP.json  |   0
 .../intl => react-aria/intl/tree}/sv-SE.json  |   0
 .../intl => react-aria/intl/tree}/tr-TR.json  |   0
 .../intl => react-aria/intl/tree}/uk-UA.json  |   0
 .../intl => react-aria/intl/tree}/zh-CN.json  |   0
 .../intl => react-aria/intl/tree}/zh-TW.json  |   0
 packages/react-aria/package.json              | 121 ++++----
 .../src/actiongroup}/useActionGroup.ts        |  10 +-
 .../src/actiongroup}/useActionGroupItem.ts    |   7 +-
 .../aria-modal-polyfill}/ariaModalPolyfill.ts |   0
 .../src/autocomplete}/useAutocomplete.ts      |  35 ++-
 .../autocomplete}/useSearchAutocomplete.ts    |  10 +-
 .../src/breadcrumbs}/useBreadcrumbItem.ts     |   2 +-
 .../src/breadcrumbs}/useBreadcrumbs.ts        |   6 +-
 .../src/button}/useButton.ts                  |   6 +-
 .../src/button}/useToggleButton.ts            |   5 +-
 .../src/button}/useToggleButtonGroup.ts       |   5 +-
 .../src/calendar}/useCalendar.ts              |   2 +-
 .../src/calendar}/useCalendarBase.ts          |  15 +-
 .../src/calendar}/useCalendarCell.ts          |  18 +-
 .../src/calendar}/useCalendarGrid.ts          |   8 +-
 .../src/calendar}/useRangeCalendar.ts         |   5 +-
 .../src => react-aria/src/calendar}/utils.ts  |   7 +-
 .../src/checkbox}/useCheckbox.ts              |  12 +-
 .../src/checkbox}/useCheckboxGroup.ts         |   9 +-
 .../src/checkbox}/useCheckboxGroupItem.ts     |  10 +-
 .../src => react-aria/src/checkbox}/utils.ts  |   2 +-
 .../src/collections}/BaseCollection.ts        |   0
 .../src/collections}/CollectionBuilder.tsx    |   8 +-
 .../src/collections}/Document.ts              |   0
 .../src/collections}/Hidden.tsx               |   0
 .../src/collections}/useCachedChildren.ts     |   0
 .../src/color}/useColorArea.ts                |  23 +-
 .../src/color}/useColorAreaGradient.ts        |   3 +-
 .../src/color}/useColorChannelField.ts        |   6 +-
 .../src/color}/useColorField.ts               |  15 +-
 .../src/color}/useColorSlider.ts              |  11 +-
 .../src/color}/useColorSwatch.ts              |  10 +-
 .../src/color}/useColorWheel.ts               |  16 +-
 .../src/combobox}/useComboBox.ts              |  40 ++-
 .../src/datepicker}/useDateField.ts           |  22 +-
 .../src/datepicker}/useDatePicker.ts          |  21 +-
 .../src/datepicker}/useDatePickerGroup.ts     |  13 +-
 .../src/datepicker}/useDateRangePicker.ts     |  23 +-
 .../src/datepicker}/useDateSegment.ts         |  18 +-
 .../src/datepicker}/useDisplayNames.ts        |   5 +-
 .../src/dialog}/useDialog.ts                  |   8 +-
 .../src/disclosure}/useDisclosure.ts          |   8 +-
 .../src => react-aria/src/dnd}/DragManager.ts |   8 +-
 .../src/dnd}/DragPreview.tsx                  |   0
 .../src/dnd}/DropTargetKeyboardNavigation.ts  |   2 +-
 .../src/dnd}/ListDropTargetDelegate.ts        |   0
 .../src => react-aria/src/dnd}/constants.ts   |   0
 .../src/dnd}/useAutoScroll.ts                 |   5 +-
 .../src/dnd}/useClipboard.ts                  |   6 +-
 .../dnd/src => react-aria/src/dnd}/useDrag.ts |   9 +-
 .../src/dnd}/useDraggableCollection.ts        |   2 +-
 .../src/dnd}/useDraggableItem.ts              |   8 +-
 .../dnd/src => react-aria/src/dnd}/useDrop.ts |   5 +-
 .../src/dnd}/useDropIndicator.ts              |   8 +-
 .../src/dnd}/useDroppableCollection.ts        |  10 +-
 .../src/dnd}/useDroppableItem.ts              |   2 +-
 .../src/dnd}/useVirtualDrop.ts                |   6 +-
 .../dnd/src => react-aria/src/dnd}/utils.ts   |   4 +-
 .../src/focus}/FocusRing.tsx                  |   2 +-
 .../src/focus}/FocusScope.tsx                 |  26 +-
 .../src/focus}/useFocusRing.ts                |   4 +-
 .../src/focus}/useHasTabbableChild.ts         |   2 +-
 .../src/focus}/virtualFocus.ts                |   3 +-
 .../src/form}/useFormValidation.ts            |   9 +-
 .../src/grid}/GridKeyboardDelegate.ts         |   4 +-
 .../src => react-aria/src/grid}/useGrid.ts    |  14 +-
 .../src/grid}/useGridCell.ts                  |  16 +-
 .../src => react-aria/src/grid}/useGridRow.ts |   6 +-
 .../src/grid}/useGridRowGroup.ts              |   0
 .../src/grid}/useGridSelectionAnnouncement.ts |  10 +-
 .../src/grid}/useGridSelectionCheckbox.ts     |   8 +-
 .../grid}/useHighlightSelectionDescription.ts |  10 +-
 .../grid/src => react-aria/src/grid}/utils.ts |   2 +-
 .../src/gridlist}/useGridList.ts              |  13 +-
 .../src/gridlist}/useGridListItem.ts          |  22 +-
 .../src/gridlist}/useGridListSection.ts       |   5 +-
 .../gridlist}/useGridListSelectionCheckbox.ts |   8 +-
 .../src => react-aria/src/gridlist}/utils.ts  |   2 +-
 .../src/i18n}/I18nProvider.tsx                |   0
 .../i18n/src => react-aria/src/i18n}/main.js  |   0
 .../src => react-aria/src/i18n}/module.js     |   0
 .../src => react-aria/src/i18n}/server.tsx    |   0
 .../src/i18n}/useCollator.ts                  |   0
 .../src/i18n}/useDateFormatter.ts             |   2 +-
 .../src/i18n}/useDefaultLocale.ts             |   2 +-
 .../src => react-aria/src/i18n}/useFilter.ts  |   0
 .../src/i18n}/useListFormatter.tsx            |   0
 .../src/i18n}/useLocalizedStringFormatter.ts  |   0
 .../src/i18n}/useMessageFormatter.ts          |   0
 .../src/i18n}/useNumberFormatter.ts           |   0
 .../i18n/src => react-aria/src/i18n}/utils.ts |   0
 packages/react-aria/src/index.ts              |  92 ------
 .../src/interactions}/PressResponder.tsx      |   4 +-
 .../src/interactions}/Pressable.tsx           |   6 +-
 .../src/interactions}/context.ts              |   0
 .../src/interactions}/createEventHandler.ts   |   0
 .../src/interactions}/focusSafely.ts          |  10 +-
 .../src/interactions}/textSelection.ts        |   5 +-
 .../src/interactions}/useFocus.ts             |   3 +-
 .../src/interactions}/useFocusVisible.ts      |  11 +-
 .../src/interactions}/useFocusWithin.ts       |   4 +-
 .../src/interactions}/useFocusable.tsx        |   9 +-
 .../src/interactions}/useHover.ts             |   4 +-
 .../src/interactions}/useInteractOutside.ts   |   5 +-
 .../src/interactions}/useKeyboard.ts          |   0
 .../src/interactions}/useLongPress.ts         |   6 +-
 .../src/interactions}/useMove.ts              |   4 +-
 .../src/interactions}/usePress.ts             |  32 +-
 .../src/interactions}/useScrollWheel.ts       |   2 +-
 .../src/interactions}/utils.ts                |   6 +-
 .../src => react-aria/src/label}/useField.ts  |   3 +-
 .../src => react-aria/src/label}/useLabel.ts  |   3 +-
 .../src/landmark}/useLandmark.ts              |   3 +-
 .../src => react-aria/src/link}/useLink.ts    |   7 +-
 .../src/listbox}/useListBox.ts                |  12 +-
 .../src/listbox}/useListBoxSection.ts         |   2 +-
 .../src/listbox}/useOption.ts                 |  16 +-
 .../src => react-aria/src/listbox}/utils.ts   |   2 +-
 .../src/live-announcer}/LiveAnnouncer.tsx     |   0
 .../src => react-aria/src/menu}/useMenu.ts    |   7 +-
 .../src/menu}/useMenuItem.ts                  |  20 +-
 .../src/menu}/useMenuSection.ts               |   2 +-
 .../src/menu}/useMenuTrigger.ts               |  14 +-
 .../src/menu}/useSafelyMouseToSubmenu.ts      |   7 +-
 .../src/menu}/useSubmenuTrigger.ts            |  13 +-
 .../menu/src => react-aria/src/menu}/utils.ts |   2 +-
 .../src => react-aria/src/meter}/useMeter.ts  |   2 +-
 .../src/numberfield}/useNumberField.ts        |  31 +-
 .../src/overlays}/DismissButton.tsx           |   8 +-
 .../src/overlays}/Overlay.tsx                 |   8 +-
 .../src/overlays}/PortalProvider.tsx          |   0
 .../src/overlays}/ariaHideOutside.ts          |   7 +-
 .../src/overlays}/calculatePosition.ts        |  17 +-
 .../src/overlays}/useCloseOnScroll.ts         |   2 +-
 .../src/overlays}/useModal.tsx                |   2 +-
 .../src/overlays}/useModalOverlay.ts          |   4 +-
 .../src/overlays}/useOverlay.ts               |   7 +-
 .../src/overlays}/useOverlayPosition.ts       |   6 +-
 .../src/overlays}/useOverlayTrigger.ts        |   4 +-
 .../src/overlays}/usePopover.ts               |   4 +-
 .../src/overlays}/usePreventScroll.ts         |  10 +-
 .../src/progress}/useProgressBar.ts           |   8 +-
 .../src => react-aria/src/radio}/useRadio.ts  |  11 +-
 .../src/radio}/useRadioGroup.ts               |  16 +-
 .../src => react-aria/src/radio}/utils.ts     |   2 +-
 .../src/searchfield}/useSearchField.ts        |  10 +-
 .../src/select}/HiddenSelect.tsx              |   9 +-
 .../src/select}/useSelect.ts                  |  21 +-
 .../src/selection}/DOMLayoutDelegate.ts       |   0
 .../src/selection}/ListKeyboardDelegate.ts    |   2 +-
 .../src/selection}/useSelectableCollection.ts |  22 +-
 .../src/selection}/useSelectableItem.ts       |  16 +-
 .../src/selection}/useSelectableList.ts       |   2 +-
 .../src/selection}/useTypeSelect.ts           |   4 +-
 .../src => react-aria/src/selection}/utils.ts |   3 +-
 .../src/separator}/useSeparator.ts            |   2 +-
 .../src/slider}/useSlider.ts                  |  13 +-
 .../src/slider}/useSliderThumb.ts             |  17 +-
 .../src => react-aria/src/slider}/utils.ts    |   2 +-
 .../src/spinbutton}/useSpinButton.ts          |  10 +-
 .../src/ssr}/SSRProvider.tsx                  |   0
 .../src/steplist}/useStepList.ts              |  11 +-
 .../src/steplist}/useStepListItem.ts          |   4 +-
 .../src/switch}/useSwitch.ts                  |   4 +-
 .../src/table}/TableKeyboardDelegate.ts       |   4 +-
 .../src => react-aria/src/table}/useTable.ts  |  19 +-
 .../src/table}/useTableCell.ts                |   4 +-
 .../src/table}/useTableColumnHeader.ts        |  15 +-
 .../src/table}/useTableColumnResize.ts        |  21 +-
 .../src/table}/useTableHeaderRow.ts           |   4 +-
 .../src/table}/useTableRow.ts                 |  17 +-
 .../src/table}/useTableRowGroup.ts            |   2 +-
 .../src/table}/useTableSelectionCheckbox.ts   |   8 +-
 .../src => react-aria/src/table}/utils.ts     |   2 +-
 .../src/tabs}/TabsKeyboardDelegate.ts         |   0
 .../src => react-aria/src/tabs}/useTab.ts     |  10 +-
 .../src => react-aria/src/tabs}/useTabList.ts |  10 +-
 .../src/tabs}/useTabPanel.ts                  |   7 +-
 .../tabs/src => react-aria/src/tabs}/utils.ts |   2 +-
 .../tag/src => react-aria/src/tag}/useTag.ts  |  21 +-
 .../src => react-aria/src/tag}/useTagGroup.ts |  16 +-
 .../src/textfield}/useFormattedTextField.ts   |   4 +-
 .../src/textfield}/useTextField.ts            |  15 +-
 .../src => react-aria/src/toast}/useToast.ts  |  10 +-
 .../src/toast}/useToastRegion.ts              |  19 +-
 .../src/toggle}/useToggle.ts                  |  10 +-
 .../src/toolbar}/useToolbar.ts                |   8 +-
 .../src/tooltip}/useTooltip.ts                |   7 +-
 .../src/tooltip}/useTooltipTrigger.ts         |   9 +-
 .../src => react-aria/src/tree}/useTree.ts    |   4 +-
 .../src/tree}/useTreeItem.ts                  |  10 +-
 .../src => react-aria/src/utils}/animation.ts |   0
 .../src => react-aria/src/utils}/chain.ts     |   0
 .../src => react-aria/src/utils}/constants.ts |   0
 .../src/utils}/domHelpers.ts                  |   0
 .../src/utils}/filterDOMProps.ts              |   0
 .../src/utils}/focusWithoutScrolling.ts       |   0
 .../src => react-aria/src/utils}/getNonce.ts  |   0
 .../src => react-aria/src/utils}/getOffset.ts |   0
 .../src/utils}/getScrollParent.ts             |   0
 .../src/utils}/getScrollParents.ts            |   0
 .../src/utils}/inertValue.ts                  |   0
 .../src/utils}/isElementVisible.ts            |   0
 .../src/utils}/isFocusable.ts                 |   0
 .../src/utils}/isScrollable.ts                |   0
 .../src/utils}/isVirtualEvent.ts              |   0
 .../src => react-aria/src/utils}/keyboard.tsx |   0
 .../src/utils}/mergeProps.ts                  |   0
 .../src => react-aria/src/utils}/mergeRefs.ts |   0
 .../src => react-aria/src/utils}/openLink.tsx |   0
 .../src => react-aria/src/utils}/platform.ts  |   0
 .../src/utils}/runAfterTransition.ts          |   0
 .../src/utils}/scrollIntoView.ts              |   0
 .../src/utils}/shadowdom/DOMFunctions.ts      |   2 +-
 .../src/utils}/shadowdom/ShadowTreeWalker.ts  |   2 +-
 .../src/utils}/useDeepMemo.ts                 |   0
 .../src/utils}/useDescription.ts              |   0
 .../src => react-aria/src/utils}/useDrag1D.ts |   0
 .../src/utils}/useEffectEvent.ts              |   0
 .../src => react-aria/src/utils}/useEvent.ts  |   0
 .../src/utils}/useFormReset.ts                |   0
 .../src/utils}/useGlobalListeners.ts          |   0
 .../src => react-aria/src/utils}/useId.ts     |   2 +-
 .../src => react-aria/src/utils}/useLabels.ts |   0
 .../src/utils}/useLayoutEffect.ts             |   0
 .../src/utils}/useLoadMore.ts                 |   0
 .../src/utils}/useLoadMoreSentinel.ts         |   0
 .../src/utils}/useObjectRef.ts                |   0
 .../src/utils}/useResizeObserver.ts           |   0
 .../src/utils}/useSyncRef.ts                  |   0
 .../src/utils}/useUpdateEffect.ts             |   0
 .../src/utils}/useUpdateLayoutEffect.ts       |   0
 .../src/utils}/useValueEffect.ts              |   0
 .../src/utils}/useViewportSize.ts             |   2 +-
 .../src/virtualizer}/ScrollView.tsx           |  12 +-
 .../src/virtualizer}/Virtualizer.tsx          |   9 +-
 .../src/virtualizer}/VirtualizerItem.tsx      |   4 +-
 .../src/virtualizer}/useVirtualizerItem.ts    |   5 +-
 .../src/virtualizer}/utils.ts                 |   0
 .../src/visually-hidden}/VisuallyHidden.tsx   |   4 +-
 .../stories/button}/useButton.stories.tsx     |   2 +-
 .../stories/calendar}/Example.tsx             |  14 +-
 .../stories/calendar}/useCalendar.stories.tsx |   0
 .../stories/checkbox}/useCheckbox.stories.tsx |   5 +-
 .../stories/combobox}/example.tsx             |  18 +-
 .../stories/combobox}/useComboBox.stories.tsx |   4 +-
 .../datepicker}/useDatePicker.stories.tsx     |   6 +-
 .../stories/dnd}/DraggableCollection.tsx      |  31 +-
 .../stories/dnd}/DraggableListBox.tsx         |  16 +-
 .../stories/dnd}/DroppableGrid.tsx            |  32 +-
 .../stories/dnd}/DroppableListBox.tsx         |  28 +-
 .../stories/dnd}/Reorderable.tsx              |  39 ++-
 .../stories/dnd}/VirtualizedListBox.tsx       |  30 +-
 .../stories/dnd}/dnd.css                      |   0
 .../stories/dnd}/dnd.stories.tsx              |  49 ++--
 .../stories/focus}/FocusScope.stories.tsx     |  14 +-
 .../stories/grid}/example.tsx                 |  14 +-
 .../stories/grid}/useGrid.stories.tsx         |   4 +-
 .../interactions}/useFocusRing.stories.tsx    |  12 +-
 .../interactions}/useHover.stories.tsx        |   8 +-
 .../useInteractOutside.stories.tsx            |   3 +-
 .../stories/interactions}/useMove.stories.tsx |   6 +-
 .../interactions}/usePress-stories.css        |   0
 .../interactions}/usePress.stories.tsx        |  17 +-
 .../stories/label}/useField.stories.tsx       |   2 +-
 .../stories/landmark}/Landmark.stories.tsx    |  22 +-
 .../stories/landmark}/index.css               |   0
 .../stories/menu}/useMenu.stories.tsx         |  22 +-
 .../overlays}/UseOverlayPosition.stories.tsx  |   8 +-
 .../stories/overlays}/useModal.stories.tsx    |   4 +-
 .../overlays}/usePreventScroll.stories.tsx    |   4 +-
 .../stories/select}/example.tsx               |  17 +-
 .../stories/select}/useSelect.stories.tsx     |   2 +-
 .../stories/selection}/List.tsx               |   5 +-
 .../stories/selection}/styles.css             |   0
 .../selection}/useSelectableList.stories.tsx  |   9 +-
 .../stories/slider}/Slider.stories.tsx        |   0
 .../stories/slider}/StoryMultiSlider.tsx      |  14 +-
 .../stories/slider}/StoryRangeSlider.tsx      |  11 +-
 .../stories/slider}/StorySlider.tsx           |  11 +-
 .../stories/slider}/story-slider.css          |   0
 .../stories/table}/docs-example.css           |   0
 .../table}/example-backwards-compat.tsx       |  29 +-
 .../stories/table}/example-docs.tsx           |  18 +-
 .../stories/table}/example-resizing.tsx       |  37 ++-
 .../stories/table}/example.tsx                |  20 +-
 .../stories/table}/resizing.css               |   0
 .../stories/table}/useTable.stories.tsx       |   8 +-
 .../stories/tabs}/example.tsx                 |   8 +-
 .../stories/tabs}/useTabList.stories.tsx      |   2 +-
 .../textfield}/useTextField.stories.tsx       |   2 +-
 .../stories/toast}/Example.tsx                |   7 +-
 .../stories/toast}/useToast.stories.tsx       |   2 +-
 .../stories/utils}/platform.stories.tsx       |   2 +-
 .../stories/utils}/useId.stories.tsx          |   4 +-
 .../utils}/useViewportSize.stories.tsx        |   2 +-
 .../test/actiongroup}/useActionGroup.test.ts  |   4 +-
 .../test/aria-modal-polyfill}/index.test.tsx  |  19 +-
 .../useSearchAutocomplete.test.js             |   6 +-
 .../breadcrumbs}/useBreadcrumbItem.test.js    |   2 +-
 .../test/breadcrumbs}/useBreadcrumbs.test.js  |   2 +-
 .../test/button}/useButton.test.js            |   2 +-
 .../test/calendar}/useCalendar.test.js        |   4 +-
 .../test/checkbox}/useCheckboxGroup.test.tsx  |   5 +-
 .../collections}/CollectionBuilder.test.js    |   3 +-
 .../test/color}/useColorField.test.js         |   6 +-
 .../test/color}/useColorWheel.test.tsx        |   5 +-
 .../test/combobox}/useComboBox.test.js        |   6 +-
 .../test/datepicker}/useDatePicker.test.tsx   |   2 +-
 .../test/dialog}/useDialog.test.js            |   2 +-
 .../test/disclosure}/useDisclosure.test.ts    |   4 +-
 .../DropTargetKeyboardNavigation.test.tsx     |   4 +-
 .../test/dnd}/dnd.ssr.test.js                 |   0
 .../test => react-aria/test/dnd}/dnd.test.js  |   8 +-
 .../test => react-aria/test/dnd}/examples.js  |  10 +-
 .../dnd/test => react-aria/test/dnd}/mocks.js |   0
 .../test/dnd}/useClipboard.test.js            |   2 +-
 .../test/dnd}/useDraggableCollection.test.js  |  10 +-
 .../test/dnd}/useDroppableCollection.test.js  |   2 +-
 .../test/focus}/FocusScope.test.js            |  16 +-
 .../focus}/FocusScopeOwnerDocument.test.js    |   2 +-
 .../test/grid}/useGrid.test.js                |   6 +-
 .../test/i18n}/languagechange.test.js         |   2 +-
 .../test/i18n}/server.test.js                 |   2 +-
 .../test/interactions}/Focusable.test.js      |   2 +-
 .../test/interactions}/PressResponder.test.js |   3 +-
 .../test/interactions}/Pressable.test.js      |   2 +-
 .../test/interactions}/focusSafely.test.js    |  10 +-
 .../test/interactions}/useFocus.test.js       |   4 +-
 .../interactions}/useFocusVisible.test.js     |  10 +-
 .../test/interactions}/useFocusWithin.test.js |   2 +-
 .../test/interactions}/useHover.test.js       |  11 +-
 .../interactions}/useInteractOutside.test.js  |   2 +-
 .../test/interactions}/useKeyboard.test.js    |   2 +-
 .../test/interactions}/useLongPress.test.js   |   5 +-
 .../test/interactions}/useMove.test.js        |   2 +-
 .../test/interactions}/usePress.test.js       |  13 +-
 .../test/label}/useField.test.js              |   4 +-
 .../test/label}/useLabel.test.js              |   2 +-
 .../test/landmark}/useLandmark.ssr.test.js    |   0
 .../test/landmark}/useLandmark.test.tsx       |  19 +-
 .../test/link}/useLink.test.js                |   2 +-
 .../test/menu}/useMenu.test.tsx               |   9 +-
 .../test/menu}/useMenuTrigger.test.js         |   2 +-
 .../test/numberfield}/useNumberField.test.ts  |   6 +-
 .../test/overlays}/DismissButton.test.tsx     |   2 +-
 .../test/overlays}/ariaHideOutside.test.js    |   4 +-
 .../test/overlays}/calculatePosition.test.ts  |   2 +-
 .../test/overlays}/useModal.ssr.test.js       |   0
 .../test/overlays}/useModal.test.js           |   2 +-
 .../test/overlays}/useModalOverlay.test.js    |   6 +-
 .../test/overlays}/useOverlay.test.js         |   4 +-
 .../overlays}/useOverlayPosition.test.tsx     |   2 +-
 .../test/overlays}/useOverlayTrigger.test.js  |   5 +-
 .../test/overlays}/usePopover.test.tsx        |   6 +-
 .../test/overlays}/usePreventScroll.test.js   |   2 +-
 .../test/progress}/useProgressBar.test.js     |   2 +-
 .../test/searchfield}/useSearchField.test.js  |   8 +-
 .../test/select}/HiddenSelect.test.tsx        |   7 +-
 .../useSelectableCollection.test.js           |   4 +-
 .../test/slider}/useSlider.test.js            |   5 +-
 .../test/slider}/useSliderThumb.test.js       |   5 +-
 .../test/spinbutton}/useSpinButton.test.js    |   6 +-
 .../test/ssr}/SSRProvider.ssr.test.js         |   0
 .../test/ssr}/SSRProvider.test.js             |   4 +-
 .../test/table}/ariaTableResizing.test.tsx    |  12 +-
 .../test/table}/tableResizingTests.tsx        |   0
 .../test/table}/useTable.test.tsx             |  15 +-
 .../table}/useTableBackwardCompat.test.tsx    |  15 +-
 .../test/tag}/useTagGroup.test.js             |  10 +-
 .../test/textfield}/useTextField.test.js      |   2 +-
 .../test/toast}/useToast.test.js              |   4 +-
 .../test/tooltip}/useTooltip.test.js          |   7 +-
 .../test/utils}/DOMFunctions.test.js          |   4 +-
 .../test/utils}/domHelpers.test.js            |   5 +-
 .../test/utils}/getNonce.test.js              |   4 +-
 .../test/utils}/mergeProps.test.jsx           |   4 +-
 .../test/utils}/mergeRefs.test.tsx            |   2 +-
 .../test/utils}/runAfterTransition.test.ts    |   2 +-
 .../test/utils}/shadowTreeWalker.test.tsx     |   4 +-
 .../test/utils}/useObjectRef.test.js          |   7 +-
 .../test/utils}/useViewportSize.ssr.test.tsx  |   0
 .../visually-hidden}/VisuallyHidden.test.tsx  |   2 +-
 .../autocomplete}/useAutocompleteState.mdx    |   0
 .../docs/calendar}/useCalendarState.mdx       |   0
 .../docs/calendar}/useRangeCalendarState.mdx  |   0
 .../docs/checkbox}/useCheckboxGroupState.mdx  |   0
 .../docs/color}/useColorAreaState.mdx         |   0
 .../docs/color}/useColorFieldState.mdx        |   0
 .../docs/color}/useColorSliderState.mdx       |   0
 .../docs/color}/useColorWheelState.mdx        |   0
 .../docs/combobox}/useComboBoxState.mdx       |   0
 .../docs/data}/useAsyncList.mdx               |   0
 .../docs/data}/useListData.mdx                |   0
 .../docs/data}/useTreeData.mdx                |   0
 .../docs/datepicker}/useDateFieldState.mdx    |   0
 .../docs/datepicker}/useDatePickerState.mdx   |   0
 .../datepicker}/useDateRangePickerState.mdx   |   0
 .../docs/datepicker}/useTimeFieldState.mdx    |   0
 .../disclosure}/useDisclosureGroupState.mdx   |   0
 .../docs/disclosure}/useDisclosureState.mdx   |   0
 .../docs/dnd}/useDraggableCollectionState.mdx |   0
 .../docs/dnd}/useDroppableCollectionState.mdx |   0
 .../docs/list}/useListState.mdx               |   0
 .../docs/list}/useSingleSelectListState.mdx   |   0
 .../docs/menu}/useMenuTriggerState.mdx        |   0
 .../docs/numberfield}/useNumberFieldState.mdx |   0
 .../docs/overlays}/useOverlayTriggerState.mdx |   0
 .../docs/radio}/useRadioGroupState.mdx        |   0
 .../docs/searchfield}/useSearchFieldState.mdx |   0
 .../docs/select}/useSelectState.mdx           |   0
 .../selection}/useMultipleSelectionState.mdx  |   0
 .../docs/slider}/useSliderState.mdx           |   0
 .../docs/table}/useTableState.mdx             |   0
 .../docs/tabs}/useTabListState.mdx            |   0
 .../docs/toast}/useToastState.mdx             |   0
 .../docs/toggle}/useToggleState.mdx           |   0
 .../docs/tooltip}/useTooltipTriggerState.mdx  |   0
 .../docs/tree}/useTreeState.mdx               |   0
 packages/react-stately/exports/Cell.ts        |  15 +
 packages/react-stately/exports/Color.ts       |  15 +
 packages/react-stately/exports/Column.ts      |  15 +
 .../exports/Item.ts}                          |   2 +-
 packages/react-stately/exports/Row.ts         |  15 +
 .../exports/Section.ts}                       |   2 +-
 packages/react-stately/exports/TableBody.ts   |  15 +
 packages/react-stately/exports/TableHeader.ts |  15 +
 packages/react-stately/exports/index.ts       | 118 ++++++++
 .../autocomplete/useAutocompleteState.ts      |   1 +
 .../exports/private/calendar/types.ts         |   1 +
 .../private/collections/CollectionBuilder.ts  |   1 +
 .../exports/private/collections/Section.ts    |   1 +
 .../private/collections/getChildNodes.ts      |   1 +
 .../private/collections/getItemCount.ts       |   1 +
 .../exports/private/collections/types.ts      |   1 +
 .../private/collections/useCollection.ts      |   1 +
 .../exports/private/datepicker/utils.ts       |   1 +
 .../exports/private/flags/flags.ts            |   1 +
 .../private/form/useFormValidationState.ts    |   1 +
 .../exports/private/grid/GridCollection.ts    |   1 +
 .../exports/private/grid/useGridState.ts      |   1 +
 .../exports/private/layout/GridLayout.ts      |   1 +
 .../exports/private/layout/ListLayout.ts      |   1 +
 .../exports/private/layout/TableLayout.ts     |   1 +
 .../exports/private/layout/WaterfallLayout.ts |   1 +
 .../exports/private/list/ListCollection.ts    |   1 +
 .../private/selection/SelectionManager.ts     |   1 +
 .../exports/private/selection/types.ts        |   1 +
 .../private/steplist/useStepListState.ts      |   1 +
 .../exports/private/table/TableCollection.ts  |   1 +
 .../private/table/TableColumnLayout.ts        |   1 +
 .../exports/private/table/useTableState.ts    |   1 +
 .../exports/private/table/useTreeGridState.ts |   1 +
 .../exports/private/tree/TreeCollection.ts    |   1 +
 .../exports/private/utils/number.ts           |   1 +
 .../private/utils/useControlledState.ts       |   1 +
 .../exports/private/virtualizer/Layout.ts     |   1 +
 .../exports/private/virtualizer/LayoutInfo.ts |   1 +
 .../exports/private/virtualizer/Point.ts      |   1 +
 .../exports/private/virtualizer/Rect.ts       |   1 +
 .../private/virtualizer/ReusableView.ts       |   1 +
 .../exports/private/virtualizer/Size.ts       |   1 +
 .../exports/private/virtualizer/types.ts      |   1 +
 .../virtualizer/useVirtualizerState.ts        |   1 +
 .../react-stately/exports/useAsyncList.ts     |  14 +
 .../react-stately/exports/useCalendarState.ts |  15 +
 .../exports/useCheckboxGroupState.ts          |  17 ++
 .../exports/useColorAreaState.ts              |  16 +
 .../exports/useColorFieldState.ts             |  18 ++
 .../exports/useColorPickerState.ts            |  17 ++
 .../exports/useColorSliderState.ts            |  17 ++
 .../exports/useColorWheelState.ts             |  16 +
 .../exports/useComboBoxState.ts}              |   4 +-
 .../exports/useDateFieldState.ts              |  15 +
 .../exports/useDatePickerState.ts             |  14 +
 .../exports/useDateRangePickerState.ts        |  14 +
 .../exports/useDisclosureGroupState.ts}       |   4 +-
 .../exports/useDisclosureState.ts}            |   4 +-
 .../exports/useDraggableCollectionState.ts    |  14 +
 .../exports/useDroppableCollectionState.ts    |  14 +
 packages/react-stately/exports/useListData.ts |  15 +
 .../react-stately/exports/useListState.ts     |  14 +
 .../exports/useMenuTriggerState.ts            |  19 ++
 .../exports/useMultipleSelectionState.ts      |  14 +
 .../exports/useNumberFieldState.ts            |  16 +
 .../exports/useOverlayTriggerState.ts         |  17 ++
 .../exports/useRadioGroupState.ts             |  17 ++
 .../exports/useRangeCalendarState.ts          |  15 +
 .../exports/useSearchFieldState.ts            |  17 ++
 .../react-stately/exports/useSelectState.ts   |  17 ++
 .../exports/useSingleSelectListState.ts       |  14 +
 .../react-stately/exports/useSliderState.ts   |  16 +
 .../react-stately/exports/useTabListState.ts  |  17 ++
 .../react-stately/exports/useTableState.ts    |  19 ++
 .../exports/useTimeFieldState.ts              |  15 +
 .../react-stately/exports/useToastState.ts    |  14 +
 .../exports/useToggleGroupState.ts            |  17 ++
 .../react-stately/exports/useToggleState.ts   |  16 +
 .../exports/useTooltipTriggerState.ts         |  17 ++
 packages/react-stately/exports/useTreeData.ts |  14 +
 .../react-stately/exports/useTreeState.ts     |  13 +
 packages/react-stately/index.ts               |  13 -
 .../intl/color}/ar-AE.json                    |   0
 .../intl/color}/bg-BG.json                    |   0
 .../intl/color}/cs-CZ.json                    |   0
 .../intl/color}/da-DK.json                    |   0
 .../intl/color}/de-DE.json                    |   0
 .../intl/color}/el-GR.json                    |   0
 .../intl/color}/en-US.json                    |   0
 .../intl/color}/es-ES.json                    |   0
 .../intl/color}/et-EE.json                    |   0
 .../intl/color}/fi-FI.json                    |   0
 .../intl/color}/fr-FR.json                    |   0
 .../intl/color}/he-IL.json                    |   0
 .../intl/color}/hr-HR.json                    |   0
 .../intl/color}/hu-HU.json                    |   0
 .../intl/color}/it-IT.json                    |   0
 .../intl/color}/ja-JP.json                    |   0
 .../intl/color}/ko-KR.json                    |   0
 .../intl/color}/lt-LT.json                    |   0
 .../intl/color}/lv-LV.json                    |   0
 .../intl/color}/nb-NO.json                    |   0
 .../intl/color}/nl-NL.json                    |   0
 .../intl/color}/pl-PL.json                    |   0
 .../intl/color}/pt-BR.json                    |   0
 .../intl/color}/pt-PT.json                    |   0
 .../intl/color}/ro-RO.json                    |   0
 .../intl/color}/ru-RU.json                    |   0
 .../intl/color}/sk-SK.json                    |   0
 .../intl/color}/sl-SI.json                    |   0
 .../intl/color}/sr-SP.json                    |   0
 .../intl/color}/sv-SE.json                    |   0
 .../intl/color}/tr-TR.json                    |   0
 .../intl/color}/uk-UA.json                    |   0
 .../intl/color}/zh-CN.json                    |   0
 .../intl/color}/zh-TW.json                    |   0
 .../intl/datepicker}/ar-AE.json               |   0
 .../intl/datepicker}/bg-BG.json               |   0
 .../intl/datepicker}/cs-CZ.json               |   0
 .../intl/datepicker}/da-DK.json               |   0
 .../intl/datepicker}/de-DE.json               |   0
 .../intl/datepicker}/el-GR.json               |   0
 .../intl/datepicker}/en-US.json               |   0
 .../intl/datepicker}/es-ES.json               |   0
 .../intl/datepicker}/et-EE.json               |   0
 .../intl/datepicker}/fi-FI.json               |   0
 .../intl/datepicker}/fr-FR.json               |   0
 .../intl/datepicker}/he-IL.json               |   0
 .../intl/datepicker}/hr-HR.json               |   0
 .../intl/datepicker}/hu-HU.json               |   0
 .../intl/datepicker}/it-IT.json               |   0
 .../intl/datepicker}/ja-JP.json               |   0
 .../intl/datepicker}/ko-KR.json               |   0
 .../intl/datepicker}/lt-LT.json               |   0
 .../intl/datepicker}/lv-LV.json               |   0
 .../intl/datepicker}/nb-NO.json               |   0
 .../intl/datepicker}/nl-NL.json               |   0
 .../intl/datepicker}/pl-PL.json               |   0
 .../intl/datepicker}/pt-BR.json               |   0
 .../intl/datepicker}/pt-PT.json               |   0
 .../intl/datepicker}/ro-RO.json               |   0
 .../intl/datepicker}/ru-RU.json               |   0
 .../intl/datepicker}/sk-SK.json               |   0
 .../intl/datepicker}/sl-SI.json               |   0
 .../intl/datepicker}/sr-SP.json               |   0
 .../intl/datepicker}/sv-SE.json               |   0
 .../intl/datepicker}/tr-TR.json               |   0
 .../intl/datepicker}/uk-UA.json               |   0
 .../intl/datepicker}/zh-CN.json               |   0
 .../intl/datepicker}/zh-TW.json               |   0
 packages/react-stately/package.json           |  94 +++---
 .../src/autocomplete}/useAutocompleteState.ts |   2 +-
 .../src/calendar}/types.ts                    |   0
 .../src/calendar}/useCalendarState.ts         |   2 +-
 .../src/calendar}/useRangeCalendarState.ts    |   2 +-
 .../src/calendar}/utils.ts                    |   0
 .../src/checkbox}/useCheckboxGroupState.ts    |   4 +-
 .../src/collections}/CollectionBuilder.ts     |   0
 .../src/collections}/Item.ts                  |   0
 .../src/collections}/Section.ts               |   0
 .../src/collections}/getChildNodes.ts         |   0
 .../src/collections}/getItemCount.ts          |   0
 .../src/collections}/types.ts                 |   0
 .../src/collections}/useCollection.ts         |   0
 .../src => react-stately/src/color}/Color.ts  |   4 +-
 .../src/color}/useColor.ts                    |   0
 .../src/color}/useColorAreaState.ts           |   4 +-
 .../src/color}/useColorChannelFieldState.ts   |   4 +-
 .../src/color}/useColorFieldState.ts          |   4 +-
 .../src/color}/useColorPickerState.ts         |   2 +-
 .../src/color}/useColorSliderState.ts         |   4 +-
 .../src/color}/useColorWheelState.ts          |   2 +-
 .../src/combobox}/useComboBoxState.ts         |  15 +-
 .../src/data}/useAsyncList.ts                 |   2 +-
 .../src/data}/useListData.ts                  |   0
 .../src/data}/useTreeData.ts                  |   0
 .../src/datepicker}/IncompleteDate.ts         |   0
 .../src/datepicker}/placeholders.ts           |   0
 .../src/datepicker}/useDateFieldState.ts      |   4 +-
 .../src/datepicker}/useDatePickerState.ts     |   6 +-
 .../datepicker}/useDateRangePickerState.ts    |   6 +-
 .../src/datepicker}/useTimeFieldState.ts      |   4 +-
 .../src/datepicker}/utils.ts                  |   4 +-
 .../disclosure}/useDisclosureGroupState.ts    |   2 +-
 .../src/disclosure}/useDisclosureState.ts     |   2 +-
 .../src/dnd}/useDraggableCollectionState.ts   |   2 +-
 .../src/dnd}/useDroppableCollectionState.ts   |   2 +-
 .../src => react-stately/src/flags}/flags.ts  |   0
 .../src/form}/useFormValidationState.ts       |   0
 .../src/grid}/GridCollection.ts               |   0
 .../src/grid}/useGridState.ts                 |   6 +-
 packages/react-stately/src/index.ts           |  62 ----
 .../src/layout}/GridLayout.ts                 |   6 +-
 .../src/layout}/ListLayout.ts                 |   8 +-
 .../src/layout}/TableLayout.ts                |  10 +-
 .../src/layout}/WaterfallLayout.ts            |   7 +-
 .../src/list}/ListCollection.ts               |   0
 .../src/list}/useListState.ts                 |   5 +-
 .../src/list}/useSingleSelectListState.ts     |   2 +-
 .../src/menu}/useMenuTriggerState.ts          |   2 +-
 .../src/menu}/useSubmenuTriggerState.ts       |   2 +-
 .../src/numberfield}/useNumberFieldState.ts   |   6 +-
 .../src/overlays}/useOverlayTriggerState.ts   |   2 +-
 .../src/radio}/useRadioGroupState.ts          |   4 +-
 .../src/searchfield}/useSearchFieldState.ts   |   2 +-
 .../src/select}/useSelectState.ts             |   8 +-
 .../src/selection}/Selection.ts               |   0
 .../src/selection}/SelectionManager.ts        |   2 +-
 .../src/selection}/types.ts                   |   0
 .../selection}/useMultipleSelectionState.ts   |   2 +-
 .../src/slider}/useSliderState.ts             |   4 +-
 .../src/steplist}/useStepListState.ts         |   4 +-
 .../src => react-stately/src/table}/Cell.ts   |   2 +-
 .../src => react-stately/src/table}/Column.ts |   2 +-
 .../src => react-stately/src/table}/Row.ts    |   2 +-
 .../src/table}/TableBody.ts                   |   2 +-
 .../src/table}/TableCollection.ts             |   4 +-
 .../src/table}/TableColumnLayout.ts           |   0
 .../src/table}/TableHeader.ts                 |   2 +-
 .../src/table}/TableUtils.ts                  |   0
 .../src/table}/useTableColumnResizeState.ts   |   0
 .../src/table}/useTableState.ts               |   9 +-
 .../src/table}/useTreeGridState.ts            |   6 +-
 .../src/tabs}/useTabListState.ts              |   2 +-
 .../src/toast}/useToastState.ts               |   0
 .../src/toggle}/useToggleGroupState.ts        |   2 +-
 .../src/toggle}/useToggleState.ts             |   2 +-
 .../src/tooltip}/useTooltipTriggerState.ts    |   2 +-
 .../src/tree}/TreeCollection.ts               |   0
 .../src/tree}/useTreeState.ts                 |   7 +-
 .../src => react-stately/src/utils}/number.ts |   0
 .../src/utils}/useControlledState.ts          |   0
 .../src/virtualizer}/Layout.ts                |   0
 .../src/virtualizer}/LayoutInfo.ts            |   0
 .../src/virtualizer}/OverscanManager.ts       |   0
 .../src/virtualizer}/Point.ts                 |   0
 .../src/virtualizer}/Rect.ts                  |   0
 .../src/virtualizer}/ReusableView.ts          |   0
 .../src/virtualizer}/Size.ts                  |   0
 .../src/virtualizer}/Virtualizer.ts           |   0
 .../src/virtualizer}/types.ts                 |   0
 .../src/virtualizer}/useVirtualizerState.ts   |   0
 .../src/virtualizer}/utils.ts                 |   0
 .../stories/tree}/useTreeState.stories.tsx    |  11 +-
 .../checkbox}/useCheckboxGroupState.test.tsx  |   2 +-
 .../test/color}/Color.test.tsx                |   2 +-
 .../test/color}/useColor.test.js              |   4 +-
 .../test/color}/useColorFieldState.test.js    |   4 +-
 .../test/combobox}/useComboBoxState.test.js   |   6 +-
 .../test/data}/useAsyncList.test.js           |   2 +-
 .../test/data}/useListData.test.js            |   2 +-
 .../test/data}/useTreeData.test.js            |   2 +-
 .../useDisclosureGroupState.test.ts           |   2 +-
 .../disclosure}/useDisclosureState.test.ts    |   2 +-
 .../searchfield}/useSearchFieldState.test.js  |   2 +-
 .../test/slider}/useSliderState.test.js       |   2 +-
 .../test/table}/TableUtils.test.js            |   4 +-
 .../test/toast}/useToastState.test.js         |   2 +-
 .../tooltip}/useTooltipTriggerState.test.js   |   5 +-
 .../test/tree}/useTreeState.test.js           |   2 +-
 .../test/utils}/number.test.ts                |   2 +-
 .../test/utils}/useControlledState.test.tsx   |   2 +-
 .../test/virtualizer}/LayoutInfo.test.tsx     |   4 +-
 4767 files changed, 16573 insertions(+), 11183 deletions(-)
 rename packages/{@react-spectrum/accordion/chromatic-fc => @adobe/react-spectrum/chromatic-fc/accordion}/Accordion.stories.tsx (87%)
 rename packages/{@react-spectrum/actionbar/chromatic-fc => @adobe/react-spectrum/chromatic-fc/actionbar}/ActionBar.stories.tsx (92%)
 rename packages/{@react-spectrum/actiongroup/chromatic-fc => @adobe/react-spectrum/chromatic-fc/actiongroup}/ActionGroup.stories.tsx (90%)
 rename packages/{@react-spectrum/autocomplete/chromatic-fc => @adobe/react-spectrum/chromatic-fc/autocomplete}/SearchAutocomplete.stories.tsx (92%)
 rename packages/{@react-spectrum/avatar/chromatic-fc => @adobe/react-spectrum/chromatic-fc/avatar}/Avatar.stories.tsx (93%)
 rename packages/{@react-spectrum/badge/chromatic-fc => @adobe/react-spectrum/chromatic-fc/badge}/Badge.stories.tsx (85%)
 rename packages/{@react-spectrum/breadcrumbs/chromatic-fc => @adobe/react-spectrum/chromatic-fc/breadcrumbs}/Breadcrumbs.stories.tsx (85%)
 rename packages/{@react-spectrum/button/chromatic-fc => @adobe/react-spectrum/chromatic-fc/button}/ActionButton.stories.tsx (93%)
 rename packages/{@react-spectrum/button/chromatic-fc => @adobe/react-spectrum/chromatic-fc/button}/Button.stories.tsx (88%)
 rename packages/{@react-spectrum/button/chromatic-fc => @adobe/react-spectrum/chromatic-fc/button}/LogicButton.stories.tsx (90%)
 rename packages/{@react-spectrum/button/chromatic-fc => @adobe/react-spectrum/chromatic-fc/button}/ToggleButton.stories.tsx (90%)
 rename packages/{@react-spectrum/calendar/chromatic-fc => @adobe/react-spectrum/chromatic-fc/calendar}/Calendar.stories.tsx (94%)
 rename packages/{@react-spectrum/calendar/chromatic-fc => @adobe/react-spectrum/chromatic-fc/calendar}/CalendarCell.stories.tsx (89%)
 rename packages/{@react-spectrum/card/chromatic-fc => @adobe/react-spectrum/chromatic-fc/card}/Card.stories.tsx (90%)
 rename packages/{@react-spectrum/card/chromatic-fc => @adobe/react-spectrum/chromatic-fc/card}/CardView.stories.tsx (87%)
 rename packages/{@react-spectrum/card/chromatic-fc => @adobe/react-spectrum/chromatic-fc/card}/QuietCard.stories.tsx (91%)
 rename packages/{@react-spectrum/checkbox/chromatic-fc => @adobe/react-spectrum/chromatic-fc/checkbox}/Checkbox.stories.tsx (85%)
 rename packages/{@react-spectrum/tree/chromatic-fc => @adobe/react-spectrum/chromatic-fc/tree}/TreeView.stories.tsx (95%)
 rename packages/{@react-spectrum/accordion/chromatic => @adobe/react-spectrum/chromatic/accordion}/Accordion.stories.tsx (96%)
 rename packages/{@react-spectrum/accordion/chromatic => @adobe/react-spectrum/chromatic/accordion}/Disclosure.stories.tsx (97%)
 rename packages/{@react-spectrum/actionbar/chromatic => @adobe/react-spectrum/chromatic/actionbar}/ActionBar.stories.tsx (93%)
 rename packages/{@react-spectrum/actiongroup/chromatic => @adobe/react-spectrum/chromatic/actiongroup}/ActionGroup.stories.tsx (97%)
 rename packages/{@react-spectrum/autocomplete/chromatic => @adobe/react-spectrum/chromatic/autocomplete}/SearchAutocomplete.stories.tsx (96%)
 rename packages/{@react-spectrum/autocomplete/chromatic => @adobe/react-spectrum/chromatic/autocomplete}/SearchAutocompleteRTL.stories.tsx (100%)
 rename packages/{@react-spectrum/avatar/chromatic => @adobe/react-spectrum/chromatic/avatar}/Avatar.stories.tsx (96%)
 rename packages/{@react-spectrum/badge/chromatic => @adobe/react-spectrum/chromatic/badge}/Badge.stories.tsx (94%)
 rename packages/{@react-spectrum/breadcrumbs/chromatic => @adobe/react-spectrum/chromatic/breadcrumbs}/Breadcrumbs.stories.tsx (94%)
 rename packages/{@react-spectrum/button/chromatic => @adobe/react-spectrum/chromatic/button}/ActionButton.stories.tsx (94%)
 rename packages/{@react-spectrum/button/chromatic => @adobe/react-spectrum/chromatic/button}/ActionButtonLanguages.stories.tsx (90%)
 rename packages/{@react-spectrum/button/chromatic => @adobe/react-spectrum/chromatic/button}/Button.stories.tsx (91%)
 rename packages/{@react-spectrum/button/chromatic => @adobe/react-spectrum/chromatic/button}/LogicButton.stories.tsx (89%)
 rename packages/{@react-spectrum/button/chromatic => @adobe/react-spectrum/chromatic/button}/ToggleButton.stories.tsx (93%)
 rename packages/{@react-spectrum/buttongroup/chromatic => @adobe/react-spectrum/chromatic/buttongroup}/ButtonGroup.stories.tsx (91%)
 rename packages/{@react-spectrum/calendar/chromatic => @adobe/react-spectrum/chromatic/calendar}/Calendar.stories.tsx (97%)
 rename packages/{@react-spectrum/calendar/chromatic => @adobe/react-spectrum/chromatic/calendar}/CalendarCell.stories.tsx (96%)
 rename packages/{@react-spectrum/calendar/chromatic => @adobe/react-spectrum/chromatic/calendar}/RangeCalendar.stories.tsx (96%)
 rename packages/{@react-spectrum/card/chromatic => @adobe/react-spectrum/chromatic/card}/Card.stories.tsx (99%)
 rename packages/{@react-spectrum/card/chromatic => @adobe/react-spectrum/chromatic/card}/CardView.stories.tsx (89%)
 rename packages/{@react-spectrum/card/chromatic => @adobe/react-spectrum/chromatic/card}/HorizontalCard.stories.tsx (98%)
 rename packages/{@react-spectrum/card/chromatic => @adobe/react-spectrum/chromatic/card}/QuietCard.stories.tsx (97%)
 rename packages/{@react-spectrum/checkbox/chromatic => @adobe/react-spectrum/chromatic/checkbox}/Checkbox.stories.tsx (95%)
 rename packages/{@react-spectrum/checkbox/chromatic => @adobe/react-spectrum/chromatic/checkbox}/CheckboxGroup.stories.tsx (94%)
 rename packages/{@react-spectrum/color/chromatic => @adobe/react-spectrum/chromatic/color}/ColorArea.stories.tsx (96%)
 rename packages/{@react-spectrum/color/chromatic => @adobe/react-spectrum/chromatic/color}/ColorField.stories.tsx (94%)
 rename packages/{@react-spectrum/color/chromatic => @adobe/react-spectrum/chromatic/color}/ColorFieldExpress.stories.tsx (100%)
 rename packages/{@react-spectrum/color/chromatic => @adobe/react-spectrum/chromatic/color}/ColorSlider.stories.tsx (93%)
 rename packages/{@react-spectrum/combobox/chromatic => @adobe/react-spectrum/chromatic/combobox}/ComboBox.stories.tsx (94%)
 rename packages/{@react-spectrum/combobox/chromatic => @adobe/react-spectrum/chromatic/combobox}/ComboBoxRTL.stories.tsx (100%)
 rename packages/{@react-spectrum/datepicker/chromatic => @adobe/react-spectrum/chromatic/datepicker}/DateField.stories.tsx (97%)
 rename packages/{@react-spectrum/datepicker/chromatic => @adobe/react-spectrum/chromatic/datepicker}/DatePicker.stories.tsx (98%)
 rename packages/{@react-spectrum/datepicker/chromatic => @adobe/react-spectrum/chromatic/datepicker}/DateRangePicker.stories.tsx (98%)
 rename packages/{@react-spectrum/datepicker/chromatic => @adobe/react-spectrum/chromatic/datepicker}/TimeField.stories.tsx (96%)
 rename packages/{@react-spectrum/dialog/chromatic => @adobe/react-spectrum/chromatic/dialog}/AlertDialog.stories.tsx (96%)
 rename packages/{@react-spectrum/dialog/chromatic => @adobe/react-spectrum/chromatic/dialog}/Dialog.stories.tsx (95%)
 rename packages/{@react-spectrum/dialog/chromatic => @adobe/react-spectrum/chromatic/dialog}/DialogExpress.stories.tsx (98%)
 rename packages/{@react-spectrum/dialog/chromatic => @adobe/react-spectrum/chromatic/dialog}/DialogLanguages.stories.tsx (85%)
 rename packages/{@react-spectrum/dialog/chromatic => @adobe/react-spectrum/chromatic/dialog}/intlMessages.json (100%)
 rename packages/{@react-spectrum/divider/chromatic => @adobe/react-spectrum/chromatic/divider}/Divider.stories.tsx (94%)
 rename packages/{@react-spectrum/dropzone/chromatic => @adobe/react-spectrum/chromatic/dropzone}/DropZone.stories.tsx (81%)
 rename packages/{@react-spectrum/form/chromatic => @adobe/react-spectrum/chromatic/form}/Form.stories.tsx (84%)
 rename packages/{@react-spectrum/form/chromatic => @adobe/react-spectrum/chromatic/form}/FormLanguages.stories.tsx (83%)
 rename packages/{@react-spectrum/form/chromatic => @adobe/react-spectrum/chromatic/form}/FormLongLabel.stories.tsx (87%)
 rename packages/{@react-spectrum/form/chromatic => @adobe/react-spectrum/chromatic/form}/intlMessages.json (100%)
 rename packages/{@react-spectrum/illustratedmessage/chromatic => @adobe/react-spectrum/chromatic/illustratedmessage}/IllustratedMessage.Languages.stories.tsx (91%)
 rename packages/{@react-spectrum/illustratedmessage/chromatic => @adobe/react-spectrum/chromatic/illustratedmessage}/IllustratedMessage.stories.tsx (94%)
 rename packages/{@react-spectrum/inlinealert/chromatic => @adobe/react-spectrum/chromatic/inlinealert}/InlineAlert.stories.tsx (93%)
 rename packages/{@react-spectrum/label/chromatic => @adobe/react-spectrum/chromatic/label}/HelpText.stories.tsx (97%)
 rename packages/{@react-spectrum/label/chromatic => @adobe/react-spectrum/chromatic/label}/Label.stories.tsx (95%)
 rename packages/{@react-spectrum/labeledvalue/chromatic => @adobe/react-spectrum/chromatic/labeledvalue}/LabeledValue.stories.tsx (95%)
 rename packages/{@react-spectrum/layout/chromatic => @adobe/react-spectrum/chromatic/layout}/Flex.stories.tsx (98%)
 rename packages/{@react-spectrum/layout/chromatic => @adobe/react-spectrum/chromatic/layout}/Grid.stories.tsx (96%)
 rename packages/{@react-spectrum/layout/chromatic => @adobe/react-spectrum/chromatic/layout}/styles.css (100%)
 rename packages/{@react-spectrum/link/chromatic => @adobe/react-spectrum/chromatic/link}/Link.stories.tsx (97%)
 rename packages/{@react-spectrum/list/chromatic => @adobe/react-spectrum/chromatic/list}/ListView.stories.tsx (91%)
 rename packages/{@react-spectrum/list/chromatic => @adobe/react-spectrum/chromatic/list}/ListViewRTL.stories.tsx (100%)
 rename packages/{@react-spectrum/listbox/chromatic => @adobe/react-spectrum/chromatic/listbox}/ListBox.stories.tsx (95%)
 rename packages/{@react-spectrum/listbox/chromatic => @adobe/react-spectrum/chromatic/listbox}/ListBoxLanguages.stories.tsx (91%)
 rename packages/{@react-spectrum/listbox/chromatic => @adobe/react-spectrum/chromatic/listbox}/intlMessages.json (100%)
 rename packages/{@react-spectrum/menu/chromatic => @adobe/react-spectrum/chromatic/menu}/MenuTrigger.stories.tsx (95%)
 rename packages/{@react-spectrum/menu/chromatic => @adobe/react-spectrum/chromatic/menu}/MenuTriggerExpress.stories.tsx (100%)
 rename packages/{@react-spectrum/menu/chromatic => @adobe/react-spectrum/chromatic/menu}/MenuTriggerLanguages.stories.tsx (85%)
 rename packages/{@react-spectrum/menu/chromatic => @adobe/react-spectrum/chromatic/menu}/MenuTriggerRTL.stories.tsx (100%)
 rename packages/{@react-spectrum/menu/chromatic => @adobe/react-spectrum/chromatic/menu}/Submenu.stories.tsx (93%)
 rename packages/{@react-spectrum/menu/chromatic => @adobe/react-spectrum/chromatic/menu}/Submenu.storiesRTL.tsx (100%)
 rename packages/{@react-spectrum/menu/chromatic => @adobe/react-spectrum/chromatic/menu}/intlMessages.json (100%)
 rename packages/{@react-spectrum/meter/chromatic => @adobe/react-spectrum/chromatic/meter}/Meter.stories.tsx (97%)
 rename packages/{@react-spectrum/numberfield/chromatic => @adobe/react-spectrum/chromatic/numberfield}/NumberField.stories.tsx (94%)
 rename packages/{@react-spectrum/picker/chromatic => @adobe/react-spectrum/chromatic/picker}/Picker.Languages.stories.tsx (95%)
 rename packages/{@react-spectrum/picker/chromatic => @adobe/react-spectrum/chromatic/picker}/Picker.stories.tsx (92%)
 rename packages/{@react-spectrum/progress/chromatic => @adobe/react-spectrum/chromatic/progress}/ProgressBar.stories.tsx (97%)
 rename packages/{@react-spectrum/progress/chromatic => @adobe/react-spectrum/chromatic/progress}/ProgressCircle.stories.tsx (97%)
 rename packages/{@react-spectrum/provider/chromatic => @adobe/react-spectrum/chromatic/provider}/Provider.stories.tsx (90%)
 rename packages/{@react-spectrum/provider/chromatic => @adobe/react-spectrum/chromatic/provider}/custom-theme.css (100%)
 rename packages/{@react-spectrum/radio/chromatic => @adobe/react-spectrum/chromatic/radio}/Radio.stories.tsx (94%)
 rename packages/{@react-spectrum/searchfield/chromatic => @adobe/react-spectrum/chromatic/searchfield}/SearchField.stories.tsx (91%)
 rename packages/{@react-spectrum/slider/chromatic => @adobe/react-spectrum/chromatic/slider}/RangeSlider.stories.tsx (88%)
 rename packages/{@react-spectrum/slider/chromatic => @adobe/react-spectrum/chromatic/slider}/Slider.stories.tsx (90%)
 rename packages/{@react-spectrum/statuslight/chromatic => @adobe/react-spectrum/chromatic/statuslight}/StatusLight.stories.tsx (92%)
 rename packages/{@react-spectrum/statuslight/chromatic => @adobe/react-spectrum/chromatic/statuslight}/StatusLightLanguages.stories.tsx (90%)
 rename packages/{@react-spectrum/steplist/chromatic => @adobe/react-spectrum/chromatic/steplist}/StepList.stories.tsx (97%)
 rename packages/{@react-spectrum/switch/chromatic => @adobe/react-spectrum/chromatic/switch}/Switch.stories.tsx (94%)
 rename packages/{@react-spectrum/table/chromatic => @adobe/react-spectrum/chromatic/table}/TableView.stories.tsx (95%)
 rename packages/{@react-spectrum/table/chromatic => @adobe/react-spectrum/chromatic/table}/TableViewRTL.stories.tsx (100%)
 rename packages/{@react-spectrum/table/chromatic => @adobe/react-spectrum/chromatic/table}/TreeGridTable.stories.tsx (95%)
 rename packages/{@react-spectrum/table/chromatic => @adobe/react-spectrum/chromatic/table}/TreeGridTableRTL.stories.tsx (100%)
 rename packages/{@react-spectrum/tabs/chromatic => @adobe/react-spectrum/chromatic/tabs}/Tabs.stories.tsx (97%)
 rename packages/{@react-spectrum/tag/chromatic => @adobe/react-spectrum/chromatic/tag}/TagGroup.stories.tsx (94%)
 rename packages/{@react-spectrum/textfield/chromatic => @adobe/react-spectrum/chromatic/textfield}/TextArea.stories.tsx (95%)
 rename packages/{@react-spectrum/textfield/chromatic => @adobe/react-spectrum/chromatic/textfield}/TextAreaLanguages.stories.tsx (96%)
 rename packages/{@react-spectrum/textfield/chromatic => @adobe/react-spectrum/chromatic/textfield}/Textfield.stories.tsx (95%)
 rename packages/{@react-spectrum/textfield/chromatic => @adobe/react-spectrum/chromatic/textfield}/TextfieldLanguages.stories.tsx (95%)
 rename packages/{@react-spectrum/toast/chromatic => @adobe/react-spectrum/chromatic/toast}/Toast.stories.tsx (95%)
 rename packages/{@react-spectrum/tooltip/chromatic => @adobe/react-spectrum/chromatic/tooltip}/Tooltip.stories.tsx (97%)
 rename packages/{@react-spectrum/tooltip/chromatic => @adobe/react-spectrum/chromatic/tooltip}/TooltipTrigger.stories.tsx (95%)
 rename packages/{@react-spectrum/tooltip/chromatic => @adobe/react-spectrum/chromatic/tooltip}/TooltipTriggerExpress.stories.tsx (94%)
 rename packages/{@react-spectrum/tooltip/chromatic => @adobe/react-spectrum/chromatic/tooltip}/TooltipTriggerRTL.stories.tsx (95%)
 rename packages/{@react-spectrum/tree/chromatic => @adobe/react-spectrum/chromatic/tree}/TreeView.stories.tsx (93%)
 rename packages/{@react-spectrum/view/chromatic => @adobe/react-spectrum/chromatic/view}/View.stories.tsx (96%)
 rename packages/{@react-spectrum/well/chromatic => @adobe/react-spectrum/chromatic/well}/Well.stories.tsx (95%)
 rename packages/{@react-spectrum/accordion/docs => @adobe/react-spectrum/docs/accordion}/Accordion.mdx (100%)
 rename packages/{@react-spectrum/accordion/docs => @adobe/react-spectrum/docs/accordion}/Disclosure.mdx (100%)
 rename packages/{@react-spectrum/actionbar/docs => @adobe/react-spectrum/docs/actionbar}/ActionBar.mdx (100%)
 rename packages/{@react-spectrum/actionbar/docs => @adobe/react-spectrum/docs/actionbar}/ActionBarAnatomy.svg (100%)
 rename packages/{@react-spectrum/actiongroup/docs => @adobe/react-spectrum/docs/actiongroup}/ActionGroup.mdx (100%)
 rename packages/{@react-spectrum/autocomplete/docs => @adobe/react-spectrum/docs/autocomplete}/SearchAutocomplete.mdx (100%)
 rename packages/{@react-spectrum/avatar/docs => @adobe/react-spectrum/docs/avatar}/Avatar.mdx (100%)
 rename packages/{@react-spectrum/badge/docs => @adobe/react-spectrum/docs/badge}/Badge.mdx (100%)
 rename packages/{@react-spectrum/breadcrumbs/docs => @adobe/react-spectrum/docs/breadcrumbs}/Breadcrumbs.mdx (100%)
 rename packages/{@react-spectrum/button/docs => @adobe/react-spectrum/docs/button}/ActionButton.mdx (100%)
 rename packages/{@react-spectrum/button/docs => @adobe/react-spectrum/docs/button}/Button.mdx (100%)
 rename packages/{@react-spectrum/button/docs => @adobe/react-spectrum/docs/button}/LogicButton.mdx (100%)
 rename packages/{@react-spectrum/button/docs => @adobe/react-spectrum/docs/button}/ToggleButton.mdx (100%)
 rename packages/{@react-spectrum/buttongroup/docs => @adobe/react-spectrum/docs/buttongroup}/ButtonGroup.mdx (100%)
 rename packages/{@react-spectrum/calendar/docs => @adobe/react-spectrum/docs/calendar}/Calendar.mdx (100%)
 rename packages/{@react-spectrum/calendar/docs => @adobe/react-spectrum/docs/calendar}/RangeCalendar.mdx (100%)
 rename packages/{@react-spectrum/card/docs => @adobe/react-spectrum/docs/card}/Card.mdx.placeholder (100%)
 rename packages/{@react-spectrum/checkbox/docs => @adobe/react-spectrum/docs/checkbox}/Checkbox.mdx (100%)
 rename packages/{@react-spectrum/checkbox/docs => @adobe/react-spectrum/docs/checkbox}/CheckboxGroup.mdx (100%)
 rename packages/{@react-spectrum/color/docs => @adobe/react-spectrum/docs/color}/ColorArea.mdx (100%)
 rename packages/{@react-spectrum/color/docs => @adobe/react-spectrum/docs/color}/ColorField.mdx (100%)
 rename packages/{@react-spectrum/color/docs => @adobe/react-spectrum/docs/color}/ColorPicker.mdx (100%)
 rename packages/{@react-spectrum/color/docs => @adobe/react-spectrum/docs/color}/ColorSlider.mdx (100%)
 rename packages/{@react-spectrum/color/docs => @adobe/react-spectrum/docs/color}/ColorSwatch.mdx (100%)
 rename packages/{@react-spectrum/color/docs => @adobe/react-spectrum/docs/color}/ColorSwatchPicker.mdx (100%)
 rename packages/{@react-spectrum/color/docs => @adobe/react-spectrum/docs/color}/ColorWheel.mdx (100%)
 rename packages/{@react-spectrum/combobox/docs => @adobe/react-spectrum/docs/combobox}/ComboBox.mdx (100%)
 rename packages/{@react-spectrum/contextualhelp/docs => @adobe/react-spectrum/docs/contextualhelp}/ContextualHelp.mdx (100%)
 rename packages/{@react-spectrum/datepicker/docs => @adobe/react-spectrum/docs/datepicker}/DateField.mdx (100%)
 rename packages/{@react-spectrum/datepicker/docs => @adobe/react-spectrum/docs/datepicker}/DatePicker.mdx (100%)
 rename packages/{@react-spectrum/datepicker/docs => @adobe/react-spectrum/docs/datepicker}/DateRangePicker.mdx (100%)
 rename packages/{@react-spectrum/datepicker/docs => @adobe/react-spectrum/docs/datepicker}/TimeField.mdx (100%)
 rename packages/{@react-spectrum/dialog/docs => @adobe/react-spectrum/docs/dialog}/AlertDialog.mdx (100%)
 rename packages/{@react-spectrum/dialog/docs => @adobe/react-spectrum/docs/dialog}/Dialog.mdx (100%)
 rename packages/{@react-spectrum/dialog/docs => @adobe/react-spectrum/docs/dialog}/DialogContainer.mdx (100%)
 rename packages/{@react-spectrum/dialog/docs => @adobe/react-spectrum/docs/dialog}/DialogTrigger.mdx (100%)
 rename packages/{@react-spectrum/dialog/docs => @adobe/react-spectrum/docs/dialog}/images/DialogAnatomy.svg (100%)
 rename packages/{@react-spectrum/divider/docs => @adobe/react-spectrum/docs/divider}/Divider.mdx (100%)
 rename packages/{@react-spectrum/dnd/docs => @adobe/react-spectrum/docs/dnd}/dnd.mdx (98%)
 rename packages/{@react-spectrum/dropzone/docs => @adobe/react-spectrum/docs/dropzone}/DropZone.mdx (100%)
 rename packages/{@react-spectrum/filetrigger/docs => @adobe/react-spectrum/docs/filetrigger}/FileTrigger.mdx (100%)
 rename packages/{@react-spectrum/form/docs => @adobe/react-spectrum/docs/form}/Form.mdx (100%)
 rename packages/{@react-spectrum/icon/docs => @adobe/react-spectrum/docs/icon}/custom-icons.mdx (100%)
 rename packages/{@react-spectrum/icon/docs => @adobe/react-spectrum/docs/icon}/workflow-icons.mdx (100%)
 rename packages/{@react-spectrum/illustratedmessage/docs => @adobe/react-spectrum/docs/illustratedmessage}/IllustratedMessage.mdx (100%)
 rename packages/{@react-spectrum/image/docs => @adobe/react-spectrum/docs/image}/Image.mdx (100%)
 rename packages/{@react-spectrum/inlinealert/docs => @adobe/react-spectrum/docs/inlinealert}/InlineAlert.mdx (100%)
 rename packages/{@react-spectrum/labeledvalue/docs => @adobe/react-spectrum/docs/labeledvalue}/LabeledValue.mdx (100%)
 rename packages/{@react-spectrum/labeledvalue/docs => @adobe/react-spectrum/docs/labeledvalue}/types.ts (88%)
 rename packages/{@react-spectrum/layout/docs => @adobe/react-spectrum/docs/layout}/Flex.mdx (100%)
 rename packages/{@react-spectrum/layout/docs => @adobe/react-spectrum/docs/layout}/Grid.mdx (100%)
 rename packages/{@react-spectrum/link/docs => @adobe/react-spectrum/docs/link}/Link.mdx (100%)
 rename packages/{@react-spectrum/list/docs => @adobe/react-spectrum/docs/list}/ListView.mdx (100%)
 rename packages/{@react-spectrum/list/docs => @adobe/react-spectrum/docs/list}/anatomy.svg (100%)
 rename packages/{@react-spectrum/listbox/docs => @adobe/react-spectrum/docs/listbox}/ListBox.mdx (100%)
 rename packages/{@react-spectrum/menu/docs => @adobe/react-spectrum/docs/menu}/ActionMenu.mdx (100%)
 rename packages/{@react-spectrum/menu/docs => @adobe/react-spectrum/docs/menu}/Menu.mdx (100%)
 rename packages/{@react-spectrum/menu/docs => @adobe/react-spectrum/docs/menu}/MenuTrigger.mdx (100%)
 rename packages/{@react-spectrum/meter/docs => @adobe/react-spectrum/docs/meter}/Meter.mdx (100%)
 rename packages/{@react-spectrum/numberfield/docs => @adobe/react-spectrum/docs/numberfield}/NumberField.mdx (100%)
 rename packages/{@react-spectrum/picker/docs => @adobe/react-spectrum/docs/picker}/Picker.mdx (100%)
 rename packages/{@react-spectrum/progress/docs => @adobe/react-spectrum/docs/progress}/ProgressBar.mdx (100%)
 rename packages/{@react-spectrum/progress/docs => @adobe/react-spectrum/docs/progress}/ProgressCircle.mdx (100%)
 rename packages/{@react-spectrum/provider/docs => @adobe/react-spectrum/docs/provider}/Provider.mdx (100%)
 rename packages/{@react-spectrum/radio/docs => @adobe/react-spectrum/docs/radio}/RadioGroup.mdx (100%)
 rename packages/{@react-spectrum/searchfield/docs => @adobe/react-spectrum/docs/searchfield}/SearchField.mdx (100%)
 rename packages/{@react-spectrum/slider/docs => @adobe/react-spectrum/docs/slider}/RangeSlider.mdx (100%)
 rename packages/{@react-spectrum/slider/docs => @adobe/react-spectrum/docs/slider}/Slider.mdx (100%)
 rename packages/{@react-spectrum/statuslight/docs => @adobe/react-spectrum/docs/statuslight}/StatusLight.mdx (100%)
 rename packages/{@react-spectrum/steplist/docs => @adobe/react-spectrum/docs/steplist}/StepList.mdx (100%)
 rename packages/{@react-spectrum/switch/docs => @adobe/react-spectrum/docs/switch}/Switch.mdx (100%)
 rename packages/{@react-spectrum/table/docs => @adobe/react-spectrum/docs/table}/TableView.mdx (100%)
 rename packages/{@react-spectrum/tabs/docs => @adobe/react-spectrum/docs/tabs}/Tabs.mdx (100%)
 rename packages/{@react-spectrum/tag/docs => @adobe/react-spectrum/docs/tag}/TagGroup.mdx (100%)
 rename packages/{@react-spectrum/text/docs => @adobe/react-spectrum/docs/text}/Heading.mdx (100%)
 rename packages/{@react-spectrum/text/docs => @adobe/react-spectrum/docs/text}/Keyboard.mdx (100%)
 rename packages/{@react-spectrum/text/docs => @adobe/react-spectrum/docs/text}/Text.mdx (100%)
 rename packages/{@react-spectrum/textfield/docs => @adobe/react-spectrum/docs/textfield}/TextArea.mdx (100%)
 rename packages/{@react-spectrum/textfield/docs => @adobe/react-spectrum/docs/textfield}/TextField.mdx (100%)
 rename packages/{@react-spectrum/toast/docs => @adobe/react-spectrum/docs/toast}/Toast.mdx (100%)
 rename packages/{@react-spectrum/tooltip/docs => @adobe/react-spectrum/docs/tooltip}/Tooltip.mdx (100%)
 rename packages/{@react-spectrum/tree/docs => @adobe/react-spectrum/docs/tree}/TreeView.mdx (100%)
 rename packages/{@react-spectrum/view/docs => @adobe/react-spectrum/docs/view}/Content.mdx (100%)
 rename packages/{@react-spectrum/view/docs => @adobe/react-spectrum/docs/view}/Footer.mdx (100%)
 rename packages/{@react-spectrum/view/docs => @adobe/react-spectrum/docs/view}/Header.mdx (100%)
 rename packages/{@react-spectrum/view/docs => @adobe/react-spectrum/docs/view}/View.mdx (100%)
 rename packages/{@react-spectrum/well/docs => @adobe/react-spectrum/docs/well}/Well.mdx (100%)
 create mode 100644 packages/@adobe/react-spectrum/exports/Accordion.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ActionBar.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ActionButton.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ActionGroup.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ActionMenu.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/AlertDialog.ts
 rename packages/{@react-spectrum/avatar/index.ts => @adobe/react-spectrum/exports/Avatar.ts} (80%)
 rename packages/{@react-aria/gridlist/index.ts => @adobe/react-spectrum/exports/Badge.ts} (80%)
 create mode 100644 packages/@adobe/react-spectrum/exports/Breadcrumbs.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Button.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ButtonGroup.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Calendar.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Checkbox.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/CheckboxGroup.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ColorArea.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ColorField.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ColorPicker.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ColorSlider.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ColorSwatch.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ColorSwatchPicker.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ColorWheel.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ComboBox.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Content.ts
 rename packages/{@react-spectrum/autocomplete/index.ts => @adobe/react-spectrum/exports/ContextualHelp.ts} (80%)
 create mode 100644 packages/@adobe/react-spectrum/exports/DateField.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/DatePicker.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/DateRangePicker.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Dialog.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/DialogContainer.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/DialogTrigger.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Divider.ts
 rename packages/{@react-aria/form/index.ts => @adobe/react-spectrum/exports/DropZone.ts} (79%)
 create mode 100644 packages/@adobe/react-spectrum/exports/Flex.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Footer.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Form.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Grid.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Header.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Heading.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Icon.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/IllustratedMessage.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Image.ts
 rename packages/{@react-aria/toolbar/index.ts => @adobe/react-spectrum/exports/InlineAlert.ts} (77%)
 create mode 100644 packages/@adobe/react-spectrum/exports/Keyboard.ts
 rename packages/{@react-spectrum/dnd/index.ts => @adobe/react-spectrum/exports/LabeledValue.ts} (76%)
 create mode 100644 packages/@adobe/react-spectrum/exports/Link.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ListBox.ts
 rename packages/{@react-aria/landmark/index.ts => @adobe/react-spectrum/exports/ListView.ts} (80%)
 create mode 100644 packages/@adobe/react-spectrum/exports/LogicButton.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Menu.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/MenuTrigger.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Meter.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/NumberField.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Picker.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ProgressBar.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ProgressCircle.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Provider.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/RadioGroup.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/RangeCalendar.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/RangeSlider.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/SearchField.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Slider.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/StatusLight.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Switch.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/TableView.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Tabs.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/TagGroup.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Text.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/TextArea.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/TextField.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/TimeField.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Toast.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/ToggleButton.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Tooltip.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/TreeView.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/View.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/Well.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/darkTheme.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/defaultTheme.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/index.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/lightTheme.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/autocomplete/SearchAutocomplete.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/button/ClearButton.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/button/FieldButton.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/card/Card.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/card/CardView.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/card/GalleryLayout.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/card/GridLayout.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/card/WaterfallLayout.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/form/Form.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/icon/Icon.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/icon/Illustration.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/icon/UIIcon.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/label/Field.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/label/HelpText.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/label/Label.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/listbox/ListBoxBase.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/overlays/Modal.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/overlays/OpenTransition.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/overlays/Overlay.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/overlays/Popover.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/overlays/Tray.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/progress/ProgressBarBase.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/provider/Provider.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/steplist/StepList.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/textfield/TextFieldBase.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/theme-express/expressTheme.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/utils/BreakpointProvider.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/utils/Slots.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/utils/classNames.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/utils/getWrappedElement.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/utils/styleProps.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/utils/useDOMRef.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/utils/useHasChild.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/utils/useIsMobileDevice.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/private/utils/useMediaQuery.ts
 create mode 100644 packages/@adobe/react-spectrum/exports/useDragAndDrop.ts
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/ar-AE.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/bg-BG.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/da-DK.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/de-DE.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/el-GR.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/en-US.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/es-ES.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/et-EE.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/fi-FI.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/fr-FR.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/he-IL.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/hr-HR.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/hu-HU.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/it-IT.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/ja-JP.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/ko-KR.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/lt-LT.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/lv-LV.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/nb-NO.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/nl-NL.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/pl-PL.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/pt-BR.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/pt-PT.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/ro-RO.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/ru-RU.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/sk-SK.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/sl-SI.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/sr-SP.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/sv-SE.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/tr-TR.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/uk-UA.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/zh-CN.json (100%)
 rename packages/{@react-spectrum/actionbar/intl => @adobe/react-spectrum/intl/actionbar}/zh-TW.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/ar-AE.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/bg-BG.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/da-DK.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/de-DE.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/el-GR.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/en-US.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/es-ES.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/et-EE.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/fi-FI.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/fr-FR.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/he-IL.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/hr-HR.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/hu-HU.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/it-IT.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/ja-JP.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/ko-KR.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/lt-LT.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/lv-LV.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/nb-NO.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/nl-NL.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/pl-PL.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/pt-BR.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/pt-PT.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/ro-RO.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/ru-RU.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/sk-SK.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/sl-SI.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/sr-SP.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/sv-SE.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/tr-TR.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/uk-UA.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/zh-CN.json (100%)
 rename packages/{@react-spectrum/actiongroup/intl => @adobe/react-spectrum/intl/actiongroup}/zh-TW.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/ar-AE.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/bg-BG.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/da-DK.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/de-DE.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/el-GR.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/en-US.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/es-ES.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/et-EE.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/fi-FI.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/fr-FR.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/he-IL.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/hr-HR.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/hu-HU.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/it-IT.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/ja-JP.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/ko-KR.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/lt-LT.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/lv-LV.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/nb-NO.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/nl-NL.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/pl-PL.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/pt-BR.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/pt-PT.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/ro-RO.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/ru-RU.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/sk-SK.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/sl-SI.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/sr-SP.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/sv-SE.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/tr-TR.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/uk-UA.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/zh-CN.json (100%)
 rename packages/{@react-spectrum/autocomplete/intl => @adobe/react-spectrum/intl/autocomplete}/zh-TW.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/ar-AE.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/bg-BG.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/da-DK.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/de-DE.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/el-GR.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/en-US.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/es-ES.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/et-EE.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/fi-FI.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/fr-FR.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/he-IL.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/hr-HR.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/hu-HU.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/it-IT.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/ja-JP.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/ko-KR.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/lt-LT.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/lv-LV.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/nb-NO.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/nl-NL.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/pl-PL.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/pt-BR.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/pt-PT.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/ro-RO.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/ru-RU.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/sk-SK.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/sl-SI.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/sr-SP.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/sv-SE.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/tr-TR.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/uk-UA.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/zh-CN.json (100%)
 rename packages/{@react-spectrum/button/intl => @adobe/react-spectrum/intl/button}/zh-TW.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/ar-AE.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/bg-BG.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/da-DK.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/de-DE.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/el-GR.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/en-US.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/es-ES.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/et-EE.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/fi-FI.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/fr-FR.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/he-IL.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/hr-HR.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/hu-HU.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/it-IT.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/ja-JP.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/ko-KR.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/lt-LT.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/lv-LV.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/nb-NO.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/nl-NL.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/pl-PL.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/pt-BR.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/pt-PT.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/ro-RO.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/ru-RU.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/sk-SK.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/sl-SI.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/sr-SP.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/sv-SE.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/tr-TR.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/uk-UA.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/zh-CN.json (100%)
 rename packages/{@react-spectrum/calendar/intl => @adobe/react-spectrum/intl/calendar}/zh-TW.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/ar-AE.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/bg-BG.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/da-DK.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/de-DE.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/el-GR.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/en-US.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/es-ES.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/et-EE.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/fi-FI.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/fr-FR.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/he-IL.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/hr-HR.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/hu-HU.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/it-IT.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/ja-JP.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/ko-KR.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/lt-LT.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/lv-LV.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/nb-NO.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/nl-NL.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/pl-PL.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/pt-BR.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/pt-PT.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/ro-RO.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/ru-RU.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/sk-SK.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/sl-SI.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/sr-SP.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/sv-SE.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/tr-TR.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/uk-UA.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/zh-CN.json (100%)
 rename packages/{@react-spectrum/card/intl => @adobe/react-spectrum/intl/card}/zh-TW.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/ar-AE.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/bg-BG.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/da-DK.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/de-DE.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/el-GR.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/en-US.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/es-ES.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/et-EE.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/fi-FI.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/fr-FR.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/he-IL.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/hr-HR.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/hu-HU.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/it-IT.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/ja-JP.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/ko-KR.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/lt-LT.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/lv-LV.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/nb-NO.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/nl-NL.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/pl-PL.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/pt-BR.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/pt-PT.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/ro-RO.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/ru-RU.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/sk-SK.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/sl-SI.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/sr-SP.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/sv-SE.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/tr-TR.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/uk-UA.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/zh-CN.json (100%)
 rename packages/{@react-spectrum/color/intl => @adobe/react-spectrum/intl/color}/zh-TW.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/ar-AE.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/bg-BG.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/da-DK.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/de-DE.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/el-GR.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/en-US.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/es-ES.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/et-EE.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/fi-FI.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/fr-FR.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/he-IL.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/hr-HR.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/hu-HU.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/it-IT.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/ja-JP.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/ko-KR.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/lt-LT.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/lv-LV.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/nb-NO.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/nl-NL.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/pl-PL.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/pt-BR.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/pt-PT.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/ro-RO.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/ru-RU.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/sk-SK.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/sl-SI.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/sr-SP.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/sv-SE.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/tr-TR.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/uk-UA.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/zh-CN.json (100%)
 rename packages/{@react-spectrum/combobox/intl => @adobe/react-spectrum/intl/combobox}/zh-TW.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/ar-AE.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/bg-BG.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/da-DK.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/de-DE.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/el-GR.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/en-US.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/es-ES.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/et-EE.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/fi-FI.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/fr-FR.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/he-IL.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/hr-HR.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/hu-HU.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/it-IT.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/ja-JP.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/ko-KR.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/lt-LT.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/lv-LV.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/nb-NO.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/nl-NL.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/pl-PL.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/pt-BR.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/pt-PT.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/ro-RO.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/ru-RU.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/sk-SK.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/sl-SI.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/sr-SP.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/sv-SE.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/tr-TR.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/uk-UA.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/zh-CN.json (100%)
 rename packages/{@react-spectrum/contextualhelp/intl => @adobe/react-spectrum/intl/contextualhelp}/zh-TW.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/ar-AE.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/bg-BG.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/da-DK.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/de-DE.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/el-GR.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/en-US.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/es-ES.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/et-EE.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/fi-FI.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/fr-FR.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/he-IL.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/hr-HR.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/hu-HU.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/it-IT.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/ja-JP.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/ko-KR.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/lt-LT.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/lv-LV.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/nb-NO.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/nl-NL.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/pl-PL.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/pt-BR.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/pt-PT.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/ro-RO.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/ru-RU.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/sk-SK.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/sl-SI.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/sr-SP.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/sv-SE.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/tr-TR.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/uk-UA.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/zh-CN.json (100%)
 rename packages/{@react-spectrum/datepicker/intl => @adobe/react-spectrum/intl/datepicker}/zh-TW.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/ar-AE.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/bg-BG.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/da-DK.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/de-DE.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/el-GR.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/en-US.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/es-ES.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/et-EE.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/fi-FI.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/fr-FR.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/he-IL.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/hr-HR.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/hu-HU.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/it-IT.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/ja-JP.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/ko-KR.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/lt-LT.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/lv-LV.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/nb-NO.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/nl-NL.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/pl-PL.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/pt-BR.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/pt-PT.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/ro-RO.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/ru-RU.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/sk-SK.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/sl-SI.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/sr-SP.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/sv-SE.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/tr-TR.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/uk-UA.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/zh-CN.json (100%)
 rename packages/{@react-spectrum/dialog/intl => @adobe/react-spectrum/intl/dialog}/zh-TW.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/ar-AE.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/bg-BG.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/da-DK.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/de-DE.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/el-GR.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/en-US.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/es-ES.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/et-EE.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/fi-FI.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/fr-FR.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/he-IL.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/hr-HR.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/hu-HU.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/it-IT.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/ja-JP.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/ko-KR.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/lt-LT.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/lv-LV.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/nb-NO.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/nl-NL.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/pl-PL.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/pt-BR.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/pt-PT.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/ro-RO.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/ru-RU.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/sk-SK.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/sl-SI.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/sr-SP.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/sv-SE.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/tr-TR.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/uk-UA.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/zh-CN.json (100%)
 rename packages/{@react-spectrum/dropzone/intl => @adobe/react-spectrum/intl/dropzone}/zh-TW.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/ar-AE.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/bg-BG.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/da-DK.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/de-DE.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/el-GR.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/en-US.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/es-ES.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/et-EE.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/fi-FI.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/fr-FR.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/he-IL.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/hr-HR.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/hu-HU.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/index.js (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/it-IT.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/ja-JP.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/ko-KR.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/lt-LT.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/lv-LV.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/nb-NO.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/nl-NL.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/pl-PL.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/pt-BR.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/pt-PT.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/ro-RO.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/ru-RU.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/sk-SK.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/sl-SI.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/sr-SP.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/sv-SE.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/tr-TR.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/uk-UA.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/zh-CN.json (100%)
 rename packages/{@react-spectrum/inlinealert/intl => @adobe/react-spectrum/intl/inlinealert}/zh-TW.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/ar-AE.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/bg-BG.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/da-DK.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/de-DE.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/el-GR.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/en-US.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/es-ES.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/et-EE.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/fi-FI.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/fr-FR.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/he-IL.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/hr-HR.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/hu-HU.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/it-IT.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/ja-JP.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/ko-KR.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/lt-LT.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/lv-LV.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/nb-NO.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/nl-NL.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/pl-PL.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/pt-BR.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/pt-PT.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/ro-RO.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/ru-RU.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/sk-SK.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/sl-SI.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/sr-SP.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/sv-SE.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/tr-TR.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/uk-UA.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/zh-CN.json (100%)
 rename packages/{@react-spectrum/label/intl => @adobe/react-spectrum/intl/label}/zh-TW.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/ar-AE.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/bg-BG.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/da-DK.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/de-DE.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/el-GR.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/en-US.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/es-ES.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/et-EE.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/fi-FI.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/fr-FR.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/he-IL.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/hr-HR.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/hu-HU.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/it-IT.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/ja-JP.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/ko-KR.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/lt-LT.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/lv-LV.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/nb-NO.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/nl-NL.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/pl-PL.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/pt-BR.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/pt-PT.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/ro-RO.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/ru-RU.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/sk-SK.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/sl-SI.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/sr-SP.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/sv-SE.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/tr-TR.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/uk-UA.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/zh-CN.json (100%)
 rename packages/{@react-spectrum/list/intl => @adobe/react-spectrum/intl/list}/zh-TW.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/ar-AE.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/bg-BG.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/da-DK.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/de-DE.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/el-GR.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/en-US.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/es-ES.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/et-EE.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/fi-FI.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/fr-FR.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/he-IL.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/hr-HR.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/hu-HU.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/it-IT.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/ja-JP.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/ko-KR.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/lt-LT.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/lv-LV.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/nb-NO.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/nl-NL.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/pl-PL.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/pt-BR.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/pt-PT.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/ro-RO.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/ru-RU.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/sk-SK.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/sl-SI.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/sr-SP.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/sv-SE.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/tr-TR.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/uk-UA.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/zh-CN.json (100%)
 rename packages/{@react-spectrum/listbox/intl => @adobe/react-spectrum/intl/listbox}/zh-TW.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/ar-AE.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/bg-BG.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/da-DK.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/de-DE.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/el-GR.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/en-US.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/es-ES.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/et-EE.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/fi-FI.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/fr-FR.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/he-IL.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/hr-HR.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/hu-HU.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/it-IT.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/ja-JP.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/ko-KR.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/lt-LT.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/lv-LV.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/nb-NO.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/nl-NL.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/pl-PL.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/pt-BR.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/pt-PT.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/ro-RO.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/ru-RU.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/sk-SK.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/sl-SI.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/sr-SP.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/sv-SE.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/tr-TR.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/uk-UA.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/zh-CN.json (100%)
 rename packages/{@react-spectrum/menu/intl => @adobe/react-spectrum/intl/menu}/zh-TW.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/ar-AE.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/bg-BG.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/da-DK.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/de-DE.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/el-GR.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/en-US.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/es-ES.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/et-EE.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/fi-FI.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/fr-FR.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/he-IL.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/hr-HR.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/hu-HU.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/it-IT.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/ja-JP.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/ko-KR.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/lt-LT.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/lv-LV.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/nb-NO.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/nl-NL.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/pl-PL.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/pt-BR.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/pt-PT.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/ro-RO.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/ru-RU.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/sk-SK.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/sl-SI.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/sr-SP.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/sv-SE.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/tr-TR.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/uk-UA.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/zh-CN.json (100%)
 rename packages/{@react-spectrum/picker/intl => @adobe/react-spectrum/intl/picker}/zh-TW.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/ar-AE.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/bg-BG.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/da-DK.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/de-DE.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/el-GR.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/en-US.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/es-ES.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/et-EE.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/fi-FI.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/fr-FR.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/he-IL.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/hr-HR.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/hu-HU.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/it-IT.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/ja-JP.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/ko-KR.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/lt-LT.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/lv-LV.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/nb-NO.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/nl-NL.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/pl-PL.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/pt-BR.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/pt-PT.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/ro-RO.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/ru-RU.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/sk-SK.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/sl-SI.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/sr-SP.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/sv-SE.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/tr-TR.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/uk-UA.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/zh-CN.json (100%)
 rename packages/{@react-spectrum/slider/intl => @adobe/react-spectrum/intl/slider}/zh-TW.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/ar-AE.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/bg-BG.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/da-DK.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/de-DE.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/el-GR.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/en-US.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/es-ES.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/et-EE.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/fi-FI.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/fr-FR.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/he-IL.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/hr-HR.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/hu-HU.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/it-IT.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/ja-JP.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/ko-KR.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/lt-LT.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/lv-LV.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/nb-NO.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/nl-NL.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/pl-PL.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/pt-BR.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/pt-PT.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/ro-RO.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/ru-RU.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/sk-SK.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/sl-SI.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/sr-SP.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/sv-SE.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/tr-TR.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/uk-UA.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/zh-CN.json (100%)
 rename packages/{@react-spectrum/steplist/intl => @adobe/react-spectrum/intl/steplist}/zh-TW.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/ar-AE.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/bg-BG.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/da-DK.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/de-DE.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/el-GR.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/en-US.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/es-ES.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/et-EE.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/fi-FI.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/fr-FR.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/he-IL.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/hr-HR.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/hu-HU.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/it-IT.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/ja-JP.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/ko-KR.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/lt-LT.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/lv-LV.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/nb-NO.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/nl-NL.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/pl-PL.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/pt-BR.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/pt-PT.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/ro-RO.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/ru-RU.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/sk-SK.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/sl-SI.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/sr-SP.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/sv-SE.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/tr-TR.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/uk-UA.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/zh-CN.json (100%)
 rename packages/{@react-spectrum/table/intl => @adobe/react-spectrum/intl/table}/zh-TW.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/ar-AE.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/bg-BG.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/da-DK.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/de-DE.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/el-GR.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/en-US.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/es-ES.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/et-EE.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/fi-FI.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/fr-FR.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/he-IL.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/hr-HR.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/hu-HU.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/it-IT.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/ja-JP.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/ko-KR.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/lt-LT.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/lv-LV.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/nb-NO.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/nl-NL.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/pl-PL.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/pt-BR.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/pt-PT.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/ro-RO.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/ru-RU.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/sk-SK.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/sl-SI.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/sr-SP.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/sv-SE.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/tr-TR.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/uk-UA.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/zh-CN.json (100%)
 rename packages/{@react-spectrum/tag/intl => @adobe/react-spectrum/intl/tag}/zh-TW.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/ar-AE.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/bg-BG.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/da-DK.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/de-DE.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/el-GR.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/en-US.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/es-ES.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/et-EE.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/fi-FI.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/fr-FR.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/he-IL.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/hr-HR.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/hu-HU.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/it-IT.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/ja-JP.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/ko-KR.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/lt-LT.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/lv-LV.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/nb-NO.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/nl-NL.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/pl-PL.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/pt-BR.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/pt-PT.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/ro-RO.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/ru-RU.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/sk-SK.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/sl-SI.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/sr-SP.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/sv-SE.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/tr-TR.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/uk-UA.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/zh-CN.json (100%)
 rename packages/{@react-spectrum/textfield/intl => @adobe/react-spectrum/intl/textfield}/zh-TW.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/ar-AE.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/bg-BG.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/cs-CZ.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/da-DK.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/de-DE.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/el-GR.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/en-US.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/es-ES.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/et-EE.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/fi-FI.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/fr-FR.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/he-IL.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/hr-HR.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/hu-HU.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/it-IT.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/ja-JP.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/ko-KR.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/lt-LT.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/lv-LV.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/nb-NO.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/nl-NL.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/pl-PL.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/pt-BR.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/pt-PT.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/ro-RO.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/ru-RU.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/sk-SK.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/sl-SI.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/sr-SP.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/sv-SE.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/tr-TR.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/uk-UA.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/zh-CN.json (100%)
 rename packages/{@react-spectrum/toast/intl => @adobe/react-spectrum/intl/toast}/zh-TW.json (100%)
 rename packages/{@react-spectrum/accordion/src => @adobe/react-spectrum/src/accordion}/Accordion.tsx (90%)
 rename packages/{@react-spectrum/actionbar/src => @adobe/react-spectrum/src/actionbar}/ActionBar.tsx (85%)
 rename packages/{@react-spectrum/actionbar/src => @adobe/react-spectrum/src/actionbar}/ActionBarContainer.tsx (86%)
 rename packages/{@react-spectrum/actionbar/src => @adobe/react-spectrum/src/actionbar}/actionbar.css (100%)
 rename packages/{@react-spectrum/actiongroup/src => @adobe/react-spectrum/src/actiongroup}/ActionGroup.tsx (90%)
 rename packages/{@react-spectrum/autocomplete/src => @adobe/react-spectrum/src/autocomplete}/MobileSearchAutocomplete.tsx (91%)
 rename packages/{@react-spectrum/autocomplete/src => @adobe/react-spectrum/src/autocomplete}/SearchAutocomplete.tsx (90%)
 rename packages/{@react-spectrum/autocomplete/src => @adobe/react-spectrum/src/autocomplete}/searchautocomplete.css (100%)
 rename packages/{@react-spectrum/avatar/src => @adobe/react-spectrum/src/avatar}/Avatar.tsx (86%)
 rename packages/{@react-spectrum/badge/src => @adobe/react-spectrum/src/badge}/Badge.tsx (85%)
 rename packages/{@react-spectrum/breadcrumbs/src => @adobe/react-spectrum/src/breadcrumbs}/BreadcrumbItem.tsx (88%)
 rename packages/{@react-spectrum/breadcrumbs/src => @adobe/react-spectrum/src/breadcrumbs}/Breadcrumbs.tsx (92%)
 rename packages/{@react-spectrum/button/src => @adobe/react-spectrum/src/button}/ActionButton.tsx (87%)
 rename packages/{@react-spectrum/button/src => @adobe/react-spectrum/src/button}/Button.tsx (89%)
 rename packages/{@react-spectrum/button/src => @adobe/react-spectrum/src/button}/ClearButton.tsx (89%)
 rename packages/{@react-spectrum/button/src => @adobe/react-spectrum/src/button}/FieldButton.tsx (86%)
 rename packages/{@react-spectrum/button/src => @adobe/react-spectrum/src/button}/LogicButton.tsx (83%)
 rename packages/{@react-spectrum/button/src => @adobe/react-spectrum/src/button}/ToggleButton.tsx (84%)
 rename packages/{@react-spectrum/buttongroup/src => @adobe/react-spectrum/src/buttongroup}/ButtonGroup.tsx (87%)
 rename packages/{@react-spectrum/calendar/src => @adobe/react-spectrum/src/calendar}/Calendar.tsx (89%)
 rename packages/{@react-spectrum/calendar/src => @adobe/react-spectrum/src/calendar}/CalendarBase.tsx (90%)
 rename packages/{@react-spectrum/calendar/src => @adobe/react-spectrum/src/calendar}/CalendarCell.tsx (90%)
 rename packages/{@react-spectrum/calendar/src => @adobe/react-spectrum/src/calendar}/CalendarMonth.tsx (92%)
 rename packages/{@react-spectrum/calendar/src => @adobe/react-spectrum/src/calendar}/RangeCalendar.tsx (88%)
 rename packages/{@react-spectrum/card/src => @adobe/react-spectrum/src/card}/BaseLayout.tsx (95%)
 rename packages/{@react-spectrum/card/src => @adobe/react-spectrum/src/card}/Card.tsx (96%)
 rename packages/{@react-spectrum/card/src => @adobe/react-spectrum/src/card}/CardBase.tsx (87%)
 rename packages/{@react-spectrum/card/src => @adobe/react-spectrum/src/card}/CardView.tsx (86%)
 rename packages/{@react-spectrum/card/src => @adobe/react-spectrum/src/card}/CardViewContext.tsx (100%)
 rename packages/{@react-spectrum/card/src => @adobe/react-spectrum/src/card}/GalleryLayout.tsx (98%)
 rename packages/{@react-spectrum/card/src => @adobe/react-spectrum/src/card}/GridLayout.tsx (96%)
 rename packages/{@react-spectrum/card/src => @adobe/react-spectrum/src/card}/WaterfallLayout.tsx (96%)
 rename packages/{@react-spectrum/checkbox/src => @adobe/react-spectrum/src/checkbox}/Checkbox.tsx (87%)
 rename packages/{@react-spectrum/checkbox/src => @adobe/react-spectrum/src/checkbox}/CheckboxGroup.tsx (84%)
 rename packages/{@react-spectrum/checkbox/src => @adobe/react-spectrum/src/checkbox}/context.ts (91%)
 rename packages/{@react-spectrum/color/src => @adobe/react-spectrum/src/color}/ColorArea.tsx (84%)
 rename packages/{@react-spectrum/color/src => @adobe/react-spectrum/src/color}/ColorEditor.tsx (88%)
 rename packages/{@react-spectrum/color/src => @adobe/react-spectrum/src/color}/ColorField.tsx (87%)
 rename packages/{@react-spectrum/color/src => @adobe/react-spectrum/src/color}/ColorPicker.tsx (90%)
 rename packages/{@react-spectrum/color/src => @adobe/react-spectrum/src/color}/ColorSlider.tsx (86%)
 rename packages/{@react-spectrum/color/src => @adobe/react-spectrum/src/color}/ColorSwatch.tsx (92%)
 rename packages/{@react-spectrum/color/src => @adobe/react-spectrum/src/color}/ColorSwatchPicker.tsx (93%)
 rename packages/{@react-spectrum/color/src => @adobe/react-spectrum/src/color}/ColorThumb.tsx (95%)
 rename packages/{@react-spectrum/color/src => @adobe/react-spectrum/src/color}/ColorWheel.tsx (84%)
 rename packages/{@react-spectrum/color/src => @adobe/react-spectrum/src/color}/colorfield.css (100%)
 rename packages/{@react-spectrum/combobox/src => @adobe/react-spectrum/src/combobox}/ComboBox.tsx (90%)
 rename packages/{@react-spectrum/combobox/src => @adobe/react-spectrum/src/combobox}/MobileComboBox.tsx (91%)
 rename packages/{@react-spectrum/combobox/src => @adobe/react-spectrum/src/combobox}/combobox.css (100%)
 rename packages/{@react-spectrum/contextualhelp/src => @adobe/react-spectrum/src/contextualhelp}/ContextualHelp.tsx (82%)
 rename packages/{@react-spectrum/datepicker/src => @adobe/react-spectrum/src/datepicker}/DateField.tsx (91%)
 rename packages/{@react-spectrum/datepicker/src => @adobe/react-spectrum/src/datepicker}/DatePicker.tsx (89%)
 rename packages/{@react-spectrum/datepicker/src => @adobe/react-spectrum/src/datepicker}/DatePickerField.tsx (90%)
 rename packages/{@react-spectrum/datepicker/src => @adobe/react-spectrum/src/datepicker}/DatePickerSegment.tsx (92%)
 rename packages/{@react-spectrum/datepicker/src => @adobe/react-spectrum/src/datepicker}/DateRangePicker.tsx (90%)
 rename packages/{@react-spectrum/datepicker/src => @adobe/react-spectrum/src/datepicker}/Input.tsx (91%)
 rename packages/{@react-spectrum/datepicker/src => @adobe/react-spectrum/src/datepicker}/TimeField.tsx (90%)
 rename packages/{@react-spectrum/datepicker/src => @adobe/react-spectrum/src/datepicker}/styles.css (100%)
 rename packages/{@react-spectrum/datepicker/src => @adobe/react-spectrum/src/datepicker}/utils.tsx (86%)
 rename packages/{@react-spectrum/dialog/src => @adobe/react-spectrum/src/dialog}/AlertDialog.tsx (86%)
 rename packages/{@react-spectrum/dialog/src => @adobe/react-spectrum/src/dialog}/Dialog.tsx (88%)
 rename packages/{@react-spectrum/dialog/src => @adobe/react-spectrum/src/dialog}/DialogContainer.tsx (95%)
 rename packages/{@react-spectrum/dialog/src => @adobe/react-spectrum/src/dialog}/DialogTrigger.tsx (93%)
 rename packages/{@react-spectrum/dialog/src => @adobe/react-spectrum/src/dialog}/context.ts (100%)
 rename packages/{@react-spectrum/dialog/src => @adobe/react-spectrum/src/dialog}/useDialogContainer.ts (100%)
 rename packages/{@react-spectrum/divider/src => @adobe/react-spectrum/src/divider}/Divider.tsx (89%)
 rename packages/{@react-spectrum/dnd/src => @adobe/react-spectrum/src/dnd}/useDragAndDrop.ts (92%)
 rename packages/{@react-spectrum/dropzone/src => @adobe/react-spectrum/src/dropzone}/DropZone.tsx (84%)
 rename packages/{@react-spectrum/form/src => @adobe/react-spectrum/src/form}/Form.tsx (89%)
 rename packages/{@react-spectrum/icon/src => @adobe/react-spectrum/src/icon}/Icon.tsx (89%)
 rename packages/{@react-spectrum/icon/src => @adobe/react-spectrum/src/icon}/Illustration.tsx (92%)
 rename packages/{@react-spectrum/icon/src => @adobe/react-spectrum/src/icon}/UIIcon.tsx (87%)
 rename packages/{@react-spectrum/illustratedmessage/src => @adobe/react-spectrum/src/illustratedmessage}/IllustratedMessage.tsx (87%)
 rename packages/{@react-spectrum/image/src => @adobe/react-spectrum/src/image}/Image.tsx (87%)
 delete mode 100644 packages/@adobe/react-spectrum/src/index.ts
 rename packages/{@react-spectrum/inlinealert/src => @adobe/react-spectrum/src/inlinealert}/InlineAlert.tsx (86%)
 rename packages/{@react-spectrum/label/src => @adobe/react-spectrum/src/label}/Field.tsx (94%)
 rename packages/{@react-spectrum/label/src => @adobe/react-spectrum/src/label}/HelpText.tsx (94%)
 rename packages/{@react-spectrum/label/src => @adobe/react-spectrum/src/label}/Label.tsx (88%)
 rename packages/{@react-spectrum/labeledvalue/src => @adobe/react-spectrum/src/labeledvalue}/LabeledValue.tsx (94%)
 rename packages/{@react-spectrum/layout/src => @adobe/react-spectrum/src/layout}/Flex.tsx (89%)
 rename packages/{@react-spectrum/layout/src => @adobe/react-spectrum/src/layout}/Grid.tsx (96%)
 rename packages/{@react-spectrum/layout/src => @adobe/react-spectrum/src/layout}/flex-gap.css (100%)
 rename packages/{@react-spectrum/link/src => @adobe/react-spectrum/src/link}/Link.tsx (83%)
 rename packages/{@react-spectrum/list/src => @adobe/react-spectrum/src/list}/DragPreview.tsx (94%)
 rename packages/{@react-spectrum/list/src => @adobe/react-spectrum/src/list}/InsertionIndicator.tsx (92%)
 rename packages/{@react-spectrum/list/src => @adobe/react-spectrum/src/list}/ListView.tsx (90%)
 rename packages/{@react-spectrum/list/src => @adobe/react-spectrum/src/list}/ListViewItem.tsx (91%)
 rename packages/{@react-spectrum/list/src => @adobe/react-spectrum/src/list}/ListViewLayout.ts (88%)
 rename packages/{@react-spectrum/list/src => @adobe/react-spectrum/src/list}/RootDropIndicator.tsx (93%)
 rename packages/{@react-spectrum/list/src => @adobe/react-spectrum/src/list}/styles.css (100%)
 rename packages/{@react-spectrum/listbox/src => @adobe/react-spectrum/src/listbox}/ListBox.tsx (93%)
 rename packages/{@react-spectrum/listbox/src => @adobe/react-spectrum/src/listbox}/ListBoxBase.tsx (87%)
 rename packages/{@react-spectrum/listbox/src => @adobe/react-spectrum/src/listbox}/ListBoxContext.ts (94%)
 rename packages/{@react-spectrum/listbox/src => @adobe/react-spectrum/src/listbox}/ListBoxLayout.ts (89%)
 rename packages/{@react-spectrum/listbox/src => @adobe/react-spectrum/src/listbox}/ListBoxOption.tsx (89%)
 rename packages/{@react-spectrum/listbox/src => @adobe/react-spectrum/src/listbox}/ListBoxSection.tsx (85%)
 rename packages/{@react-spectrum/menu/src => @adobe/react-spectrum/src/menu}/ActionMenu.tsx (87%)
 rename packages/{@react-spectrum/menu/src => @adobe/react-spectrum/src/menu}/ContextualHelpTrigger.tsx (91%)
 rename packages/{@react-spectrum/menu/src => @adobe/react-spectrum/src/menu}/Menu.tsx (90%)
 rename packages/{@react-spectrum/menu/src => @adobe/react-spectrum/src/menu}/MenuItem.tsx (88%)
 rename packages/{@react-spectrum/menu/src => @adobe/react-spectrum/src/menu}/MenuSection.tsx (91%)
 rename packages/{@react-spectrum/menu/src => @adobe/react-spectrum/src/menu}/MenuTrigger.tsx (86%)
 rename packages/{@react-spectrum/menu/src => @adobe/react-spectrum/src/menu}/SubmenuTrigger.tsx (91%)
 rename packages/{@react-spectrum/menu/src => @adobe/react-spectrum/src/menu}/context.ts (95%)
 rename packages/{@react-spectrum/menu/src => @adobe/react-spectrum/src/menu}/overlays.css (100%)
 rename packages/{@react-spectrum/menu/src => @adobe/react-spectrum/src/menu}/useCloseOnScroll.ts (96%)
 rename packages/{@react-spectrum/meter/src => @adobe/react-spectrum/src/meter}/Meter.tsx (91%)
 rename packages/{@react-spectrum/numberfield/src => @adobe/react-spectrum/src/numberfield}/NumberField.tsx (89%)
 rename packages/{@react-spectrum/numberfield/src => @adobe/react-spectrum/src/numberfield}/StepButton.tsx (90%)
 rename packages/{@react-spectrum/overlays/src => @adobe/react-spectrum/src/overlays}/Modal.tsx (89%)
 rename packages/{@react-spectrum/overlays/src => @adobe/react-spectrum/src/overlays}/OpenTransition.tsx (100%)
 rename packages/{@react-spectrum/overlays/src => @adobe/react-spectrum/src/overlays}/Overlay.tsx (95%)
 rename packages/{@react-spectrum/overlays/src => @adobe/react-spectrum/src/overlays}/Popover.tsx (93%)
 rename packages/{@react-spectrum/overlays/src => @adobe/react-spectrum/src/overlays}/Tray.tsx (89%)
 rename packages/{@react-spectrum/overlays/src => @adobe/react-spectrum/src/overlays}/Underlay.tsx (93%)
 rename packages/{@react-spectrum/overlays/src => @adobe/react-spectrum/src/overlays}/overlays.css (100%)
 rename packages/{@react-spectrum/picker/src => @adobe/react-spectrum/src/picker}/Picker.tsx (86%)
 rename packages/{@react-spectrum/progress/src => @adobe/react-spectrum/src/progress}/ProgressBar.tsx (94%)
 rename packages/{@react-spectrum/progress/src => @adobe/react-spectrum/src/progress}/ProgressBarBase.tsx (94%)
 rename packages/{@react-spectrum/progress/src => @adobe/react-spectrum/src/progress}/ProgressCircle.tsx (93%)
 rename packages/{@react-spectrum/provider/src => @adobe/react-spectrum/src/provider}/Provider.tsx (92%)
 rename packages/{@react-spectrum/provider/src => @adobe/react-spectrum/src/provider}/context.ts (100%)
 rename packages/{@react-spectrum/provider/src => @adobe/react-spectrum/src/provider}/mediaQueries.ts (96%)
 rename packages/{@react-spectrum/radio/src => @adobe/react-spectrum/src/radio}/Radio.tsx (90%)
 rename packages/{@react-spectrum/radio/src => @adobe/react-spectrum/src/radio}/RadioGroup.tsx (85%)
 rename packages/{@react-spectrum/radio/src => @adobe/react-spectrum/src/radio}/context.ts (93%)
 rename packages/{@react-spectrum/searchfield/src => @adobe/react-spectrum/src/searchfield}/SearchField.tsx (88%)
 rename packages/{@react-spectrum/slider/src => @adobe/react-spectrum/src/slider}/RangeSlider.tsx (94%)
 rename packages/{@react-spectrum/slider/src => @adobe/react-spectrum/src/slider}/Slider.tsx (96%)
 rename packages/{@react-spectrum/slider/src => @adobe/react-spectrum/src/slider}/SliderBase.tsx (93%)
 rename packages/{@react-spectrum/slider/src => @adobe/react-spectrum/src/slider}/SliderThumb.tsx (84%)
 rename packages/{@react-spectrum/statuslight/src => @adobe/react-spectrum/src/statuslight}/StatusLight.tsx (88%)
 rename packages/{@react-spectrum/steplist/src => @adobe/react-spectrum/src/steplist}/StepList.tsx (87%)
 rename packages/{@react-spectrum/steplist/src => @adobe/react-spectrum/src/steplist}/StepListContext.ts (90%)
 rename packages/{@react-spectrum/steplist/src => @adobe/react-spectrum/src/steplist}/StepListItem.tsx (86%)
 rename packages/{@react-spectrum/switch/src => @adobe/react-spectrum/src/switch}/Switch.tsx (85%)
 rename packages/{@react-spectrum/table/src => @adobe/react-spectrum/src/table}/DragPreview.tsx (95%)
 rename packages/{@react-spectrum/table/src => @adobe/react-spectrum/src/table}/InsertionIndicator.tsx (95%)
 rename packages/{@react-spectrum/table/src => @adobe/react-spectrum/src/table}/Nubbin.tsx (100%)
 rename packages/{@react-spectrum/table/src => @adobe/react-spectrum/src/table}/Resizer.tsx (88%)
 rename packages/{@react-spectrum/table/src => @adobe/react-spectrum/src/table}/RootDropIndicator.tsx (96%)
 rename packages/{@react-spectrum/table/src => @adobe/react-spectrum/src/table}/TableView.tsx (92%)
 rename packages/{@react-spectrum/table/src => @adobe/react-spectrum/src/table}/TableViewBase.tsx (95%)
 rename packages/{@react-spectrum/table/src => @adobe/react-spectrum/src/table}/TableViewLayout.ts (91%)
 rename packages/{@react-spectrum/table/src => @adobe/react-spectrum/src/table}/TableViewWithoutExpanding.tsx (97%)
 rename packages/{@react-spectrum/table/src => @adobe/react-spectrum/src/table}/TreeGridTableView.tsx (95%)
 rename packages/{@react-spectrum/table/src => @adobe/react-spectrum/src/table}/cursors/Cur_MoveHorizontal_9_9.svg (100%)
 rename packages/{@react-spectrum/table/src => @adobe/react-spectrum/src/table}/cursors/Cur_MoveToLeft_9_9.svg (100%)
 rename packages/{@react-spectrum/table/src => @adobe/react-spectrum/src/table}/cursors/Cur_MoveToRight_9_9.svg (100%)
 rename packages/{@react-spectrum/table/src => @adobe/react-spectrum/src/table}/table.css (100%)
 rename packages/{@react-spectrum/tabs/src => @adobe/react-spectrum/src/tabs}/Tabs.tsx (93%)
 rename packages/{@react-spectrum/tag/src => @adobe/react-spectrum/src/tag}/Tag.tsx (83%)
 rename packages/{@react-spectrum/tag/src => @adobe/react-spectrum/src/tag}/TagGroup.tsx (90%)
 rename packages/{@react-spectrum/text/src => @adobe/react-spectrum/src/text}/Heading.tsx (80%)
 rename packages/{@react-spectrum/text/src => @adobe/react-spectrum/src/text}/Keyboard.tsx (84%)
 rename packages/{@react-spectrum/text/src => @adobe/react-spectrum/src/text}/Text.tsx (84%)
 rename packages/{@react-spectrum/textfield/src => @adobe/react-spectrum/src/textfield}/TextArea.tsx (91%)
 rename packages/{@react-spectrum/textfield/src => @adobe/react-spectrum/src/textfield}/TextField.tsx (91%)
 rename packages/{@react-spectrum/textfield/src => @adobe/react-spectrum/src/textfield}/TextFieldBase.tsx (92%)
 rename packages/{@react-spectrum/theme-dark/src => @adobe/react-spectrum/src/theme-dark}/darkTheme.ts (100%)
 rename packages/{@react-spectrum/theme-default/src => @adobe/react-spectrum/src/theme-default}/defaultTheme.ts (100%)
 rename packages/{@react-spectrum/theme-express/src => @adobe/react-spectrum/src/theme-express}/expressTheme.ts (93%)
 rename packages/{@react-spectrum/theme-light/src => @adobe/react-spectrum/src/theme-light}/lightTheme.ts (100%)
 rename packages/{@react-spectrum/toast/src => @adobe/react-spectrum/src/toast}/Toast.tsx (85%)
 rename packages/{@react-spectrum/toast/src => @adobe/react-spectrum/src/toast}/ToastContainer.tsx (96%)
 rename packages/{@react-spectrum/toast/src => @adobe/react-spectrum/src/toast}/Toaster.tsx (83%)
 rename packages/{@react-spectrum/toast/src => @adobe/react-spectrum/src/toast}/toastContainer.css (100%)
 rename packages/{@react-spectrum/tooltip/src => @adobe/react-spectrum/src/tooltip}/Tooltip.tsx (91%)
 rename packages/{@react-spectrum/tooltip/src => @adobe/react-spectrum/src/tooltip}/TooltipTrigger.tsx (91%)
 rename packages/{@react-spectrum/tooltip/src => @adobe/react-spectrum/src/tooltip}/context.ts (93%)
 rename packages/{@react-spectrum/tree/src => @adobe/react-spectrum/src/tree}/TreeView.tsx (93%)
 rename packages/{@react-spectrum/utils/src => @adobe/react-spectrum/src/utils}/BreakpointProvider.tsx (98%)
 rename packages/{@react-spectrum/utils/src => @adobe/react-spectrum/src/utils}/Slots.tsx (98%)
 rename packages/{@react-spectrum/utils/src => @adobe/react-spectrum/src/utils}/classNames.ts (100%)
 rename packages/{@react-spectrum/utils/src => @adobe/react-spectrum/src/utils}/getWrappedElement.tsx (100%)
 rename packages/{@react-spectrum/utils/src => @adobe/react-spectrum/src/utils}/styleProps.ts (99%)
 rename packages/{@react-spectrum/utils/src => @adobe/react-spectrum/src/utils}/useDOMRef.ts (100%)
 rename packages/{@react-spectrum/utils/src => @adobe/react-spectrum/src/utils}/useHasChild.ts (93%)
 rename packages/{@react-spectrum/utils/src => @adobe/react-spectrum/src/utils}/useIsMobileDevice.ts (94%)
 rename packages/{@react-spectrum/utils/src => @adobe/react-spectrum/src/utils}/useMediaQuery.ts (96%)
 rename packages/{@react-spectrum/view/src => @adobe/react-spectrum/src/view}/Content.tsx (84%)
 rename packages/{@react-spectrum/view/src => @adobe/react-spectrum/src/view}/Footer.tsx (84%)
 rename packages/{@react-spectrum/view/src => @adobe/react-spectrum/src/view}/Header.tsx (84%)
 rename packages/{@react-spectrum/view/src => @adobe/react-spectrum/src/view}/View.tsx (86%)
 rename packages/{@react-spectrum/well/src => @adobe/react-spectrum/src/well}/Well.tsx (88%)
 rename packages/{@react-spectrum/accordion/stories => @adobe/react-spectrum/stories/accordion}/Accordion.stories.tsx (95%)
 rename packages/{@react-spectrum/accordion/stories => @adobe/react-spectrum/stories/accordion}/Disclosure.stories.tsx (96%)
 rename packages/{@react-spectrum/actionbar/stories => @adobe/react-spectrum/stories/actionbar}/ActionBar.stories.tsx (93%)
 rename packages/{@react-spectrum/actionbar/stories => @adobe/react-spectrum/stories/actionbar}/Example.tsx (95%)
 rename packages/{@react-spectrum/actiongroup/stories => @adobe/react-spectrum/stories/actiongroup}/ActionGroup.stories.tsx (96%)
 rename packages/{@react-spectrum/actiongroup/stories => @adobe/react-spectrum/stories/actiongroup}/Toolbar.stories.tsx (91%)
 rename packages/{@react-spectrum/actiongroup/stories => @adobe/react-spectrum/stories/actiongroup}/toolbar.css (100%)
 rename packages/{@react-spectrum/autocomplete/stories => @adobe/react-spectrum/stories/autocomplete}/SearchAutocomplete.stories.tsx (95%)
 rename packages/{@react-spectrum/avatar/stories => @adobe/react-spectrum/stories/avatar}/Avatar.stories.tsx (96%)
 rename packages/{@react-spectrum/badge/stories => @adobe/react-spectrum/stories/badge}/Badge.stories.tsx (95%)
 rename packages/{@react-spectrum/breadcrumbs/stories => @adobe/react-spectrum/stories/breadcrumbs}/Breadcrumbs.stories.tsx (97%)
 rename packages/{@react-spectrum/button/stories => @adobe/react-spectrum/stories/button}/ActionButton.stories.tsx (94%)
 rename packages/{@react-spectrum/button/stories => @adobe/react-spectrum/stories/button}/Button.stories.tsx (97%)
 rename packages/{@react-spectrum/button/stories => @adobe/react-spectrum/stories/button}/LogicButton.stories.tsx (96%)
 rename packages/{@react-spectrum/button/stories => @adobe/react-spectrum/stories/button}/ToggleButton.stories.tsx (94%)
 rename packages/{@react-spectrum/buttongroup/stories => @adobe/react-spectrum/stories/buttongroup}/ButtonGroup.stories.tsx (94%)
 rename packages/{@react-spectrum/calendar/stories => @adobe/react-spectrum/stories/calendar}/Calendar.stories.tsx (95%)
 rename packages/{@react-spectrum/calendar/stories => @adobe/react-spectrum/stories/calendar}/RangeCalendar.stories.tsx (96%)
 rename packages/{@react-spectrum/calendar/stories => @adobe/react-spectrum/stories/calendar}/RangeCalendarCell.stories.tsx (95%)
 rename packages/{@react-spectrum/card/stories => @adobe/react-spectrum/stories/card}/Card.stories.tsx (95%)
 rename packages/{@react-spectrum/card/stories => @adobe/react-spectrum/stories/card}/GalleryCardView.stories.tsx (96%)
 rename packages/{@react-spectrum/card/stories => @adobe/react-spectrum/stories/card}/GridCardView.stories.tsx (95%)
 rename packages/{@react-spectrum/card/stories => @adobe/react-spectrum/stories/card}/HorizontalCard.stories.tsx (91%)
 rename packages/{@react-spectrum/card/stories => @adobe/react-spectrum/stories/card}/QuietCard.stories.tsx (96%)
 rename packages/{@react-spectrum/card/stories => @adobe/react-spectrum/stories/card}/WaterfallCardView.stories.tsx (95%)
 rename packages/{@react-spectrum/card/stories => @adobe/react-spectrum/stories/card}/assets.css (100%)
 rename packages/{@react-spectrum/card/stories => @adobe/react-spectrum/stories/card}/images/starry_sky.jpeg (100%)
 rename packages/{@react-spectrum/card/stories => @adobe/react-spectrum/stories/card}/utils.ts (100%)
 rename packages/{@react-spectrum/checkbox/stories => @adobe/react-spectrum/stories/checkbox}/Checkbox.stories.tsx (95%)
 rename packages/{@react-spectrum/checkbox/stories => @adobe/react-spectrum/stories/checkbox}/CheckboxGroup.stories.tsx (94%)
 rename packages/{@react-spectrum/color/stories => @adobe/react-spectrum/stories/color}/ColorArea.stories.tsx (95%)
 rename packages/{@react-spectrum/color/stories => @adobe/react-spectrum/stories/color}/ColorField.stories.tsx (90%)
 rename packages/{@react-spectrum/color/stories => @adobe/react-spectrum/stories/color}/ColorPicker.stories.tsx (83%)
 rename packages/{@react-spectrum/color/stories => @adobe/react-spectrum/stories/color}/ColorSlider.stories.tsx (92%)
 rename packages/{@react-spectrum/color/stories => @adobe/react-spectrum/stories/color}/ColorSwatch.stories.tsx (94%)
 rename packages/{@react-spectrum/color/stories => @adobe/react-spectrum/stories/color}/ColorSwatchPicker.stories.tsx (95%)
 rename packages/{@react-spectrum/color/stories => @adobe/react-spectrum/stories/color}/ColorThumb.stories.tsx (92%)
 rename packages/{@react-spectrum/color/stories => @adobe/react-spectrum/stories/color}/ColorWheel.stories.tsx (90%)
 rename packages/{@react-spectrum/combobox/stories => @adobe/react-spectrum/stories/combobox}/ComboBox.stories.tsx (96%)
 rename packages/{@react-spectrum/contextualhelp/stories => @adobe/react-spectrum/stories/contextualhelp}/ContextualHelp.stories.tsx (89%)
 rename packages/{@react-spectrum/datepicker/stories => @adobe/react-spectrum/stories/datepicker}/DateField.stories.tsx (95%)
 rename packages/{@react-spectrum/datepicker/stories => @adobe/react-spectrum/stories/datepicker}/DatePicker.stories.tsx (95%)
 rename packages/{@react-spectrum/datepicker/stories => @adobe/react-spectrum/stories/datepicker}/DateRangePicker.stories.tsx (96%)
 rename packages/{@react-spectrum/datepicker/stories => @adobe/react-spectrum/stories/datepicker}/DateRangePickerStyling.stories.tsx (95%)
 rename packages/{@react-spectrum/datepicker/stories => @adobe/react-spectrum/stories/datepicker}/TimeField.stories.tsx (98%)
 rename packages/{@react-spectrum/datepicker/stories => @adobe/react-spectrum/stories/datepicker}/TimeFieldStyling.stories.tsx (94%)
 rename packages/{@react-spectrum/dialog/stories => @adobe/react-spectrum/stories/dialog}/AlertDialog.stories.tsx (96%)
 rename packages/{@react-spectrum/dialog/stories => @adobe/react-spectrum/stories/dialog}/Dialog.stories.tsx (95%)
 rename packages/{@react-spectrum/dialog/stories => @adobe/react-spectrum/stories/dialog}/DialogContainer.stories.tsx (96%)
 rename packages/{@react-spectrum/dialog/stories => @adobe/react-spectrum/stories/dialog}/DialogContainerExamples.tsx (79%)
 rename packages/{@react-spectrum/dialog/stories => @adobe/react-spectrum/stories/dialog}/DialogTrigger.stories.tsx (95%)
 rename packages/{@react-spectrum/divider/stories => @adobe/react-spectrum/stories/divider}/Divider.stories.tsx (95%)
 rename packages/{@react-spectrum/dropzone/stories => @adobe/react-spectrum/stories/dropzone}/DropZone.stories.tsx (92%)
 rename packages/{@react-spectrum/dropzone/stories => @adobe/react-spectrum/stories/dropzone}/FileTrigger.stories.tsx (92%)
 rename packages/{@react-spectrum/dropzone/stories => @adobe/react-spectrum/stories/dropzone}/styles.css (100%)
 rename packages/{@react-spectrum/form/stories => @adobe/react-spectrum/stories/form}/Form.stories.tsx (93%)
 rename packages/{@react-spectrum/form/stories => @adobe/react-spectrum/stories/form}/data.ts (100%)
 rename packages/{@react-spectrum/icon/stories => @adobe/react-spectrum/stories/icon}/Icon.stories.tsx (96%)
 rename packages/{@react-spectrum/illustratedmessage/stories => @adobe/react-spectrum/stories/illustratedmessage}/IllustratedMessage.stories.tsx (88%)
 rename packages/{@react-spectrum/image/stories => @adobe/react-spectrum/stories/image}/Image.stories.tsx (97%)
 rename packages/{@react-spectrum/inlinealert/stories => @adobe/react-spectrum/stories/inlinealert}/InlineAlert.stories.tsx (89%)
 rename packages/{@react-spectrum/label/stories => @adobe/react-spectrum/stories/label}/HelpText.stories.tsx (95%)
 rename packages/{@react-spectrum/label/stories => @adobe/react-spectrum/stories/label}/Label.stories.tsx (94%)
 rename packages/{@react-spectrum/labeledvalue/stories => @adobe/react-spectrum/stories/labeledvalue}/LabeledValue.stories.tsx (94%)
 rename packages/{@react-spectrum/layout/stories => @adobe/react-spectrum/stories/layout}/Flex.stories.tsx (98%)
 rename packages/{@react-spectrum/layout/stories => @adobe/react-spectrum/stories/layout}/Grid.stories.tsx (96%)
 rename packages/{@react-spectrum/layout/stories => @adobe/react-spectrum/stories/layout}/styles.css (100%)
 rename packages/{@react-spectrum/link/stories => @adobe/react-spectrum/stories/link}/Link.stories.tsx (98%)
 rename packages/{@react-spectrum/list/stories => @adobe/react-spectrum/stories/list}/ListView.stories.tsx (93%)
 rename packages/{@react-spectrum/list/stories => @adobe/react-spectrum/stories/list}/ListViewActions.stories.tsx (93%)
 rename packages/{@react-spectrum/list/stories => @adobe/react-spectrum/stories/list}/ListViewDnD.stories.tsx (96%)
 rename packages/{@react-spectrum/list/stories => @adobe/react-spectrum/stories/list}/ListViewDnDExamples.tsx (97%)
 rename packages/{@react-spectrum/list/stories => @adobe/react-spectrum/stories/list}/ListViewDnDUtil.stories.tsx (97%)
 rename packages/{@react-spectrum/list/stories => @adobe/react-spectrum/stories/list}/ListViewDnDUtilExamples.tsx (98%)
 rename packages/{@react-spectrum/list/stories => @adobe/react-spectrum/stories/list}/ListViewSelection.stories.tsx (95%)
 rename packages/{@react-spectrum/listbox/stories => @adobe/react-spectrum/stories/listbox}/ListBox.stories.tsx (97%)
 rename packages/{@react-spectrum/menu/stories => @adobe/react-spectrum/stories/menu}/ActionMenu.stories.tsx (93%)
 rename packages/{@react-spectrum/menu/stories => @adobe/react-spectrum/stories/menu}/MenuTrigger.stories.tsx (97%)
 rename packages/{@react-spectrum/menu/stories => @adobe/react-spectrum/stories/menu}/Submenu.stories.tsx (96%)
 rename packages/{@react-spectrum/meter/stories => @adobe/react-spectrum/stories/meter}/Meter.stories.tsx (98%)
 rename packages/{@react-spectrum/numberfield/stories => @adobe/react-spectrum/stories/numberfield}/NumberField.stories.tsx (96%)
 rename packages/{@react-spectrum/overlays/stories => @adobe/react-spectrum/stories/overlays}/Modal.stories.tsx (82%)
 rename packages/{@react-spectrum/picker/stories => @adobe/react-spectrum/stories/picker}/Picker.stories.tsx (95%)
 rename packages/{@react-spectrum/progress/stories => @adobe/react-spectrum/stories/progress}/ProgressBar.stories.tsx (98%)
 rename packages/{@react-spectrum/progress/stories => @adobe/react-spectrum/stories/progress}/ProgressCircle.stories.tsx (96%)
 rename packages/{@react-spectrum/provider/stories => @adobe/react-spectrum/stories/provider}/Provider.stories.tsx (87%)
 rename packages/{@react-spectrum/provider/stories => @adobe/react-spectrum/stories/provider}/custom-theme.css (100%)
 rename packages/{@react-spectrum/radio/stories => @adobe/react-spectrum/stories/radio}/Radio.stories.tsx (94%)
 rename packages/{@react-spectrum/searchfield/stories => @adobe/react-spectrum/stories/searchfield}/SearchField.stories.tsx (92%)
 rename packages/{@react-spectrum/slider/stories => @adobe/react-spectrum/stories/slider}/RangeSlider.stories.tsx (94%)
 rename packages/{@react-spectrum/slider/stories => @adobe/react-spectrum/stories/slider}/Slider.stories.tsx (95%)
 rename packages/{@react-spectrum/statuslight/stories => @adobe/react-spectrum/stories/statuslight}/StatusLight.stories.tsx (95%)
 rename packages/{@react-spectrum/steplist/stories => @adobe/react-spectrum/stories/steplist}/StepList.stories.tsx (94%)
 rename packages/{@react-spectrum/switch/stories => @adobe/react-spectrum/stories/switch}/Switch.stories.tsx (95%)
 rename packages/{@react-spectrum/table/stories => @adobe/react-spectrum/stories/table}/CRUDExample.tsx (83%)
 rename packages/{@react-spectrum/table/stories => @adobe/react-spectrum/stories/table}/ControllingResize.tsx (95%)
 rename packages/{@react-spectrum/table/stories => @adobe/react-spectrum/stories/table}/HidingColumns.tsx (93%)
 rename packages/{@react-spectrum/table/stories => @adobe/react-spectrum/stories/table}/HidingColumnsAllowsResizing.tsx (93%)
 rename packages/{@react-spectrum/table/stories => @adobe/react-spectrum/stories/table}/Performance.tsx (94%)
 rename packages/{@react-spectrum/table/stories => @adobe/react-spectrum/stories/table}/Table.stories.tsx (98%)
 rename packages/{@react-spectrum/table/stories => @adobe/react-spectrum/stories/table}/TableDnD.stories.tsx (95%)
 rename packages/{@react-spectrum/table/stories => @adobe/react-spectrum/stories/table}/TableDnDExamples.tsx (98%)
 rename packages/{@react-spectrum/table/stories => @adobe/react-spectrum/stories/table}/TableDnDUtil.stories.tsx (97%)
 rename packages/{@react-spectrum/table/stories => @adobe/react-spectrum/stories/table}/TableDnDUtilExamples.tsx (98%)
 rename packages/{@react-spectrum/table/stories => @adobe/react-spectrum/stories/table}/TreeGridTable.stories.tsx (97%)
 rename packages/{@react-spectrum/tabs/stories => @adobe/react-spectrum/stories/tabs}/Tabs.stories.tsx (98%)
 rename packages/{@react-spectrum/tag/stories => @adobe/react-spectrum/stories/tag}/TagGroup.stories.tsx (95%)
 rename packages/{@react-spectrum/textfield/stories => @adobe/react-spectrum/stories/textfield}/TextArea.stories.tsx (95%)
 rename packages/{@react-spectrum/textfield/stories => @adobe/react-spectrum/stories/textfield}/Textfield.stories.tsx (96%)
 rename packages/{@react-spectrum/toast/stories => @adobe/react-spectrum/stories/toast}/Toast.stories.tsx (93%)
 rename packages/{@react-spectrum/tooltip/stories => @adobe/react-spectrum/stories/tooltip}/Tooltip.stories.tsx (97%)
 rename packages/{@react-spectrum/tooltip/stories => @adobe/react-spectrum/stories/tooltip}/TooltipTrigger.stories.tsx (95%)
 rename packages/{@react-spectrum/tree/stories => @adobe/react-spectrum/stories/tree}/TreeView.stories.tsx (96%)
 rename packages/{@react-spectrum/view/stories => @adobe/react-spectrum/stories/view}/View.stories.tsx (96%)
 rename packages/{@react-spectrum/well/stories => @adobe/react-spectrum/stories/well}/Well.stories.tsx (95%)
 rename packages/{@react-spectrum/accordion/test => @adobe/react-spectrum/test/accordion}/Accordion.ssr.test.js (100%)
 rename packages/{@react-spectrum/accordion/test => @adobe/react-spectrum/test/accordion}/Accordion.test.js (97%)
 rename packages/{@react-spectrum/actionbar/test => @adobe/react-spectrum/test/actionbar}/ActionBar.test.js (96%)
 rename packages/{@react-spectrum/actiongroup/test => @adobe/react-spectrum/test/actiongroup}/ActionGroup.ssr.test.js (100%)
 rename packages/{@react-spectrum/actiongroup/test => @adobe/react-spectrum/test/actiongroup}/ActionGroup.test.js (98%)
 rename packages/{@react-spectrum/actiongroup/test => @adobe/react-spectrum/test/actiongroup}/Toolbar.test.tsx (97%)
 rename packages/{@react-spectrum/autocomplete/test => @adobe/react-spectrum/test/autocomplete}/SearchAutocomplete.test.js (99%)
 rename packages/{@react-spectrum/avatar/test => @adobe/react-spectrum/test/avatar}/Avatar.test.js (97%)
 rename packages/{@react-spectrum/badge/test => @adobe/react-spectrum/test/badge}/Badge.ssr.test.js (100%)
 rename packages/{@react-spectrum/badge/test => @adobe/react-spectrum/test/badge}/Badge.test.js (96%)
 rename packages/{@react-spectrum/breadcrumbs/test => @adobe/react-spectrum/test/breadcrumbs}/BreadcrumbItem.test.js (97%)
 rename packages/{@react-spectrum/breadcrumbs/test => @adobe/react-spectrum/test/breadcrumbs}/Breadcrumbs.ssr.test.js (100%)
 rename packages/{@react-spectrum/breadcrumbs/test => @adobe/react-spectrum/test/breadcrumbs}/Breadcrumbs.test.js (98%)
 rename packages/{@react-spectrum/button/test => @adobe/react-spectrum/test/button}/ActionButton.test.js (96%)
 rename packages/{@react-spectrum/button/test => @adobe/react-spectrum/test/button}/Button.ssr.test.js (100%)
 rename packages/{@react-spectrum/button/test => @adobe/react-spectrum/test/button}/Button.test.js (97%)
 rename packages/{@react-spectrum/button/test => @adobe/react-spectrum/test/button}/ClearButton.test.js (97%)
 rename packages/{@react-spectrum/button/test => @adobe/react-spectrum/test/button}/ToggleButton.test.js (97%)
 rename packages/{@react-spectrum/buttongroup/test => @adobe/react-spectrum/test/buttongroup}/ButtonGroup.ssr.test.js (100%)
 rename packages/{@react-spectrum/buttongroup/test => @adobe/react-spectrum/test/buttongroup}/ButtonGroup.test.js (96%)
 rename packages/{@react-spectrum/calendar/test => @adobe/react-spectrum/test/calendar}/Calendar.ssr.test.js (100%)
 rename packages/{@react-spectrum/calendar/test => @adobe/react-spectrum/test/calendar}/Calendar.test.js (98%)
 rename packages/{@react-spectrum/calendar/test => @adobe/react-spectrum/test/calendar}/CalendarBase.test.js (99%)
 rename packages/{@react-spectrum/calendar/test => @adobe/react-spectrum/test/calendar}/RangeCalendar.test.js (99%)
 rename packages/{@react-spectrum/card/test => @adobe/react-spectrum/test/card}/Card.test.js (94%)
 rename packages/{@react-spectrum/card/test => @adobe/react-spectrum/test/card}/CardView.test.js (98%)
 rename packages/{@react-spectrum/checkbox/test => @adobe/react-spectrum/test/checkbox}/Checkbox.ssr.test.js (100%)
 rename packages/{@react-spectrum/checkbox/test => @adobe/react-spectrum/test/checkbox}/Checkbox.test.js (98%)
 rename packages/{@react-spectrum/checkbox/test => @adobe/react-spectrum/test/checkbox}/CheckboxGroup.test.js (98%)
 rename packages/{@react-spectrum/color/test => @adobe/react-spectrum/test/color}/ColorArea.test.tsx (99%)
 rename packages/{@react-spectrum/color/test => @adobe/react-spectrum/test/color}/ColorField.test.js (98%)
 rename packages/{@react-spectrum/color/test => @adobe/react-spectrum/test/color}/ColorPicker.test.js (95%)
 rename packages/{@react-spectrum/color/test => @adobe/react-spectrum/test/color}/ColorSlider.test.tsx (99%)
 rename packages/{@react-spectrum/color/test => @adobe/react-spectrum/test/color}/ColorSwatchPicker.test.js (94%)
 rename packages/{@react-spectrum/color/test => @adobe/react-spectrum/test/color}/ColorWheel.test.tsx (99%)
 rename packages/{@react-spectrum/combobox/test => @adobe/react-spectrum/test/combobox}/ComboBox.test.js (99%)
 rename packages/{@react-spectrum/contextualhelp/test => @adobe/react-spectrum/test/contextualhelp}/ContextualHelp.test.js (93%)
 rename packages/{@react-spectrum/datepicker/test => @adobe/react-spectrum/test/datepicker}/DateField.test.js (99%)
 rename packages/{@react-spectrum/datepicker/test => @adobe/react-spectrum/test/datepicker}/DatePicker.ssr.test.js (100%)
 rename packages/{@react-spectrum/datepicker/test => @adobe/react-spectrum/test/datepicker}/DatePicker.test.js (99%)
 rename packages/{@react-spectrum/datepicker/test => @adobe/react-spectrum/test/datepicker}/DatePickerBase.test.js (98%)
 rename packages/{@react-spectrum/datepicker/test => @adobe/react-spectrum/test/datepicker}/DateRangePicker.test.js (99%)
 rename packages/{@react-spectrum/datepicker/test => @adobe/react-spectrum/test/datepicker}/TimeField.test.js (98%)
 rename packages/{@react-spectrum/dialog/test => @adobe/react-spectrum/test/dialog}/AlertDialog.test.js (97%)
 rename packages/{@react-spectrum/dialog/test => @adobe/react-spectrum/test/dialog}/Dialog.ssr.test.js (100%)
 rename packages/{@react-spectrum/dialog/test => @adobe/react-spectrum/test/dialog}/Dialog.test.js (93%)
 rename packages/{@react-spectrum/dialog/test => @adobe/react-spectrum/test/dialog}/DialogContainer.test.js (91%)
 rename packages/{@react-spectrum/dialog/test => @adobe/react-spectrum/test/dialog}/DialogTrigger.test.js (97%)
 rename packages/{@react-spectrum/divider/test => @adobe/react-spectrum/test/divider}/Divider.ssr.test.js (100%)
 rename packages/{@react-spectrum/divider/test => @adobe/react-spectrum/test/divider}/Divider.test.js (98%)
 rename packages/{@react-spectrum/dropzone/test => @adobe/react-spectrum/test/dropzone}/DropZone.test.js (91%)
 rename packages/{@react-spectrum/form/test => @adobe/react-spectrum/test/form}/Form.ssr.test.js (100%)
 rename packages/{@react-spectrum/form/test => @adobe/react-spectrum/test/form}/Form.test.js (92%)
 rename packages/{@react-spectrum/icon/test => @adobe/react-spectrum/test/icon}/Icon.test.js (98%)
 rename packages/{@react-spectrum/icon/test => @adobe/react-spectrum/test/icon}/Illustration.test.js (97%)
 rename packages/{@react-spectrum/icon/test => @adobe/react-spectrum/test/icon}/UIIcon.test.js (97%)
 rename packages/{@react-spectrum/illustratedmessage/test => @adobe/react-spectrum/test/illustratedmessage}/IllustratedMessage.ssr.test.js (100%)
 rename packages/{@react-spectrum/illustratedmessage/test => @adobe/react-spectrum/test/illustratedmessage}/IllustratedMessage.test.js (93%)
 rename packages/{@react-spectrum/image/test => @adobe/react-spectrum/test/image}/Image.test.js (98%)
 rename packages/{@react-spectrum/inlinealert/test => @adobe/react-spectrum/test/inlinealert}/InlineAlert.test.js (94%)
 rename packages/{@react-spectrum/label/test => @adobe/react-spectrum/test/label}/Field.test.js (96%)
 rename packages/{@react-spectrum/labeledvalue/test => @adobe/react-spectrum/test/labeledvalue}/LabeledValue.test.js (99%)
 rename packages/{@react-spectrum/layout/test => @adobe/react-spectrum/test/layout}/Flex.ssr.test.js (100%)
 rename packages/{@react-spectrum/layout/test => @adobe/react-spectrum/test/layout}/Grid.ssr.test.js (100%)
 rename packages/{@react-spectrum/layout/test => @adobe/react-spectrum/test/layout}/Grid.test.js (95%)
 rename packages/{@react-spectrum/link/test => @adobe/react-spectrum/test/link}/Link.ssr.test.js (100%)
 rename packages/{@react-spectrum/link/test => @adobe/react-spectrum/test/link}/Link.test.js (94%)
 rename packages/{@react-spectrum/list/test => @adobe/react-spectrum/test/list}/ListView.ssr.test.js (100%)
 rename packages/{@react-spectrum/list/test => @adobe/react-spectrum/test/list}/ListView.test.js (98%)
 rename packages/{@react-spectrum/list/test => @adobe/react-spectrum/test/list}/ListViewDnd.test.js (99%)
 rename packages/{@react-spectrum/listbox/test => @adobe/react-spectrum/test/listbox}/ListBox.ssr.test.js (100%)
 rename packages/{@react-spectrum/listbox/test => @adobe/react-spectrum/test/listbox}/ListBox.test.js (99%)
 rename packages/{@react-spectrum/menu/test => @adobe/react-spectrum/test/menu}/ActionMenu.test.js (95%)
 rename packages/{@react-spectrum/menu/test => @adobe/react-spectrum/test/menu}/Menu.ssr.test.js (100%)
 rename packages/{@react-spectrum/menu/test => @adobe/react-spectrum/test/menu}/Menu.test.js (98%)
 rename packages/{@react-spectrum/menu/test => @adobe/react-spectrum/test/menu}/MenuTrigger.ssr.test.js (100%)
 rename packages/{@react-spectrum/menu/test => @adobe/react-spectrum/test/menu}/MenuTrigger.test.js (97%)
 rename packages/{@react-spectrum/menu/test => @adobe/react-spectrum/test/menu}/SubMenuTrigger.test.tsx (99%)
 rename packages/{@react-spectrum/meter/test => @adobe/react-spectrum/test/meter}/Meter.ssr.test.js (100%)
 rename packages/{@react-spectrum/meter/test => @adobe/react-spectrum/test/meter}/Meter.test.js (98%)
 rename packages/{@react-spectrum/numberfield/test => @adobe/react-spectrum/test/numberfield}/NumberField.ssr.test.js (100%)
 rename packages/{@react-spectrum/numberfield/test => @adobe/react-spectrum/test/numberfield}/NumberField.test.js (99%)
 rename packages/{@react-spectrum/overlays/test => @adobe/react-spectrum/test/overlays}/Modal.test.js (93%)
 rename packages/{@react-spectrum/overlays/test => @adobe/react-spectrum/test/overlays}/Overlay.test.js (91%)
 rename packages/{@react-spectrum/overlays/test => @adobe/react-spectrum/test/overlays}/Popover.test.js (96%)
 rename packages/{@react-spectrum/overlays/test => @adobe/react-spectrum/test/overlays}/Tray.test.js (93%)
 rename packages/{@react-spectrum/picker/test => @adobe/react-spectrum/test/picker}/Picker.ssr.test.js (100%)
 rename packages/{@react-spectrum/picker/test => @adobe/react-spectrum/test/picker}/Picker.test.js (99%)
 rename packages/{@react-spectrum/picker/test => @adobe/react-spectrum/test/picker}/TempUtilTest.test.js (94%)
 rename packages/{@react-spectrum/picker/test => @adobe/react-spectrum/test/picker}/data.js (100%)
 rename packages/{@react-spectrum/progress/test => @adobe/react-spectrum/test/progress}/ProgressBar.ssr.test.js (100%)
 rename packages/{@react-spectrum/progress/test => @adobe/react-spectrum/test/progress}/ProgressBar.test.js (98%)
 rename packages/{@react-spectrum/progress/test => @adobe/react-spectrum/test/progress}/ProgressCircle.ssr.test.js (100%)
 rename packages/{@react-spectrum/progress/test => @adobe/react-spectrum/test/progress}/ProgressCircle.test.js (99%)
 rename packages/{@react-spectrum/provider/test => @adobe/react-spectrum/test/provider}/Provider.ssr.test.js (100%)
 rename packages/{@react-spectrum/provider/test => @adobe/react-spectrum/test/provider}/Provider.test.tsx (96%)
 rename packages/{@react-spectrum/provider/test => @adobe/react-spectrum/test/provider}/mediaQueries.test.ts (96%)
 rename packages/{@react-spectrum/radio/test => @adobe/react-spectrum/test/radio}/Radio.ssr.test.js (100%)
 rename packages/{@react-spectrum/radio/test => @adobe/react-spectrum/test/radio}/Radio.test.js (99%)
 rename packages/{@react-spectrum/searchfield/test => @adobe/react-spectrum/test/searchfield}/SearchField.ssr.test.js (100%)
 rename packages/{@react-spectrum/searchfield/test => @adobe/react-spectrum/test/searchfield}/SearchField.test.js (99%)
 rename packages/{@react-spectrum/slider/test => @adobe/react-spectrum/test/slider}/RangeSlider.test.tsx (99%)
 rename packages/{@react-spectrum/slider/test => @adobe/react-spectrum/test/slider}/Slider.test.tsx (99%)
 rename packages/{@react-spectrum/slider/test => @adobe/react-spectrum/test/slider}/utils.ts (100%)
 rename packages/{@react-spectrum/statuslight/test => @adobe/react-spectrum/test/statuslight}/StatusLight.ssr.test.js (100%)
 rename packages/{@react-spectrum/statuslight/test => @adobe/react-spectrum/test/statuslight}/StatusLight.test.js (98%)
 rename packages/{@react-spectrum/steplist/test => @adobe/react-spectrum/test/steplist}/StepList.test.tsx (98%)
 rename packages/{@react-spectrum/switch/test => @adobe/react-spectrum/test/switch}/Switch.ssr.test.js (100%)
 rename packages/{@react-spectrum/switch/test => @adobe/react-spectrum/test/switch}/Switch.test.js (99%)
 rename packages/{@react-spectrum/table/test => @adobe/react-spectrum/test/table}/Table.ssr.test.js (100%)
 rename packages/{@react-spectrum/table/test => @adobe/react-spectrum/test/table}/Table.test.js (100%)
 rename packages/{@react-spectrum/table/test => @adobe/react-spectrum/test/table}/TableDnd.test.js (99%)
 rename packages/{@react-spectrum/table/test => @adobe/react-spectrum/test/table}/TableNestedRows.test.js (88%)
 rename packages/{@react-spectrum/table/test => @adobe/react-spectrum/test/table}/TableSizing.test.tsx (99%)
 rename packages/{@react-spectrum/table/test => @adobe/react-spectrum/test/table}/TableTests.js (99%)
 rename packages/{@react-spectrum/table/test => @adobe/react-spectrum/test/table}/TestTableUtils.test.tsx (98%)
 rename packages/{@react-spectrum/table/test => @adobe/react-spectrum/test/table}/TreeGridTable.test.tsx (99%)
 rename packages/{@react-spectrum/tabs/test => @adobe/react-spectrum/test/tabs}/Tabs.test.js (99%)
 rename packages/{@react-spectrum/tag/test => @adobe/react-spectrum/test/tag}/TagGroup.ssr.test.js (100%)
 rename packages/{@react-spectrum/tag/test => @adobe/react-spectrum/test/tag}/TagGroup.test.js (98%)
 rename packages/{@react-spectrum/text/test => @adobe/react-spectrum/test/text}/Heading.ssr.test.js (100%)
 rename packages/{@react-spectrum/text/test => @adobe/react-spectrum/test/text}/Keyboard.ssr.test.js (100%)
 rename packages/{@react-spectrum/text/test => @adobe/react-spectrum/test/text}/Text.ssr.test.js (100%)
 rename packages/{@react-spectrum/textfield/test => @adobe/react-spectrum/test/textfield}/TextArea.ssr.test.js (100%)
 rename packages/{@react-spectrum/textfield/test => @adobe/react-spectrum/test/textfield}/TextArea.test.js (98%)
 rename packages/{@react-spectrum/textfield/test => @adobe/react-spectrum/test/textfield}/TextField.ssr.test.js (100%)
 rename packages/{@react-spectrum/textfield/test => @adobe/react-spectrum/test/textfield}/TextField.test.js (98%)
 rename packages/{@react-spectrum/toast/test => @adobe/react-spectrum/test/toast}/ToastContainer.ssr.test.js (100%)
 rename packages/{@react-spectrum/toast/test => @adobe/react-spectrum/test/toast}/ToastContainer.test.js (98%)
 rename packages/{@react-spectrum/tooltip/test => @adobe/react-spectrum/test/tooltip}/Tooltip.test.js (97%)
 rename packages/{@react-spectrum/tooltip/test => @adobe/react-spectrum/test/tooltip}/TooltipTrigger.test.js (99%)
 rename packages/{@react-spectrum/tree/test => @adobe/react-spectrum/test/tree}/TreeView.ssr.test.tsx (100%)
 rename packages/{@react-spectrum/tree/test => @adobe/react-spectrum/test/tree}/TreeView.test.tsx (99%)
 rename packages/{@react-spectrum/utils/test => @adobe/react-spectrum/test/utils}/Slots.test.js (97%)
 rename packages/{@react-spectrum/utils/test => @adobe/react-spectrum/test/utils}/styleProps.test.js (99%)
 rename packages/{@react-spectrum/view/test => @adobe/react-spectrum/test/view}/Content.ssr.test.js (100%)
 rename packages/{@react-spectrum/view/test => @adobe/react-spectrum/test/view}/Footer.ssr.test.js (100%)
 rename packages/{@react-spectrum/view/test => @adobe/react-spectrum/test/view}/Header.ssr.test.js (100%)
 rename packages/{@react-spectrum/view/test => @adobe/react-spectrum/test/view}/View.ssr.test.js (100%)
 rename packages/{@react-spectrum/view/test => @adobe/react-spectrum/test/view}/View.test.js (95%)
 rename packages/{@react-spectrum/well/test => @adobe/react-spectrum/test/well}/Well.ssr.test.js (100%)
 rename packages/{@react-spectrum/well/test => @adobe/react-spectrum/test/well}/Well.test.js (98%)
 delete mode 100644 packages/@react-aria/autocomplete/index.ts
 delete mode 100644 packages/@react-aria/button/index.ts
 delete mode 100644 packages/@react-aria/calendar/index.ts
 delete mode 100644 packages/@react-aria/checkbox/index.ts
 delete mode 100644 packages/@react-aria/color/index.ts
 delete mode 100644 packages/@react-aria/datepicker/index.ts
 delete mode 100644 packages/@react-aria/dialog/index.ts
 delete mode 100644 packages/@react-aria/disclosure/index.ts
 delete mode 100644 packages/@react-aria/dnd/index.ts
 delete mode 100644 packages/@react-aria/focus/index.ts
 delete mode 100644 packages/@react-aria/i18n/index.ts
 delete mode 100644 packages/@react-aria/interactions/index.ts
 delete mode 100644 packages/@react-aria/label/index.ts
 delete mode 100644 packages/@react-aria/link/index.ts
 delete mode 100644 packages/@react-aria/listbox/index.ts
 delete mode 100644 packages/@react-aria/live-announcer/index.ts
 delete mode 100644 packages/@react-aria/menu/index.ts
 delete mode 100644 packages/@react-aria/meter/index.ts
 delete mode 100644 packages/@react-aria/numberfield/index.ts
 delete mode 100644 packages/@react-aria/overlays/index.ts
 delete mode 100644 packages/@react-aria/progress/index.ts
 delete mode 100644 packages/@react-aria/radio/index.ts
 delete mode 100644 packages/@react-aria/searchfield/index.ts
 delete mode 100644 packages/@react-aria/select/index.ts
 delete mode 100644 packages/@react-aria/selection/index.ts
 delete mode 100644 packages/@react-aria/separator/index.ts
 delete mode 100644 packages/@react-aria/slider/index.ts
 delete mode 100644 packages/@react-aria/spinbutton/index.ts
 delete mode 100644 packages/@react-aria/ssr/index.ts
 delete mode 100644 packages/@react-aria/steplist/index.ts
 delete mode 100644 packages/@react-aria/switch/index.ts
 delete mode 100644 packages/@react-aria/table/index.ts
 delete mode 100644 packages/@react-aria/tabs/index.ts
 delete mode 100644 packages/@react-aria/tag/index.ts
 delete mode 100644 packages/@react-aria/textfield/index.ts
 delete mode 100644 packages/@react-aria/toast/index.ts
 delete mode 100644 packages/@react-aria/toggle/index.ts
 delete mode 100644 packages/@react-aria/tooltip/index.ts
 delete mode 100644 packages/@react-aria/tree/index.ts
 delete mode 100644 packages/@react-aria/utils/index.ts
 delete mode 100644 packages/@react-aria/virtualizer/index.ts
 delete mode 100644 packages/@react-aria/visually-hidden/index.ts
 delete mode 100644 packages/@react-spectrum/accordion/index.ts
 delete mode 100644 packages/@react-spectrum/actionbar/index.ts
 delete mode 100644 packages/@react-spectrum/actiongroup/index.ts
 delete mode 100644 packages/@react-spectrum/breadcrumbs/index.ts
 delete mode 100644 packages/@react-spectrum/button/index.ts
 delete mode 100644 packages/@react-spectrum/buttongroup/index.ts
 delete mode 100644 packages/@react-spectrum/calendar/index.ts
 delete mode 100644 packages/@react-spectrum/card/index.ts
 delete mode 100644 packages/@react-spectrum/checkbox/index.ts
 delete mode 100644 packages/@react-spectrum/color/index.ts
 delete mode 100644 packages/@react-spectrum/combobox/index.ts
 delete mode 100644 packages/@react-spectrum/contextualhelp/index.ts
 delete mode 100644 packages/@react-spectrum/datepicker/index.ts
 delete mode 100644 packages/@react-spectrum/dialog/index.ts
 delete mode 100644 packages/@react-spectrum/divider/index.ts
 delete mode 100644 packages/@react-spectrum/dropzone/index.ts
 delete mode 100644 packages/@react-spectrum/filetrigger/index.ts
 delete mode 100644 packages/@react-spectrum/form/index.ts
 delete mode 100644 packages/@react-spectrum/icon/index.ts
 delete mode 100644 packages/@react-spectrum/illustratedmessage/index.ts
 delete mode 100644 packages/@react-spectrum/image/index.ts
 delete mode 100644 packages/@react-spectrum/inlinealert/index.ts
 delete mode 100644 packages/@react-spectrum/label/index.ts
 delete mode 100644 packages/@react-spectrum/labeledvalue/index.ts
 delete mode 100644 packages/@react-spectrum/layout/index.ts
 delete mode 100644 packages/@react-spectrum/link/index.ts
 delete mode 100644 packages/@react-spectrum/list/index.ts
 delete mode 100644 packages/@react-spectrum/listbox/index.ts
 delete mode 100644 packages/@react-spectrum/menu/index.ts
 delete mode 100644 packages/@react-spectrum/meter/index.ts
 delete mode 100644 packages/@react-spectrum/numberfield/index.ts
 delete mode 100644 packages/@react-spectrum/overlays/index.ts
 delete mode 100644 packages/@react-spectrum/picker/index.ts
 delete mode 100644 packages/@react-spectrum/progress/index.ts
 delete mode 100644 packages/@react-spectrum/provider/index.ts
 delete mode 100644 packages/@react-spectrum/radio/index.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Accordion.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ActionBar.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ActionButton.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ActionButtonGroup.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ActionMenu.ts
 create mode 100644 packages/@react-spectrum/s2/exports/AlertDialog.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Avatar.ts
 create mode 100644 packages/@react-spectrum/s2/exports/AvatarGroup.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Badge.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Breadcrumbs.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Button.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ButtonGroup.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Calendar.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Card.ts
 create mode 100644 packages/@react-spectrum/s2/exports/CardView.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Checkbox.ts
 create mode 100644 packages/@react-spectrum/s2/exports/CheckboxGroup.ts
 create mode 100644 packages/@react-spectrum/s2/exports/CloseButton.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ColorArea.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ColorField.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ColorSlider.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ColorSwatch.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ColorSwatchPicker.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ColorWheel.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ComboBox.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Content.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ContextualHelp.ts
 create mode 100644 packages/@react-spectrum/s2/exports/CustomDialog.ts
 create mode 100644 packages/@react-spectrum/s2/exports/DateField.ts
 create mode 100644 packages/@react-spectrum/s2/exports/DatePicker.ts
 create mode 100644 packages/@react-spectrum/s2/exports/DateRangePicker.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Dialog.ts
 create mode 100644 packages/@react-spectrum/s2/exports/DialogContainer.ts
 create mode 100644 packages/@react-spectrum/s2/exports/DialogTrigger.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Disclosure.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Divider.ts
 create mode 100644 packages/@react-spectrum/s2/exports/DropZone.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Form.ts
 create mode 100644 packages/@react-spectrum/s2/exports/FullscreenDialog.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Icon.ts
 create mode 100644 packages/@react-spectrum/s2/exports/IllustratedMessage.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Image.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ImageCoordinator.ts
 create mode 100644 packages/@react-spectrum/s2/exports/InlineAlert.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Link.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ListView.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Menu.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Meter.ts
 create mode 100644 packages/@react-spectrum/s2/exports/NotificationBadge.ts
 create mode 100644 packages/@react-spectrum/s2/exports/NumberField.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Picker.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Popover.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ProgressBar.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ProgressCircle.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Provider.ts
 create mode 100644 packages/@react-spectrum/s2/exports/RadioGroup.ts
 create mode 100644 packages/@react-spectrum/s2/exports/RangeCalendar.ts
 create mode 100644 packages/@react-spectrum/s2/exports/RangeSlider.ts
 create mode 100644 packages/@react-spectrum/s2/exports/SearchField.ts
 create mode 100644 packages/@react-spectrum/s2/exports/SegmentedControl.ts
 create mode 100644 packages/@react-spectrum/s2/exports/SelectBoxGroup.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Skeleton.ts
 create mode 100644 packages/@react-spectrum/s2/exports/SkeletonCollection.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Slider.ts
 create mode 100644 packages/@react-spectrum/s2/exports/StatusLight.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Switch.ts
 create mode 100644 packages/@react-spectrum/s2/exports/TableView.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Tabs.ts
 create mode 100644 packages/@react-spectrum/s2/exports/TagGroup.ts
 create mode 100644 packages/@react-spectrum/s2/exports/TextField.ts
 create mode 100644 packages/@react-spectrum/s2/exports/TimeField.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Toast.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ToggleButton.ts
 create mode 100644 packages/@react-spectrum/s2/exports/ToggleButtonGroup.ts
 create mode 100644 packages/@react-spectrum/s2/exports/Tooltip.ts
 create mode 100644 packages/@react-spectrum/s2/exports/TreeView.ts
 rename packages/@react-spectrum/s2/{src => exports}/index.ts (90%)
 create mode 100644 packages/@react-spectrum/s2/exports/pressScale.ts
 delete mode 100644 packages/@react-spectrum/s2/index.ts
 delete mode 100644 packages/@react-spectrum/searchfield/index.ts
 delete mode 100644 packages/@react-spectrum/slider/index.ts
 delete mode 100644 packages/@react-spectrum/statuslight/index.ts
 delete mode 100644 packages/@react-spectrum/steplist/index.ts
 delete mode 100644 packages/@react-spectrum/switch/index.ts
 delete mode 100644 packages/@react-spectrum/table/index.ts
 delete mode 100644 packages/@react-spectrum/tabs/index.ts
 delete mode 100644 packages/@react-spectrum/tag/index.ts
 delete mode 100644 packages/@react-spectrum/text/index.ts
 delete mode 100644 packages/@react-spectrum/textfield/index.ts
 delete mode 100644 packages/@react-spectrum/theme-dark/index.ts
 delete mode 100644 packages/@react-spectrum/theme-default/index.ts
 delete mode 100644 packages/@react-spectrum/theme-express/index.ts
 delete mode 100644 packages/@react-spectrum/theme-light/index.ts
 delete mode 100644 packages/@react-spectrum/toast/index.ts
 delete mode 100644 packages/@react-spectrum/tooltip/index.ts
 delete mode 100644 packages/@react-spectrum/tree/index.ts
 delete mode 100644 packages/@react-spectrum/utils/index.ts
 delete mode 100644 packages/@react-spectrum/view/index.ts
 delete mode 100644 packages/@react-spectrum/well/index.ts
 delete mode 100644 packages/@react-stately/calendar/index.ts
 delete mode 100644 packages/@react-stately/checkbox/index.ts
 delete mode 100644 packages/@react-stately/collections/index.ts
 delete mode 100644 packages/@react-stately/color/index.ts
 delete mode 100644 packages/@react-stately/combobox/index.ts
 delete mode 100644 packages/@react-stately/data/index.ts
 delete mode 100644 packages/@react-stately/datepicker/index.ts
 delete mode 100644 packages/@react-stately/disclosure/index.ts
 delete mode 100644 packages/@react-stately/dnd/index.ts
 delete mode 100644 packages/@react-stately/flags/index.ts
 delete mode 100644 packages/@react-stately/form/index.ts
 delete mode 100644 packages/@react-stately/grid/index.ts
 delete mode 100644 packages/@react-stately/layout/index.ts
 delete mode 100644 packages/@react-stately/list/index.ts
 delete mode 100644 packages/@react-stately/menu/index.ts
 delete mode 100644 packages/@react-stately/numberfield/index.ts
 delete mode 100644 packages/@react-stately/overlays/index.ts
 delete mode 100644 packages/@react-stately/radio/index.ts
 delete mode 100644 packages/@react-stately/searchfield/index.ts
 delete mode 100644 packages/@react-stately/select/index.ts
 delete mode 100644 packages/@react-stately/selection/index.ts
 delete mode 100644 packages/@react-stately/slider/index.ts
 delete mode 100644 packages/@react-stately/steplist/index.ts
 delete mode 100644 packages/@react-stately/table/index.ts
 delete mode 100644 packages/@react-stately/tabs/index.ts
 delete mode 100644 packages/@react-stately/toast/index.ts
 delete mode 100644 packages/@react-stately/toggle/index.ts
 delete mode 100644 packages/@react-stately/tooltip/index.ts
 delete mode 100644 packages/@react-stately/tree/index.ts
 delete mode 100644 packages/@react-stately/utils/index.ts
 delete mode 100644 packages/@react-stately/virtualizer/index.ts
 create mode 100644 packages/react-aria-components/exports/Autocomplete.ts
 create mode 100644 packages/react-aria-components/exports/Breadcrumbs.ts
 create mode 100644 packages/react-aria-components/exports/Button.ts
 create mode 100644 packages/react-aria-components/exports/Calendar.ts
 create mode 100644 packages/react-aria-components/exports/Checkbox.ts
 create mode 100644 packages/react-aria-components/exports/Collection.ts
 create mode 100644 packages/react-aria-components/exports/ColorArea.ts
 create mode 100644 packages/react-aria-components/exports/ColorField.ts
 create mode 100644 packages/react-aria-components/exports/ColorPicker.ts
 create mode 100644 packages/react-aria-components/exports/ColorSlider.ts
 create mode 100644 packages/react-aria-components/exports/ColorSwatch.ts
 create mode 100644 packages/react-aria-components/exports/ColorSwatchPicker.ts
 create mode 100644 packages/react-aria-components/exports/ColorThumb.ts
 create mode 100644 packages/react-aria-components/exports/ColorWheel.ts
 create mode 100644 packages/react-aria-components/exports/ComboBox.ts
 create mode 100644 packages/react-aria-components/exports/DateField.ts
 create mode 100644 packages/react-aria-components/exports/DatePicker.ts
 create mode 100644 packages/react-aria-components/exports/Dialog.ts
 create mode 100644 packages/react-aria-components/exports/Disclosure.ts
 create mode 100644 packages/react-aria-components/exports/DropZone.ts
 create mode 100644 packages/react-aria-components/exports/FieldError.ts
 create mode 100644 packages/react-aria-components/exports/FileTrigger.ts
 create mode 100644 packages/react-aria-components/exports/Form.ts
 create mode 100644 packages/react-aria-components/exports/GridList.ts
 create mode 100644 packages/react-aria-components/exports/Group.ts
 create mode 100644 packages/react-aria-components/exports/Header.ts
 create mode 100644 packages/react-aria-components/exports/Heading.ts
 create mode 100644 packages/react-aria-components/exports/Input.ts
 create mode 100644 packages/react-aria-components/exports/Keyboard.ts
 create mode 100644 packages/react-aria-components/exports/Label.ts
 create mode 100644 packages/react-aria-components/exports/Link.ts
 create mode 100644 packages/react-aria-components/exports/ListBox.ts
 create mode 100644 packages/react-aria-components/exports/Menu.ts
 create mode 100644 packages/react-aria-components/exports/Meter.ts
 create mode 100644 packages/react-aria-components/exports/Modal.ts
 create mode 100644 packages/react-aria-components/exports/NumberField.ts
 create mode 100644 packages/react-aria-components/exports/OverlayArrow.ts
 create mode 100644 packages/react-aria-components/exports/Popover.ts
 create mode 100644 packages/react-aria-components/exports/ProgressBar.ts
 create mode 100644 packages/react-aria-components/exports/RadioGroup.ts
 create mode 100644 packages/react-aria-components/exports/SearchField.ts
 create mode 100644 packages/react-aria-components/exports/Select.ts
 create mode 100644 packages/react-aria-components/exports/SelectionIndicator.ts
 create mode 100644 packages/react-aria-components/exports/Separator.ts
 create mode 100644 packages/react-aria-components/exports/SharedElementTransition.ts
 create mode 100644 packages/react-aria-components/exports/Slider.ts
 create mode 100644 packages/react-aria-components/exports/Switch.ts
 create mode 100644 packages/react-aria-components/exports/Table.ts
 create mode 100644 packages/react-aria-components/exports/Tabs.ts
 create mode 100644 packages/react-aria-components/exports/TagGroup.ts
 create mode 100644 packages/react-aria-components/exports/Text.ts
 create mode 100644 packages/react-aria-components/exports/TextArea.ts
 create mode 100644 packages/react-aria-components/exports/TextField.ts
 create mode 100644 packages/react-aria-components/exports/Toast.ts
 create mode 100644 packages/react-aria-components/exports/ToggleButton.ts
 create mode 100644 packages/react-aria-components/exports/ToggleButtonGroup.ts
 create mode 100644 packages/react-aria-components/exports/Toolbar.ts
 create mode 100644 packages/react-aria-components/exports/Tooltip.ts
 create mode 100644 packages/react-aria-components/exports/Tree.ts
 create mode 100644 packages/react-aria-components/exports/Virtualizer.ts
 rename packages/react-aria-components/{src => exports}/index.ts (73%)
 create mode 100644 packages/react-aria-components/exports/useDragAndDrop.ts
 create mode 100644 packages/react-aria-components/exports/utils.ts
 delete mode 100644 packages/react-aria-components/index.ts
 rename packages/{@react-aria/autocomplete/docs => react-aria/docs/autocomplete}/anatomy.svg (100%)
 rename packages/{@react-aria/autocomplete/docs => react-aria/docs/autocomplete}/useAutocomplete.mdx (100%)
 rename packages/{@react-aria/breadcrumbs/docs => react-aria/docs/breadcrumbs}/anatomy.svg (100%)
 rename packages/{@react-aria/breadcrumbs/docs => react-aria/docs/breadcrumbs}/useBreadcrumbs.mdx (100%)
 rename packages/{@react-aria/button/docs => react-aria/docs/button}/ToggleButtonGroupAnatomy.svg (100%)
 rename packages/{@react-aria/button/docs => react-aria/docs/button}/useButton.mdx (100%)
 rename packages/{@react-aria/button/docs => react-aria/docs/button}/useToggleButton.mdx (100%)
 rename packages/{@react-aria/button/docs => react-aria/docs/button}/useToggleButtonGroup.mdx (100%)
 rename packages/{@react-aria/calendar/docs => react-aria/docs/calendar}/calendar-anatomy.svg (100%)
 rename packages/{@react-aria/calendar/docs => react-aria/docs/calendar}/calendar-tailwind.png (100%)
 rename packages/{@react-aria/calendar/docs => react-aria/docs/calendar}/css-modules.png (100%)
 rename packages/{@react-aria/calendar/docs => react-aria/docs/calendar}/rangecalendar-anatomy.svg (100%)
 rename packages/{@react-aria/calendar/docs => react-aria/docs/calendar}/styled-components.png (100%)
 rename packages/{@react-aria/calendar/docs => react-aria/docs/calendar}/tailwind.png (100%)
 rename packages/{@react-aria/calendar/docs => react-aria/docs/calendar}/useCalendar.mdx (100%)
 rename packages/{@react-aria/calendar/docs => react-aria/docs/calendar}/useRangeCalendar.mdx (100%)
 rename packages/{@react-aria/checkbox/docs => react-aria/docs/checkbox}/buttongroup-example.png (100%)
 rename packages/{@react-aria/checkbox/docs => react-aria/docs/checkbox}/checkbox-anatomy.svg (100%)
 rename packages/{@react-aria/checkbox/docs => react-aria/docs/checkbox}/checkboxgroup-anatomy.svg (100%)
 rename packages/{@react-aria/checkbox/docs => react-aria/docs/checkbox}/tailwind-example.png (100%)
 rename packages/{@react-aria/checkbox/docs => react-aria/docs/checkbox}/useCheckbox.mdx (100%)
 rename packages/{@react-aria/checkbox/docs => react-aria/docs/checkbox}/useCheckboxGroup.mdx (100%)
 rename packages/{@react-aria/color/docs => react-aria/docs/color}/ColorAreaAnatomy.svg (100%)
 rename packages/{@react-aria/color/docs => react-aria/docs/color}/ColorFieldAnatomy.svg (100%)
 rename packages/{@react-aria/color/docs => react-aria/docs/color}/ColorSliderAnatomy.svg (100%)
 rename packages/{@react-aria/color/docs => react-aria/docs/color}/ColorWheelAnatomy.svg (100%)
 rename packages/{@react-aria/color/docs => react-aria/docs/color}/useColorArea.mdx (100%)
 rename packages/{@react-aria/color/docs => react-aria/docs/color}/useColorField.mdx (100%)
 rename packages/{@react-aria/color/docs => react-aria/docs/color}/useColorSlider.mdx (100%)
 rename packages/{@react-aria/color/docs => react-aria/docs/color}/useColorSwatch.mdx (100%)
 rename packages/{@react-aria/color/docs => react-aria/docs/color}/useColorWheel.mdx (100%)
 rename packages/{@react-aria/combobox/docs => react-aria/docs/combobox}/anatomy.svg (100%)
 rename packages/{@react-aria/combobox/docs => react-aria/docs/combobox}/chakra.png (100%)
 rename packages/{@react-aria/combobox/docs => react-aria/docs/combobox}/example.png (100%)
 rename packages/{@react-aria/combobox/docs => react-aria/docs/combobox}/material.png (100%)
 rename packages/{@react-aria/combobox/docs => react-aria/docs/combobox}/search.png (100%)
 rename packages/{@react-aria/combobox/docs => react-aria/docs/combobox}/styled-components.png (100%)
 rename packages/{@react-aria/combobox/docs => react-aria/docs/combobox}/useComboBox.mdx (100%)
 rename packages/{@react-aria/datepicker/docs => react-aria/docs/datepicker}/DateField-tailwind.png (100%)
 rename packages/{@react-aria/datepicker/docs => react-aria/docs/datepicker}/DatePicker-chakra.png (100%)
 rename packages/{@react-aria/datepicker/docs => react-aria/docs/datepicker}/DatePicker-tailwind.png (100%)
 rename packages/{@react-aria/datepicker/docs => react-aria/docs/datepicker}/DateRangePicker-chakra.png (100%)
 rename packages/{@react-aria/datepicker/docs => react-aria/docs/datepicker}/DateRangePicker-tailwind.png (100%)
 rename packages/{@react-aria/datepicker/docs => react-aria/docs/datepicker}/TimeField-tailwind.png (100%)
 rename packages/{@react-aria/datepicker/docs => react-aria/docs/datepicker}/datefield-anatomy.svg (100%)
 rename packages/{@react-aria/datepicker/docs => react-aria/docs/datepicker}/datepicker-anatomy.svg (100%)
 rename packages/{@react-aria/datepicker/docs => react-aria/docs/datepicker}/daterangepicker-anatomy.svg (100%)
 rename packages/{@react-aria/datepicker/docs => react-aria/docs/datepicker}/timefield-anatomy.svg (100%)
 rename packages/{@react-aria/datepicker/docs => react-aria/docs/datepicker}/useDateField.mdx (100%)
 rename packages/{@react-aria/datepicker/docs => react-aria/docs/datepicker}/useDatePicker.mdx (100%)
 rename packages/{@react-aria/datepicker/docs => react-aria/docs/datepicker}/useDateRangePicker.mdx (100%)
 rename packages/{@react-aria/datepicker/docs => react-aria/docs/datepicker}/useTimeField.mdx (100%)
 rename packages/{@react-aria/dialog/docs => react-aria/docs/dialog}/anatomy.svg (100%)
 rename packages/{@react-aria/dialog/docs => react-aria/docs/dialog}/tailwind.png (100%)
 rename packages/{@react-aria/dialog/docs => react-aria/docs/dialog}/useDialog.mdx (100%)
 rename packages/{@react-aria/disclosure/docs => react-aria/docs/disclosure}/anatomy.svg (100%)
 rename packages/{@react-aria/disclosure/docs => react-aria/docs/disclosure}/useDisclosure.mdx (100%)
 rename packages/{@react-aria/dnd/docs => react-aria/docs/dnd}/Anatomy.svg (100%)
 rename packages/{@react-aria/dnd/docs => react-aria/docs/dnd}/BetweenDropPosition.svg (100%)
 rename packages/{@react-aria/dnd/docs => react-aria/docs/dnd}/DragAffordance.svg (100%)
 rename packages/{@react-aria/dnd/docs => react-aria/docs/dnd}/DragPreview.svg (100%)
 rename packages/{@react-aria/dnd/docs => react-aria/docs/dnd}/DropOperation.svg (100%)
 rename packages/{@react-aria/dnd/docs => react-aria/docs/dnd}/OnDropPosition.svg (100%)
 rename packages/{@react-aria/dnd/docs => react-aria/docs/dnd}/RootDropPosition.svg (100%)
 rename packages/{@react-aria/dnd/docs => react-aria/docs/dnd}/useDraggableCollection.mdx (100%)
 rename packages/{@react-aria/dnd/docs => react-aria/docs/dnd}/useDroppableCollection.mdx (100%)
 rename packages/{@react-aria/gridlist/docs => react-aria/docs/gridlist}/anatomy.svg (100%)
 rename packages/{@react-aria/gridlist/docs => react-aria/docs/gridlist}/useGridList.mdx (100%)
 rename packages/{@react-aria/link/docs => react-aria/docs/link}/useLink.mdx (100%)
 rename packages/{@react-aria/listbox/docs => react-aria/docs/listbox}/anatomy.svg (100%)
 rename packages/{@react-aria/listbox/docs => react-aria/docs/listbox}/useListBox.mdx (100%)
 rename packages/{@react-aria/menu/docs => react-aria/docs/menu}/menu-trigger-anatomy.svg (100%)
 rename packages/{@react-aria/menu/docs => react-aria/docs/menu}/tailwind.png (100%)
 rename packages/{@react-aria/menu/docs => react-aria/docs/menu}/useMenu.mdx (100%)
 rename packages/{@react-aria/meter/docs => react-aria/docs/meter}/anatomy.svg (100%)
 rename packages/{@react-aria/meter/docs => react-aria/docs/meter}/circular-example.png (100%)
 rename packages/{@react-aria/meter/docs => react-aria/docs/meter}/useMeter.mdx (100%)
 rename packages/{@react-aria/numberfield/docs => react-aria/docs/numberfield}/anatomy.svg (100%)
 rename packages/{@react-aria/numberfield/docs => react-aria/docs/numberfield}/useNumberField.mdx (100%)
 rename packages/{@react-aria/overlays/docs => react-aria/docs/overlays}/modal-anatomy.svg (100%)
 rename packages/{@react-aria/overlays/docs => react-aria/docs/overlays}/popover-anatomy.svg (100%)
 rename packages/{@react-aria/overlays/docs => react-aria/docs/overlays}/useModalOverlay.mdx (100%)
 rename packages/{@react-aria/overlays/docs => react-aria/docs/overlays}/usePopover.mdx (100%)
 rename packages/{@react-aria/progress/docs => react-aria/docs/progress}/anatomy.svg (100%)
 rename packages/{@react-aria/progress/docs => react-aria/docs/progress}/useProgressBar.mdx (100%)
 rename packages/{@react-aria/radio/docs => react-aria/docs/radio}/anatomy.svg (100%)
 rename packages/{@react-aria/radio/docs => react-aria/docs/radio}/buttongroup-example.png (100%)
 rename packages/{@react-aria/radio/docs => react-aria/docs/radio}/card-example.png (100%)
 rename packages/{@react-aria/radio/docs => react-aria/docs/radio}/swatch-example.png (100%)
 rename packages/{@react-aria/radio/docs => react-aria/docs/radio}/useRadioGroup.mdx (100%)
 rename packages/{@react-aria/searchfield/docs => react-aria/docs/searchfield}/anatomy.svg (100%)
 rename packages/{@react-aria/searchfield/docs => react-aria/docs/searchfield}/useSearchField.mdx (100%)
 rename packages/{@react-aria/select/docs => react-aria/docs/select}/anatomy.svg (100%)
 rename packages/{@react-aria/select/docs => react-aria/docs/select}/example.png (100%)
 rename packages/{@react-aria/select/docs => react-aria/docs/select}/popup-example.png (100%)
 rename packages/{@react-aria/select/docs => react-aria/docs/select}/styled-components.png (100%)
 rename packages/{@react-aria/select/docs => react-aria/docs/select}/useSelect.mdx (100%)
 rename packages/{@react-aria/separator/docs => react-aria/docs/separator}/useSeparator.mdx (100%)
 rename packages/{@react-aria/slider/docs => react-aria/docs/slider}/anatomy.svg (100%)
 rename packages/{@react-aria/slider/docs => react-aria/docs/slider}/useSlider.mdx (100%)
 rename packages/{@react-aria/switch/docs => react-aria/docs/switch}/anatomy.svg (100%)
 rename packages/{@react-aria/switch/docs => react-aria/docs/switch}/useSwitch.mdx (100%)
 rename packages/{@react-aria/table/docs => react-aria/docs/table}/Table-tailwind.png (100%)
 rename packages/{@react-aria/table/docs => react-aria/docs/table}/TableAnatomy.svg (100%)
 rename packages/{@react-aria/table/docs => react-aria/docs/table}/useTable.mdx (100%)
 rename packages/{@react-aria/tabs/docs => react-aria/docs/tabs}/anatomy.svg (100%)
 rename packages/{@react-aria/tabs/docs => react-aria/docs/tabs}/animated-example.png (100%)
 rename packages/{@react-aria/tabs/docs => react-aria/docs/tabs}/useTabList.mdx (100%)
 rename packages/{@react-aria/tag/docs => react-aria/docs/tag}/anatomy.svg (100%)
 rename packages/{@react-aria/tag/docs => react-aria/docs/tag}/tailwind.png (100%)
 rename packages/{@react-aria/tag/docs => react-aria/docs/tag}/useTagGroup.mdx (100%)
 rename packages/{@react-aria/textfield/docs => react-aria/docs/textfield}/anatomy.svg (100%)
 rename packages/{@react-aria/textfield/docs => react-aria/docs/textfield}/useTextField.mdx (100%)
 rename packages/{@react-aria/toast/docs => react-aria/docs/toast}/toast-anatomy.svg (100%)
 rename packages/{@react-aria/toast/docs => react-aria/docs/toast}/useToast.mdx (100%)
 rename packages/{@react-aria/toolbar/docs => react-aria/docs/toolbar}/toolbar-anatomy.svg (100%)
 rename packages/{@react-aria/toolbar/docs => react-aria/docs/toolbar}/useToolbar.mdx (100%)
 rename packages/{@react-aria/tooltip/docs => react-aria/docs/tooltip}/anatomy.svg (100%)
 rename packages/{@react-aria/tooltip/docs => react-aria/docs/tooltip}/useTooltipTrigger.mdx (100%)
 create mode 100644 packages/react-aria/exports/DragPreview.ts
 create mode 100644 packages/react-aria/exports/FocusRing.ts
 create mode 100644 packages/react-aria/exports/FocusScope.ts
 create mode 100644 packages/react-aria/exports/I18nProvider.ts
 create mode 100644 packages/react-aria/exports/ListDropTargetDelegate.ts
 rename packages/{@react-aria/actiongroup/index.ts => react-aria/exports/ListKeyboardDelegate.ts} (89%)
 create mode 100644 packages/react-aria/exports/Overlay.ts
 create mode 100644 packages/react-aria/exports/PortalProvider.ts
 create mode 100644 packages/react-aria/exports/SSRProvider.ts
 create mode 100644 packages/react-aria/exports/VisuallyHidden.ts
 create mode 100644 packages/react-aria/exports/index.ts
 create mode 100644 packages/react-aria/exports/mergeProps.ts
 create mode 100644 packages/react-aria/exports/private/actiongroup/useActionGroup.ts
 create mode 100644 packages/react-aria/exports/private/actiongroup/useActionGroupItem.ts
 create mode 100644 packages/react-aria/exports/private/aria-modal-polyfill/ariaModalPolyfill.ts
 create mode 100644 packages/react-aria/exports/private/autocomplete/useAutocomplete.ts
 create mode 100644 packages/react-aria/exports/private/autocomplete/useSearchAutocomplete.ts
 create mode 100644 packages/react-aria/exports/private/calendar/useCalendarBase.ts
 create mode 100644 packages/react-aria/exports/private/collections/BaseCollection.ts
 create mode 100644 packages/react-aria/exports/private/collections/CollectionBuilder.ts
 create mode 100644 packages/react-aria/exports/private/collections/Hidden.ts
 create mode 100644 packages/react-aria/exports/private/collections/useCachedChildren.ts
 create mode 100644 packages/react-aria/exports/private/datepicker/useDisplayNames.ts
 create mode 100644 packages/react-aria/exports/private/dnd/DragManager.ts
 create mode 100644 packages/react-aria/exports/private/dnd/utils.ts
 create mode 100644 packages/react-aria/exports/private/focus/FocusScope.ts
 create mode 100644 packages/react-aria/exports/private/focus/useHasTabbableChild.ts
 create mode 100644 packages/react-aria/exports/private/focus/virtualFocus.ts
 create mode 100644 packages/react-aria/exports/private/form/useFormValidation.ts
 create mode 100644 packages/react-aria/exports/private/grid/GridKeyboardDelegate.ts
 create mode 100644 packages/react-aria/exports/private/grid/useGrid.ts
 create mode 100644 packages/react-aria/exports/private/grid/useGridCell.ts
 create mode 100644 packages/react-aria/exports/private/grid/useGridRow.ts
 create mode 100644 packages/react-aria/exports/private/grid/useGridRowGroup.ts
 create mode 100644 packages/react-aria/exports/private/grid/useGridSelectionAnnouncement.ts
 create mode 100644 packages/react-aria/exports/private/grid/useGridSelectionCheckbox.ts
 create mode 100644 packages/react-aria/exports/private/grid/useHighlightSelectionDescription.ts
 create mode 100644 packages/react-aria/exports/private/i18n/useLocalizedStringFormatter.ts
 create mode 100644 packages/react-aria/exports/private/i18n/useMessageFormatter.ts
 create mode 100644 packages/react-aria/exports/private/i18n/utils.ts
 create mode 100644 packages/react-aria/exports/private/interactions/PressResponder.ts
 create mode 100644 packages/react-aria/exports/private/interactions/Pressable.ts
 create mode 100644 packages/react-aria/exports/private/interactions/focusSafely.ts
 create mode 100644 packages/react-aria/exports/private/interactions/useFocusVisible.ts
 create mode 100644 packages/react-aria/exports/private/interactions/useFocusable.ts
 create mode 100644 packages/react-aria/exports/private/interactions/useInteractOutside.ts
 create mode 100644 packages/react-aria/exports/private/interactions/useScrollWheel.ts
 create mode 100644 packages/react-aria/exports/private/landmark/useLandmark.ts
 create mode 100644 packages/react-aria/exports/private/listbox/utils.ts
 create mode 100644 packages/react-aria/exports/private/live-announcer/LiveAnnouncer.ts
 create mode 100644 packages/react-aria/exports/private/overlays/Overlay.ts
 create mode 100644 packages/react-aria/exports/private/overlays/ariaHideOutside.ts
 create mode 100644 packages/react-aria/exports/private/overlays/useModal.ts
 create mode 100644 packages/react-aria/exports/private/overlays/useOverlay.ts
 create mode 100644 packages/react-aria/exports/private/overlays/useOverlayPosition.ts
 create mode 100644 packages/react-aria/exports/private/overlays/usePreventScroll.ts
 create mode 100644 packages/react-aria/exports/private/selection/DOMLayoutDelegate.ts
 create mode 100644 packages/react-aria/exports/private/selection/useSelectableCollection.ts
 create mode 100644 packages/react-aria/exports/private/selection/useSelectableItem.ts
 create mode 100644 packages/react-aria/exports/private/selection/useSelectableList.ts
 create mode 100644 packages/react-aria/exports/private/selection/useTypeSelect.ts
 create mode 100644 packages/react-aria/exports/private/spinbutton/useSpinButton.ts
 create mode 100644 packages/react-aria/exports/private/ssr/SSRProvider.ts
 create mode 100644 packages/react-aria/exports/private/steplist/useStepList.ts
 create mode 100644 packages/react-aria/exports/private/steplist/useStepListItem.ts
 create mode 100644 packages/react-aria/exports/private/textfield/useFormattedTextField.ts
 create mode 100644 packages/react-aria/exports/private/toggle/useToggle.ts
 create mode 100644 packages/react-aria/exports/private/toolbar/useToolbar.ts
 create mode 100644 packages/react-aria/exports/private/tree/useTree.ts
 create mode 100644 packages/react-aria/exports/private/tree/useTreeItem.ts
 create mode 100644 packages/react-aria/exports/private/utils/animation.ts
 create mode 100644 packages/react-aria/exports/private/utils/chain.ts
 create mode 100644 packages/react-aria/exports/private/utils/constants.ts
 create mode 100644 packages/react-aria/exports/private/utils/domHelpers.ts
 create mode 100644 packages/react-aria/exports/private/utils/filterDOMProps.ts
 create mode 100644 packages/react-aria/exports/private/utils/focusWithoutScrolling.ts
 create mode 100644 packages/react-aria/exports/private/utils/getNonce.ts
 create mode 100644 packages/react-aria/exports/private/utils/getOffset.ts
 create mode 100644 packages/react-aria/exports/private/utils/getScrollParent.ts
 create mode 100644 packages/react-aria/exports/private/utils/getScrollParents.ts
 create mode 100644 packages/react-aria/exports/private/utils/inertValue.ts
 create mode 100644 packages/react-aria/exports/private/utils/isFocusable.ts
 create mode 100644 packages/react-aria/exports/private/utils/isScrollable.ts
 create mode 100644 packages/react-aria/exports/private/utils/isVirtualEvent.ts
 create mode 100644 packages/react-aria/exports/private/utils/keyboard.ts
 create mode 100644 packages/react-aria/exports/private/utils/mergeRefs.ts
 create mode 100644 packages/react-aria/exports/private/utils/openLink.ts
 create mode 100644 packages/react-aria/exports/private/utils/platform.ts
 create mode 100644 packages/react-aria/exports/private/utils/runAfterTransition.ts
 create mode 100644 packages/react-aria/exports/private/utils/scrollIntoView.ts
 create mode 100644 packages/react-aria/exports/private/utils/shadowdom/DOMFunctions.ts
 create mode 100644 packages/react-aria/exports/private/utils/shadowdom/ShadowTreeWalker.ts
 create mode 100644 packages/react-aria/exports/private/utils/useDeepMemo.ts
 create mode 100644 packages/react-aria/exports/private/utils/useDescription.ts
 create mode 100644 packages/react-aria/exports/private/utils/useDrag1D.ts
 create mode 100644 packages/react-aria/exports/private/utils/useEffectEvent.ts
 create mode 100644 packages/react-aria/exports/private/utils/useEvent.ts
 create mode 100644 packages/react-aria/exports/private/utils/useFormReset.ts
 create mode 100644 packages/react-aria/exports/private/utils/useGlobalListeners.ts
 create mode 100644 packages/react-aria/exports/private/utils/useId.ts
 create mode 100644 packages/react-aria/exports/private/utils/useLabels.ts
 create mode 100644 packages/react-aria/exports/private/utils/useLayoutEffect.ts
 create mode 100644 packages/react-aria/exports/private/utils/useLoadMore.ts
 create mode 100644 packages/react-aria/exports/private/utils/useLoadMoreSentinel.ts
 create mode 100644 packages/react-aria/exports/private/utils/useResizeObserver.ts
 create mode 100644 packages/react-aria/exports/private/utils/useSyncRef.ts
 create mode 100644 packages/react-aria/exports/private/utils/useUpdateEffect.ts
 create mode 100644 packages/react-aria/exports/private/utils/useUpdateLayoutEffect.ts
 create mode 100644 packages/react-aria/exports/private/utils/useValueEffect.ts
 create mode 100644 packages/react-aria/exports/private/utils/useViewportSize.ts
 create mode 100644 packages/react-aria/exports/private/virtualizer/ScrollView.ts
 create mode 100644 packages/react-aria/exports/private/virtualizer/Virtualizer.ts
 create mode 100644 packages/react-aria/exports/private/virtualizer/VirtualizerItem.ts
 create mode 100644 packages/react-aria/exports/private/virtualizer/useVirtualizerItem.ts
 create mode 100644 packages/react-aria/exports/private/virtualizer/utils.ts
 create mode 100644 packages/react-aria/exports/useBreadcrumbs.ts
 create mode 100644 packages/react-aria/exports/useButton.ts
 create mode 100644 packages/react-aria/exports/useCalendar.ts
 create mode 100644 packages/react-aria/exports/useCheckbox.ts
 create mode 100644 packages/react-aria/exports/useCheckboxGroup.ts
 create mode 100644 packages/react-aria/exports/useClipboard.ts
 create mode 100644 packages/react-aria/exports/useCollator.ts
 create mode 100644 packages/react-aria/exports/useColorArea.ts
 create mode 100644 packages/react-aria/exports/useColorField.ts
 create mode 100644 packages/react-aria/exports/useColorSlider.ts
 create mode 100644 packages/react-aria/exports/useColorSwatch.ts
 create mode 100644 packages/react-aria/exports/useColorWheel.ts
 create mode 100644 packages/react-aria/exports/useComboBox.ts
 create mode 100644 packages/react-aria/exports/useDateField.ts
 create mode 100644 packages/react-aria/exports/useDateFormatter.ts
 create mode 100644 packages/react-aria/exports/useDatePicker.ts
 create mode 100644 packages/react-aria/exports/useDateRangePicker.ts
 create mode 100644 packages/react-aria/exports/useDialog.ts
 rename packages/{@react-aria/combobox/index.ts => react-aria/exports/useDisclosure.ts} (80%)
 create mode 100644 packages/react-aria/exports/useDrag.ts
 create mode 100644 packages/react-aria/exports/useDraggableCollection.ts
 create mode 100644 packages/react-aria/exports/useDrop.ts
 create mode 100644 packages/react-aria/exports/useDroppableCollection.ts
 create mode 100644 packages/react-aria/exports/useField.ts
 create mode 100644 packages/react-aria/exports/useFilter.ts
 create mode 100644 packages/react-aria/exports/useFocus.ts
 create mode 100644 packages/react-aria/exports/useFocusRing.ts
 create mode 100644 packages/react-aria/exports/useFocusVisible.ts
 create mode 100644 packages/react-aria/exports/useFocusWithin.ts
 create mode 100644 packages/react-aria/exports/useGridList.ts
 create mode 100644 packages/react-aria/exports/useHover.ts
 rename packages/{@react-aria/breadcrumbs/index.ts => react-aria/exports/useId.ts} (86%)
 create mode 100644 packages/react-aria/exports/useKeyboard.ts
 create mode 100644 packages/react-aria/exports/useLabel.ts
 rename packages/{@react-spectrum/badge/index.ts => react-aria/exports/useLandmark.ts} (77%)
 create mode 100644 packages/react-aria/exports/useLink.ts
 create mode 100644 packages/react-aria/exports/useListBox.ts
 create mode 100644 packages/react-aria/exports/useListFormatter.ts
 create mode 100644 packages/react-aria/exports/useLocalizedStringFormatter.ts
 create mode 100644 packages/react-aria/exports/useLongPress.ts
 create mode 100644 packages/react-aria/exports/useMenu.ts
 create mode 100644 packages/react-aria/exports/useMeter.ts
 create mode 100644 packages/react-aria/exports/useModalOverlay.ts
 create mode 100644 packages/react-aria/exports/useMove.ts
 create mode 100644 packages/react-aria/exports/useNumberField.ts
 create mode 100644 packages/react-aria/exports/useNumberFormatter.ts
 create mode 100644 packages/react-aria/exports/useObjectRef.ts
 create mode 100644 packages/react-aria/exports/useOverlayTrigger.ts
 create mode 100644 packages/react-aria/exports/usePopover.ts
 create mode 100644 packages/react-aria/exports/usePress.ts
 create mode 100644 packages/react-aria/exports/useProgressBar.ts
 create mode 100644 packages/react-aria/exports/useRadioGroup.ts
 create mode 100644 packages/react-aria/exports/useRangeCalendar.ts
 create mode 100644 packages/react-aria/exports/useSearchField.ts
 create mode 100644 packages/react-aria/exports/useSelect.ts
 create mode 100644 packages/react-aria/exports/useSeparator.ts
 create mode 100644 packages/react-aria/exports/useSlider.ts
 create mode 100644 packages/react-aria/exports/useSwitch.ts
 create mode 100644 packages/react-aria/exports/useTabList.ts
 create mode 100644 packages/react-aria/exports/useTable.ts
 create mode 100644 packages/react-aria/exports/useTagGroup.ts
 create mode 100644 packages/react-aria/exports/useTextField.ts
 create mode 100644 packages/react-aria/exports/useToast.ts
 create mode 100644 packages/react-aria/exports/useToggleButton.ts
 create mode 100644 packages/react-aria/exports/useToggleButtonGroup.ts
 create mode 100644 packages/react-aria/exports/useTooltipTrigger.ts
 delete mode 100644 packages/react-aria/index.ts
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/ar-AE.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/bg-BG.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/cs-CZ.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/da-DK.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/de-DE.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/el-GR.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/en-US.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/es-ES.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/et-EE.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/fi-FI.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/fr-FR.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/he-IL.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/hr-HR.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/hu-HU.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/it-IT.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/ja-JP.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/ko-KR.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/lt-LT.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/lv-LV.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/nb-NO.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/nl-NL.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/pl-PL.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/pt-BR.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/pt-PT.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/ro-RO.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/ru-RU.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/sk-SK.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/sl-SI.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/sr-SP.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/sv-SE.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/tr-TR.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/uk-UA.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/zh-CN.json (100%)
 rename packages/{@react-aria/autocomplete/intl => react-aria/intl/autocomplete}/zh-TW.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/ar-AE.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/bg-BG.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/cs-CZ.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/da-DK.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/de-DE.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/el-GR.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/en-US.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/es-ES.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/et-EE.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/fi-FI.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/fr-FR.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/he-IL.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/hr-HR.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/hu-HU.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/it-IT.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/ja-JP.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/ko-KR.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/lt-LT.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/lv-LV.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/nb-NO.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/nl-NL.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/pl-PL.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/pt-BR.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/pt-PT.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/ro-RO.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/ru-RU.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/sk-SK.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/sl-SI.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/sr-SP.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/sv-SE.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/tr-TR.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/uk-UA.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/zh-CN.json (100%)
 rename packages/{@react-aria/breadcrumbs/intl => react-aria/intl/breadcrumbs}/zh-TW.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/ar-AE.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/bg-BG.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/cs-CZ.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/da-DK.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/de-DE.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/el-GR.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/en-US.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/es-ES.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/et-EE.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/fi-FI.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/fr-FR.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/he-IL.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/hr-HR.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/hu-HU.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/it-IT.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/ja-JP.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/ko-KR.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/lt-LT.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/lv-LV.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/nb-NO.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/nl-NL.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/pl-PL.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/pt-BR.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/pt-PT.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/ro-RO.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/ru-RU.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/sk-SK.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/sl-SI.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/sr-SP.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/sv-SE.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/tr-TR.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/uk-UA.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/zh-CN.json (100%)
 rename packages/{@react-aria/calendar/intl => react-aria/intl/calendar}/zh-TW.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/ar-AE.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/bg-BG.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/cs-CZ.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/da-DK.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/de-DE.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/el-GR.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/en-US.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/es-ES.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/et-EE.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/fi-FI.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/fr-FR.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/he-IL.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/hr-HR.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/hu-HU.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/it-IT.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/ja-JP.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/ko-KR.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/lt-LT.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/lv-LV.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/nb-NO.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/nl-NL.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/pl-PL.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/pt-BR.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/pt-PT.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/ro-RO.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/ru-RU.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/sk-SK.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/sl-SI.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/sr-SP.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/sv-SE.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/tr-TR.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/uk-UA.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/zh-CN.json (100%)
 rename packages/{@react-aria/color/intl => react-aria/intl/color}/zh-TW.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/ar-AE.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/bg-BG.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/cs-CZ.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/da-DK.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/de-DE.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/el-GR.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/en-US.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/es-ES.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/et-EE.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/fi-FI.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/fr-FR.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/he-IL.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/hr-HR.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/hu-HU.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/it-IT.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/ja-JP.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/ko-KR.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/lt-LT.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/lv-LV.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/nb-NO.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/nl-NL.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/pl-PL.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/pt-BR.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/pt-PT.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/ro-RO.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/ru-RU.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/sk-SK.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/sl-SI.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/sr-SP.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/sv-SE.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/tr-TR.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/uk-UA.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/zh-CN.json (100%)
 rename packages/{@react-aria/combobox/intl => react-aria/intl/combobox}/zh-TW.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/ar-AE.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/bg-BG.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/cs-CZ.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/da-DK.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/de-DE.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/el-GR.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/en-US.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/es-ES.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/et-EE.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/fi-FI.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/fr-FR.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/he-IL.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/hr-HR.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/hu-HU.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/it-IT.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/ja-JP.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/ko-KR.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/lt-LT.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/lv-LV.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/nb-NO.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/nl-NL.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/pl-PL.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/pt-BR.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/pt-PT.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/ro-RO.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/ru-RU.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/sk-SK.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/sl-SI.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/sr-SP.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/sv-SE.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/tr-TR.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/uk-UA.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/zh-CN.json (100%)
 rename packages/{@react-aria/datepicker/intl => react-aria/intl/datepicker}/zh-TW.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/ar-AE.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/bg-BG.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/cs-CZ.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/da-DK.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/de-DE.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/el-GR.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/en-US.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/es-ES.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/et-EE.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/fi-FI.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/fr-FR.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/he-IL.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/hr-HR.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/hu-HU.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/it-IT.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/ja-JP.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/ko-KR.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/lt-LT.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/lv-LV.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/nb-NO.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/nl-NL.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/pl-PL.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/pt-BR.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/pt-PT.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/ro-RO.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/ru-RU.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/sk-SK.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/sl-SI.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/sr-SP.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/sv-SE.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/tr-TR.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/uk-UA.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/zh-CN.json (100%)
 rename packages/{@react-aria/dnd/intl => react-aria/intl/dnd}/zh-TW.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/ar-AE.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/bg-BG.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/cs-CZ.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/da-DK.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/de-DE.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/el-GR.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/en-US.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/es-ES.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/et-EE.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/fi-FI.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/fr-FR.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/he-IL.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/hr-HR.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/hu-HU.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/it-IT.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/ja-JP.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/ko-KR.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/lt-LT.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/lv-LV.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/nb-NO.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/nl-NL.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/pl-PL.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/pt-BR.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/pt-PT.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/ro-RO.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/ru-RU.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/sk-SK.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/sl-SI.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/sr-SP.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/sv-SE.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/tr-TR.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/uk-UA.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/zh-CN.json (100%)
 rename packages/{@react-aria/grid/intl => react-aria/intl/grid}/zh-TW.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/ar-AE.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/bg-BG.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/cs-CZ.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/da-DK.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/de-DE.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/el-GR.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/en-US.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/es-ES.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/et-EE.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/fi-FI.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/fr-FR.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/he-IL.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/hr-HR.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/hu-HU.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/it-IT.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/ja-JP.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/ko-KR.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/lt-LT.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/lv-LV.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/nb-NO.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/nl-NL.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/pl-PL.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/pt-BR.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/pt-PT.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/ro-RO.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/ru-RU.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/sk-SK.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/sl-SI.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/sr-SP.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/sv-SE.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/tr-TR.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/uk-UA.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/zh-CN.json (100%)
 rename packages/{@react-aria/gridlist/intl => react-aria/intl/gridlist}/zh-TW.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/ar-AE.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/bg-BG.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/cs-CZ.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/da-DK.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/de-DE.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/el-GR.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/en-US.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/es-ES.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/et-EE.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/fi-FI.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/fr-FR.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/he-IL.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/hr-HR.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/hu-HU.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/it-IT.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/ja-JP.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/ko-KR.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/lt-LT.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/lv-LV.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/nb-NO.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/nl-NL.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/pl-PL.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/pt-BR.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/pt-PT.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/ro-RO.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/ru-RU.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/sk-SK.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/sl-SI.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/sr-SP.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/sv-SE.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/tr-TR.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/uk-UA.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/zh-CN.json (100%)
 rename packages/{@react-aria/menu/intl => react-aria/intl/menu}/zh-TW.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/ar-AE.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/bg-BG.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/cs-CZ.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/da-DK.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/de-DE.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/el-GR.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/en-US.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/es-ES.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/et-EE.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/fi-FI.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/fr-FR.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/he-IL.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/hr-HR.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/hu-HU.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/it-IT.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/ja-JP.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/ko-KR.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/lt-LT.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/lv-LV.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/nb-NO.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/nl-NL.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/pl-PL.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/pt-BR.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/pt-PT.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/ro-RO.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/ru-RU.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/sk-SK.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/sl-SI.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/sr-SP.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/sv-SE.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/tr-TR.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/uk-UA.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/zh-CN.json (100%)
 rename packages/{@react-aria/numberfield/intl => react-aria/intl/numberfield}/zh-TW.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/ar-AE.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/bg-BG.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/cs-CZ.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/da-DK.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/de-DE.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/el-GR.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/en-US.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/es-ES.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/et-EE.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/fi-FI.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/fr-FR.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/he-IL.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/hr-HR.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/hu-HU.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/it-IT.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/ja-JP.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/ko-KR.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/lt-LT.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/lv-LV.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/nb-NO.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/nl-NL.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/pl-PL.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/pt-BR.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/pt-PT.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/ro-RO.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/ru-RU.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/sk-SK.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/sl-SI.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/sr-SP.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/sv-SE.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/tr-TR.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/uk-UA.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/zh-CN.json (100%)
 rename packages/{@react-aria/overlays/intl => react-aria/intl/overlays}/zh-TW.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/ar-AE.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/bg-BG.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/cs-CZ.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/da-DK.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/de-DE.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/el-GR.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/en-US.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/es-ES.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/et-EE.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/fi-FI.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/fr-FR.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/he-IL.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/hr-HR.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/hu-HU.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/it-IT.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/ja-JP.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/ko-KR.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/lt-LT.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/lv-LV.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/nb-NO.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/nl-NL.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/pl-PL.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/pt-BR.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/pt-PT.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/ro-RO.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/ru-RU.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/sk-SK.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/sl-SI.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/sr-SP.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/sv-SE.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/tr-TR.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/uk-UA.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/zh-CN.json (100%)
 rename packages/{@react-aria/searchfield/intl => react-aria/intl/searchfield}/zh-TW.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/ar-AE.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/bg-BG.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/cs-CZ.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/da-DK.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/de-DE.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/el-GR.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/en-US.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/es-ES.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/et-EE.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/fi-FI.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/fr-FR.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/he-IL.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/hr-HR.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/hu-HU.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/it-IT.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/ja-JP.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/ko-KR.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/lt-LT.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/lv-LV.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/nb-NO.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/nl-NL.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/pl-PL.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/pt-BR.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/pt-PT.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/ro-RO.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/ru-RU.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/sk-SK.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/sl-SI.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/sr-SP.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/sv-SE.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/tr-TR.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/uk-UA.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/zh-CN.json (100%)
 rename packages/{@react-aria/spinbutton/intl => react-aria/intl/spinbutton}/zh-TW.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/ar-AE.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/bg-BG.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/cs-CZ.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/da-DK.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/de-DE.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/el-GR.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/en-US.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/es-ES.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/et-EE.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/fi-FI.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/fr-FR.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/he-IL.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/hr-HR.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/hu-HU.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/it-IT.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/ja-JP.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/ko-KR.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/lt-LT.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/lv-LV.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/nb-NO.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/nl-NL.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/pl-PL.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/pt-BR.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/pt-PT.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/ro-RO.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/ru-RU.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/sk-SK.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/sl-SI.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/sr-SP.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/sv-SE.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/tr-TR.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/uk-UA.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/zh-CN.json (100%)
 rename packages/{@react-aria/steplist/intl => react-aria/intl/steplist}/zh-TW.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/ar-AE.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/bg-BG.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/cs-CZ.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/da-DK.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/de-DE.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/el-GR.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/en-US.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/es-ES.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/et-EE.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/fi-FI.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/fr-FR.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/he-IL.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/hr-HR.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/hu-HU.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/it-IT.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/ja-JP.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/ko-KR.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/lt-LT.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/lv-LV.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/nb-NO.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/nl-NL.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/pl-PL.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/pt-BR.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/pt-PT.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/ro-RO.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/ru-RU.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/sk-SK.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/sl-SI.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/sr-SP.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/sv-SE.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/tr-TR.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/uk-UA.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/zh-CN.json (100%)
 rename packages/{@react-aria/table/intl => react-aria/intl/table}/zh-TW.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/ar-AE.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/bg-BG.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/cs-CZ.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/da-DK.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/de-DE.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/el-GR.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/en-US.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/es-ES.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/et-EE.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/fi-FI.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/fr-FR.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/he-IL.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/hr-HR.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/hu-HU.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/it-IT.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/ja-JP.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/ko-KR.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/lt-LT.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/lv-LV.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/nb-NO.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/nl-NL.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/pl-PL.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/pt-BR.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/pt-PT.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/ro-RO.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/ru-RU.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/sk-SK.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/sl-SI.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/sr-SP.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/sv-SE.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/tr-TR.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/uk-UA.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/zh-CN.json (100%)
 rename packages/{@react-aria/tag/intl => react-aria/intl/tag}/zh-TW.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/ar-AE.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/bg-BG.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/cs-CZ.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/da-DK.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/de-DE.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/el-GR.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/en-US.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/es-ES.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/et-EE.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/fi-FI.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/fr-FR.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/he-IL.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/hr-HR.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/hu-HU.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/it-IT.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/ja-JP.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/ko-KR.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/lt-LT.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/lv-LV.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/nb-NO.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/nl-NL.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/pl-PL.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/pt-BR.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/pt-PT.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/ro-RO.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/ru-RU.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/sk-SK.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/sl-SI.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/sr-SP.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/sv-SE.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/tr-TR.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/uk-UA.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/zh-CN.json (100%)
 rename packages/{@react-aria/toast/intl => react-aria/intl/toast}/zh-TW.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/ar-AE.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/bg-BG.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/cs-CZ.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/da-DK.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/de-DE.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/el-GR.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/en-US.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/es-ES.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/et-EE.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/fi-FI.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/fr-FR.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/he-IL.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/hr-HR.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/hu-HU.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/it-IT.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/ja-JP.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/ko-KR.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/lt-LT.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/lv-LV.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/nb-NO.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/nl-NL.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/pl-PL.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/pt-BR.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/pt-PT.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/ro-RO.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/ru-RU.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/sk-SK.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/sl-SI.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/sr-SP.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/sv-SE.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/tr-TR.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/uk-UA.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/zh-CN.json (100%)
 rename packages/{@react-aria/tree/intl => react-aria/intl/tree}/zh-TW.json (100%)
 rename packages/{@react-aria/actiongroup/src => react-aria/src/actiongroup}/useActionGroup.ts (89%)
 rename packages/{@react-aria/actiongroup/src => react-aria/src/actiongroup}/useActionGroupItem.ts (91%)
 rename packages/{@react-aria/aria-modal-polyfill/src => react-aria/src/aria-modal-polyfill}/ariaModalPolyfill.ts (100%)
 rename packages/{@react-aria/autocomplete/src => react-aria/src/autocomplete}/useAutocomplete.ts (93%)
 rename packages/{@react-aria/autocomplete/src => react-aria/src/autocomplete}/useSearchAutocomplete.ts (93%)
 rename packages/{@react-aria/breadcrumbs/src => react-aria/src/breadcrumbs}/useBreadcrumbItem.ts (97%)
 rename packages/{@react-aria/breadcrumbs/src => react-aria/src/breadcrumbs}/useBreadcrumbs.ts (88%)
 rename packages/{@react-aria/button/src => react-aria/src/button}/useButton.ts (95%)
 rename packages/{@react-aria/button/src => react-aria/src/button}/useToggleButton.ts (95%)
 rename packages/{@react-aria/button/src => react-aria/src/button}/useToggleButtonGroup.ts (95%)
 rename packages/{@react-aria/calendar/src => react-aria/src/calendar}/useCalendar.ts (94%)
 rename packages/{@react-aria/calendar/src => react-aria/src/calendar}/useCalendarBase.ts (89%)
 rename packages/{@react-aria/calendar/src => react-aria/src/calendar}/useCalendarCell.ts (94%)
 rename packages/{@react-aria/calendar/src => react-aria/src/calendar}/useCalendarGrid.ts (95%)
 rename packages/{@react-aria/calendar/src => react-aria/src/calendar}/useRangeCalendar.ts (94%)
 rename packages/{@react-aria/calendar/src => react-aria/src/calendar}/utils.ts (95%)
 rename packages/{@react-aria/checkbox/src => react-aria/src/checkbox}/useCheckbox.ts (92%)
 rename packages/{@react-aria/checkbox/src => react-aria/src/checkbox}/useCheckboxGroup.ts (90%)
 rename packages/{@react-aria/checkbox/src => react-aria/src/checkbox}/useCheckboxGroupItem.ts (93%)
 rename packages/{@react-aria/checkbox/src => react-aria/src/checkbox}/utils.ts (92%)
 rename packages/{@react-aria/collections/src => react-aria/src/collections}/BaseCollection.ts (100%)
 rename packages/{@react-aria/collections/src => react-aria/src/collections}/CollectionBuilder.tsx (98%)
 rename packages/{@react-aria/collections/src => react-aria/src/collections}/Document.ts (100%)
 rename packages/{@react-aria/collections/src => react-aria/src/collections}/Hidden.tsx (100%)
 rename packages/{@react-aria/collections/src => react-aria/src/collections}/useCachedChildren.ts (100%)
 rename packages/{@react-aria/color/src => react-aria/src/color}/useColorArea.ts (95%)
 rename packages/{@react-aria/color/src => react-aria/src/color}/useColorAreaGradient.ts (97%)
 rename packages/{@react-aria/color/src => react-aria/src/color}/useColorChannelField.ts (87%)
 rename packages/{@react-aria/color/src => react-aria/src/color}/useColorField.ts (87%)
 rename packages/{@react-aria/color/src => react-aria/src/color}/useColorSlider.ts (93%)
 rename packages/{@react-aria/color/src => react-aria/src/color}/useColorSwatch.ts (89%)
 rename packages/{@react-aria/color/src => react-aria/src/color}/useColorWheel.ts (94%)
 rename packages/{@react-aria/combobox/src => react-aria/src/combobox}/useComboBox.ts (91%)
 rename packages/{@react-aria/datepicker/src => react-aria/src/datepicker}/useDateField.ts (91%)
 rename packages/{@react-aria/datepicker/src => react-aria/src/datepicker}/useDatePicker.ts (89%)
 rename packages/{@react-aria/datepicker/src => react-aria/src/datepicker}/useDatePickerGroup.ts (88%)
 rename packages/{@react-aria/datepicker/src => react-aria/src/datepicker}/useDateRangePicker.ts (91%)
 rename packages/{@react-aria/datepicker/src => react-aria/src/datepicker}/useDateSegment.ts (95%)
 rename packages/{@react-aria/datepicker/src => react-aria/src/datepicker}/useDisplayNames.ts (90%)
 rename packages/{@react-aria/dialog/src => react-aria/src/dialog}/useDialog.ts (91%)
 rename packages/{@react-aria/disclosure/src => react-aria/src/disclosure}/useDisclosure.ts (95%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/DragManager.ts (98%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/DragPreview.tsx (100%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/DropTargetKeyboardNavigation.ts (99%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/ListDropTargetDelegate.ts (100%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/constants.ts (100%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/useAutoScroll.ts (95%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/useClipboard.ts (96%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/useDrag.ts (97%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/useDraggableCollection.ts (94%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/useDraggableItem.ts (95%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/useDrop.ts (98%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/useDropIndicator.ts (94%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/useDroppableCollection.ts (98%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/useDroppableItem.ts (97%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/useVirtualDrop.ts (90%)
 rename packages/{@react-aria/dnd/src => react-aria/src/dnd}/utils.ts (98%)
 rename packages/{@react-aria/focus/src => react-aria/src/focus}/FocusRing.tsx (97%)
 rename packages/{@react-aria/focus/src => react-aria/src/focus}/FocusScope.tsx (98%)
 rename packages/{@react-aria/focus/src => react-aria/src/focus}/useFocusRing.ts (91%)
 rename packages/{@react-aria/focus/src => react-aria/src/focus}/useHasTabbableChild.ts (97%)
 rename packages/{@react-aria/focus/src => react-aria/src/focus}/virtualFocus.ts (89%)
 rename packages/{@react-aria/form/src => react-aria/src/form}/useFormValidation.ts (94%)
 rename packages/{@react-aria/grid/src => react-aria/src/grid}/GridKeyboardDelegate.ts (99%)
 rename packages/{@react-aria/grid/src => react-aria/src/grid}/useGrid.ts (92%)
 rename packages/{@react-aria/grid/src => react-aria/src/grid}/useGridCell.ts (94%)
 rename packages/{@react-aria/grid/src => react-aria/src/grid}/useGridRow.ts (94%)
 rename packages/{@react-aria/grid/src => react-aria/src/grid}/useGridRowGroup.ts (100%)
 rename packages/{@react-aria/grid/src => react-aria/src/grid}/useGridSelectionAnnouncement.ts (93%)
 rename packages/{@react-aria/grid/src => react-aria/src/grid}/useGridSelectionCheckbox.ts (85%)
 rename packages/{@react-aria/grid/src => react-aria/src/grid}/useHighlightSelectionDescription.ts (86%)
 rename packages/{@react-aria/grid/src => react-aria/src/grid}/utils.ts (94%)
 rename packages/{@react-aria/gridlist/src => react-aria/src/gridlist}/useGridList.ts (92%)
 rename packages/{@react-aria/gridlist/src => react-aria/src/gridlist}/useGridListItem.ts (94%)
 rename packages/{@react-aria/gridlist/src => react-aria/src/gridlist}/useGridListSection.ts (92%)
 rename packages/{@react-aria/gridlist/src => react-aria/src/gridlist}/useGridListSelectionCheckbox.ts (86%)
 rename packages/{@react-aria/gridlist/src => react-aria/src/gridlist}/utils.ts (96%)
 rename packages/{@react-aria/i18n/src => react-aria/src/i18n}/I18nProvider.tsx (100%)
 rename packages/{@react-aria/i18n/src => react-aria/src/i18n}/main.js (100%)
 rename packages/{@react-aria/i18n/src => react-aria/src/i18n}/module.js (100%)
 rename packages/{@react-aria/i18n/src => react-aria/src/i18n}/server.tsx (100%)
 rename packages/{@react-aria/i18n/src => react-aria/src/i18n}/useCollator.ts (100%)
 rename packages/{@react-aria/i18n/src => react-aria/src/i18n}/useDateFormatter.ts (97%)
 rename packages/{@react-aria/i18n/src => react-aria/src/i18n}/useDefaultLocale.ts (98%)
 rename packages/{@react-aria/i18n/src => react-aria/src/i18n}/useFilter.ts (100%)
 rename packages/{@react-aria/i18n/src => react-aria/src/i18n}/useListFormatter.tsx (100%)
 rename packages/{@react-aria/i18n/src => react-aria/src/i18n}/useLocalizedStringFormatter.ts (100%)
 rename packages/{@react-aria/i18n/src => react-aria/src/i18n}/useMessageFormatter.ts (100%)
 rename packages/{@react-aria/i18n/src => react-aria/src/i18n}/useNumberFormatter.ts (100%)
 rename packages/{@react-aria/i18n/src => react-aria/src/i18n}/utils.ts (100%)
 delete mode 100644 packages/react-aria/src/index.ts
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/PressResponder.tsx (94%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/Pressable.tsx (92%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/context.ts (100%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/createEventHandler.ts (100%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/focusSafely.ts (88%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/textSelection.ts (96%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/useFocus.ts (95%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/useFocusVisible.ts (97%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/useFocusWithin.ts (95%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/useFocusable.tsx (94%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/useHover.ts (97%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/useInteractOutside.ts (96%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/useKeyboard.ts (100%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/useLongPress.ts (93%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/useMove.ts (98%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/usePress.ts (98%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/useScrollWheel.ts (97%)
 rename packages/{@react-aria/interactions/src => react-aria/src/interactions}/utils.ts (95%)
 rename packages/{@react-aria/label/src => react-aria/src/label}/useField.ts (96%)
 rename packages/{@react-aria/label/src => react-aria/src/label}/useLabel.ts (96%)
 rename packages/{@react-aria/landmark/src => react-aria/src/landmark}/useLandmark.ts (99%)
 rename packages/{@react-aria/link/src => react-aria/src/link}/useLink.ts (89%)
 rename packages/{@react-aria/listbox/src => react-aria/src/listbox}/useListBox.ts (92%)
 rename packages/{@react-aria/listbox/src => react-aria/src/listbox}/useListBoxSection.ts (98%)
 rename packages/{@react-aria/listbox/src => react-aria/src/listbox}/useOption.ts (90%)
 rename packages/{@react-aria/listbox/src => react-aria/src/listbox}/utils.ts (96%)
 rename packages/{@react-aria/live-announcer/src => react-aria/src/live-announcer}/LiveAnnouncer.tsx (100%)
 rename packages/{@react-aria/menu/src => react-aria/src/menu}/useMenu.ts (92%)
 rename packages/{@react-aria/menu/src => react-aria/src/menu}/useMenuItem.ts (92%)
 rename packages/{@react-aria/menu/src => react-aria/src/menu}/useMenuSection.ts (98%)
 rename packages/{@react-aria/menu/src => react-aria/src/menu}/useMenuTrigger.ts (91%)
 rename packages/{@react-aria/menu/src => react-aria/src/menu}/useSafelyMouseToSubmenu.ts (95%)
 rename packages/{@react-aria/menu/src => react-aria/src/menu}/useSubmenuTrigger.ts (94%)
 rename packages/{@react-aria/menu/src => react-aria/src/menu}/utils.ts (94%)
 rename packages/{@react-aria/meter/src => react-aria/src/meter}/useMeter.ts (96%)
 rename packages/{@react-aria/numberfield/src => react-aria/src/numberfield}/useNumberField.ts (92%)
 rename packages/{@react-aria/overlays/src => react-aria/src/overlays}/DismissButton.tsx (86%)
 rename packages/{@react-aria/overlays/src => react-aria/src/overlays}/Overlay.tsx (93%)
 rename packages/{@react-aria/overlays/src => react-aria/src/overlays}/PortalProvider.tsx (100%)
 rename packages/{@react-aria/overlays/src => react-aria/src/overlays}/ariaHideOutside.ts (97%)
 rename packages/{@react-aria/overlays/src => react-aria/src/overlays}/calculatePosition.ts (98%)
 rename packages/{@react-aria/overlays/src => react-aria/src/overlays}/useCloseOnScroll.ts (97%)
 rename packages/{@react-aria/overlays/src => react-aria/src/overlays}/useModal.tsx (99%)
 rename packages/{@react-aria/overlays/src => react-aria/src/overlays}/useModalOverlay.ts (94%)
 rename packages/{@react-aria/overlays/src => react-aria/src/overlays}/useOverlay.ts (95%)
 rename packages/{@react-aria/overlays/src => react-aria/src/overlays}/useOverlayPosition.ts (97%)
 rename packages/{@react-aria/overlays/src => react-aria/src/overlays}/useOverlayTrigger.ts (95%)
 rename packages/{@react-aria/overlays/src => react-aria/src/overlays}/usePopover.ts (97%)
 rename packages/{@react-aria/overlays/src => react-aria/src/overlays}/usePreventScroll.ts (96%)
 rename packages/{@react-aria/progress/src => react-aria/src/progress}/useProgressBar.ts (89%)
 rename packages/{@react-aria/radio/src => react-aria/src/radio}/useRadio.ts (92%)
 rename packages/{@react-aria/radio/src => react-aria/src/radio}/useRadioGroup.ts (90%)
 rename packages/{@react-aria/radio/src => react-aria/src/radio}/utils.ts (93%)
 rename packages/{@react-aria/searchfield/src => react-aria/src/searchfield}/useSearchField.ts (93%)
 rename packages/{@react-aria/select/src => react-aria/src/select}/HiddenSelect.tsx (96%)
 rename packages/{@react-aria/select/src => react-aria/src/select}/useSelect.ts (91%)
 rename packages/{@react-aria/selection/src => react-aria/src/selection}/DOMLayoutDelegate.ts (100%)
 rename packages/{@react-aria/selection/src => react-aria/src/selection}/ListKeyboardDelegate.ts (99%)
 rename packages/{@react-aria/selection/src => react-aria/src/selection}/useSelectableCollection.ts (95%)
 rename packages/{@react-aria/selection/src => react-aria/src/selection}/useSelectableItem.ts (96%)
 rename packages/{@react-aria/selection/src => react-aria/src/selection}/useSelectableList.ts (98%)
 rename packages/{@react-aria/selection/src => react-aria/src/selection}/useTypeSelect.ts (96%)
 rename packages/{@react-aria/selection/src => react-aria/src/selection}/utils.ts (95%)
 rename packages/{@react-aria/separator/src => react-aria/src/separator}/useSeparator.ts (97%)
 rename packages/{@react-aria/slider/src => react-aria/src/slider}/useSlider.ts (95%)
 rename packages/{@react-aria/slider/src => react-aria/src/slider}/useSliderThumb.ts (92%)
 rename packages/{@react-aria/slider/src => react-aria/src/slider}/utils.ts (87%)
 rename packages/{@react-aria/spinbutton/src => react-aria/src/spinbutton}/useSpinButton.ts (96%)
 rename packages/{@react-aria/ssr/src => react-aria/src/ssr}/SSRProvider.tsx (100%)
 rename packages/{@react-aria/steplist/src => react-aria/src/steplist}/useStepList.ts (79%)
 rename packages/{@react-aria/steplist/src => react-aria/src/steplist}/useStepListItem.ts (93%)
 rename packages/{@react-aria/switch/src => react-aria/src/switch}/useSwitch.ts (95%)
 rename packages/{@react-aria/table/src => react-aria/src/table}/TableKeyboardDelegate.ts (97%)
 rename packages/{@react-aria/table/src => react-aria/src/table}/useTable.ts (86%)
 rename packages/{@react-aria/table/src => react-aria/src/table}/useTableCell.ts (95%)
 rename packages/{@react-aria/table/src => react-aria/src/table}/useTableColumnHeader.ts (89%)
 rename packages/{@react-aria/table/src => react-aria/src/table}/useTableColumnResize.ts (91%)
 rename packages/{@react-aria/table/src => react-aria/src/table}/useTableHeaderRow.ts (93%)
 rename packages/{@react-aria/table/src => react-aria/src/table}/useTableRow.ts (89%)
 rename packages/{@react-aria/table/src => react-aria/src/table}/useTableRowGroup.ts (90%)
 rename packages/{@react-aria/table/src => react-aria/src/table}/useTableSelectionCheckbox.ts (91%)
 rename packages/{@react-aria/table/src => react-aria/src/table}/utils.ts (96%)
 rename packages/{@react-aria/tabs/src => react-aria/src/tabs}/TabsKeyboardDelegate.ts (100%)
 rename packages/{@react-aria/tabs/src => react-aria/src/tabs}/useTab.ts (88%)
 rename packages/{@react-aria/tabs/src => react-aria/src/tabs}/useTabList.ts (88%)
 rename packages/{@react-aria/tabs/src => react-aria/src/tabs}/useTabPanel.ts (89%)
 rename packages/{@react-aria/tabs/src => react-aria/src/tabs}/utils.ts (95%)
 rename packages/{@react-aria/tag/src => react-aria/src/tag}/useTag.ts (85%)
 rename packages/{@react-aria/tag/src => react-aria/src/tag}/useTagGroup.ts (91%)
 rename packages/{@react-aria/textfield/src => react-aria/src/textfield}/useFormattedTextField.ts (97%)
 rename packages/{@react-aria/textfield/src => react-aria/src/textfield}/useTextField.ts (93%)
 rename packages/{@react-aria/toast/src => react-aria/src/toast}/useToast.ts (89%)
 rename packages/{@react-aria/toast/src => react-aria/src/toast}/useToastRegion.ts (91%)
 rename packages/{@react-aria/toggle/src => react-aria/src/toggle}/useToggle.ts (91%)
 rename packages/{@react-aria/toolbar/src => react-aria/src/toolbar}/useToolbar.ts (94%)
 rename packages/{@react-aria/tooltip/src => react-aria/src/tooltip}/useTooltip.ts (84%)
 rename packages/{@react-aria/tooltip/src => react-aria/src/tooltip}/useTooltipTrigger.ts (92%)
 rename packages/{@react-aria/tree/src => react-aria/src/tree}/useTree.ts (95%)
 rename packages/{@react-aria/tree/src => react-aria/src/tree}/useTreeItem.ts (91%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/animation.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/chain.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/constants.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/domHelpers.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/filterDOMProps.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/focusWithoutScrolling.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/getNonce.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/getOffset.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/getScrollParent.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/getScrollParents.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/inertValue.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/isElementVisible.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/isFocusable.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/isScrollable.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/isVirtualEvent.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/keyboard.tsx (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/mergeProps.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/mergeRefs.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/openLink.tsx (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/platform.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/runAfterTransition.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/scrollIntoView.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/shadowdom/DOMFunctions.ts (98%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/shadowdom/ShadowTreeWalker.ts (99%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useDeepMemo.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useDescription.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useDrag1D.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useEffectEvent.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useEvent.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useFormReset.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useGlobalListeners.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useId.ts (98%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useLabels.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useLayoutEffect.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useLoadMore.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useLoadMoreSentinel.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useObjectRef.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useResizeObserver.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useSyncRef.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useUpdateEffect.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useUpdateLayoutEffect.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useValueEffect.ts (100%)
 rename packages/{@react-aria/utils/src => react-aria/src/utils}/useViewportSize.ts (98%)
 rename packages/{@react-aria/virtualizer/src => react-aria/src/virtualizer}/ScrollView.tsx (95%)
 rename packages/{@react-aria/virtualizer/src => react-aria/src/virtualizer}/Virtualizer.tsx (89%)
 rename packages/{@react-aria/virtualizer/src => react-aria/src/virtualizer}/VirtualizerItem.tsx (96%)
 rename packages/{@react-aria/virtualizer/src => react-aria/src/virtualizer}/useVirtualizerItem.ts (89%)
 rename packages/{@react-aria/virtualizer/src => react-aria/src/virtualizer}/utils.ts (100%)
 rename packages/{@react-aria/visually-hidden/src => react-aria/src/visually-hidden}/VisuallyHidden.tsx (96%)
 rename packages/{@react-aria/button/stories => react-aria/stories/button}/useButton.stories.tsx (96%)
 rename packages/{@react-aria/calendar/stories => react-aria/stories/calendar}/Example.tsx (89%)
 rename packages/{@react-aria/calendar/stories => react-aria/stories/calendar}/useCalendar.stories.tsx (100%)
 rename packages/{@react-aria/checkbox/stories => react-aria/stories/checkbox}/useCheckbox.stories.tsx (88%)
 rename packages/{@react-aria/combobox/stories => react-aria/stories/combobox}/example.tsx (89%)
 rename packages/{@react-aria/combobox/stories => react-aria/stories/combobox}/useComboBox.stories.tsx (93%)
 rename packages/{@react-aria/datepicker/stories => react-aria/stories/datepicker}/useDatePicker.stories.tsx (90%)
 rename packages/{@react-aria/dnd/stories => react-aria/stories/dnd}/DraggableCollection.tsx (84%)
 rename packages/{@react-aria/dnd/stories => react-aria/stories/dnd}/DraggableListBox.tsx (74%)
 rename packages/{@react-aria/dnd/stories => react-aria/stories/dnd}/DroppableGrid.tsx (89%)
 rename packages/{@react-aria/dnd/stories => react-aria/stories/dnd}/DroppableListBox.tsx (87%)
 rename packages/{@react-aria/dnd/stories => react-aria/stories/dnd}/Reorderable.tsx (86%)
 rename packages/{@react-aria/dnd/stories => react-aria/stories/dnd}/VirtualizedListBox.tsx (89%)
 rename packages/{@react-aria/dnd/stories => react-aria/stories/dnd}/dnd.css (100%)
 rename packages/{@react-aria/dnd/stories => react-aria/stories/dnd}/dnd.stories.tsx (91%)
 rename packages/{@react-aria/focus/stories => react-aria/stories/focus}/FocusScope.stories.tsx (96%)
 rename packages/{@react-aria/grid/stories => react-aria/stories/grid}/example.tsx (84%)
 rename packages/{@react-aria/grid/stories => react-aria/stories/grid}/useGrid.stories.tsx (95%)
 rename packages/{@react-aria/interactions/stories => react-aria/stories/interactions}/useFocusRing.stories.tsx (91%)
 rename packages/{@react-aria/interactions/stories => react-aria/stories/interactions}/useHover.stories.tsx (88%)
 rename packages/{@react-aria/interactions/stories => react-aria/stories/interactions}/useInteractOutside.stories.tsx (95%)
 rename packages/{@react-aria/interactions/stories => react-aria/stories/interactions}/useMove.stories.tsx (97%)
 rename packages/{@react-aria/interactions/stories => react-aria/stories/interactions}/usePress-stories.css (100%)
 rename packages/{@react-aria/interactions/stories => react-aria/stories/interactions}/usePress.stories.tsx (96%)
 rename packages/{@react-aria/label/stories => react-aria/stories/label}/useField.stories.tsx (96%)
 rename packages/{@react-aria/landmark/stories => react-aria/stories/landmark}/Landmark.stories.tsx (95%)
 rename packages/{@react-aria/landmark/stories => react-aria/stories/landmark}/index.css (100%)
 rename packages/{@react-aria/menu/stories => react-aria/stories/menu}/useMenu.stories.tsx (86%)
 rename packages/{@react-aria/overlays/stories => react-aria/stories/overlays}/UseOverlayPosition.stories.tsx (93%)
 rename packages/{@react-aria/overlays/stories => react-aria/stories/overlays}/useModal.stories.tsx (95%)
 rename packages/{@react-aria/overlays/stories => react-aria/stories/overlays}/usePreventScroll.stories.tsx (92%)
 rename packages/{@react-aria/select/stories => react-aria/stories/select}/example.tsx (87%)
 rename packages/{@react-aria/select/stories => react-aria/stories/select}/useSelect.stories.tsx (96%)
 rename packages/{@react-aria/selection/stories => react-aria/stories/selection}/List.tsx (87%)
 rename packages/{@react-aria/selection/stories => react-aria/stories/selection}/styles.css (100%)
 rename packages/{@react-aria/selection/stories => react-aria/stories/selection}/useSelectableList.stories.tsx (95%)
 rename packages/{@react-aria/slider/stories => react-aria/stories/slider}/Slider.stories.tsx (100%)
 rename packages/{@react-aria/slider/stories => react-aria/stories/slider}/StoryMultiSlider.tsx (89%)
 rename packages/{@react-aria/slider/stories => react-aria/stories/slider}/StoryRangeSlider.tsx (90%)
 rename packages/{@react-aria/slider/stories => react-aria/stories/slider}/StorySlider.tsx (90%)
 rename packages/{@react-aria/slider/stories => react-aria/stories/slider}/story-slider.css (100%)
 rename packages/{@react-aria/table/stories => react-aria/stories/table}/docs-example.css (100%)
 rename packages/{@react-aria/table/stories => react-aria/stories/table}/example-backwards-compat.tsx (90%)
 rename packages/{@react-aria/table/stories => react-aria/stories/table}/example-docs.tsx (90%)
 rename packages/{@react-aria/table/stories => react-aria/stories/table}/example-resizing.tsx (90%)
 rename packages/{@react-aria/table/stories => react-aria/stories/table}/example.tsx (89%)
 rename packages/{@react-aria/table/stories => react-aria/stories/table}/resizing.css (100%)
 rename packages/{@react-aria/table/stories => react-aria/stories/table}/useTable.stories.tsx (97%)
 rename packages/{@react-aria/tabs/stories => react-aria/stories/tabs}/example.tsx (89%)
 rename packages/{@react-aria/tabs/stories => react-aria/stories/tabs}/useTabList.stories.tsx (96%)
 rename packages/{@react-aria/textfield/stories => react-aria/stories/textfield}/useTextField.stories.tsx (96%)
 rename packages/{@react-aria/toast/stories => react-aria/stories/toast}/Example.tsx (88%)
 rename packages/{@react-aria/toast/stories => react-aria/stories/toast}/useToast.stories.tsx (95%)
 rename packages/{@react-aria/utils/stories => react-aria/stories/utils}/platform.stories.tsx (97%)
 rename packages/{@react-aria/utils/stories => react-aria/stories/utils}/useId.stories.tsx (95%)
 rename packages/{@react-aria/utils/stories => react-aria/stories/utils}/useViewportSize.stories.tsx (94%)
 rename packages/{@react-aria/actiongroup/test => react-aria/test/actiongroup}/useActionGroup.test.ts (94%)
 rename packages/{@react-aria/aria-modal-polyfill/test => react-aria/test/aria-modal-polyfill}/index.test.tsx (91%)
 rename packages/{@react-aria/autocomplete/test => react-aria/test/autocomplete}/useSearchAutocomplete.test.js (94%)
 rename packages/{@react-aria/breadcrumbs/test => react-aria/test/breadcrumbs}/useBreadcrumbItem.test.js (96%)
 rename packages/{@react-aria/breadcrumbs/test => react-aria/test/breadcrumbs}/useBreadcrumbs.test.js (94%)
 rename packages/{@react-aria/button/test => react-aria/test/button}/useButton.test.js (98%)
 rename packages/{@react-aria/calendar/test => react-aria/test/calendar}/useCalendar.test.js (99%)
 rename packages/{@react-aria/checkbox/test => react-aria/test/checkbox}/useCheckboxGroup.test.tsx (97%)
 rename packages/{@react-aria/collections/test => react-aria/test/collections}/CollectionBuilder.test.js (91%)
 rename packages/{@react-aria/color/test => react-aria/test/color}/useColorField.test.js (95%)
 rename packages/{@react-aria/color/test => react-aria/test/color}/useColorWheel.test.tsx (98%)
 rename packages/{@react-aria/combobox/test => react-aria/test/combobox}/useComboBox.test.js (97%)
 rename packages/{@react-aria/datepicker/test => react-aria/test/datepicker}/useDatePicker.test.tsx (92%)
 rename packages/{@react-aria/dialog/test => react-aria/test/dialog}/useDialog.test.js (97%)
 rename packages/{@react-aria/disclosure/test => react-aria/test/disclosure}/useDisclosure.test.ts (97%)
 rename packages/{@react-aria/dnd/test => react-aria/test/dnd}/DropTargetKeyboardNavigation.test.tsx (98%)
 rename packages/{@react-aria/dnd/test => react-aria/test/dnd}/dnd.ssr.test.js (100%)
 rename packages/{@react-aria/dnd/test => react-aria/test/dnd}/dnd.test.js (99%)
 rename packages/{@react-aria/dnd/test => react-aria/test/dnd}/examples.js (85%)
 rename packages/{@react-aria/dnd/test => react-aria/test/dnd}/mocks.js (100%)
 rename packages/{@react-aria/dnd/test => react-aria/test/dnd}/useClipboard.test.js (99%)
 rename packages/{@react-aria/dnd/test => react-aria/test/dnd}/useDraggableCollection.test.js (99%)
 rename packages/{@react-aria/dnd/test => react-aria/test/dnd}/useDroppableCollection.test.js (99%)
 rename packages/{@react-aria/focus/test => react-aria/test/focus}/FocusScope.test.js (99%)
 rename packages/{@react-aria/focus/test => react-aria/test/focus}/FocusScopeOwnerDocument.test.js (99%)
 rename packages/{@react-aria/grid/test => react-aria/test/grid}/useGrid.test.js (97%)
 rename packages/{@react-aria/i18n/test => react-aria/test/i18n}/languagechange.test.js (98%)
 rename packages/{@react-aria/i18n/test => react-aria/test/i18n}/server.test.js (94%)
 rename packages/{@react-aria/interactions/test => react-aria/test/interactions}/Focusable.test.js (98%)
 rename packages/{@react-aria/interactions/test => react-aria/test/interactions}/PressResponder.test.js (95%)
 rename packages/{@react-aria/interactions/test => react-aria/test/interactions}/Pressable.test.js (98%)
 rename packages/{@react-aria/interactions/test => react-aria/test/interactions}/focusSafely.test.js (89%)
 rename packages/{@react-aria/interactions/test => react-aria/test/interactions}/useFocus.test.js (98%)
 rename packages/{@react-aria/interactions/test => react-aria/test/interactions}/useFocusVisible.test.js (98%)
 rename packages/{@react-aria/interactions/test => react-aria/test/interactions}/useFocusWithin.test.js (98%)
 rename packages/{@react-aria/interactions/test => react-aria/test/interactions}/useHover.test.js (98%)
 rename packages/{@react-aria/interactions/test => react-aria/test/interactions}/useInteractOutside.test.js (99%)
 rename packages/{@react-aria/interactions/test => react-aria/test/interactions}/useKeyboard.test.js (98%)
 rename packages/{@react-aria/interactions/test => react-aria/test/interactions}/useLongPress.test.js (98%)
 rename packages/{@react-aria/interactions/test => react-aria/test/interactions}/useMove.test.js (99%)
 rename packages/{@react-aria/interactions/test => react-aria/test/interactions}/usePress.test.js (99%)
 rename packages/{@react-aria/label/test => react-aria/test/label}/useField.test.js (95%)
 rename packages/{@react-aria/label/test => react-aria/test/label}/useLabel.test.js (98%)
 rename packages/{@react-aria/landmark/test => react-aria/test/landmark}/useLandmark.ssr.test.js (100%)
 rename packages/{@react-aria/landmark/test => react-aria/test/landmark}/useLandmark.test.tsx (98%)
 rename packages/{@react-aria/link/test => react-aria/test/link}/useLink.test.js (97%)
 rename packages/{@react-aria/menu/test => react-aria/test/menu}/useMenu.test.tsx (94%)
 rename packages/{@react-aria/menu/test => react-aria/test/menu}/useMenuTrigger.test.js (98%)
 rename packages/{@react-aria/numberfield/test => react-aria/test/numberfield}/useNumberField.test.ts (94%)
 rename packages/{@react-aria/overlays/test => react-aria/test/overlays}/DismissButton.test.tsx (96%)
 rename packages/{@react-aria/overlays/test => react-aria/test/overlays}/ariaHideOutside.test.js (99%)
 rename packages/{@react-aria/overlays/test => react-aria/test/overlays}/calculatePosition.test.ts (99%)
 rename packages/{@react-aria/overlays/test => react-aria/test/overlays}/useModal.ssr.test.js (100%)
 rename packages/{@react-aria/overlays/test => react-aria/test/overlays}/useModal.test.js (98%)
 rename packages/{@react-aria/overlays/test => react-aria/test/overlays}/useModalOverlay.test.js (91%)
 rename packages/{@react-aria/overlays/test => react-aria/test/overlays}/useOverlay.test.js (97%)
 rename packages/{@react-aria/overlays/test => react-aria/test/overlays}/useOverlayPosition.test.tsx (99%)
 rename packages/{@react-aria/overlays/test => react-aria/test/overlays}/useOverlayTrigger.test.js (91%)
 rename packages/{@react-aria/overlays/test => react-aria/test/overlays}/usePopover.test.tsx (84%)
 rename packages/{@react-aria/overlays/test => react-aria/test/overlays}/usePreventScroll.test.js (97%)
 rename packages/{@react-aria/progress/test => react-aria/test/progress}/useProgressBar.test.js (97%)
 rename packages/{@react-aria/searchfield/test => react-aria/test/searchfield}/useSearchField.test.js (96%)
 rename packages/{@react-aria/select/test => react-aria/test/select}/HiddenSelect.test.tsx (92%)
 rename packages/{@react-aria/selection/test => react-aria/test/selection}/useSelectableCollection.test.js (98%)
 rename packages/{@react-aria/slider/test => react-aria/test/slider}/useSlider.test.js (98%)
 rename packages/{@react-aria/slider/test => react-aria/test/slider}/useSliderThumb.test.js (99%)
 rename packages/{@react-aria/spinbutton/test => react-aria/test/spinbutton}/useSpinButton.test.js (97%)
 rename packages/{@react-aria/ssr/test => react-aria/test/ssr}/SSRProvider.ssr.test.js (100%)
 rename packages/{@react-aria/ssr/test => react-aria/test/ssr}/SSRProvider.test.js (97%)
 rename packages/{@react-aria/table/test => react-aria/test/table}/ariaTableResizing.test.tsx (86%)
 rename packages/{@react-aria/table/test => react-aria/test/table}/tableResizingTests.tsx (100%)
 rename packages/{@react-aria/table/test => react-aria/test/table}/useTable.test.tsx (91%)
 rename packages/{@react-aria/table/test => react-aria/test/table}/useTableBackwardCompat.test.tsx (90%)
 rename packages/{@react-aria/tag/test => react-aria/test/tag}/useTagGroup.test.js (96%)
 rename packages/{@react-aria/textfield/test => react-aria/test/textfield}/useTextField.test.js (98%)
 rename packages/{@react-aria/toast/test => react-aria/test/toast}/useToast.test.js (96%)
 rename packages/{@react-aria/tooltip/test => react-aria/test/tooltip}/useTooltip.test.js (95%)
 rename packages/{@react-aria/utils/test => react-aria/test/utils}/DOMFunctions.test.js (91%)
 rename packages/{@react-aria/utils/test => react-aria/test/utils}/domHelpers.test.js (95%)
 rename packages/{@react-aria/utils/test => react-aria/test/utils}/getNonce.test.js (97%)
 rename packages/{@react-aria/utils/test => react-aria/test/utils}/mergeProps.test.jsx (97%)
 rename packages/{@react-aria/utils/test => react-aria/test/utils}/mergeRefs.test.tsx (97%)
 rename packages/{@react-aria/utils/test => react-aria/test/utils}/runAfterTransition.test.ts (97%)
 rename packages/{@react-aria/utils/test => react-aria/test/utils}/shadowTreeWalker.test.tsx (98%)
 rename packages/{@react-aria/utils/test => react-aria/test/utils}/useObjectRef.test.js (97%)
 rename packages/{@react-aria/utils/test => react-aria/test/utils}/useViewportSize.ssr.test.tsx (100%)
 rename packages/{@react-aria/visually-hidden/test => react-aria/test/visually-hidden}/VisuallyHidden.test.tsx (97%)
 rename packages/{@react-stately/autocomplete/docs => react-stately/docs/autocomplete}/useAutocompleteState.mdx (100%)
 rename packages/{@react-stately/calendar/docs => react-stately/docs/calendar}/useCalendarState.mdx (100%)
 rename packages/{@react-stately/calendar/docs => react-stately/docs/calendar}/useRangeCalendarState.mdx (100%)
 rename packages/{@react-stately/checkbox/docs => react-stately/docs/checkbox}/useCheckboxGroupState.mdx (100%)
 rename packages/{@react-stately/color/docs => react-stately/docs/color}/useColorAreaState.mdx (100%)
 rename packages/{@react-stately/color/docs => react-stately/docs/color}/useColorFieldState.mdx (100%)
 rename packages/{@react-stately/color/docs => react-stately/docs/color}/useColorSliderState.mdx (100%)
 rename packages/{@react-stately/color/docs => react-stately/docs/color}/useColorWheelState.mdx (100%)
 rename packages/{@react-stately/combobox/docs => react-stately/docs/combobox}/useComboBoxState.mdx (100%)
 rename packages/{@react-stately/data/docs => react-stately/docs/data}/useAsyncList.mdx (100%)
 rename packages/{@react-stately/data/docs => react-stately/docs/data}/useListData.mdx (100%)
 rename packages/{@react-stately/data/docs => react-stately/docs/data}/useTreeData.mdx (100%)
 rename packages/{@react-stately/datepicker/docs => react-stately/docs/datepicker}/useDateFieldState.mdx (100%)
 rename packages/{@react-stately/datepicker/docs => react-stately/docs/datepicker}/useDatePickerState.mdx (100%)
 rename packages/{@react-stately/datepicker/docs => react-stately/docs/datepicker}/useDateRangePickerState.mdx (100%)
 rename packages/{@react-stately/datepicker/docs => react-stately/docs/datepicker}/useTimeFieldState.mdx (100%)
 rename packages/{@react-stately/disclosure/docs => react-stately/docs/disclosure}/useDisclosureGroupState.mdx (100%)
 rename packages/{@react-stately/disclosure/docs => react-stately/docs/disclosure}/useDisclosureState.mdx (100%)
 rename packages/{@react-stately/dnd/docs => react-stately/docs/dnd}/useDraggableCollectionState.mdx (100%)
 rename packages/{@react-stately/dnd/docs => react-stately/docs/dnd}/useDroppableCollectionState.mdx (100%)
 rename packages/{@react-stately/list/docs => react-stately/docs/list}/useListState.mdx (100%)
 rename packages/{@react-stately/list/docs => react-stately/docs/list}/useSingleSelectListState.mdx (100%)
 rename packages/{@react-stately/menu/docs => react-stately/docs/menu}/useMenuTriggerState.mdx (100%)
 rename packages/{@react-stately/numberfield/docs => react-stately/docs/numberfield}/useNumberFieldState.mdx (100%)
 rename packages/{@react-stately/overlays/docs => react-stately/docs/overlays}/useOverlayTriggerState.mdx (100%)
 rename packages/{@react-stately/radio/docs => react-stately/docs/radio}/useRadioGroupState.mdx (100%)
 rename packages/{@react-stately/searchfield/docs => react-stately/docs/searchfield}/useSearchFieldState.mdx (100%)
 rename packages/{@react-stately/select/docs => react-stately/docs/select}/useSelectState.mdx (100%)
 rename packages/{@react-stately/selection/docs => react-stately/docs/selection}/useMultipleSelectionState.mdx (100%)
 rename packages/{@react-stately/slider/docs => react-stately/docs/slider}/useSliderState.mdx (100%)
 rename packages/{@react-stately/table/docs => react-stately/docs/table}/useTableState.mdx (100%)
 rename packages/{@react-stately/tabs/docs => react-stately/docs/tabs}/useTabListState.mdx (100%)
 rename packages/{@react-stately/toast/docs => react-stately/docs/toast}/useToastState.mdx (100%)
 rename packages/{@react-stately/toggle/docs => react-stately/docs/toggle}/useToggleState.mdx (100%)
 rename packages/{@react-stately/tooltip/docs => react-stately/docs/tooltip}/useTooltipTriggerState.mdx (100%)
 rename packages/{@react-stately/tree/docs => react-stately/docs/tree}/useTreeState.mdx (100%)
 create mode 100644 packages/react-stately/exports/Cell.ts
 create mode 100644 packages/react-stately/exports/Color.ts
 create mode 100644 packages/react-stately/exports/Column.ts
 rename packages/{@adobe/react-spectrum/index.ts => react-stately/exports/Item.ts} (93%)
 create mode 100644 packages/react-stately/exports/Row.ts
 rename packages/{@react-aria/aria-modal-polyfill/index.ts => react-stately/exports/Section.ts} (92%)
 create mode 100644 packages/react-stately/exports/TableBody.ts
 create mode 100644 packages/react-stately/exports/TableHeader.ts
 create mode 100644 packages/react-stately/exports/index.ts
 create mode 100644 packages/react-stately/exports/private/autocomplete/useAutocompleteState.ts
 create mode 100644 packages/react-stately/exports/private/calendar/types.ts
 create mode 100644 packages/react-stately/exports/private/collections/CollectionBuilder.ts
 create mode 100644 packages/react-stately/exports/private/collections/Section.ts
 create mode 100644 packages/react-stately/exports/private/collections/getChildNodes.ts
 create mode 100644 packages/react-stately/exports/private/collections/getItemCount.ts
 create mode 100644 packages/react-stately/exports/private/collections/types.ts
 create mode 100644 packages/react-stately/exports/private/collections/useCollection.ts
 create mode 100644 packages/react-stately/exports/private/datepicker/utils.ts
 create mode 100644 packages/react-stately/exports/private/flags/flags.ts
 create mode 100644 packages/react-stately/exports/private/form/useFormValidationState.ts
 create mode 100644 packages/react-stately/exports/private/grid/GridCollection.ts
 create mode 100644 packages/react-stately/exports/private/grid/useGridState.ts
 create mode 100644 packages/react-stately/exports/private/layout/GridLayout.ts
 create mode 100644 packages/react-stately/exports/private/layout/ListLayout.ts
 create mode 100644 packages/react-stately/exports/private/layout/TableLayout.ts
 create mode 100644 packages/react-stately/exports/private/layout/WaterfallLayout.ts
 create mode 100644 packages/react-stately/exports/private/list/ListCollection.ts
 create mode 100644 packages/react-stately/exports/private/selection/SelectionManager.ts
 create mode 100644 packages/react-stately/exports/private/selection/types.ts
 create mode 100644 packages/react-stately/exports/private/steplist/useStepListState.ts
 create mode 100644 packages/react-stately/exports/private/table/TableCollection.ts
 create mode 100644 packages/react-stately/exports/private/table/TableColumnLayout.ts
 create mode 100644 packages/react-stately/exports/private/table/useTableState.ts
 create mode 100644 packages/react-stately/exports/private/table/useTreeGridState.ts
 create mode 100644 packages/react-stately/exports/private/tree/TreeCollection.ts
 create mode 100644 packages/react-stately/exports/private/utils/number.ts
 create mode 100644 packages/react-stately/exports/private/utils/useControlledState.ts
 create mode 100644 packages/react-stately/exports/private/virtualizer/Layout.ts
 create mode 100644 packages/react-stately/exports/private/virtualizer/LayoutInfo.ts
 create mode 100644 packages/react-stately/exports/private/virtualizer/Point.ts
 create mode 100644 packages/react-stately/exports/private/virtualizer/Rect.ts
 create mode 100644 packages/react-stately/exports/private/virtualizer/ReusableView.ts
 create mode 100644 packages/react-stately/exports/private/virtualizer/Size.ts
 create mode 100644 packages/react-stately/exports/private/virtualizer/types.ts
 create mode 100644 packages/react-stately/exports/private/virtualizer/useVirtualizerState.ts
 create mode 100644 packages/react-stately/exports/useAsyncList.ts
 create mode 100644 packages/react-stately/exports/useCalendarState.ts
 create mode 100644 packages/react-stately/exports/useCheckboxGroupState.ts
 create mode 100644 packages/react-stately/exports/useColorAreaState.ts
 create mode 100644 packages/react-stately/exports/useColorFieldState.ts
 create mode 100644 packages/react-stately/exports/useColorPickerState.ts
 create mode 100644 packages/react-stately/exports/useColorSliderState.ts
 create mode 100644 packages/react-stately/exports/useColorWheelState.ts
 rename packages/{@react-aria/grid/index.ts => react-stately/exports/useComboBoxState.ts} (79%)
 create mode 100644 packages/react-stately/exports/useDateFieldState.ts
 create mode 100644 packages/react-stately/exports/useDatePickerState.ts
 create mode 100644 packages/react-stately/exports/useDateRangePickerState.ts
 rename packages/{@react-stately/autocomplete/index.ts => react-stately/exports/useDisclosureGroupState.ts} (76%)
 rename packages/{@react-aria/collections/index.ts => react-stately/exports/useDisclosureState.ts} (78%)
 create mode 100644 packages/react-stately/exports/useDraggableCollectionState.ts
 create mode 100644 packages/react-stately/exports/useDroppableCollectionState.ts
 create mode 100644 packages/react-stately/exports/useListData.ts
 create mode 100644 packages/react-stately/exports/useListState.ts
 create mode 100644 packages/react-stately/exports/useMenuTriggerState.ts
 create mode 100644 packages/react-stately/exports/useMultipleSelectionState.ts
 create mode 100644 packages/react-stately/exports/useNumberFieldState.ts
 create mode 100644 packages/react-stately/exports/useOverlayTriggerState.ts
 create mode 100644 packages/react-stately/exports/useRadioGroupState.ts
 create mode 100644 packages/react-stately/exports/useRangeCalendarState.ts
 create mode 100644 packages/react-stately/exports/useSearchFieldState.ts
 create mode 100644 packages/react-stately/exports/useSelectState.ts
 create mode 100644 packages/react-stately/exports/useSingleSelectListState.ts
 create mode 100644 packages/react-stately/exports/useSliderState.ts
 create mode 100644 packages/react-stately/exports/useTabListState.ts
 create mode 100644 packages/react-stately/exports/useTableState.ts
 create mode 100644 packages/react-stately/exports/useTimeFieldState.ts
 create mode 100644 packages/react-stately/exports/useToastState.ts
 create mode 100644 packages/react-stately/exports/useToggleGroupState.ts
 create mode 100644 packages/react-stately/exports/useToggleState.ts
 create mode 100644 packages/react-stately/exports/useTooltipTriggerState.ts
 create mode 100644 packages/react-stately/exports/useTreeData.ts
 create mode 100644 packages/react-stately/exports/useTreeState.ts
 delete mode 100644 packages/react-stately/index.ts
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/ar-AE.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/bg-BG.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/cs-CZ.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/da-DK.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/de-DE.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/el-GR.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/en-US.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/es-ES.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/et-EE.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/fi-FI.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/fr-FR.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/he-IL.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/hr-HR.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/hu-HU.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/it-IT.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/ja-JP.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/ko-KR.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/lt-LT.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/lv-LV.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/nb-NO.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/nl-NL.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/pl-PL.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/pt-BR.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/pt-PT.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/ro-RO.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/ru-RU.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/sk-SK.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/sl-SI.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/sr-SP.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/sv-SE.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/tr-TR.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/uk-UA.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/zh-CN.json (100%)
 rename packages/{@react-stately/color/intl => react-stately/intl/color}/zh-TW.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/ar-AE.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/bg-BG.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/cs-CZ.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/da-DK.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/de-DE.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/el-GR.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/en-US.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/es-ES.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/et-EE.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/fi-FI.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/fr-FR.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/he-IL.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/hr-HR.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/hu-HU.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/it-IT.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/ja-JP.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/ko-KR.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/lt-LT.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/lv-LV.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/nb-NO.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/nl-NL.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/pl-PL.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/pt-BR.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/pt-PT.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/ro-RO.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/ru-RU.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/sk-SK.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/sl-SI.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/sr-SP.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/sv-SE.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/tr-TR.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/uk-UA.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/zh-CN.json (100%)
 rename packages/{@react-stately/datepicker/intl => react-stately/intl/datepicker}/zh-TW.json (100%)
 rename packages/{@react-stately/autocomplete/src => react-stately/src/autocomplete}/useAutocompleteState.ts (97%)
 rename packages/{@react-stately/calendar/src => react-stately/src/calendar}/types.ts (100%)
 rename packages/{@react-stately/calendar/src => react-stately/src/calendar}/useCalendarState.ts (99%)
 rename packages/{@react-stately/calendar/src => react-stately/src/calendar}/useRangeCalendarState.ts (99%)
 rename packages/{@react-stately/calendar/src => react-stately/src/calendar}/utils.ts (100%)
 rename packages/{@react-stately/checkbox/src => react-stately/src/checkbox}/useCheckboxGroupState.ts (97%)
 rename packages/{@react-stately/collections/src => react-stately/src/collections}/CollectionBuilder.ts (100%)
 rename packages/{@react-stately/collections/src => react-stately/src/collections}/Item.ts (100%)
 rename packages/{@react-stately/collections/src => react-stately/src/collections}/Section.ts (100%)
 rename packages/{@react-stately/collections/src => react-stately/src/collections}/getChildNodes.ts (100%)
 rename packages/{@react-stately/collections/src => react-stately/src/collections}/getItemCount.ts (100%)
 rename packages/{@react-stately/collections/src => react-stately/src/collections}/types.ts (100%)
 rename packages/{@react-stately/collections/src => react-stately/src/collections}/useCollection.ts (100%)
 rename packages/{@react-stately/color/src => react-stately/src/color}/Color.ts (99%)
 rename packages/{@react-stately/color/src => react-stately/src/color}/useColor.ts (100%)
 rename packages/{@react-stately/color/src => react-stately/src/color}/useColorAreaState.ts (98%)
 rename packages/{@react-stately/color/src => react-stately/src/color}/useColorChannelFieldState.ts (94%)
 rename packages/{@react-stately/color/src => react-stately/src/color}/useColorFieldState.ts (97%)
 rename packages/{@react-stately/color/src => react-stately/src/color}/useColorPickerState.ts (93%)
 rename packages/{@react-stately/color/src => react-stately/src/color}/useColorSliderState.ts (96%)
 rename packages/{@react-stately/color/src => react-stately/src/color}/useColorWheelState.ts (99%)
 rename packages/{@react-stately/combobox/src => react-stately/src/combobox}/useComboBoxState.ts (97%)
 rename packages/{@react-stately/data/src => react-stately/src/data}/useAsyncList.ts (99%)
 rename packages/{@react-stately/data/src => react-stately/src/data}/useListData.ts (100%)
 rename packages/{@react-stately/data/src => react-stately/src/data}/useTreeData.ts (100%)
 rename packages/{@react-stately/datepicker/src => react-stately/src/datepicker}/IncompleteDate.ts (100%)
 rename packages/{@react-stately/datepicker/src => react-stately/src/datepicker}/placeholders.ts (100%)
 rename packages/{@react-stately/datepicker/src => react-stately/src/datepicker}/useDateFieldState.ts (99%)
 rename packages/{@react-stately/datepicker/src => react-stately/src/datepicker}/useDatePickerState.ts (96%)
 rename packages/{@react-stately/datepicker/src => react-stately/src/datepicker}/useDateRangePickerState.ts (98%)
 rename packages/{@react-stately/datepicker/src => react-stately/src/datepicker}/useTimeFieldState.ts (96%)
 rename packages/{@react-stately/datepicker/src => react-stately/src/datepicker}/utils.ts (98%)
 rename packages/{@react-stately/disclosure/src => react-stately/src/disclosure}/useDisclosureGroupState.ts (97%)
 rename packages/{@react-stately/disclosure/src => react-stately/src/disclosure}/useDisclosureState.ts (97%)
 rename packages/{@react-stately/dnd/src => react-stately/src/dnd}/useDraggableCollectionState.ts (98%)
 rename packages/{@react-stately/dnd/src => react-stately/src/dnd}/useDroppableCollectionState.ts (99%)
 rename packages/{@react-stately/flags/src => react-stately/src/flags}/flags.ts (100%)
 rename packages/{@react-stately/form/src => react-stately/src/form}/useFormValidationState.ts (100%)
 rename packages/{@react-stately/grid/src => react-stately/src/grid}/GridCollection.ts (100%)
 rename packages/{@react-stately/grid/src => react-stately/src/grid}/useGridState.ts (93%)
 delete mode 100644 packages/react-stately/src/index.ts
 rename packages/{@react-stately/layout/src => react-stately/src/layout}/GridLayout.ts (98%)
 rename packages/{@react-stately/layout/src => react-stately/src/layout}/ListLayout.ts (98%)
 rename packages/{@react-stately/layout/src => react-stately/src/layout}/TableLayout.ts (98%)
 rename packages/{@react-stately/layout/src => react-stately/src/layout}/WaterfallLayout.ts (97%)
 rename packages/{@react-stately/list/src => react-stately/src/list}/ListCollection.ts (100%)
 rename packages/{@react-stately/list/src => react-stately/src/list}/useListState.ts (95%)
 rename packages/{@react-stately/list/src => react-stately/src/list}/useSingleSelectListState.ts (97%)
 rename packages/{@react-stately/menu/src => react-stately/src/menu}/useMenuTriggerState.ts (97%)
 rename packages/{@react-stately/menu/src => react-stately/src/menu}/useSubmenuTriggerState.ts (97%)
 rename packages/{@react-stately/numberfield/src => react-stately/src/numberfield}/useNumberFieldState.ts (98%)
 rename packages/{@react-stately/overlays/src => react-stately/src/overlays}/useOverlayTriggerState.ts (96%)
 rename packages/{@react-stately/radio/src => react-stately/src/radio}/useRadioGroupState.ts (95%)
 rename packages/{@react-stately/searchfield/src => react-stately/src/searchfield}/useSearchFieldState.ts (95%)
 rename packages/{@react-stately/select/src => react-stately/src/select}/useSelectState.ts (95%)
 rename packages/{@react-stately/selection/src => react-stately/src/selection}/Selection.ts (100%)
 rename packages/{@react-stately/selection/src => react-stately/src/selection}/SelectionManager.ts (99%)
 rename packages/{@react-stately/selection/src => react-stately/src/selection}/types.ts (100%)
 rename packages/{@react-stately/selection/src => react-stately/src/selection}/useMultipleSelectionState.ts (98%)
 rename packages/{@react-stately/slider/src => react-stately/src/slider}/useSliderState.ts (98%)
 rename packages/{@react-stately/steplist/src => react-stately/src/steplist}/useStepListState.ts (97%)
 rename packages/{@react-stately/table/src => react-stately/src/table}/Cell.ts (96%)
 rename packages/{@react-stately/table/src => react-stately/src/table}/Column.ts (98%)
 rename packages/{@react-stately/table/src => react-stately/src/table}/Row.ts (98%)
 rename packages/{@react-stately/table/src => react-stately/src/table}/TableBody.ts (97%)
 rename packages/{@react-stately/table/src => react-stately/src/table}/TableCollection.ts (98%)
 rename packages/{@react-stately/table/src => react-stately/src/table}/TableColumnLayout.ts (100%)
 rename packages/{@react-stately/table/src => react-stately/src/table}/TableHeader.ts (97%)
 rename packages/{@react-stately/table/src => react-stately/src/table}/TableUtils.ts (100%)
 rename packages/{@react-stately/table/src => react-stately/src/table}/useTableColumnResizeState.ts (100%)
 rename packages/{@react-stately/table/src => react-stately/src/table}/useTableState.ts (94%)
 rename packages/{@react-stately/table/src => react-stately/src/table}/useTreeGridState.ts (97%)
 rename packages/{@react-stately/tabs/src => react-stately/src/tabs}/useTabListState.ts (97%)
 rename packages/{@react-stately/toast/src => react-stately/src/toast}/useToastState.ts (100%)
 rename packages/{@react-stately/toggle/src => react-stately/src/toggle}/useToggleGroupState.ts (98%)
 rename packages/{@react-stately/toggle/src => react-stately/src/toggle}/useToggleState.ts (96%)
 rename packages/{@react-stately/tooltip/src => react-stately/src/tooltip}/useTooltipTriggerState.ts (98%)
 rename packages/{@react-stately/tree/src => react-stately/src/tree}/TreeCollection.ts (100%)
 rename packages/{@react-stately/tree/src => react-stately/src/tree}/useTreeState.ts (92%)
 rename packages/{@react-stately/utils/src => react-stately/src/utils}/number.ts (100%)
 rename packages/{@react-stately/utils/src => react-stately/src/utils}/useControlledState.ts (100%)
 rename packages/{@react-stately/virtualizer/src => react-stately/src/virtualizer}/Layout.ts (100%)
 rename packages/{@react-stately/virtualizer/src => react-stately/src/virtualizer}/LayoutInfo.ts (100%)
 rename packages/{@react-stately/virtualizer/src => react-stately/src/virtualizer}/OverscanManager.ts (100%)
 rename packages/{@react-stately/virtualizer/src => react-stately/src/virtualizer}/Point.ts (100%)
 rename packages/{@react-stately/virtualizer/src => react-stately/src/virtualizer}/Rect.ts (100%)
 rename packages/{@react-stately/virtualizer/src => react-stately/src/virtualizer}/ReusableView.ts (100%)
 rename packages/{@react-stately/virtualizer/src => react-stately/src/virtualizer}/Size.ts (100%)
 rename packages/{@react-stately/virtualizer/src => react-stately/src/virtualizer}/Virtualizer.ts (100%)
 rename packages/{@react-stately/virtualizer/src => react-stately/src/virtualizer}/types.ts (100%)
 rename packages/{@react-stately/virtualizer/src => react-stately/src/virtualizer}/useVirtualizerState.ts (100%)
 rename packages/{@react-stately/virtualizer/src => react-stately/src/virtualizer}/utils.ts (100%)
 rename packages/{@react-stately/tree/stories => react-stately/stories/tree}/useTreeState.stories.tsx (92%)
 rename packages/{@react-stately/checkbox/test => react-stately/test/checkbox}/useCheckboxGroupState.test.tsx (99%)
 rename packages/{@react-stately/color/test => react-stately/test/color}/Color.test.tsx (99%)
 rename packages/{@react-stately/color/test => react-stately/test/color}/useColor.test.js (93%)
 rename packages/{@react-stately/color/test => react-stately/test/color}/useColorFieldState.test.js (98%)
 rename packages/{@react-stately/combobox/test => react-stately/test/combobox}/useComboBoxState.test.js (98%)
 rename packages/{@react-stately/data/test => react-stately/test/data}/useAsyncList.test.js (99%)
 rename packages/{@react-stately/data/test => react-stately/test/data}/useListData.test.js (99%)
 rename packages/{@react-stately/data/test => react-stately/test/data}/useTreeData.test.js (99%)
 rename packages/{@react-stately/disclosure/test => react-stately/test/disclosure}/useDisclosureGroupState.test.ts (97%)
 rename packages/{@react-stately/disclosure/test => react-stately/test/disclosure}/useDisclosureState.test.ts (97%)
 rename packages/{@react-stately/searchfield/test => react-stately/test/searchfield}/useSearchFieldState.test.js (97%)
 rename packages/{@react-stately/slider/test => react-stately/test/slider}/useSliderState.test.js (99%)
 rename packages/{@react-stately/table/test => react-stately/test/table}/TableUtils.test.js (98%)
 rename packages/{@react-stately/toast/test => react-stately/test/toast}/useToastState.test.js (99%)
 rename packages/{@react-stately/tooltip/test => react-stately/test/tooltip}/useTooltipTriggerState.test.js (98%)
 rename packages/{@react-stately/tree/test => react-stately/test/tree}/useTreeState.test.js (96%)
 rename packages/{@react-stately/utils/test => react-stately/test/utils}/number.test.ts (96%)
 rename packages/{@react-stately/utils/test => react-stately/test/utils}/useControlledState.test.tsx (99%)
 rename packages/{@react-stately/virtualizer/test => react-stately/test/virtualizer}/LayoutInfo.test.tsx (91%)

diff --git a/packages/@react-spectrum/accordion/chromatic-fc/Accordion.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/accordion/Accordion.stories.tsx
similarity index 87%
rename from packages/@react-spectrum/accordion/chromatic-fc/Accordion.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/accordion/Accordion.stories.tsx
index 87ecaedb5ce..df46120ac18 100644
--- a/packages/@react-spectrum/accordion/chromatic-fc/Accordion.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/accordion/Accordion.stories.tsx
@@ -12,8 +12,8 @@
 
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {SpectrumAccordionProps} from '../src/Accordion';
-import {Template} from '../chromatic/Accordion.stories';
+import {SpectrumAccordionProps} from '../../src/accordion/Accordion';
+import {Template} from '../../chromatic/accordion/Accordion.stories';
 
 const meta: Meta<SpectrumAccordionProps> = {
   title: 'Accordion'
diff --git a/packages/@react-spectrum/actionbar/chromatic-fc/ActionBar.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/actionbar/ActionBar.stories.tsx
similarity index 92%
rename from packages/@react-spectrum/actionbar/chromatic-fc/ActionBar.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/actionbar/ActionBar.stories.tsx
index 7cf2a06e9b0..cad22b37f5a 100644
--- a/packages/@react-spectrum/actionbar/chromatic-fc/ActionBar.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/actionbar/ActionBar.stories.tsx
@@ -11,8 +11,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {Example} from '../stories/Example';
-import {Flex} from '@react-spectrum/layout';
+import {Example} from '../../stories/actionbar/Example';
+import {Flex} from '../../src/layout/Flex';
 import React from 'react';
 import {StoryFn} from '@storybook/react';
 
diff --git a/packages/@react-spectrum/actiongroup/chromatic-fc/ActionGroup.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/actiongroup/ActionGroup.stories.tsx
similarity index 90%
rename from packages/@react-spectrum/actiongroup/chromatic-fc/ActionGroup.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/actiongroup/ActionGroup.stories.tsx
index 6f728f50cbf..377be12c054 100644
--- a/packages/@react-spectrum/actiongroup/chromatic-fc/ActionGroup.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/actiongroup/ActionGroup.stories.tsx
@@ -11,11 +11,11 @@
  */
 
 
-import {docItems, editItems, Render, viewItems} from '../chromatic/ActionGroup.stories';
-import {Flex} from '@react-spectrum/layout';
+import {docItems, editItems, Render, viewItems} from '../../chromatic/actiongroup/ActionGroup.stories';
+import {Flex} from '../../src/layout/Flex';
 import React from 'react';
 import {StoryFn} from '@storybook/react';
-import {View} from '@react-spectrum/view';
+import {View} from '../../src/view/View';
 
 export default {
   title: 'ActionGroup'
diff --git a/packages/@react-spectrum/autocomplete/chromatic-fc/SearchAutocomplete.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/autocomplete/SearchAutocomplete.stories.tsx
similarity index 92%
rename from packages/@react-spectrum/autocomplete/chromatic-fc/SearchAutocomplete.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/autocomplete/SearchAutocomplete.stories.tsx
index ce5b907868c..e91ed41bd14 100644
--- a/packages/@react-spectrum/autocomplete/chromatic-fc/SearchAutocomplete.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/autocomplete/SearchAutocomplete.stories.tsx
@@ -12,7 +12,7 @@
 
 import React from 'react';
 import {StoryObj} from '@storybook/react';
-import {Template} from '../chromatic/SearchAutocomplete.stories';
+import {Template} from '../../chromatic/autocomplete/SearchAutocomplete.stories';
 
 export default {
   title: 'SearchAutocomplete'
diff --git a/packages/@react-spectrum/avatar/chromatic-fc/Avatar.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/avatar/Avatar.stories.tsx
similarity index 93%
rename from packages/@react-spectrum/avatar/chromatic-fc/Avatar.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/avatar/Avatar.stories.tsx
index 57776adfdc9..accef4da1b0 100644
--- a/packages/@react-spectrum/avatar/chromatic-fc/Avatar.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/avatar/Avatar.stories.tsx
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {Avatar} from '..';
-import {Flex} from '@react-spectrum/layout';
+import {Avatar} from '../../src/avatar/Avatar';
+import {Flex} from '../../src/layout/Flex';
 import React from 'react';
 import {StoryFn} from '@storybook/react';
 
diff --git a/packages/@react-spectrum/badge/chromatic-fc/Badge.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/badge/Badge.stories.tsx
similarity index 85%
rename from packages/@react-spectrum/badge/chromatic-fc/Badge.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/badge/Badge.stories.tsx
index b0174eb7a9c..95ceeb081f1 100644
--- a/packages/@react-spectrum/badge/chromatic-fc/Badge.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/badge/Badge.stories.tsx
@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {Badge} from '..';
-import {BadgeStory, RenderVariants} from '../chromatic/Badge.stories';
+import {Badge} from '../../src/badge/Badge';
+import {BadgeStory, RenderVariants} from '../../chromatic/badge/Badge.stories';
 import CheckmarkCircle from '@spectrum-icons/workflow/CheckmarkCircle';
 import {Meta} from '@storybook/react';
 import React from 'react';
-import {Text} from '@react-spectrum/text';
+import {Text} from '../../src/text/Text';
 
 export default {
   title: 'Badge',
diff --git a/packages/@react-spectrum/breadcrumbs/chromatic-fc/Breadcrumbs.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/breadcrumbs/Breadcrumbs.stories.tsx
similarity index 85%
rename from packages/@react-spectrum/breadcrumbs/chromatic-fc/Breadcrumbs.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/breadcrumbs/Breadcrumbs.stories.tsx
index 150ff783000..b8f6c0aa7e0 100644
--- a/packages/@react-spectrum/breadcrumbs/chromatic-fc/Breadcrumbs.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/breadcrumbs/Breadcrumbs.stories.tsx
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {Breadcrumbs} from '../';
-import {Default as ChromaticDefault} from '../chromatic/Breadcrumbs.stories';
+import {Breadcrumbs} from '../../src/breadcrumbs/Breadcrumbs';
+import {Default as ChromaticDefault} from '../../chromatic/breadcrumbs/Breadcrumbs.stories';
 import {Meta, StoryObj} from '@storybook/react';
 
 export default {
diff --git a/packages/@react-spectrum/button/chromatic-fc/ActionButton.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/button/ActionButton.stories.tsx
similarity index 93%
rename from packages/@react-spectrum/button/chromatic-fc/ActionButton.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/button/ActionButton.stories.tsx
index 8f5188eb7d1..389ab1e71d8 100644
--- a/packages/@react-spectrum/button/chromatic-fc/ActionButton.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/button/ActionButton.stories.tsx
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '../';
+import {ActionButton} from '../../src/button/ActionButton';
 import Add from '@spectrum-icons/workflow/Add';
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {Text} from '@react-spectrum/text';
-import {View} from '@react-spectrum/view';
+import {Text} from '../../src/text/Text';
+import {View} from '../../src/view/View';
 
 export default {
   title: 'Button/ActionButtons'
diff --git a/packages/@react-spectrum/button/chromatic-fc/Button.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/button/Button.stories.tsx
similarity index 88%
rename from packages/@react-spectrum/button/chromatic-fc/Button.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/button/Button.stories.tsx
index 2848ff1fc58..3eb33421927 100644
--- a/packages/@react-spectrum/button/chromatic-fc/Button.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/button/Button.stories.tsx
@@ -11,12 +11,12 @@
  */
 
 import Bell from '@spectrum-icons/workflow/Bell';
-import {Button} from '../';
-import {Flex} from '@react-spectrum/layout';
+import {Button} from '../../src/button/Button';
+import {Flex} from '../../src/layout/Flex';
 import React from 'react';
-import {Render} from '../chromatic/Button.stories';
+import {Render} from '../../chromatic/button/Button.stories';
 import {StoryFn} from '@storybook/react';
-import {Text} from '@react-spectrum/text';
+import {Text} from '../../src/text/Text';
 
 export default {
   title: 'Button'
diff --git a/packages/@react-spectrum/button/chromatic-fc/LogicButton.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/button/LogicButton.stories.tsx
similarity index 90%
rename from packages/@react-spectrum/button/chromatic-fc/LogicButton.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/button/LogicButton.stories.tsx
index 76b26cc6d82..78e2da3b2ff 100644
--- a/packages/@react-spectrum/button/chromatic-fc/LogicButton.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/button/LogicButton.stories.tsx
@@ -10,9 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import React from 'react';
-import {Render} from '../chromatic/LogicButton.stories';
+import {Render} from '../../chromatic/button/LogicButton.stories';
 import {StoryFn} from '@storybook/react';
 
 export default {
diff --git a/packages/@react-spectrum/button/chromatic-fc/ToggleButton.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/button/ToggleButton.stories.tsx
similarity index 90%
rename from packages/@react-spectrum/button/chromatic-fc/ToggleButton.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/button/ToggleButton.stories.tsx
index 1aa5ba59b47..686e1091613 100644
--- a/packages/@react-spectrum/button/chromatic-fc/ToggleButton.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/button/ToggleButton.stories.tsx
@@ -10,13 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
-import {Flex, Grid, repeat, View} from '@adobe/react-spectrum';
+import {classNames} from '../../src/utils/classNames';
+
+import {Flex} from '../../src/layout/Flex';
 import {generatePowerset} from '@react-spectrum/story-utils';
+import {Grid, repeat} from '../../src/layout/Grid';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import styles from '@adobe/spectrum-css-temp/components/button/vars.css';
-import {ToggleButton} from '../';
+import {ToggleButton} from '../../src/button/ToggleButton';
+import {View} from '../../src/view/View';
 
 let states = [
   {isQuiet: true},
diff --git a/packages/@react-spectrum/calendar/chromatic-fc/Calendar.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/calendar/Calendar.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/calendar/chromatic-fc/Calendar.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/calendar/Calendar.stories.tsx
index af504234153..b5bd7f12785 100644
--- a/packages/@react-spectrum/calendar/chromatic-fc/Calendar.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/calendar/Calendar.stories.tsx
@@ -10,9 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {Calendar} from '../';
+import {Calendar} from '../../src/calendar/Calendar';
 import {CalendarDate} from '@internationalized/date';
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 export default {
diff --git a/packages/@react-spectrum/calendar/chromatic-fc/CalendarCell.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/calendar/CalendarCell.stories.tsx
similarity index 89%
rename from packages/@react-spectrum/calendar/chromatic-fc/CalendarCell.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/calendar/CalendarCell.stories.tsx
index 32b7b11c913..38531e37cd0 100644
--- a/packages/@react-spectrum/calendar/chromatic-fc/CalendarCell.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/calendar/CalendarCell.stories.tsx
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AllStates} from '../chromatic/CalendarCell.stories';
-import {Flex} from '@react-spectrum/layout';
+import {AllStates} from '../../chromatic/calendar/CalendarCell.stories';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/card/chromatic-fc/Card.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/card/Card.stories.tsx
similarity index 90%
rename from packages/@react-spectrum/card/chromatic-fc/Card.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/card/Card.stories.tsx
index 30ea55a9bd6..9db5857970d 100644
--- a/packages/@react-spectrum/card/chromatic-fc/Card.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/card/Card.stories.tsx
@@ -11,16 +11,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {Card} from '..';
+import {Card} from '../../src/card/Card';
 import {
   CardStory,
   WithColorfulIllustration as WithColorfulIllustrationStory,
   WithIllustration as WithIllustrationStory
-} from '../chromatic/Card.stories';
+} from '../../chromatic/card/Card.stories';
 import {
   Default as DefaultCard,
   Selected as SelectedStory
-} from '../stories/Card.stories';
+} from '../../stories/card/Card.stories';
 import {Meta} from '@storybook/react';
 
 export default {
diff --git a/packages/@react-spectrum/card/chromatic-fc/CardView.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/card/CardView.stories.tsx
similarity index 87%
rename from packages/@react-spectrum/card/chromatic-fc/CardView.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/card/CardView.stories.tsx
index d074fc8dd6a..eb72bf2a3a7 100644
--- a/packages/@react-spectrum/card/chromatic-fc/CardView.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/card/CardView.stories.tsx
@@ -11,8 +11,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {CardView} from '../';
-import {DefaultGrid as DefaultGridStory} from '../chromatic/CardView.stories';
+import {CardView} from '../../src/card/CardView';
+import {DefaultGrid as DefaultGridStory} from '../../chromatic/card/CardView.stories';
 import {Meta, StoryObj} from '@storybook/react';
 import {SpectrumCardViewProps} from '@react-types/card';
 
diff --git a/packages/@react-spectrum/card/chromatic-fc/QuietCard.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/card/QuietCard.stories.tsx
similarity index 91%
rename from packages/@react-spectrum/card/chromatic-fc/QuietCard.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/card/QuietCard.stories.tsx
index fd2d3643af6..8816ed6b81b 100644
--- a/packages/@react-spectrum/card/chromatic-fc/QuietCard.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/card/QuietCard.stories.tsx
@@ -11,12 +11,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {Card} from '../index';
+import {Card} from '../../src/card/Card';
 import {
   CardStory,
   Default,
   Selected
-} from '../chromatic/Card.stories';
+} from '../../chromatic/card/Card.stories';
 import {Meta} from '@storybook/react';
 
 export default {
diff --git a/packages/@react-spectrum/checkbox/chromatic-fc/Checkbox.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/checkbox/Checkbox.stories.tsx
similarity index 85%
rename from packages/@react-spectrum/checkbox/chromatic-fc/Checkbox.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/checkbox/Checkbox.stories.tsx
index c5173392881..35a13c7d82d 100644
--- a/packages/@react-spectrum/checkbox/chromatic-fc/Checkbox.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/checkbox/Checkbox.stories.tsx
@@ -11,12 +11,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {Checkbox} from '../';
-import {Flex} from '@react-spectrum/layout';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {Flex} from '../../src/layout/Flex';
 import React from 'react';
-import {Render} from '../chromatic/Checkbox.stories';
+import {Render} from '../../chromatic/checkbox/Checkbox.stories';
 import {StoryFn} from '@storybook/react';
-import {View} from '@react-spectrum/view';
+import {View} from '../../src/view/View';
 
 export default {
   title: 'Checkbox'
diff --git a/packages/@react-spectrum/tree/chromatic-fc/TreeView.stories.tsx b/packages/@adobe/react-spectrum/chromatic-fc/tree/TreeView.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/tree/chromatic-fc/TreeView.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic-fc/tree/TreeView.stories.tsx
index 74e2df5d0c6..70a8e3659ad 100644
--- a/packages/@react-spectrum/tree/chromatic-fc/TreeView.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic-fc/tree/TreeView.stories.tsx
@@ -10,17 +10,19 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionGroup, Item} from '@react-spectrum/actiongroup';
-import {ActionMenu} from '@react-spectrum/menu';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
+
+import {ActionMenu} from '../../src/menu/ActionMenu';
 import Add from '@spectrum-icons/workflow/Add';
 import Delete from '@spectrum-icons/workflow/Delete';
 import Edit from '@spectrum-icons/workflow/Edit';
 import FileTxt from '@spectrum-icons/workflow/FileTxt';
 import Folder from '@spectrum-icons/workflow/Folder';
+import {Item} from 'react-stately/Item';
 import React from 'react';
-import {SpectrumTreeViewProps, TreeView, TreeViewItem, TreeViewItemContent} from '../src';
+import {SpectrumTreeViewProps, TreeView, TreeViewItem, TreeViewItemContent} from '../../src/tree/TreeView';
 import {StoryFn} from '@storybook/react';
-import {Text} from '@react-spectrum/text';
+import {Text} from '../../src/text/Text';
 
 export default {
   title: 'TreeView'
diff --git a/packages/@react-spectrum/accordion/chromatic/Accordion.stories.tsx b/packages/@adobe/react-spectrum/chromatic/accordion/Accordion.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/accordion/chromatic/Accordion.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/accordion/Accordion.stories.tsx
index a492ca26c44..1ff47c13765 100644
--- a/packages/@react-spectrum/accordion/chromatic/Accordion.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/accordion/Accordion.stories.tsx
@@ -10,7 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {Accordion, Disclosure, DisclosurePanel, DisclosureTitle, SpectrumAccordionProps} from '../';
+import {
+  Accordion,
+  Disclosure,
+  DisclosurePanel,
+  DisclosureTitle,
+  SpectrumAccordionProps
+} from '../../src/accordion/Accordion';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
 
diff --git a/packages/@react-spectrum/accordion/chromatic/Disclosure.stories.tsx b/packages/@adobe/react-spectrum/chromatic/accordion/Disclosure.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/accordion/chromatic/Disclosure.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/accordion/Disclosure.stories.tsx
index 03849a8108f..4519e42e89b 100644
--- a/packages/@react-spectrum/accordion/chromatic/Disclosure.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/accordion/Disclosure.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Disclosure, DisclosurePanel, DisclosureTitle, SpectrumDisclosureProps} from '../';
+import {Disclosure, DisclosurePanel, DisclosureTitle, SpectrumDisclosureProps} from '../../src/accordion/Accordion';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
 
diff --git a/packages/@react-spectrum/actionbar/chromatic/ActionBar.stories.tsx b/packages/@adobe/react-spectrum/chromatic/actionbar/ActionBar.stories.tsx
similarity index 93%
rename from packages/@react-spectrum/actionbar/chromatic/ActionBar.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/actionbar/ActionBar.stories.tsx
index bbf2f592bd4..fd4cb7382ed 100644
--- a/packages/@react-spectrum/actionbar/chromatic/ActionBar.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/actionbar/ActionBar.stories.tsx
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {Example, Example2} from '../stories/Example';
-import {Flex} from '@react-spectrum/layout';
+import {Example, Example2} from '../../stories/actionbar/Example';
+import {Flex} from '../../src/layout/Flex';
 import React from 'react';
 import {StoryFn} from '@storybook/react';
 
diff --git a/packages/@react-spectrum/actiongroup/chromatic/ActionGroup.stories.tsx b/packages/@adobe/react-spectrum/chromatic/actiongroup/ActionGroup.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/actiongroup/chromatic/ActionGroup.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/actiongroup/ActionGroup.stories.tsx
index 251a7c5de04..5c70dadc477 100644
--- a/packages/@react-spectrum/actiongroup/chromatic/ActionGroup.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/actiongroup/ActionGroup.stories.tsx
@@ -10,21 +10,23 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionGroup, SpectrumActionGroupProps} from '../';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
+
 import BookIcon from '@spectrum-icons/workflow/Book';
 import CopyIcon from '@spectrum-icons/workflow/Copy';
 import DeleteIcon from '@spectrum-icons/workflow/Delete';
 import DocumentIcon from '@spectrum-icons/workflow/Document';
 import DrawIcon from '@spectrum-icons/workflow/Draw';
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import InfoIcon from '@spectrum-icons/workflow/Info';
-import {Item} from '@react-stately/collections';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryObj} from '@storybook/react';
 import PropertiesIcon from '@spectrum-icons/workflow/Properties';
 import React, {JSX} from 'react';
 import SettingsIcon from '@spectrum-icons/workflow/Settings';
-import {Text} from '@react-spectrum/text';
-import {View} from '@react-spectrum/view';
+import {SpectrumActionGroupProps} from '@react-types/actiongroup';
+import {Text} from '../../src/text/Text';
+import {View} from '../../src/view/View';
 import ViewCardIcon from '@spectrum-icons/workflow/ViewCard';
 import ViewGridIcon from '@spectrum-icons/workflow/ViewGrid';
 import ViewListIcon from '@spectrum-icons/workflow/ViewList';
diff --git a/packages/@react-spectrum/autocomplete/chromatic/SearchAutocomplete.stories.tsx b/packages/@adobe/react-spectrum/chromatic/autocomplete/SearchAutocomplete.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/autocomplete/chromatic/SearchAutocomplete.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/autocomplete/SearchAutocomplete.stories.tsx
index 32ae901e755..5266277ee58 100644
--- a/packages/@react-spectrum/autocomplete/chromatic/SearchAutocomplete.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/autocomplete/SearchAutocomplete.stories.tsx
@@ -12,10 +12,11 @@
 
 import Filter from '@spectrum-icons/workflow/Filter';
 import {generatePowerset} from '@react-spectrum/story-utils';
-import {Grid, repeat} from '@react-spectrum/layout';
-import {Item, SearchAutocomplete} from '../';
+import {Grid, repeat} from '../../src/layout/Grid';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
+import {SearchAutocomplete} from '../../src/autocomplete/SearchAutocomplete';
 import {SpectrumSearchAutocompleteProps} from '@react-types/autocomplete';
 
 // Skipping focus styles because don't have a way of applying it via classnames
diff --git a/packages/@react-spectrum/autocomplete/chromatic/SearchAutocompleteRTL.stories.tsx b/packages/@adobe/react-spectrum/chromatic/autocomplete/SearchAutocompleteRTL.stories.tsx
similarity index 100%
rename from packages/@react-spectrum/autocomplete/chromatic/SearchAutocompleteRTL.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/autocomplete/SearchAutocompleteRTL.stories.tsx
diff --git a/packages/@react-spectrum/avatar/chromatic/Avatar.stories.tsx b/packages/@adobe/react-spectrum/chromatic/avatar/Avatar.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/avatar/chromatic/Avatar.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/avatar/Avatar.stories.tsx
index cabf4c21403..431a494054a 100644
--- a/packages/@react-spectrum/avatar/chromatic/Avatar.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/avatar/Avatar.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Avatar} from '../';
+import {Avatar} from '../../src/avatar/Avatar';
 import {Meta, StoryObj} from '@storybook/react';
 import {SpectrumAvatarProps} from '@react-types/avatar';
 
diff --git a/packages/@react-spectrum/badge/chromatic/Badge.stories.tsx b/packages/@adobe/react-spectrum/chromatic/badge/Badge.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/badge/chromatic/Badge.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/badge/Badge.stories.tsx
index e03d1f24782..60bc66d5ea5 100644
--- a/packages/@react-spectrum/badge/chromatic/Badge.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/badge/Badge.stories.tsx
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {Badge} from '../';
+import {Badge} from '../../src/badge/Badge';
 import CheckmarkCircle from '@spectrum-icons/workflow/CheckmarkCircle';
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 import {SpectrumBadgeProps} from '@react-types/badge';
-import {Text} from '@react-spectrum/text';
+import {Text} from '../../src/text/Text';
 
 let variants: SpectrumBadgeProps['variant'][] =
   ['positive', 'info', 'negative', 'neutral', 'yellow', 'fuchsia', 'indigo', 'seafoam', 'magenta', 'purple'];
diff --git a/packages/@react-spectrum/breadcrumbs/chromatic/Breadcrumbs.stories.tsx b/packages/@adobe/react-spectrum/chromatic/breadcrumbs/Breadcrumbs.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/breadcrumbs/chromatic/Breadcrumbs.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/breadcrumbs/Breadcrumbs.stories.tsx
index 42ea61e9c15..83b6f91b4a7 100644
--- a/packages/@react-spectrum/breadcrumbs/chromatic/Breadcrumbs.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/breadcrumbs/Breadcrumbs.stories.tsx
@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {Breadcrumbs, Item} from '../';
+import {Breadcrumbs} from '../../src/breadcrumbs/Breadcrumbs';
+
+import {Item} from 'react-stately/Item';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/button/chromatic/ActionButton.stories.tsx b/packages/@adobe/react-spectrum/chromatic/button/ActionButton.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/button/chromatic/ActionButton.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/button/ActionButton.stories.tsx
index 98d3614df9c..441c2a0ecb8 100644
--- a/packages/@react-spectrum/button/chromatic/ActionButton.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/button/ActionButton.stories.tsx
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '../';
+import {ActionButton} from '../../src/button/ActionButton';
 import Add from '@spectrum-icons/workflow/Add';
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {Text} from '@react-spectrum/text';
-import {View} from '@react-spectrum/view';
+import {Text} from '../../src/text/Text';
+import {View} from '../../src/view/View';
 
 export default {
   title: 'Button/ActionButton',
diff --git a/packages/@react-spectrum/button/chromatic/ActionButtonLanguages.stories.tsx b/packages/@adobe/react-spectrum/chromatic/button/ActionButtonLanguages.stories.tsx
similarity index 90%
rename from packages/@react-spectrum/button/chromatic/ActionButtonLanguages.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/button/ActionButtonLanguages.stories.tsx
index 360ed8572a2..37ee1d3f79d 100644
--- a/packages/@react-spectrum/button/chromatic/ActionButtonLanguages.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/button/ActionButtonLanguages.stories.tsx
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '../';
+import {ActionButton} from '../../src/button/ActionButton';
 import Add from '@spectrum-icons/workflow/Add';
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {Text} from '@react-spectrum/text';
-import {View} from '@react-spectrum/view';
+import {Text} from '../../src/text/Text';
+import {View} from '../../src/view/View';
 
 export default {
   title: 'Languages/ActionButton',
diff --git a/packages/@react-spectrum/button/chromatic/Button.stories.tsx b/packages/@adobe/react-spectrum/chromatic/button/Button.stories.tsx
similarity index 91%
rename from packages/@react-spectrum/button/chromatic/Button.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/button/Button.stories.tsx
index 56802c9674b..0e4436dfcbd 100644
--- a/packages/@react-spectrum/button/chromatic/Button.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/button/Button.stories.tsx
@@ -11,15 +11,17 @@
  */
 
 import Bell from '@spectrum-icons/workflow/Bell';
-import {Button, SpectrumButtonProps} from '../';
-import {classNames} from '@react-spectrum/utils';
-import {Flex, Grid, repeat} from '@react-spectrum/layout';
+import {Button} from '../../src/button/Button';
+import {classNames} from '../../src/utils/classNames';
+import {Flex} from '../../src/layout/Flex';
 import {generatePowerset} from '@react-spectrum/story-utils';
+import {Grid, repeat} from '../../src/layout/Grid';
 import {Meta, StoryFn} from '@storybook/react';
 import React, {ElementType, JSX} from 'react';
+import {SpectrumButtonProps} from '@react-types/button';
 import styles from '@adobe/spectrum-css-temp/components/button/vars.css';
-import {Text} from '@react-spectrum/text';
-import {View} from '@react-spectrum/view';
+import {Text} from '../../src/text/Text';
+import {View} from '../../src/view/View';
 
 let states = [
   {UNSAFE_className: classNames(styles, 'is-hovered'), 'data-hover': true},
@@ -133,7 +135,7 @@ DoubleTextNode.story = {
 
 export function Render<T extends ElementType = 'button'>(props: SpectrumButtonProps<T> = {variant: 'accent'}): JSX.Element {
   return (
-    <Grid columns={repeat(4, '1fr')} autoFlow="row" justifyItems="start" gap="size-300">
+    (<Grid columns={repeat(4, '1fr')} autoFlow="row" justifyItems="start" gap="size-300">
       {combinations.map(c => {
         let key = Object.keys(c).map(k => {
           if (k === 'UNSAFE_className') {
@@ -161,6 +163,6 @@ export function Render<T extends ElementType = 'button'>(props: SpectrumButtonPr
         }
         return button;
       })}
-    </Grid>
+    </Grid>)
   );
 }
diff --git a/packages/@react-spectrum/button/chromatic/LogicButton.stories.tsx b/packages/@adobe/react-spectrum/chromatic/button/LogicButton.stories.tsx
similarity index 89%
rename from packages/@react-spectrum/button/chromatic/LogicButton.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/button/LogicButton.stories.tsx
index 482ffbd4e08..3de4867b1c1 100644
--- a/packages/@react-spectrum/button/chromatic/LogicButton.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/button/LogicButton.stories.tsx
@@ -10,10 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {Flex} from '@react-spectrum/layout';
-import {LogicButton, SpectrumLogicButtonProps} from '../';
+import {Flex} from '../../src/layout/Flex';
+
+import {LogicButton} from '../../src/button/LogicButton';
 import {Meta, StoryFn} from '@storybook/react';
 import React, {JSX} from 'react';
+import {SpectrumLogicButtonProps} from '@react-types/button';
 
 export default {
   title: 'Button/LogicButton',
diff --git a/packages/@react-spectrum/button/chromatic/ToggleButton.stories.tsx b/packages/@adobe/react-spectrum/chromatic/button/ToggleButton.stories.tsx
similarity index 93%
rename from packages/@react-spectrum/button/chromatic/ToggleButton.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/button/ToggleButton.stories.tsx
index 41079ad2bf2..6bb54f2b670 100644
--- a/packages/@react-spectrum/button/chromatic/ToggleButton.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/button/ToggleButton.stories.tsx
@@ -10,13 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '../../src/utils/classNames';
+
 import {generatePowerset} from '@react-spectrum/story-utils';
-import {Grid, repeat, View} from '@adobe/react-spectrum';
+import {Grid, repeat} from '../../src/layout/Grid';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import styles from '@adobe/spectrum-css-temp/components/button/vars.css';
-import {ToggleButton} from '../';
+import {ToggleButton} from '../../src/button/ToggleButton';
+import {View} from '../../src/view/View';
 
 let states = [
   {isQuiet: true},
diff --git a/packages/@react-spectrum/buttongroup/chromatic/ButtonGroup.stories.tsx b/packages/@adobe/react-spectrum/chromatic/buttongroup/ButtonGroup.stories.tsx
similarity index 91%
rename from packages/@react-spectrum/buttongroup/chromatic/ButtonGroup.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/buttongroup/ButtonGroup.stories.tsx
index 5310e3a729c..835a6b9078c 100644
--- a/packages/@react-spectrum/buttongroup/chromatic/ButtonGroup.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/buttongroup/ButtonGroup.stories.tsx
@@ -10,11 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button} from '@react-spectrum/button';
-import {ButtonGroup, SpectrumButtonGroupProps} from '../';
+import {Button} from '../../src/button/Button';
+
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
 import React, {JSX} from 'react';
+import {SpectrumButtonGroupProps} from '@react-types/buttongroup';
 import {StoryFn} from '@storybook/react';
-import {View} from '@react-spectrum/view';
+import {View} from '../../src/view/View';
 
 export default {
   title: 'ButtonGroup'
diff --git a/packages/@react-spectrum/calendar/chromatic/Calendar.stories.tsx b/packages/@adobe/react-spectrum/chromatic/calendar/Calendar.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/calendar/chromatic/Calendar.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/calendar/Calendar.stories.tsx
index 84f67496a92..06623f55fd7 100644
--- a/packages/@react-spectrum/calendar/chromatic/Calendar.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/calendar/Calendar.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Calendar} from '../';
+import {Calendar} from '../../src/calendar/Calendar';
 import {CalendarDate} from '@internationalized/date';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
diff --git a/packages/@react-spectrum/calendar/chromatic/CalendarCell.stories.tsx b/packages/@adobe/react-spectrum/chromatic/calendar/CalendarCell.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/calendar/chromatic/CalendarCell.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/calendar/CalendarCell.stories.tsx
index a576e17dd9f..e076a8dfb3c 100644
--- a/packages/@react-spectrum/calendar/chromatic/CalendarCell.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/calendar/CalendarCell.stories.tsx
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '../../src/utils/classNames';
 import {generatePowerset} from '@react-spectrum/story-utils';
-import {Grid, repeat} from '@react-spectrum/layout';
+import {Grid, repeat} from '../../src/layout/Grid';
 import {Meta, StoryFn} from '@storybook/react';
 import React, {JSX} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/calendar/vars.css';
-import {useProvider} from '@react-spectrum/provider';
+import {useProvider} from '../../src/provider/Provider';
 
 export default {
   title: 'CalendarCall',
diff --git a/packages/@react-spectrum/calendar/chromatic/RangeCalendar.stories.tsx b/packages/@adobe/react-spectrum/chromatic/calendar/RangeCalendar.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/calendar/chromatic/RangeCalendar.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/calendar/RangeCalendar.stories.tsx
index 1b264ff8833..e88a1c55334 100644
--- a/packages/@react-spectrum/calendar/chromatic/RangeCalendar.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/calendar/RangeCalendar.stories.tsx
@@ -12,9 +12,9 @@
 
 import {CalendarDate, isWeekend} from '@internationalized/date';
 import {Meta, StoryFn} from '@storybook/react';
-import {RangeCalendar} from '../';
+import {RangeCalendar} from '../../src/calendar/RangeCalendar';
 import React from 'react';
-import {useLocale} from '@react-aria/i18n';
+import {useLocale} from 'react-aria/I18nProvider';
 
 export default {
   title: 'RangeCalendar',
diff --git a/packages/@react-spectrum/card/chromatic/Card.stories.tsx b/packages/@adobe/react-spectrum/chromatic/card/Card.stories.tsx
similarity index 99%
rename from packages/@react-spectrum/card/chromatic/Card.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/card/Card.stories.tsx
index c6e5f059365..be2c8b4e112 100644
--- a/packages/@react-spectrum/card/chromatic/Card.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/card/Card.stories.tsx
@@ -12,15 +12,18 @@
  */
 
 import assetStyles from '@adobe/spectrum-css-temp/components/asset/vars.css';
-import {Card} from '..';
-import {classNames, useSlotProps, useStyleProps} from '@react-spectrum/utils';
-import {Content} from '@react-spectrum/view';
-import {Default as DefaultCard, Selected as SelectedStory} from '../stories/Card.stories';
-import {Heading, Text} from '@react-spectrum/text';
-import {IllustratedMessage} from '@react-spectrum/illustratedmessage';
-import {Image} from '@react-spectrum/image';
+import {Card} from '../../src/card/Card';
+import {classNames} from '../../src/utils/classNames';
+import {Content} from '../../src/view/Content';
+import {Default as DefaultCard, Selected as SelectedStory} from '../../stories/card/Card.stories';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
+import {Image} from '../../src/image/Image';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
+import {Text} from '../../src/text/Text';
+import {useSlotProps} from '../../src/utils/Slots';
+import {useStyleProps} from '../../src/utils/styleProps';
 
 export default {
   title: 'Card/default',
diff --git a/packages/@react-spectrum/card/chromatic/CardView.stories.tsx b/packages/@adobe/react-spectrum/chromatic/card/CardView.stories.tsx
similarity index 89%
rename from packages/@react-spectrum/card/chromatic/CardView.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/card/CardView.stories.tsx
index 50d06991528..c33e54d49d6 100644
--- a/packages/@react-spectrum/card/chromatic/CardView.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/card/CardView.stories.tsx
@@ -11,14 +11,20 @@
  * governing permissions and limitations under the License.
  */
 
-import {Card, CardView, GalleryLayout, GridLayout, WaterfallLayout} from '..';
-import {Content} from '@react-spectrum/view';
-import {Heading, Text} from '@react-spectrum/text';
-import {Image} from '@react-spectrum/image';
+import {Card} from '../../src/card/Card';
+
+import {CardView} from '../../src/card/CardView';
+import {Content} from '../../src/view/Content';
+import {GalleryLayout} from '../../src/card/GalleryLayout';
+import {GridLayout} from '../../src/card/GridLayout';
+import {Heading} from '../../src/text/Heading';
+import {Image} from '../../src/image/Image';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX, useMemo} from 'react';
 import {SpectrumCardViewProps} from '@react-types/card';
-import {useCollator} from '@react-aria/i18n';
+import {Text} from '../../src/text/Text';
+import {useCollator} from 'react-aria/useCollator';
+import {WaterfallLayout} from '../../src/card/WaterfallLayout';
 
 const meta: Meta<SpectrumCardViewProps<object>> = {
   title: 'CardView'
diff --git a/packages/@react-spectrum/card/chromatic/HorizontalCard.stories.tsx b/packages/@adobe/react-spectrum/chromatic/card/HorizontalCard.stories.tsx
similarity index 98%
rename from packages/@react-spectrum/card/chromatic/HorizontalCard.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/card/HorizontalCard.stories.tsx
index ebf9bc38a52..2df016e1bb8 100644
--- a/packages/@react-spectrum/card/chromatic/HorizontalCard.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/card/HorizontalCard.stories.tsx
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Card} from '../index';
+import {Card} from '../../src/card/Card';
 import {
   CardStory,
   Default,
diff --git a/packages/@react-spectrum/card/chromatic/QuietCard.stories.tsx b/packages/@adobe/react-spectrum/chromatic/card/QuietCard.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/card/chromatic/QuietCard.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/card/QuietCard.stories.tsx
index eca1a06b1fc..16bd791ba2c 100644
--- a/packages/@react-spectrum/card/chromatic/QuietCard.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/card/QuietCard.stories.tsx
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Card} from '../index';
+import {Card} from '../../src/card/Card';
 import {
   CardStory,
   Default,
diff --git a/packages/@react-spectrum/checkbox/chromatic/Checkbox.stories.tsx b/packages/@adobe/react-spectrum/chromatic/checkbox/Checkbox.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/checkbox/chromatic/Checkbox.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/checkbox/Checkbox.stories.tsx
index ccc9af6e68d..16674d0fce6 100644
--- a/packages/@react-spectrum/checkbox/chromatic/Checkbox.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/checkbox/Checkbox.stories.tsx
@@ -10,10 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {Checkbox, SpectrumCheckboxProps} from '../';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+
 import {Meta, StoryFn} from '@storybook/react';
 import React, {JSX} from 'react';
-import {View} from '@react-spectrum/view';
+import {SpectrumCheckboxProps} from '@react-types/checkbox';
+import {View} from '../../src/view/View';
 
 export default {
   title: 'Checkbox',
diff --git a/packages/@react-spectrum/checkbox/chromatic/CheckboxGroup.stories.tsx b/packages/@adobe/react-spectrum/chromatic/checkbox/CheckboxGroup.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/checkbox/chromatic/CheckboxGroup.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/checkbox/CheckboxGroup.stories.tsx
index 166d20a06e8..955d1b903dc 100644
--- a/packages/@react-spectrum/checkbox/chromatic/CheckboxGroup.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/checkbox/CheckboxGroup.stories.tsx
@@ -10,9 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {Checkbox, CheckboxGroup, SpectrumCheckboxGroupProps} from '..';
-import {Content, ContextualHelp, Heading} from '@adobe/react-spectrum';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+
+import {CheckboxGroup} from '../../src/checkbox/CheckboxGroup';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Heading} from '../../src/text/Heading';
 import React from 'react';
+import {SpectrumCheckboxGroupProps} from '@react-types/checkbox';
 import {StoryFn} from '@storybook/react';
 
 export default {
diff --git a/packages/@react-spectrum/color/chromatic/ColorArea.stories.tsx b/packages/@adobe/react-spectrum/chromatic/color/ColorArea.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/color/chromatic/ColorArea.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/color/ColorArea.stories.tsx
index 06b58c828f5..99819ee8c7d 100644
--- a/packages/@react-spectrum/color/chromatic/ColorArea.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/color/ColorArea.stories.tsx
@@ -10,10 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorArea, ColorField, ColorSlider, ColorSwatch, ColorWheel} from '../';
-import {Flex} from '@adobe/react-spectrum';
+import {ColorArea} from '../../src/color/ColorArea';
+
+import {ColorField} from '../../src/color/ColorField';
+import {ColorSlider} from '../../src/color/ColorSlider';
+import {ColorSwatch} from '../../src/color/ColorSwatch';
+import {ColorWheel} from '../../src/color/ColorWheel';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryObj} from '@storybook/react';
-import {parseColor} from '@react-stately/color';
+import {parseColor} from 'react-stately/Color';
 import React, {JSX, useState} from 'react';
 import {SpectrumColorAreaProps} from '@react-types/color';
 
diff --git a/packages/@react-spectrum/color/chromatic/ColorField.stories.tsx b/packages/@adobe/react-spectrum/chromatic/color/ColorField.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/color/chromatic/ColorField.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/color/ColorField.stories.tsx
index 293f3c9ad1b..06f7141e648 100644
--- a/packages/@react-spectrum/color/chromatic/ColorField.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/color/ColorField.stories.tsx
@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorField} from '../';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
+import {ColorField} from '../../src/color/ColorField';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
 import {generatePowerset} from '@react-spectrum/story-utils';
-import {Grid, repeat} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
+import {Grid, repeat} from '../../src/layout/Grid';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
 import {SpectrumColorFieldProps} from '@react-types/color';
diff --git a/packages/@react-spectrum/color/chromatic/ColorFieldExpress.stories.tsx b/packages/@adobe/react-spectrum/chromatic/color/ColorFieldExpress.stories.tsx
similarity index 100%
rename from packages/@react-spectrum/color/chromatic/ColorFieldExpress.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/color/ColorFieldExpress.stories.tsx
diff --git a/packages/@react-spectrum/color/chromatic/ColorSlider.stories.tsx b/packages/@adobe/react-spectrum/chromatic/color/ColorSlider.stories.tsx
similarity index 93%
rename from packages/@react-spectrum/color/chromatic/ColorSlider.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/color/ColorSlider.stories.tsx
index 74b38a6f7c5..9beb33b1ba2 100644
--- a/packages/@react-spectrum/color/chromatic/ColorSlider.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/color/ColorSlider.stories.tsx
@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorSlider} from '../';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
+import {ColorSlider} from '../../src/color/ColorSlider';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
 import {generatePowerset} from '@react-spectrum/story-utils';
-import {Grid, repeat} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
+import {Grid, repeat} from '../../src/layout/Grid';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
 import {SpectrumColorSliderProps} from '@react-types/color';
diff --git a/packages/@react-spectrum/combobox/chromatic/ComboBox.stories.tsx b/packages/@adobe/react-spectrum/chromatic/combobox/ComboBox.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/combobox/chromatic/ComboBox.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/combobox/ComboBox.stories.tsx
index 52e2e33b95a..b108591e2e0 100644
--- a/packages/@react-spectrum/combobox/chromatic/ComboBox.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/combobox/ComboBox.stories.tsx
@@ -10,12 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {ComboBox, Item} from '../';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
+import {ComboBox} from '../../src/combobox/ComboBox';
+
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
 import {generatePowerset} from '@react-spectrum/story-utils';
-import {Grid, repeat} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
+import {Grid, repeat} from '../../src/layout/Grid';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
 import {SpectrumComboBoxProps} from '@react-types/combobox';
diff --git a/packages/@react-spectrum/combobox/chromatic/ComboBoxRTL.stories.tsx b/packages/@adobe/react-spectrum/chromatic/combobox/ComboBoxRTL.stories.tsx
similarity index 100%
rename from packages/@react-spectrum/combobox/chromatic/ComboBoxRTL.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/combobox/ComboBoxRTL.stories.tsx
diff --git a/packages/@react-spectrum/datepicker/chromatic/DateField.stories.tsx b/packages/@adobe/react-spectrum/chromatic/datepicker/DateField.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/datepicker/chromatic/DateField.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/datepicker/DateField.stories.tsx
index ca45cf70837..75a10c24bae 100644
--- a/packages/@react-spectrum/datepicker/chromatic/DateField.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/datepicker/DateField.stories.tsx
@@ -11,12 +11,12 @@
  */
 
 import {CalendarDate, CalendarDateTime, parseZonedDateTime} from '@internationalized/date';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {DateField} from '../';
-import {Heading} from '@react-spectrum/text';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {DateField} from '../../src/datepicker/DateField';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryFn} from '@storybook/react';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
 
 export default {
diff --git a/packages/@react-spectrum/datepicker/chromatic/DatePicker.stories.tsx b/packages/@adobe/react-spectrum/chromatic/datepicker/DatePicker.stories.tsx
similarity index 98%
rename from packages/@react-spectrum/datepicker/chromatic/DatePicker.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/datepicker/DatePicker.stories.tsx
index b69fb2ddd75..2ffb9f76a77 100644
--- a/packages/@react-spectrum/datepicker/chromatic/DatePicker.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/datepicker/DatePicker.stories.tsx
@@ -11,10 +11,10 @@
  */
 
 import {CalendarDate, CalendarDateTime, parseZonedDateTime} from '@internationalized/date';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {DatePicker} from '../';
-import {Heading} from '@react-spectrum/text';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {DatePicker} from '../../src/datepicker/DatePicker';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import {userEvent, within} from 'storybook/test';
diff --git a/packages/@react-spectrum/datepicker/chromatic/DateRangePicker.stories.tsx b/packages/@adobe/react-spectrum/chromatic/datepicker/DateRangePicker.stories.tsx
similarity index 98%
rename from packages/@react-spectrum/datepicker/chromatic/DateRangePicker.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/datepicker/DateRangePicker.stories.tsx
index 90f149f89df..ca3dd6d6357 100644
--- a/packages/@react-spectrum/datepicker/chromatic/DateRangePicker.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/datepicker/DateRangePicker.stories.tsx
@@ -11,10 +11,10 @@
  */
 
 import {CalendarDate, CalendarDateTime, parseZonedDateTime} from '@internationalized/date';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {DateRangePicker} from '../';
-import {Heading} from '@react-spectrum/text';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {DateRangePicker} from '../../src/datepicker/DateRangePicker';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import {userEvent, within} from 'storybook/test';
diff --git a/packages/@react-spectrum/datepicker/chromatic/TimeField.stories.tsx b/packages/@adobe/react-spectrum/chromatic/datepicker/TimeField.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/datepicker/chromatic/TimeField.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/datepicker/TimeField.stories.tsx
index f610c8d9ad2..2d95b74d74a 100644
--- a/packages/@react-spectrum/datepicker/chromatic/TimeField.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/datepicker/TimeField.stories.tsx
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Heading} from '@react-spectrum/text';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryFn} from '@storybook/react';
 import {parseZonedDateTime, Time} from '@internationalized/date';
 import React from 'react';
-import {TimeField} from '../';
+import {TimeField} from '../../src/datepicker/TimeField';
 
 export default {
   title: 'TimeField',
diff --git a/packages/@react-spectrum/dialog/chromatic/AlertDialog.stories.tsx b/packages/@adobe/react-spectrum/chromatic/dialog/AlertDialog.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/dialog/chromatic/AlertDialog.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/dialog/AlertDialog.stories.tsx
index 6ba04a79b62..625447f9e60 100644
--- a/packages/@react-spectrum/dialog/chromatic/AlertDialog.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/dialog/AlertDialog.stories.tsx
@@ -10,8 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
-import {AlertDialog, DialogTrigger} from '../';
+import {ActionButton} from '../../src/button/ActionButton';
+
+import {AlertDialog} from '../../src/dialog/AlertDialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
 import {Meta, StoryFn} from '@storybook/react';
 import React, {JSX} from 'react';
 import {singleParagraph} from './Dialog.stories';
diff --git a/packages/@react-spectrum/dialog/chromatic/Dialog.stories.tsx b/packages/@adobe/react-spectrum/chromatic/dialog/Dialog.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/dialog/chromatic/Dialog.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/dialog/Dialog.stories.tsx
index aecba104b2f..ea2606dd867 100644
--- a/packages/@react-spectrum/dialog/chromatic/Dialog.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/dialog/Dialog.stories.tsx
@@ -10,20 +10,28 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, Button} from '@react-spectrum/button';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {Checkbox} from '@react-spectrum/checkbox';
-import {Content, Footer, Header} from '@react-spectrum/view';
-import {Dialog, DialogTrigger, SpectrumDialogProps, SpectrumDialogTriggerProps} from '../';
-import {Divider} from '@react-spectrum/divider';
-import {Flex} from '@react-spectrum/layout';
-import {Form} from '@react-spectrum/form';
-import {Heading, Text} from '@react-spectrum/text';
-import {Image} from '@react-spectrum/image';
+import {ActionButton} from '../../src/button/ActionButton';
+
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {Content} from '../../src/view/Content';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
+import {Divider} from '../../src/divider/Divider';
+import {Flex} from '../../src/layout/Flex';
+import {Footer} from '../../src/view/Footer';
+import {Form} from '../../src/form/Form';
+import {Header} from '../../src/view/Header';
+import {Heading} from '../../src/text/Heading';
+import {Image} from '../../src/image/Image';
 import {Meta, StoryFn} from '@storybook/react';
-import {Radio, RadioGroup} from '@react-spectrum/radio';
+import {Radio} from '../../src/radio/Radio';
+import {RadioGroup} from '../../src/radio/RadioGroup';
 import React, {JSX} from 'react';
-import {TextField} from '@react-spectrum/textfield';
+import {SpectrumDialogProps, SpectrumDialogTriggerProps} from '@react-types/dialog';
+import {Text} from '../../src/text/Text';
+import {TextField} from '../../src/textfield/TextField';
 
 export default {
   title: 'Dialog',
diff --git a/packages/@react-spectrum/dialog/chromatic/DialogExpress.stories.tsx b/packages/@adobe/react-spectrum/chromatic/dialog/DialogExpress.stories.tsx
similarity index 98%
rename from packages/@react-spectrum/dialog/chromatic/DialogExpress.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/dialog/DialogExpress.stories.tsx
index 9eb128b7731..3aa941e1a52 100644
--- a/packages/@react-spectrum/dialog/chromatic/DialogExpress.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/dialog/DialogExpress.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Dialog} from '../';
+import {Dialog} from '../../src/dialog/Dialog';
 import {Meta, StoryFn} from '@storybook/react';
 import {renderAlert} from './AlertDialog.stories';
 import {renderTriggerProps, singleParagraph} from './Dialog.stories';
diff --git a/packages/@react-spectrum/dialog/chromatic/DialogLanguages.stories.tsx b/packages/@adobe/react-spectrum/chromatic/dialog/DialogLanguages.stories.tsx
similarity index 85%
rename from packages/@react-spectrum/dialog/chromatic/DialogLanguages.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/dialog/DialogLanguages.stories.tsx
index 847a33f016c..750d3bfaea3 100644
--- a/packages/@react-spectrum/dialog/chromatic/DialogLanguages.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/dialog/DialogLanguages.stories.tsx
@@ -10,20 +10,26 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, Button} from '@react-spectrum/button';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@react-spectrum/table';
-import {Content, Header} from '@react-spectrum/view';
-import {Dialog, DialogTrigger, SpectrumDialogTriggerProps} from '../';
-import {Divider} from '@react-spectrum/divider';
-import {Heading} from '@react-spectrum/text';
-// @ts-ignore
+import {ActionButton} from '../../src/button/ActionButton';
+
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../src/table/TableView';
+import {Content} from '../../src/view/Content';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
+import {Divider} from '../../src/divider/Divider';
+import {Header} from '../../src/view/Header';
+import {Heading} from '../../src/text/Heading';
 import intlMessages from './intlMessages.json';
-import {Item, TagGroup} from '@react-spectrum/tag';
+// @ts-ignore
+import {Item} from 'react-stately/Item';
 import {Meta, StoryFn} from '@storybook/react';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../../src/provider/Provider';
 import React, {JSX} from 'react';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {SpectrumDialogTriggerProps} from '@react-types/dialog';
+import {TagGroup} from '../../src/tag/TagGroup';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 
 export default {
   title: 'Languages/Dialog',
diff --git a/packages/@react-spectrum/dialog/chromatic/intlMessages.json b/packages/@adobe/react-spectrum/chromatic/dialog/intlMessages.json
similarity index 100%
rename from packages/@react-spectrum/dialog/chromatic/intlMessages.json
rename to packages/@adobe/react-spectrum/chromatic/dialog/intlMessages.json
diff --git a/packages/@react-spectrum/divider/chromatic/Divider.stories.tsx b/packages/@adobe/react-spectrum/chromatic/divider/Divider.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/divider/chromatic/Divider.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/divider/Divider.stories.tsx
index 5789c498b8d..95edb7cf581 100644
--- a/packages/@react-spectrum/divider/chromatic/Divider.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/divider/Divider.stories.tsx
@@ -10,9 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
 import Copy from '@spectrum-icons/workflow/Copy';
-import {Divider} from '../';
+import {Divider} from '../../src/divider/Divider';
 import Edit from '@spectrum-icons/workflow/Edit';
 import {Meta, StoryFn} from '@storybook/react';
 import Properties from '@spectrum-icons/workflow/Properties';
diff --git a/packages/@react-spectrum/dropzone/chromatic/DropZone.stories.tsx b/packages/@adobe/react-spectrum/chromatic/dropzone/DropZone.stories.tsx
similarity index 81%
rename from packages/@react-spectrum/dropzone/chromatic/DropZone.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/dropzone/DropZone.stories.tsx
index 2d07ba3ebcf..2f373210314 100644
--- a/packages/@react-spectrum/dropzone/chromatic/DropZone.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/dropzone/DropZone.stories.tsx
@@ -10,13 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button} from '@react-spectrum/button';
-import {DropZone, SpectrumDropZoneProps} from '../';
-import {FileTrigger, Text} from 'react-aria-components';
-import {Heading} from '@react-spectrum/text';
-import {IllustratedMessage} from '@react-spectrum/illustratedmessage';
+import {Button} from '../../src/button/Button';
+
+import {DropZone, SpectrumDropZoneProps} from '../../src/dropzone/DropZone';
+import {FileTrigger} from 'react-aria-components/FileTrigger';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
+import {Text} from 'react-aria-components/Text';
 import Upload from '@spectrum-icons/illustrations/Upload';
 
 const meta: Meta<SpectrumDropZoneProps> = {
diff --git a/packages/@react-spectrum/form/chromatic/Form.stories.tsx b/packages/@adobe/react-spectrum/chromatic/form/Form.stories.tsx
similarity index 84%
rename from packages/@react-spectrum/form/chromatic/Form.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/form/Form.stories.tsx
index bfcc0247983..a13debc70d5 100644
--- a/packages/@react-spectrum/form/chromatic/Form.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/form/Form.stories.tsx
@@ -10,20 +10,25 @@
  * governing permissions and limitations under the License.
  */
 
-import {Checkbox, CheckboxGroup} from '@react-spectrum/checkbox';
-import {ComboBox} from '@react-spectrum/combobox';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Form} from '../';
-import {Heading} from '@react-spectrum/text';
-import {Item, Picker} from '@react-spectrum/picker';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+
+import {CheckboxGroup} from '../../src/checkbox/CheckboxGroup';
+import {ComboBox} from '../../src/combobox/ComboBox';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Form} from '../../src/form/Form';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryObj} from '@storybook/react';
-import {NumberField} from '@react-spectrum/numberfield';
-import {Radio, RadioGroup} from '@react-spectrum/radio';
+import {NumberField} from '../../src/numberfield/NumberField';
+import {Picker} from '../../src/picker/Picker';
+import {Radio} from '../../src/radio/Radio';
+import {RadioGroup} from '../../src/radio/RadioGroup';
 import React, {JSX} from 'react';
-import {SearchField} from '@react-spectrum/searchfield';
+import {SearchField} from '../../src/searchfield/SearchField';
 import {SpectrumFormProps} from '@react-types/form';
-import {TextArea, TextField} from '@react-spectrum/textfield';
+import {TextArea} from '../../src/textfield/TextArea';
+import {TextField} from '../../src/textfield/TextField';
 
 const meta: Meta<SpectrumFormProps> = {
   title: 'Form',
diff --git a/packages/@react-spectrum/form/chromatic/FormLanguages.stories.tsx b/packages/@adobe/react-spectrum/chromatic/form/FormLanguages.stories.tsx
similarity index 83%
rename from packages/@react-spectrum/form/chromatic/FormLanguages.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/form/FormLanguages.stories.tsx
index deb8c551d6a..de179a7ca05 100644
--- a/packages/@react-spectrum/form/chromatic/FormLanguages.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/form/FormLanguages.stories.tsx
@@ -10,25 +10,32 @@
  * governing permissions and limitations under the License.
  */
 
-import {Checkbox, CheckboxGroup} from '@react-spectrum/checkbox';
-import {ColorField} from '@react-spectrum/color';
-import {ComboBox} from '@react-spectrum/combobox';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Form, SpectrumFormProps} from '@react-spectrum/form';
-import {Heading} from '@react-spectrum/text';
-// @ts-ignore
+import {Checkbox} from '../../src/checkbox/Checkbox';
+
+import {CheckboxGroup} from '../../src/checkbox/CheckboxGroup';
+import {ColorField} from '../../src/color/ColorField';
+import {ComboBox} from '../../src/combobox/ComboBox';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Form} from '../../src/form/Form';
+import {Heading} from '../../src/text/Heading';
 import intlMessages from './intlMessages.json';
-import {Item, Picker} from '@react-spectrum/picker';
+// @ts-ignore
+import {Item} from 'react-stately/Item';
 import {Meta, StoryFn} from '@storybook/react';
-import {NumberField} from '@react-spectrum/numberfield';
-import {Radio, RadioGroup} from '@react-spectrum/radio';
-import {RangeSlider, Slider} from '@react-spectrum/slider';
+import {NumberField} from '../../src/numberfield/NumberField';
+import {Picker} from '../../src/picker/Picker';
+import {Radio} from '../../src/radio/Radio';
+import {RadioGroup} from '../../src/radio/RadioGroup';
+import {RangeSlider} from '../../src/slider/RangeSlider';
 import React, {JSX} from 'react';
-import {SearchField} from '@react-spectrum/searchfield';
-import {Switch} from '@react-spectrum/switch';
-import {TextArea, TextField} from '@react-spectrum/textfield';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {SearchField} from '../../src/searchfield/SearchField';
+import {Slider} from '../../src/slider/Slider';
+import {SpectrumFormProps} from '@react-types/form';
+import {Switch} from '../../src/switch/Switch';
+import {TextArea} from '../../src/textfield/TextArea';
+import {TextField} from '../../src/textfield/TextField';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 
 export default {
   title: 'Languages/Form',
diff --git a/packages/@react-spectrum/form/chromatic/FormLongLabel.stories.tsx b/packages/@adobe/react-spectrum/chromatic/form/FormLongLabel.stories.tsx
similarity index 87%
rename from packages/@react-spectrum/form/chromatic/FormLongLabel.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/form/FormLongLabel.stories.tsx
index 07c754eec65..f1aefc1607c 100644
--- a/packages/@react-spectrum/form/chromatic/FormLongLabel.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/form/FormLongLabel.stories.tsx
@@ -10,18 +10,23 @@
  * governing permissions and limitations under the License.
  */
 
-import {Checkbox, CheckboxGroup} from '@react-spectrum/checkbox';
-import {ColorField} from '@react-spectrum/color';
-import {ComboBox} from '@react-spectrum/combobox';
-import {Form} from '../';
-import {Item, Picker} from '@react-spectrum/picker';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+
+import {CheckboxGroup} from '../../src/checkbox/CheckboxGroup';
+import {ColorField} from '../../src/color/ColorField';
+import {ComboBox} from '../../src/combobox/ComboBox';
+import {Form} from '../../src/form/Form';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryObj} from '@storybook/react';
-import {NumberField} from '@react-spectrum/numberfield';
-import {Radio, RadioGroup} from '@react-spectrum/radio';
+import {NumberField} from '../../src/numberfield/NumberField';
+import {Picker} from '../../src/picker/Picker';
+import {Radio} from '../../src/radio/Radio';
+import {RadioGroup} from '../../src/radio/RadioGroup';
 import React, {JSX} from 'react';
-import {SearchField} from '@react-spectrum/searchfield';
+import {SearchField} from '../../src/searchfield/SearchField';
 import {SpectrumFormProps} from '@react-types/form';
-import {TextArea, TextField} from '@react-spectrum/textfield';
+import {TextArea} from '../../src/textfield/TextArea';
+import {TextField} from '../../src/textfield/TextField';
 
 const meta: Meta<SpectrumFormProps> = {
   title: 'Form/LongLabel',
diff --git a/packages/@react-spectrum/form/chromatic/intlMessages.json b/packages/@adobe/react-spectrum/chromatic/form/intlMessages.json
similarity index 100%
rename from packages/@react-spectrum/form/chromatic/intlMessages.json
rename to packages/@adobe/react-spectrum/chromatic/form/intlMessages.json
diff --git a/packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.Languages.stories.tsx b/packages/@adobe/react-spectrum/chromatic/illustratedmessage/IllustratedMessage.Languages.stories.tsx
similarity index 91%
rename from packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.Languages.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/illustratedmessage/IllustratedMessage.Languages.stories.tsx
index f1cd186aca3..35d112c2ee3 100644
--- a/packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.Languages.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/illustratedmessage/IllustratedMessage.Languages.stories.tsx
@@ -9,10 +9,10 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {Content} from '@react-spectrum/view';
-import {Flex} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
-import {IllustratedMessage} from '..';
+import {Content} from '../../src/view/Content';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
 import {Meta, StoryObj} from '@storybook/react';
 import NotFound from '@spectrum-icons/illustrations/NotFound';
 import React from 'react';
diff --git a/packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.stories.tsx b/packages/@adobe/react-spectrum/chromatic/illustratedmessage/IllustratedMessage.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/illustratedmessage/IllustratedMessage.stories.tsx
index 2fe10dc8730..ded15522b3e 100644
--- a/packages/@react-spectrum/illustratedmessage/chromatic/IllustratedMessage.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/illustratedmessage/IllustratedMessage.stories.tsx
@@ -9,11 +9,11 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {Content} from '@react-spectrum/view';
+import {Content} from '../../src/view/Content';
 import Error from '@spectrum-icons/illustrations/Error';
-import {Heading} from '@react-spectrum/text';
-import {IllustratedMessage} from '../';
-import {Link} from '@react-spectrum/link';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
+import {Link} from '../../src/link/Link';
 import {Meta, StoryObj} from '@storybook/react';
 import NoSearchResults from '@spectrum-icons/illustrations/NoSearchResults';
 import NotFound from '@spectrum-icons/illustrations/NotFound';
diff --git a/packages/@react-spectrum/inlinealert/chromatic/InlineAlert.stories.tsx b/packages/@adobe/react-spectrum/chromatic/inlinealert/InlineAlert.stories.tsx
similarity index 93%
rename from packages/@react-spectrum/inlinealert/chromatic/InlineAlert.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/inlinealert/InlineAlert.stories.tsx
index 6c1b76d53d9..92957b7f784 100644
--- a/packages/@react-spectrum/inlinealert/chromatic/InlineAlert.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/inlinealert/InlineAlert.stories.tsx
@@ -10,9 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {Content} from '@react-spectrum/view';
-import {Heading} from '@react-spectrum/text';
-import {InlineAlert, SpectrumInlineAlertProps} from '../';
+import {Content} from '../../src/view/Content';
+import {Heading} from '../../src/text/Heading';
+import {InlineAlert, SpectrumInlineAlertProps} from '../../src/inlinealert/InlineAlert';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/label/chromatic/HelpText.stories.tsx b/packages/@adobe/react-spectrum/chromatic/label/HelpText.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/label/chromatic/HelpText.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/label/HelpText.stories.tsx
index cecab0c49ad..ccee6da3492 100644
--- a/packages/@react-spectrum/label/chromatic/HelpText.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/label/HelpText.stories.tsx
@@ -9,10 +9,10 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {TextField} from '@react-spectrum/textfield';
+import {TextField} from '../../src/textfield/TextField';
 
 export default {
   title: 'HelpText',
diff --git a/packages/@react-spectrum/label/chromatic/Label.stories.tsx b/packages/@adobe/react-spectrum/chromatic/label/Label.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/label/chromatic/Label.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/label/Label.stories.tsx
index 1a5d4740ff3..61e3f8a1378 100644
--- a/packages/@react-spectrum/label/chromatic/Label.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/label/Label.stories.tsx
@@ -9,10 +9,10 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {Label} from '../';
+import {Label} from '../../src/label/Label';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {TextField} from '@react-spectrum/textfield';
+import {TextField} from '../../src/textfield/TextField';
 
 type LabelStory = StoryObj<typeof Label>;
 
diff --git a/packages/@react-spectrum/labeledvalue/chromatic/LabeledValue.stories.tsx b/packages/@adobe/react-spectrum/chromatic/labeledvalue/LabeledValue.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/labeledvalue/chromatic/LabeledValue.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/labeledvalue/LabeledValue.stories.tsx
index e3c358d4813..7e39fc6505a 100644
--- a/packages/@react-spectrum/labeledvalue/chromatic/LabeledValue.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/labeledvalue/LabeledValue.stories.tsx
@@ -11,10 +11,10 @@
  */
 
 import {CalendarDate, CalendarDateTime, Time, ZonedDateTime} from '@internationalized/date';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Heading} from '@react-spectrum/text';
-import {LabeledValue} from '..';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Heading} from '../../src/text/Heading';
+import {LabeledValue} from '../../src/labeledvalue/LabeledValue';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/layout/chromatic/Flex.stories.tsx b/packages/@adobe/react-spectrum/chromatic/layout/Flex.stories.tsx
similarity index 98%
rename from packages/@react-spectrum/layout/chromatic/Flex.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/layout/Flex.stories.tsx
index 84f2cc68db8..fd04bc37a6a 100644
--- a/packages/@react-spectrum/layout/chromatic/Flex.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/layout/Flex.stories.tsx
@@ -11,10 +11,10 @@
  */
 
 import {BackgroundColorValue, Responsive} from '@react-types/shared';
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {View} from '@react-spectrum/view';
+import {View} from '../../src/view/View';
 
 let baseColors = [
   'celery',
diff --git a/packages/@react-spectrum/layout/chromatic/Grid.stories.tsx b/packages/@adobe/react-spectrum/chromatic/layout/Grid.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/layout/chromatic/Grid.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/layout/Grid.stories.tsx
index 0e7ae45a652..19d61ce9069 100644
--- a/packages/@react-spectrum/layout/chromatic/Grid.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/layout/Grid.stories.tsx
@@ -11,10 +11,10 @@
  */
 
 import {BackgroundColorValue, Responsive} from '@react-types/shared';
-import {Grid, repeat} from '@react-spectrum/layout';
+import {Grid, repeat} from '../../src/layout/Grid';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {View} from '@react-spectrum/view';
+import {View} from '../../src/view/View';
 
 let baseColors = [
   'celery',
diff --git a/packages/@react-spectrum/layout/chromatic/styles.css b/packages/@adobe/react-spectrum/chromatic/layout/styles.css
similarity index 100%
rename from packages/@react-spectrum/layout/chromatic/styles.css
rename to packages/@adobe/react-spectrum/chromatic/layout/styles.css
diff --git a/packages/@react-spectrum/link/chromatic/Link.stories.tsx b/packages/@adobe/react-spectrum/chromatic/link/Link.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/link/chromatic/Link.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/link/Link.stories.tsx
index b6f1b19bb7e..990b68e2c6d 100644
--- a/packages/@react-spectrum/link/chromatic/Link.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/link/Link.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Link} from '../';
+import {Link} from '../../src/link/Link';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 import {SpectrumLinkProps} from '@react-types/link';
diff --git a/packages/@react-spectrum/list/chromatic/ListView.stories.tsx b/packages/@adobe/react-spectrum/chromatic/list/ListView.stories.tsx
similarity index 91%
rename from packages/@react-spectrum/list/chromatic/ListView.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/list/ListView.stories.tsx
index f20477600df..c463937742d 100644
--- a/packages/@react-spectrum/list/chromatic/ListView.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/list/ListView.stories.tsx
@@ -10,21 +10,25 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionGroup} from '@react-spectrum/actiongroup';
-import {ActionMenu} from '@react-spectrum/menu';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
+
+import {ActionMenu} from '../../src/menu/ActionMenu';
 import Add from '@spectrum-icons/workflow/Add';
-import {Content, View} from '@react-spectrum/view';
+import {Content} from '../../src/view/Content';
 import Delete from '@spectrum-icons/workflow/Delete';
 import Folder from '@spectrum-icons/illustrations/Folder';
 import {generatePowerset} from '@react-spectrum/story-utils';
-import {Grid, repeat} from '@react-spectrum/layout';
-import {Heading, Text} from '@react-spectrum/text';
-import {IllustratedMessage} from '@react-spectrum/illustratedmessage';
-import {Image} from '@react-spectrum/image';
+import {Grid, repeat} from '../../src/layout/Grid';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
+import {Image} from '../../src/image/Image';
 import Info from '@spectrum-icons/workflow/Info';
-import {Item, ListView, SpectrumListViewProps} from '../';
+import {Item} from 'react-stately/Item';
+import {ListView, SpectrumListViewProps} from '../../src/list/ListView';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
+import {Text} from '../../src/text/Text';
+import {View} from '../../src/view/View';
 
 let states = [
   {isQuiet: true},
diff --git a/packages/@react-spectrum/list/chromatic/ListViewRTL.stories.tsx b/packages/@adobe/react-spectrum/chromatic/list/ListViewRTL.stories.tsx
similarity index 100%
rename from packages/@react-spectrum/list/chromatic/ListViewRTL.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/list/ListViewRTL.stories.tsx
diff --git a/packages/@react-spectrum/listbox/chromatic/ListBox.stories.tsx b/packages/@adobe/react-spectrum/chromatic/listbox/ListBox.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/listbox/chromatic/ListBox.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/listbox/ListBox.stories.tsx
index 08873024fc8..d6a547d72f8 100644
--- a/packages/@react-spectrum/listbox/chromatic/ListBox.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/listbox/ListBox.stories.tsx
@@ -13,18 +13,20 @@
 import AlignCenter from '@spectrum-icons/workflow/AlignCenter';
 import AlignLeft from '@spectrum-icons/workflow/AlignLeft';
 import AlignRight from '@spectrum-icons/workflow/AlignRight';
-import {Avatar} from '@react-spectrum/avatar';
+import {Avatar} from '../../src/avatar/Avatar';
 import Blower from '@spectrum-icons/workflow/Blower';
 import Book from '@spectrum-icons/workflow/Book';
 import Copy from '@spectrum-icons/workflow/Copy';
 import Cut from '@spectrum-icons/workflow/Cut';
-import {Item, ListBox, Section} from '../';
-import {Label} from '@react-spectrum/label';
+import {Item} from 'react-stately/Item';
+import {Label} from '../../src/label/Label';
+import {ListBox} from '../../src/listbox/ListBox';
 import {Meta, StoryObj} from '@storybook/react';
 import Paste from '@spectrum-icons/workflow/Paste';
 import React, {JSX} from 'react';
+import {Section} from 'react-stately/Section';
 import {SpectrumListBoxProps} from '@react-types/listbox';
-import {Text} from '@react-spectrum/text';
+import {Text} from '../../src/text/Text';
 
 let iconMap = {
   AlignCenter,
diff --git a/packages/@react-spectrum/listbox/chromatic/ListBoxLanguages.stories.tsx b/packages/@adobe/react-spectrum/chromatic/listbox/ListBoxLanguages.stories.tsx
similarity index 91%
rename from packages/@react-spectrum/listbox/chromatic/ListBoxLanguages.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/listbox/ListBoxLanguages.stories.tsx
index f47b61ea415..f20d8e8e432 100644
--- a/packages/@react-spectrum/listbox/chromatic/ListBoxLanguages.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/listbox/ListBoxLanguages.stories.tsx
@@ -16,13 +16,15 @@ import Bell from '@spectrum-icons/workflow/Bell';
 import Draw from '@spectrum-icons/workflow/Draw';
 // @ts-ignore
 import intlMessages from './intlMessages.json';
-import {Item, ListBox, Section} from '..';
-import {Label} from '@react-spectrum/label';
+import {Item} from 'react-stately/Item';
+import {Label} from '../../src/label/Label';
+import {ListBox} from '../../src/listbox/ListBox';
 import {Meta, StoryFn} from '@storybook/react';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../../src/provider/Provider';
 import React, {JSX} from 'react';
-import {Text} from '@react-spectrum/text';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {Section} from 'react-stately/Section';
+import {Text} from '../../src/text/Text';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 
 export default {
   title: 'Languages/ListBox',
diff --git a/packages/@react-spectrum/listbox/chromatic/intlMessages.json b/packages/@adobe/react-spectrum/chromatic/listbox/intlMessages.json
similarity index 100%
rename from packages/@react-spectrum/listbox/chromatic/intlMessages.json
rename to packages/@adobe/react-spectrum/chromatic/listbox/intlMessages.json
diff --git a/packages/@react-spectrum/menu/chromatic/MenuTrigger.stories.tsx b/packages/@adobe/react-spectrum/chromatic/menu/MenuTrigger.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/menu/chromatic/MenuTrigger.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/menu/MenuTrigger.stories.tsx
index 418edd08c9a..23ba7fa67f7 100644
--- a/packages/@react-spectrum/menu/chromatic/MenuTrigger.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/menu/MenuTrigger.stories.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
+
 import AlignCenter from '@spectrum-icons/workflow/AlignCenter';
 import AlignLeft from '@spectrum-icons/workflow/AlignLeft';
 import AlignRight from '@spectrum-icons/workflow/AlignRight';
@@ -18,12 +19,16 @@ import Blower from '@spectrum-icons/workflow/Blower';
 import Book from '@spectrum-icons/workflow/Book';
 import Copy from '@spectrum-icons/workflow/Copy';
 import Cut from '@spectrum-icons/workflow/Cut';
-import {Item, Menu, MenuTrigger, Section} from '../';
-import {Keyboard, Text} from '@react-spectrum/text';
+import {Item} from 'react-stately/Item';
+import {Keyboard} from '../../src/text/Keyboard';
+import {Menu} from '../../src/menu/Menu';
+import {MenuTrigger} from '../../src/menu/MenuTrigger';
 import {Meta, StoryObj} from '@storybook/react';
 import Paste from '@spectrum-icons/workflow/Paste';
 import React, {JSX} from 'react';
+import {Section} from 'react-stately/Section';
 import {SpectrumMenuTriggerProps} from '@react-types/menu';
+import {Text} from '../../src/text/Text';
 
 const meta: Meta<SpectrumMenuTriggerProps> = {
   title: 'MenuTrigger',
diff --git a/packages/@react-spectrum/menu/chromatic/MenuTriggerExpress.stories.tsx b/packages/@adobe/react-spectrum/chromatic/menu/MenuTriggerExpress.stories.tsx
similarity index 100%
rename from packages/@react-spectrum/menu/chromatic/MenuTriggerExpress.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/menu/MenuTriggerExpress.stories.tsx
diff --git a/packages/@react-spectrum/menu/chromatic/MenuTriggerLanguages.stories.tsx b/packages/@adobe/react-spectrum/chromatic/menu/MenuTriggerLanguages.stories.tsx
similarity index 85%
rename from packages/@react-spectrum/menu/chromatic/MenuTriggerLanguages.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/menu/MenuTriggerLanguages.stories.tsx
index 4b108bed6f0..cf5577bbec6 100644
--- a/packages/@react-spectrum/menu/chromatic/MenuTriggerLanguages.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/menu/MenuTriggerLanguages.stories.tsx
@@ -10,18 +10,23 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
+
 import Copy from '@spectrum-icons/workflow/Copy';
 import Cut from '@spectrum-icons/workflow/Cut';
 // @ts-ignore
 import intlMessages from './intlMessages.json';
-import {Item, Menu, MenuTrigger, SpectrumMenuTriggerProps} from '../';
-import {Keyboard, Text} from '@react-spectrum/text';
+import {Item} from 'react-stately/Item';
+import {Keyboard} from '../../src/text/Keyboard';
+import {Menu} from '../../src/menu/Menu';
+import {MenuTrigger} from '../../src/menu/MenuTrigger';
 import {Meta, StoryFn} from '@storybook/react';
 import Paste from '@spectrum-icons/workflow/Paste';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../../src/provider/Provider';
 import React, {JSX} from 'react';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {SpectrumMenuTriggerProps} from '@react-types/menu';
+import {Text} from '../../src/text/Text';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 
 export default {
   title: 'Languages/MenuTrigger',
diff --git a/packages/@react-spectrum/menu/chromatic/MenuTriggerRTL.stories.tsx b/packages/@adobe/react-spectrum/chromatic/menu/MenuTriggerRTL.stories.tsx
similarity index 100%
rename from packages/@react-spectrum/menu/chromatic/MenuTriggerRTL.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/menu/MenuTriggerRTL.stories.tsx
diff --git a/packages/@react-spectrum/menu/chromatic/Submenu.stories.tsx b/packages/@adobe/react-spectrum/chromatic/menu/Submenu.stories.tsx
similarity index 93%
rename from packages/@react-spectrum/menu/chromatic/Submenu.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/menu/Submenu.stories.tsx
index f03e2c61b6e..c172acb59d1 100644
--- a/packages/@react-spectrum/menu/chromatic/Submenu.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/menu/Submenu.stories.tsx
@@ -10,16 +10,22 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
+
 import AlignCenter from '@spectrum-icons/workflow/AlignCenter';
 import AlignLeft from '@spectrum-icons/workflow/AlignLeft';
 import AlignRight from '@spectrum-icons/workflow/AlignRight';
 import AnnotatePen from '@spectrum-icons/workflow/AnnotatePen';
-import {Item, Menu, MenuTrigger, Section, SubmenuTrigger} from '../';
-import {Keyboard, Text} from '@react-spectrum/text';
+import {Item} from 'react-stately/Item';
+import {Keyboard} from '../../src/text/Keyboard';
+import {Menu} from '../../src/menu/Menu';
+import {MenuTrigger} from '../../src/menu/MenuTrigger';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
+import {Section} from 'react-stately/Section';
 import {SpectrumMenuTriggerProps} from '@react-types/menu';
+import {SubmenuTrigger} from '../../src/menu/SubmenuTrigger';
+import {Text} from '../../src/text/Text';
 import TextIndentIncrease from '@spectrum-icons/workflow/TextIndentIncrease';
 import TextItalics from '@spectrum-icons/workflow/TextItalic';
 import {userEvent, within} from 'storybook/test';
diff --git a/packages/@react-spectrum/menu/chromatic/Submenu.storiesRTL.tsx b/packages/@adobe/react-spectrum/chromatic/menu/Submenu.storiesRTL.tsx
similarity index 100%
rename from packages/@react-spectrum/menu/chromatic/Submenu.storiesRTL.tsx
rename to packages/@adobe/react-spectrum/chromatic/menu/Submenu.storiesRTL.tsx
diff --git a/packages/@react-spectrum/menu/chromatic/intlMessages.json b/packages/@adobe/react-spectrum/chromatic/menu/intlMessages.json
similarity index 100%
rename from packages/@react-spectrum/menu/chromatic/intlMessages.json
rename to packages/@adobe/react-spectrum/chromatic/menu/intlMessages.json
diff --git a/packages/@react-spectrum/meter/chromatic/Meter.stories.tsx b/packages/@adobe/react-spectrum/chromatic/meter/Meter.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/meter/chromatic/Meter.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/meter/Meter.stories.tsx
index 10cc07f6dce..1a09f98ad17 100644
--- a/packages/@react-spectrum/meter/chromatic/Meter.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/meter/Meter.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {Meta, StoryObj} from '@storybook/react';
-import {Meter} from '../';
+import {Meter} from '../../src/meter/Meter';
 import {SpectrumMeterProps} from '@react-types/meter';
 
 const meta: Meta<SpectrumMeterProps> = {
diff --git a/packages/@react-spectrum/numberfield/chromatic/NumberField.stories.tsx b/packages/@adobe/react-spectrum/chromatic/numberfield/NumberField.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/numberfield/chromatic/NumberField.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/numberfield/NumberField.stories.tsx
index bbf9e9b338c..6abe12dbc92 100644
--- a/packages/@react-spectrum/numberfield/chromatic/NumberField.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/numberfield/NumberField.stories.tsx
@@ -10,15 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
+import {classNames} from '../../src/utils/classNames';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
 import {generatePowerset} from '@react-spectrum/story-utils';
-import {Grid, repeat} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
-import {mergeProps} from '@react-aria/utils';
+import {Grid, repeat} from '../../src/layout/Grid';
+import {Heading} from '../../src/text/Heading';
+import {mergeProps} from 'react-aria/mergeProps';
 import {Meta, StoryObj} from '@storybook/react';
-import {NumberField} from '../src';
+import {NumberField} from '../../src/numberfield/NumberField';
 import React, {JSX} from 'react';
 import {SpectrumNumberFieldProps} from '@react-types/numberfield';
 import stepperStyles from '@adobe/spectrum-css-temp/components/stepper/vars.css';
diff --git a/packages/@react-spectrum/picker/chromatic/Picker.Languages.stories.tsx b/packages/@adobe/react-spectrum/chromatic/picker/Picker.Languages.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/picker/chromatic/Picker.Languages.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/picker/Picker.Languages.stories.tsx
index c15de9c692f..a737872b3bc 100644
--- a/packages/@react-spectrum/picker/chromatic/Picker.Languages.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/picker/Picker.Languages.stories.tsx
@@ -10,9 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {Item, Picker, Section} from '..';
+import {Item} from 'react-stately/Item';
+
 import {Meta, StoryObj} from '@storybook/react';
+import {Picker} from '../../src/picker/Picker';
 import React, {JSX} from 'react';
+import {Section} from 'react-stately/Section';
 import {SpectrumPickerProps} from '@react-types/select';
 
 export default {
diff --git a/packages/@react-spectrum/picker/chromatic/Picker.stories.tsx b/packages/@adobe/react-spectrum/chromatic/picker/Picker.stories.tsx
similarity index 92%
rename from packages/@react-spectrum/picker/chromatic/Picker.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/picker/Picker.stories.tsx
index ad3d9e3cdfb..5f4f93777ed 100644
--- a/packages/@react-spectrum/picker/chromatic/Picker.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/picker/Picker.stories.tsx
@@ -13,17 +13,20 @@
 import AlignCenter from '@spectrum-icons/workflow/AlignCenter';
 import AlignLeft from '@spectrum-icons/workflow/AlignLeft';
 import AlignRight from '@spectrum-icons/workflow/AlignRight';
-import {Avatar} from '@react-spectrum/avatar';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
+import {Avatar} from '../../src/avatar/Avatar';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
 import Copy from '@spectrum-icons/workflow/Copy';
 import Cut from '@spectrum-icons/workflow/Cut';
-import {Heading, Text} from '@react-spectrum/text';
-import {Item, Picker, Section} from '../';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryObj} from '@storybook/react';
 import Paste from '@spectrum-icons/workflow/Paste';
+import {Picker} from '../../src/picker/Picker';
 import React, {JSX} from 'react';
+import {Section} from 'react-stately/Section';
 import {SpectrumPickerProps} from '@react-types/select';
+import {Text} from '../../src/text/Text';
 
 const meta: Meta<SpectrumPickerProps<object>> = {
   title: 'Picker',
diff --git a/packages/@react-spectrum/progress/chromatic/ProgressBar.stories.tsx b/packages/@adobe/react-spectrum/chromatic/progress/ProgressBar.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/progress/chromatic/ProgressBar.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/progress/ProgressBar.stories.tsx
index 59417e51b8e..66ba38cc2c2 100644
--- a/packages/@react-spectrum/progress/chromatic/ProgressBar.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/progress/ProgressBar.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {Meta, StoryObj} from '@storybook/react';
-import {ProgressBar} from '../';
+import {ProgressBar} from '../../src/progress/ProgressBar';
 import React, {CSSProperties} from 'react';
 import {SpectrumProgressBarProps} from '@react-types/progress';
 
diff --git a/packages/@react-spectrum/progress/chromatic/ProgressCircle.stories.tsx b/packages/@adobe/react-spectrum/chromatic/progress/ProgressCircle.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/progress/chromatic/ProgressCircle.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/progress/ProgressCircle.stories.tsx
index dec906c6dc9..b26aa8616f9 100644
--- a/packages/@react-spectrum/progress/chromatic/ProgressCircle.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/progress/ProgressCircle.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {Meta, StoryObj} from '@storybook/react';
-import {ProgressCircle} from '../';
+import {ProgressCircle} from '../../src/progress/ProgressCircle';
 import React, {CSSProperties} from 'react';
 import {SpectrumProgressCircleProps} from '@react-types/progress';
 
diff --git a/packages/@react-spectrum/provider/chromatic/Provider.stories.tsx b/packages/@adobe/react-spectrum/chromatic/provider/Provider.stories.tsx
similarity index 90%
rename from packages/@react-spectrum/provider/chromatic/Provider.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/provider/Provider.stories.tsx
index bd12e7c7184..98587e3666b 100644
--- a/packages/@react-spectrum/provider/chromatic/Provider.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/provider/Provider.stories.tsx
@@ -10,24 +10,28 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button} from '@react-spectrum/button';
-import {Checkbox, CheckboxGroup} from '@react-spectrum/checkbox';
-import {ComboBox, Item} from '@react-spectrum/combobox';
+import {Button} from '../../src/button/Button';
+
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {CheckboxGroup} from '../../src/checkbox/CheckboxGroup';
+import {ComboBox} from '../../src/combobox/ComboBox';
 import customTheme from './custom-theme.css';
-import {Flex} from '@react-spectrum/layout';
-import {Form} from '@react-spectrum/form';
+import {Flex} from '../../src/layout/Flex';
+import {Form} from '../../src/form/Form';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
-import {NumberField} from '@react-spectrum/numberfield';
-import {Provider} from '../';
+import {NumberField} from '../../src/numberfield/NumberField';
+import {Provider} from '../../src/provider/Provider';
 import {ProviderProps} from '@react-types/provider';
-import {Radio, RadioGroup} from '@react-spectrum/radio';
+import {Radio} from '../../src/radio/Radio';
+import {RadioGroup} from '../../src/radio/RadioGroup';
 import React, {JSX} from 'react';
 import scaleLarge from '@adobe/spectrum-css-temp/vars/spectrum-large.css';
 import scaleMedium from '@adobe/spectrum-css-temp/vars/spectrum-medium.css';
-import {SearchField} from '@react-spectrum/searchfield';
-import {Switch} from '@react-spectrum/switch';
-import {TextField} from '@react-spectrum/textfield';
-import {useBreakpoint} from '@react-spectrum/utils';
+import {SearchField} from '../../src/searchfield/SearchField';
+import {Switch} from '../../src/switch/Switch';
+import {TextField} from '../../src/textfield/TextField';
+import {useBreakpoint} from '../../src/utils/BreakpointProvider';
 
 const THEME = {
   light: customTheme,
diff --git a/packages/@react-spectrum/provider/chromatic/custom-theme.css b/packages/@adobe/react-spectrum/chromatic/provider/custom-theme.css
similarity index 100%
rename from packages/@react-spectrum/provider/chromatic/custom-theme.css
rename to packages/@adobe/react-spectrum/chromatic/provider/custom-theme.css
diff --git a/packages/@react-spectrum/radio/chromatic/Radio.stories.tsx b/packages/@adobe/react-spectrum/chromatic/radio/Radio.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/radio/chromatic/Radio.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/radio/Radio.stories.tsx
index eb3901841f5..06ee64c2194 100644
--- a/packages/@react-spectrum/radio/chromatic/Radio.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/radio/Radio.stories.tsx
@@ -10,11 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {Content, ContextualHelp, Heading} from '@adobe/react-spectrum';
+import {Content} from '../../src/view/Content';
+
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryFn} from '@storybook/react';
-import {Radio, RadioGroup} from '../src';
+import {Radio} from '../../src/radio/Radio';
+import {RadioGroup} from '../../src/radio/RadioGroup';
 import React from 'react';
-import {View} from '@react-spectrum/view';
+import {View} from '../../src/view/View';
 
 export default {
   title: 'RadioGroup'
diff --git a/packages/@react-spectrum/searchfield/chromatic/SearchField.stories.tsx b/packages/@adobe/react-spectrum/chromatic/searchfield/SearchField.stories.tsx
similarity index 91%
rename from packages/@react-spectrum/searchfield/chromatic/SearchField.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/searchfield/SearchField.stories.tsx
index c523bfbb403..e3a6a5b114a 100644
--- a/packages/@react-spectrum/searchfield/chromatic/SearchField.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/searchfield/SearchField.stories.tsx
@@ -10,14 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Flex} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import Refresh from '@spectrum-icons/workflow/Refresh';
-import {SearchField} from '../';
+import {SearchField} from '../../src/searchfield/SearchField';
 
 const info =
   'A containing element with `role="search"` has been added to define a **search** landmark region.';
diff --git a/packages/@react-spectrum/slider/chromatic/RangeSlider.stories.tsx b/packages/@adobe/react-spectrum/chromatic/slider/RangeSlider.stories.tsx
similarity index 88%
rename from packages/@react-spectrum/slider/chromatic/RangeSlider.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/slider/RangeSlider.stories.tsx
index c2de34fa927..67de24b004a 100644
--- a/packages/@react-spectrum/slider/chromatic/RangeSlider.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/slider/RangeSlider.stories.tsx
@@ -10,11 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Heading} from '@react-spectrum/text';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryObj} from '@storybook/react';
-import {RangeSlider} from '../';
+import {RangeSlider} from '../../src/slider/RangeSlider';
 import React from 'react';
 import {SpectrumRangeSliderProps} from '@react-types/slider';
 
diff --git a/packages/@react-spectrum/slider/chromatic/Slider.stories.tsx b/packages/@adobe/react-spectrum/chromatic/slider/Slider.stories.tsx
similarity index 90%
rename from packages/@react-spectrum/slider/chromatic/Slider.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/slider/Slider.stories.tsx
index d73825a7bef..9451dbfe9c9 100644
--- a/packages/@react-spectrum/slider/chromatic/Slider.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/slider/Slider.stories.tsx
@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Heading} from '@react-spectrum/text';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {Slider} from '../';
+import {Slider} from '../../src/slider/Slider';
 import {SpectrumSliderProps} from '@react-types/slider';
 
 const meta: Meta<SpectrumSliderProps> = {
diff --git a/packages/@react-spectrum/statuslight/chromatic/StatusLight.stories.tsx b/packages/@adobe/react-spectrum/chromatic/statuslight/StatusLight.stories.tsx
similarity index 92%
rename from packages/@react-spectrum/statuslight/chromatic/StatusLight.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/statuslight/StatusLight.stories.tsx
index 83d53ed26d2..3c1cfde6f63 100644
--- a/packages/@react-spectrum/statuslight/chromatic/StatusLight.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/statuslight/StatusLight.stories.tsx
@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 import {SpectrumStatusLightProps} from '@react-types/statuslight';
-import {StatusLight} from '../';
-import {View} from '@react-spectrum/view';
+import {StatusLight} from '../../src/statuslight/StatusLight';
+import {View} from '../../src/view/View';
 
 let variants = ['celery', 'yellow', 'fuchsia', 'indigo', 'seafoam', 'chartreuse', 'magenta', 'purple', 'neutral', 'info', 'positive', 'notice', 'negative', 'positive'] as SpectrumStatusLightProps['variant'][];
 
diff --git a/packages/@react-spectrum/statuslight/chromatic/StatusLightLanguages.stories.tsx b/packages/@adobe/react-spectrum/chromatic/statuslight/StatusLightLanguages.stories.tsx
similarity index 90%
rename from packages/@react-spectrum/statuslight/chromatic/StatusLightLanguages.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/statuslight/StatusLightLanguages.stories.tsx
index d9618d05baa..daabbc78b42 100644
--- a/packages/@react-spectrum/statuslight/chromatic/StatusLightLanguages.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/statuslight/StatusLightLanguages.stories.tsx
@@ -10,10 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
+
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {SpectrumStatusLightProps, StatusLight} from '../';
+import {SpectrumStatusLightProps} from '@react-types/statuslight';
+import {StatusLight} from '../../src/statuslight/StatusLight';
 
 export default {
   title: 'Languages/StatusLight',
diff --git a/packages/@react-spectrum/steplist/chromatic/StepList.stories.tsx b/packages/@adobe/react-spectrum/chromatic/steplist/StepList.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/steplist/chromatic/StepList.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/steplist/StepList.stories.tsx
index c99ac66fded..df528862103 100644
--- a/packages/@react-spectrum/steplist/chromatic/StepList.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/steplist/StepList.stories.tsx
@@ -10,9 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {Item, StepList} from '../';
+import {Item} from 'react-stately/Item';
+
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
+import {StepList} from '../../src/steplist/StepList';
 
 export type StepListStory = StoryObj<typeof StepList>;
 
diff --git a/packages/@react-spectrum/switch/chromatic/Switch.stories.tsx b/packages/@adobe/react-spectrum/chromatic/switch/Switch.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/switch/chromatic/Switch.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/switch/Switch.stories.tsx
index 20d8cb35bed..4c6c7339381 100644
--- a/packages/@react-spectrum/switch/chromatic/Switch.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/switch/Switch.stories.tsx
@@ -12,8 +12,9 @@
 
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
-import {SpectrumSwitchProps, Switch} from '../';
-import {View} from '@react-spectrum/view';
+import {SpectrumSwitchProps} from '@react-types/switch';
+import {Switch} from '../../src/switch/Switch';
+import {View} from '../../src/view/View';
 
 export default {
   title: 'Switch'
diff --git a/packages/@react-spectrum/table/chromatic/TableView.stories.tsx b/packages/@adobe/react-spectrum/chromatic/table/TableView.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/table/chromatic/TableView.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/table/TableView.stories.tsx
index 9b4f6352752..5872560d795 100644
--- a/packages/@react-spectrum/table/chromatic/TableView.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/table/TableView.stories.tsx
@@ -10,16 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
-import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../';
-import {Content, View} from '@react-spectrum/view';
+import {ActionButton} from '../../src/button/ActionButton';
+
+import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../../src/table/TableView';
+import {Content} from '../../src/view/Content';
 import Delete from '@spectrum-icons/workflow/Delete';
 import {generatePowerset} from '@react-spectrum/story-utils';
-import {Grid, repeat} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
-import {IllustratedMessage} from '@react-spectrum/illustratedmessage';
+import {Grid, repeat} from '../../src/layout/Grid';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
+import {View} from '../../src/view/View';
 
 let states = [
   {isQuiet: true},
diff --git a/packages/@react-spectrum/table/chromatic/TableViewRTL.stories.tsx b/packages/@adobe/react-spectrum/chromatic/table/TableViewRTL.stories.tsx
similarity index 100%
rename from packages/@react-spectrum/table/chromatic/TableViewRTL.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/table/TableViewRTL.stories.tsx
diff --git a/packages/@react-spectrum/table/chromatic/TreeGridTable.stories.tsx b/packages/@adobe/react-spectrum/chromatic/table/TreeGridTable.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/table/chromatic/TreeGridTable.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/table/TreeGridTable.stories.tsx
index 2c55e96363a..8b9923e3f0c 100644
--- a/packages/@react-spectrum/table/chromatic/TreeGridTable.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/table/TreeGridTable.stories.tsx
@@ -10,17 +10,19 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
-import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../';
-import {Content, View} from '@react-spectrum/view';
+import {ActionButton} from '../../src/button/ActionButton';
+
+import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../../src/table/TableView';
+import {Content} from '../../src/view/Content';
 import Delete from '@spectrum-icons/workflow/Delete';
-import {enableTableNestedRows} from '@react-stately/flags';
+import {enableTableNestedRows} from 'react-stately/private/flags/flags';
 import {generatePowerset} from '@react-spectrum/story-utils';
-import {Grid, repeat} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
-import {IllustratedMessage} from '@react-spectrum/illustratedmessage';
+import {Grid, repeat} from '../../src/layout/Grid';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
+import {View} from '../../src/view/View';
 
 enableTableNestedRows();
 
diff --git a/packages/@react-spectrum/table/chromatic/TreeGridTableRTL.stories.tsx b/packages/@adobe/react-spectrum/chromatic/table/TreeGridTableRTL.stories.tsx
similarity index 100%
rename from packages/@react-spectrum/table/chromatic/TreeGridTableRTL.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/table/TreeGridTableRTL.stories.tsx
diff --git a/packages/@react-spectrum/tabs/chromatic/Tabs.stories.tsx b/packages/@adobe/react-spectrum/chromatic/tabs/Tabs.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/tabs/chromatic/Tabs.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/tabs/Tabs.stories.tsx
index 7edb0dc8772..4add4ad4d15 100644
--- a/packages/@react-spectrum/tabs/chromatic/Tabs.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/tabs/Tabs.stories.tsx
@@ -10,11 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {Heading, Text} from '@react-spectrum/text';
-import {Item, TabList, TabPanels, Tabs} from '../';
+import {Heading} from '../../src/text/Heading';
+
+import {Item} from 'react-stately/Item';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
 import {SpectrumTabsProps} from '@react-types/tabs';
+import {TabList, TabPanels, Tabs} from '../../src/tabs/Tabs';
+import {Text} from '../../src/text/Text';
 
 const meta: Meta<SpectrumTabsProps<object>> = {
   title: 'Tabs',
diff --git a/packages/@react-spectrum/tag/chromatic/TagGroup.stories.tsx b/packages/@adobe/react-spectrum/chromatic/tag/TagGroup.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/tag/chromatic/TagGroup.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/tag/TagGroup.stories.tsx
index d1420fe2d83..71b13a2734f 100644
--- a/packages/@react-spectrum/tag/chromatic/TagGroup.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/tag/TagGroup.stories.tsx
@@ -11,11 +11,12 @@
  */
 
 import Audio from '@spectrum-icons/workflow/Audio';
-import {Item, TagGroup} from '../';
-import {Link} from '@react-spectrum/link';
+import {Item} from 'react-stately/Item';
+import {Link} from '../../src/link/Link';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {Text} from '@react-spectrum/text';
+import {TagGroup} from '../../src/tag/TagGroup';
+import {Text} from '../../src/text/Text';
 
 export type TagGroupStory = StoryObj<typeof TagGroup>;
 
diff --git a/packages/@react-spectrum/textfield/chromatic/TextArea.stories.tsx b/packages/@adobe/react-spectrum/chromatic/textfield/TextArea.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/textfield/chromatic/TextArea.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/textfield/TextArea.stories.tsx
index 1953190ac29..cf59d2c6c79 100644
--- a/packages/@react-spectrum/textfield/chromatic/TextArea.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/textfield/TextArea.stories.tsx
@@ -10,12 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {Content, ContextualHelp, Heading} from '@adobe/react-spectrum';
-import {Flex} from '@react-spectrum/layout';
+import {Content} from '../../src/view/Content';
+
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
 import Info from '@spectrum-icons/workflow/Info';
 import {Meta, StoryFn} from '@storybook/react';
 import React, {JSX} from 'react';
-import {TextArea} from '../';
+import {TextArea} from '../../src/textfield/TextArea';
 
 export default {
   title: 'TextArea',
diff --git a/packages/@react-spectrum/textfield/chromatic/TextAreaLanguages.stories.tsx b/packages/@adobe/react-spectrum/chromatic/textfield/TextAreaLanguages.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/textfield/chromatic/TextAreaLanguages.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/textfield/TextAreaLanguages.stories.tsx
index ea400348f34..c5da27cc7ae 100644
--- a/packages/@react-spectrum/textfield/chromatic/TextAreaLanguages.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/textfield/TextAreaLanguages.stories.tsx
@@ -14,7 +14,7 @@ import Info from '@spectrum-icons/workflow/Info';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import {render} from './TextArea.stories';
-import {TextArea} from '../';
+import {TextArea} from '../../src/textfield/TextArea';
 
 export default {
   title: 'Languages/TextArea',
diff --git a/packages/@react-spectrum/textfield/chromatic/Textfield.stories.tsx b/packages/@adobe/react-spectrum/chromatic/textfield/Textfield.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/textfield/chromatic/Textfield.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/textfield/Textfield.stories.tsx
index 8a2a8e62d51..f3fd38e7587 100644
--- a/packages/@react-spectrum/textfield/chromatic/Textfield.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/textfield/Textfield.stories.tsx
@@ -10,12 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {Content, ContextualHelp, Heading} from '@adobe/react-spectrum';
-import {Flex} from '@react-spectrum/layout';
+import {Content} from '../../src/view/Content';
+
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
 import Info from '@spectrum-icons/workflow/Info';
 import {Meta, StoryFn} from '@storybook/react';
 import React, {JSX} from 'react';
-import {TextField} from '../';
+import {TextField} from '../../src/textfield/TextField';
 
 export default {
   title: 'Textfield',
diff --git a/packages/@react-spectrum/textfield/chromatic/TextfieldLanguages.stories.tsx b/packages/@adobe/react-spectrum/chromatic/textfield/TextfieldLanguages.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/textfield/chromatic/TextfieldLanguages.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/textfield/TextfieldLanguages.stories.tsx
index 554840918d5..78cb394d00b 100644
--- a/packages/@react-spectrum/textfield/chromatic/TextfieldLanguages.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/textfield/TextfieldLanguages.stories.tsx
@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import Info from '@spectrum-icons/workflow/Info';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import {render} from './Textfield.stories';
-import {TextField} from '../';
+import {TextField} from '../../src/textfield/TextField';
 
 export default {
   title: 'Languages/Textfield',
diff --git a/packages/@react-spectrum/toast/chromatic/Toast.stories.tsx b/packages/@adobe/react-spectrum/chromatic/toast/Toast.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/toast/chromatic/Toast.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/toast/Toast.stories.tsx
index 5d2650f59ce..ece745b155b 100644
--- a/packages/@react-spectrum/toast/chromatic/Toast.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/toast/Toast.stories.tsx
@@ -12,8 +12,8 @@
 
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
-import {SpectrumToastValue, Toast} from '../src/Toast';
-import {useToastState} from '@react-stately/toast';
+import {SpectrumToastValue, Toast} from '../../src/toast/Toast';
+import {useToastState} from 'react-stately/useToastState';
 
 function FakeToast(props: SpectrumToastValue): JSX.Element {
   let state = useToastState<any>();
diff --git a/packages/@react-spectrum/tooltip/chromatic/Tooltip.stories.tsx b/packages/@adobe/react-spectrum/chromatic/tooltip/Tooltip.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/tooltip/chromatic/Tooltip.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/tooltip/Tooltip.stories.tsx
index a9ec95e1d0f..bf62b4853ab 100644
--- a/packages/@react-spectrum/tooltip/chromatic/Tooltip.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/tooltip/Tooltip.stories.tsx
@@ -11,7 +11,7 @@
  */
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {Tooltip} from '../';
+import {Tooltip} from '../../src/tooltip/Tooltip';
 
 type TooltipStory = StoryObj<typeof Tooltip>;
 
diff --git a/packages/@react-spectrum/tooltip/chromatic/TooltipTrigger.stories.tsx b/packages/@adobe/react-spectrum/chromatic/tooltip/TooltipTrigger.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/tooltip/chromatic/TooltipTrigger.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/tooltip/TooltipTrigger.stories.tsx
index 0b40c336b0a..a102a26574d 100644
--- a/packages/@react-spectrum/tooltip/chromatic/TooltipTrigger.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/tooltip/TooltipTrigger.stories.tsx
@@ -9,10 +9,12 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
+
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {Tooltip, TooltipTrigger} from '../';
+import {Tooltip} from '../../src/tooltip/Tooltip';
+import {TooltipTrigger} from '../../src/tooltip/TooltipTrigger';
 
 type TooltipTriggerStory = StoryObj<typeof TooltipTrigger>;
 
diff --git a/packages/@react-spectrum/tooltip/chromatic/TooltipTriggerExpress.stories.tsx b/packages/@adobe/react-spectrum/chromatic/tooltip/TooltipTriggerExpress.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/tooltip/chromatic/TooltipTriggerExpress.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/tooltip/TooltipTriggerExpress.stories.tsx
index cd262c24df2..b7fa02d2a72 100644
--- a/packages/@react-spectrum/tooltip/chromatic/TooltipTriggerExpress.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/tooltip/TooltipTriggerExpress.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 import {Meta} from '@storybook/react';
-import {TooltipTrigger} from '../';
+import {TooltipTrigger} from '../../src/tooltip/TooltipTrigger';
 import {default as tooltipTriggerDefault} from './TooltipTrigger.stories';
 
 export default {
diff --git a/packages/@react-spectrum/tooltip/chromatic/TooltipTriggerRTL.stories.tsx b/packages/@adobe/react-spectrum/chromatic/tooltip/TooltipTriggerRTL.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/tooltip/chromatic/TooltipTriggerRTL.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/tooltip/TooltipTriggerRTL.stories.tsx
index a63082ea2e7..93807ec9f5c 100644
--- a/packages/@react-spectrum/tooltip/chromatic/TooltipTriggerRTL.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/tooltip/TooltipTriggerRTL.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 import {Meta} from '@storybook/react';
-import {TooltipTrigger} from '../';
+import {TooltipTrigger} from '../../src/tooltip/TooltipTrigger';
 import {default as tooltipTriggerDefault} from './TooltipTrigger.stories';
 
 export default {
diff --git a/packages/@react-spectrum/tree/chromatic/TreeView.stories.tsx b/packages/@adobe/react-spectrum/chromatic/tree/TreeView.stories.tsx
similarity index 93%
rename from packages/@react-spectrum/tree/chromatic/TreeView.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/tree/TreeView.stories.tsx
index bca65f67f0a..f17cea49fe7 100644
--- a/packages/@react-spectrum/tree/chromatic/TreeView.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/tree/TreeView.stories.tsx
@@ -10,21 +10,25 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionGroup, Item} from '@react-spectrum/actiongroup';
-import {ActionMenu} from '@react-spectrum/menu';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
+
+import {ActionMenu} from '../../src/menu/ActionMenu';
 import Add from '@spectrum-icons/workflow/Add';
-import {Content, View} from '@react-spectrum/view';
+import {Content} from '../../src/view/Content';
 import Delete from '@spectrum-icons/workflow/Delete';
 import Edit from '@spectrum-icons/workflow/Edit';
 import FileTxt from '@spectrum-icons/workflow/FileTxt';
 import Folder from '@spectrum-icons/workflow/Folder';
 import {generatePowerset} from '@react-spectrum/story-utils';
-import {Grid, repeat} from '@react-spectrum/layout';
-import {Heading, Text} from '@react-spectrum/text';
-import {IllustratedMessage} from '@react-spectrum/illustratedmessage';
+import {Grid, repeat} from '../../src/layout/Grid';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
-import {SpectrumTreeViewProps, TreeView, TreeViewItem, TreeViewItemContent} from '../src';
+import {SpectrumTreeViewProps, TreeView, TreeViewItem, TreeViewItemContent} from '../../src/tree/TreeView';
+import {Text} from '../../src/text/Text';
+import {View} from '../../src/view/View';
 
 let states = [
   {selectionMode: ['multiple', 'single']},
diff --git a/packages/@react-spectrum/view/chromatic/View.stories.tsx b/packages/@adobe/react-spectrum/chromatic/view/View.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/view/chromatic/View.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/view/View.stories.tsx
index 1546650d8dc..eb071890f34 100644
--- a/packages/@react-spectrum/view/chromatic/View.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/view/View.stories.tsx
@@ -9,10 +9,10 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {Button} from '@react-spectrum/button';
+import {Button} from '../../src/button/Button';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {View} from '../';
+import {View} from '../../src/view/View';
 
 type ViewStory = StoryObj<typeof View>;
 
diff --git a/packages/@react-spectrum/well/chromatic/Well.stories.tsx b/packages/@adobe/react-spectrum/chromatic/well/Well.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/well/chromatic/Well.stories.tsx
rename to packages/@adobe/react-spectrum/chromatic/well/Well.stories.tsx
index 2c52bc55579..6dfe7ef668b 100644
--- a/packages/@react-spectrum/well/chromatic/Well.stories.tsx
+++ b/packages/@adobe/react-spectrum/chromatic/well/Well.stories.tsx
@@ -13,7 +13,7 @@
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 import {SpectrumWellProps} from '@react-types/well';
-import {Well} from '../';
+import {Well} from '../../src/well/Well';
 
 const meta: Meta<SpectrumWellProps> = {
   title: 'Well',
diff --git a/packages/@react-spectrum/accordion/docs/Accordion.mdx b/packages/@adobe/react-spectrum/docs/accordion/Accordion.mdx
similarity index 100%
rename from packages/@react-spectrum/accordion/docs/Accordion.mdx
rename to packages/@adobe/react-spectrum/docs/accordion/Accordion.mdx
diff --git a/packages/@react-spectrum/accordion/docs/Disclosure.mdx b/packages/@adobe/react-spectrum/docs/accordion/Disclosure.mdx
similarity index 100%
rename from packages/@react-spectrum/accordion/docs/Disclosure.mdx
rename to packages/@adobe/react-spectrum/docs/accordion/Disclosure.mdx
diff --git a/packages/@react-spectrum/actionbar/docs/ActionBar.mdx b/packages/@adobe/react-spectrum/docs/actionbar/ActionBar.mdx
similarity index 100%
rename from packages/@react-spectrum/actionbar/docs/ActionBar.mdx
rename to packages/@adobe/react-spectrum/docs/actionbar/ActionBar.mdx
diff --git a/packages/@react-spectrum/actionbar/docs/ActionBarAnatomy.svg b/packages/@adobe/react-spectrum/docs/actionbar/ActionBarAnatomy.svg
similarity index 100%
rename from packages/@react-spectrum/actionbar/docs/ActionBarAnatomy.svg
rename to packages/@adobe/react-spectrum/docs/actionbar/ActionBarAnatomy.svg
diff --git a/packages/@react-spectrum/actiongroup/docs/ActionGroup.mdx b/packages/@adobe/react-spectrum/docs/actiongroup/ActionGroup.mdx
similarity index 100%
rename from packages/@react-spectrum/actiongroup/docs/ActionGroup.mdx
rename to packages/@adobe/react-spectrum/docs/actiongroup/ActionGroup.mdx
diff --git a/packages/@react-spectrum/autocomplete/docs/SearchAutocomplete.mdx b/packages/@adobe/react-spectrum/docs/autocomplete/SearchAutocomplete.mdx
similarity index 100%
rename from packages/@react-spectrum/autocomplete/docs/SearchAutocomplete.mdx
rename to packages/@adobe/react-spectrum/docs/autocomplete/SearchAutocomplete.mdx
diff --git a/packages/@react-spectrum/avatar/docs/Avatar.mdx b/packages/@adobe/react-spectrum/docs/avatar/Avatar.mdx
similarity index 100%
rename from packages/@react-spectrum/avatar/docs/Avatar.mdx
rename to packages/@adobe/react-spectrum/docs/avatar/Avatar.mdx
diff --git a/packages/@react-spectrum/badge/docs/Badge.mdx b/packages/@adobe/react-spectrum/docs/badge/Badge.mdx
similarity index 100%
rename from packages/@react-spectrum/badge/docs/Badge.mdx
rename to packages/@adobe/react-spectrum/docs/badge/Badge.mdx
diff --git a/packages/@react-spectrum/breadcrumbs/docs/Breadcrumbs.mdx b/packages/@adobe/react-spectrum/docs/breadcrumbs/Breadcrumbs.mdx
similarity index 100%
rename from packages/@react-spectrum/breadcrumbs/docs/Breadcrumbs.mdx
rename to packages/@adobe/react-spectrum/docs/breadcrumbs/Breadcrumbs.mdx
diff --git a/packages/@react-spectrum/button/docs/ActionButton.mdx b/packages/@adobe/react-spectrum/docs/button/ActionButton.mdx
similarity index 100%
rename from packages/@react-spectrum/button/docs/ActionButton.mdx
rename to packages/@adobe/react-spectrum/docs/button/ActionButton.mdx
diff --git a/packages/@react-spectrum/button/docs/Button.mdx b/packages/@adobe/react-spectrum/docs/button/Button.mdx
similarity index 100%
rename from packages/@react-spectrum/button/docs/Button.mdx
rename to packages/@adobe/react-spectrum/docs/button/Button.mdx
diff --git a/packages/@react-spectrum/button/docs/LogicButton.mdx b/packages/@adobe/react-spectrum/docs/button/LogicButton.mdx
similarity index 100%
rename from packages/@react-spectrum/button/docs/LogicButton.mdx
rename to packages/@adobe/react-spectrum/docs/button/LogicButton.mdx
diff --git a/packages/@react-spectrum/button/docs/ToggleButton.mdx b/packages/@adobe/react-spectrum/docs/button/ToggleButton.mdx
similarity index 100%
rename from packages/@react-spectrum/button/docs/ToggleButton.mdx
rename to packages/@adobe/react-spectrum/docs/button/ToggleButton.mdx
diff --git a/packages/@react-spectrum/buttongroup/docs/ButtonGroup.mdx b/packages/@adobe/react-spectrum/docs/buttongroup/ButtonGroup.mdx
similarity index 100%
rename from packages/@react-spectrum/buttongroup/docs/ButtonGroup.mdx
rename to packages/@adobe/react-spectrum/docs/buttongroup/ButtonGroup.mdx
diff --git a/packages/@react-spectrum/calendar/docs/Calendar.mdx b/packages/@adobe/react-spectrum/docs/calendar/Calendar.mdx
similarity index 100%
rename from packages/@react-spectrum/calendar/docs/Calendar.mdx
rename to packages/@adobe/react-spectrum/docs/calendar/Calendar.mdx
diff --git a/packages/@react-spectrum/calendar/docs/RangeCalendar.mdx b/packages/@adobe/react-spectrum/docs/calendar/RangeCalendar.mdx
similarity index 100%
rename from packages/@react-spectrum/calendar/docs/RangeCalendar.mdx
rename to packages/@adobe/react-spectrum/docs/calendar/RangeCalendar.mdx
diff --git a/packages/@react-spectrum/card/docs/Card.mdx.placeholder b/packages/@adobe/react-spectrum/docs/card/Card.mdx.placeholder
similarity index 100%
rename from packages/@react-spectrum/card/docs/Card.mdx.placeholder
rename to packages/@adobe/react-spectrum/docs/card/Card.mdx.placeholder
diff --git a/packages/@react-spectrum/checkbox/docs/Checkbox.mdx b/packages/@adobe/react-spectrum/docs/checkbox/Checkbox.mdx
similarity index 100%
rename from packages/@react-spectrum/checkbox/docs/Checkbox.mdx
rename to packages/@adobe/react-spectrum/docs/checkbox/Checkbox.mdx
diff --git a/packages/@react-spectrum/checkbox/docs/CheckboxGroup.mdx b/packages/@adobe/react-spectrum/docs/checkbox/CheckboxGroup.mdx
similarity index 100%
rename from packages/@react-spectrum/checkbox/docs/CheckboxGroup.mdx
rename to packages/@adobe/react-spectrum/docs/checkbox/CheckboxGroup.mdx
diff --git a/packages/@react-spectrum/color/docs/ColorArea.mdx b/packages/@adobe/react-spectrum/docs/color/ColorArea.mdx
similarity index 100%
rename from packages/@react-spectrum/color/docs/ColorArea.mdx
rename to packages/@adobe/react-spectrum/docs/color/ColorArea.mdx
diff --git a/packages/@react-spectrum/color/docs/ColorField.mdx b/packages/@adobe/react-spectrum/docs/color/ColorField.mdx
similarity index 100%
rename from packages/@react-spectrum/color/docs/ColorField.mdx
rename to packages/@adobe/react-spectrum/docs/color/ColorField.mdx
diff --git a/packages/@react-spectrum/color/docs/ColorPicker.mdx b/packages/@adobe/react-spectrum/docs/color/ColorPicker.mdx
similarity index 100%
rename from packages/@react-spectrum/color/docs/ColorPicker.mdx
rename to packages/@adobe/react-spectrum/docs/color/ColorPicker.mdx
diff --git a/packages/@react-spectrum/color/docs/ColorSlider.mdx b/packages/@adobe/react-spectrum/docs/color/ColorSlider.mdx
similarity index 100%
rename from packages/@react-spectrum/color/docs/ColorSlider.mdx
rename to packages/@adobe/react-spectrum/docs/color/ColorSlider.mdx
diff --git a/packages/@react-spectrum/color/docs/ColorSwatch.mdx b/packages/@adobe/react-spectrum/docs/color/ColorSwatch.mdx
similarity index 100%
rename from packages/@react-spectrum/color/docs/ColorSwatch.mdx
rename to packages/@adobe/react-spectrum/docs/color/ColorSwatch.mdx
diff --git a/packages/@react-spectrum/color/docs/ColorSwatchPicker.mdx b/packages/@adobe/react-spectrum/docs/color/ColorSwatchPicker.mdx
similarity index 100%
rename from packages/@react-spectrum/color/docs/ColorSwatchPicker.mdx
rename to packages/@adobe/react-spectrum/docs/color/ColorSwatchPicker.mdx
diff --git a/packages/@react-spectrum/color/docs/ColorWheel.mdx b/packages/@adobe/react-spectrum/docs/color/ColorWheel.mdx
similarity index 100%
rename from packages/@react-spectrum/color/docs/ColorWheel.mdx
rename to packages/@adobe/react-spectrum/docs/color/ColorWheel.mdx
diff --git a/packages/@react-spectrum/combobox/docs/ComboBox.mdx b/packages/@adobe/react-spectrum/docs/combobox/ComboBox.mdx
similarity index 100%
rename from packages/@react-spectrum/combobox/docs/ComboBox.mdx
rename to packages/@adobe/react-spectrum/docs/combobox/ComboBox.mdx
diff --git a/packages/@react-spectrum/contextualhelp/docs/ContextualHelp.mdx b/packages/@adobe/react-spectrum/docs/contextualhelp/ContextualHelp.mdx
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/docs/ContextualHelp.mdx
rename to packages/@adobe/react-spectrum/docs/contextualhelp/ContextualHelp.mdx
diff --git a/packages/@react-spectrum/datepicker/docs/DateField.mdx b/packages/@adobe/react-spectrum/docs/datepicker/DateField.mdx
similarity index 100%
rename from packages/@react-spectrum/datepicker/docs/DateField.mdx
rename to packages/@adobe/react-spectrum/docs/datepicker/DateField.mdx
diff --git a/packages/@react-spectrum/datepicker/docs/DatePicker.mdx b/packages/@adobe/react-spectrum/docs/datepicker/DatePicker.mdx
similarity index 100%
rename from packages/@react-spectrum/datepicker/docs/DatePicker.mdx
rename to packages/@adobe/react-spectrum/docs/datepicker/DatePicker.mdx
diff --git a/packages/@react-spectrum/datepicker/docs/DateRangePicker.mdx b/packages/@adobe/react-spectrum/docs/datepicker/DateRangePicker.mdx
similarity index 100%
rename from packages/@react-spectrum/datepicker/docs/DateRangePicker.mdx
rename to packages/@adobe/react-spectrum/docs/datepicker/DateRangePicker.mdx
diff --git a/packages/@react-spectrum/datepicker/docs/TimeField.mdx b/packages/@adobe/react-spectrum/docs/datepicker/TimeField.mdx
similarity index 100%
rename from packages/@react-spectrum/datepicker/docs/TimeField.mdx
rename to packages/@adobe/react-spectrum/docs/datepicker/TimeField.mdx
diff --git a/packages/@react-spectrum/dialog/docs/AlertDialog.mdx b/packages/@adobe/react-spectrum/docs/dialog/AlertDialog.mdx
similarity index 100%
rename from packages/@react-spectrum/dialog/docs/AlertDialog.mdx
rename to packages/@adobe/react-spectrum/docs/dialog/AlertDialog.mdx
diff --git a/packages/@react-spectrum/dialog/docs/Dialog.mdx b/packages/@adobe/react-spectrum/docs/dialog/Dialog.mdx
similarity index 100%
rename from packages/@react-spectrum/dialog/docs/Dialog.mdx
rename to packages/@adobe/react-spectrum/docs/dialog/Dialog.mdx
diff --git a/packages/@react-spectrum/dialog/docs/DialogContainer.mdx b/packages/@adobe/react-spectrum/docs/dialog/DialogContainer.mdx
similarity index 100%
rename from packages/@react-spectrum/dialog/docs/DialogContainer.mdx
rename to packages/@adobe/react-spectrum/docs/dialog/DialogContainer.mdx
diff --git a/packages/@react-spectrum/dialog/docs/DialogTrigger.mdx b/packages/@adobe/react-spectrum/docs/dialog/DialogTrigger.mdx
similarity index 100%
rename from packages/@react-spectrum/dialog/docs/DialogTrigger.mdx
rename to packages/@adobe/react-spectrum/docs/dialog/DialogTrigger.mdx
diff --git a/packages/@react-spectrum/dialog/docs/images/DialogAnatomy.svg b/packages/@adobe/react-spectrum/docs/dialog/images/DialogAnatomy.svg
similarity index 100%
rename from packages/@react-spectrum/dialog/docs/images/DialogAnatomy.svg
rename to packages/@adobe/react-spectrum/docs/dialog/images/DialogAnatomy.svg
diff --git a/packages/@react-spectrum/divider/docs/Divider.mdx b/packages/@adobe/react-spectrum/docs/divider/Divider.mdx
similarity index 100%
rename from packages/@react-spectrum/divider/docs/Divider.mdx
rename to packages/@adobe/react-spectrum/docs/divider/Divider.mdx
diff --git a/packages/@react-spectrum/dnd/docs/dnd.mdx b/packages/@adobe/react-spectrum/docs/dnd/dnd.mdx
similarity index 98%
rename from packages/@react-spectrum/dnd/docs/dnd.mdx
rename to packages/@adobe/react-spectrum/docs/dnd/dnd.mdx
index 1806afd7766..36116d4d957 100644
--- a/packages/@react-spectrum/dnd/docs/dnd.mdx
+++ b/packages/@adobe/react-spectrum/docs/dnd/dnd.mdx
@@ -15,12 +15,12 @@ import docs from 'docs:@react-spectrum/dnd';
 import dndDocs from 'docs:@react-types/shared/src/dnd.d.ts';
 import {FunctionAPI, PageDescription, TypeContext, InterfaceType} from '@react-spectrum/docs';
 import {Keyboard} from '@react-spectrum/text';
-import DragPreview from '/packages/@react-aria/dnd/docs/DragPreview.svg';
-import BetweenDropPosition from '/packages/@react-aria/dnd/docs/BetweenDropPosition.svg';
-import OnDropPosition from '/packages/@react-aria/dnd/docs/OnDropPosition.svg';
-import RootDropPosition from '/packages/@react-aria/dnd/docs/RootDropPosition.svg';
-import DragAffordance from '/packages/@react-aria/dnd/docs/DragAffordance.svg';
-import Anatomy from '/packages/@react-aria/dnd/docs/Anatomy.svg';
+import DragPreview from '/packages/react-aria/docs/dnd/DragPreview.svg';
+import BetweenDropPosition from '/packages/react-aria/docs/dnd/BetweenDropPosition.svg';
+import OnDropPosition from '/packages/react-aria/docs/dnd/OnDropPosition.svg';
+import RootDropPosition from '/packages/react-aria/docs/dnd/RootDropPosition.svg';
+import DragAffordance from '/packages/react-aria/docs/dnd/DragAffordance.svg';
+import Anatomy from '/packages/react-aria/docs/dnd/Anatomy.svg';
 
 ---
 category: Concepts
diff --git a/packages/@react-spectrum/dropzone/docs/DropZone.mdx b/packages/@adobe/react-spectrum/docs/dropzone/DropZone.mdx
similarity index 100%
rename from packages/@react-spectrum/dropzone/docs/DropZone.mdx
rename to packages/@adobe/react-spectrum/docs/dropzone/DropZone.mdx
diff --git a/packages/@react-spectrum/filetrigger/docs/FileTrigger.mdx b/packages/@adobe/react-spectrum/docs/filetrigger/FileTrigger.mdx
similarity index 100%
rename from packages/@react-spectrum/filetrigger/docs/FileTrigger.mdx
rename to packages/@adobe/react-spectrum/docs/filetrigger/FileTrigger.mdx
diff --git a/packages/@react-spectrum/form/docs/Form.mdx b/packages/@adobe/react-spectrum/docs/form/Form.mdx
similarity index 100%
rename from packages/@react-spectrum/form/docs/Form.mdx
rename to packages/@adobe/react-spectrum/docs/form/Form.mdx
diff --git a/packages/@react-spectrum/icon/docs/custom-icons.mdx b/packages/@adobe/react-spectrum/docs/icon/custom-icons.mdx
similarity index 100%
rename from packages/@react-spectrum/icon/docs/custom-icons.mdx
rename to packages/@adobe/react-spectrum/docs/icon/custom-icons.mdx
diff --git a/packages/@react-spectrum/icon/docs/workflow-icons.mdx b/packages/@adobe/react-spectrum/docs/icon/workflow-icons.mdx
similarity index 100%
rename from packages/@react-spectrum/icon/docs/workflow-icons.mdx
rename to packages/@adobe/react-spectrum/docs/icon/workflow-icons.mdx
diff --git a/packages/@react-spectrum/illustratedmessage/docs/IllustratedMessage.mdx b/packages/@adobe/react-spectrum/docs/illustratedmessage/IllustratedMessage.mdx
similarity index 100%
rename from packages/@react-spectrum/illustratedmessage/docs/IllustratedMessage.mdx
rename to packages/@adobe/react-spectrum/docs/illustratedmessage/IllustratedMessage.mdx
diff --git a/packages/@react-spectrum/image/docs/Image.mdx b/packages/@adobe/react-spectrum/docs/image/Image.mdx
similarity index 100%
rename from packages/@react-spectrum/image/docs/Image.mdx
rename to packages/@adobe/react-spectrum/docs/image/Image.mdx
diff --git a/packages/@react-spectrum/inlinealert/docs/InlineAlert.mdx b/packages/@adobe/react-spectrum/docs/inlinealert/InlineAlert.mdx
similarity index 100%
rename from packages/@react-spectrum/inlinealert/docs/InlineAlert.mdx
rename to packages/@adobe/react-spectrum/docs/inlinealert/InlineAlert.mdx
diff --git a/packages/@react-spectrum/labeledvalue/docs/LabeledValue.mdx b/packages/@adobe/react-spectrum/docs/labeledvalue/LabeledValue.mdx
similarity index 100%
rename from packages/@react-spectrum/labeledvalue/docs/LabeledValue.mdx
rename to packages/@adobe/react-spectrum/docs/labeledvalue/LabeledValue.mdx
diff --git a/packages/@react-spectrum/labeledvalue/docs/types.ts b/packages/@adobe/react-spectrum/docs/labeledvalue/types.ts
similarity index 88%
rename from packages/@react-spectrum/labeledvalue/docs/types.ts
rename to packages/@adobe/react-spectrum/docs/labeledvalue/types.ts
index e9e96e35ba8..a516bd332b7 100644
--- a/packages/@react-spectrum/labeledvalue/docs/types.ts
+++ b/packages/@adobe/react-spectrum/docs/labeledvalue/types.ts
@@ -1,5 +1,5 @@
 // @ts-ignore
-import {DateTime, LabeledValueBaseProps} from '../src/LabeledValue';
+import {DateTime, LabeledValueBaseProps} from '../../src/labeledvalue/LabeledValue';
 import {RangeValue} from '@react-types/shared';
 import {ReactElement} from 'react';
 
diff --git a/packages/@react-spectrum/layout/docs/Flex.mdx b/packages/@adobe/react-spectrum/docs/layout/Flex.mdx
similarity index 100%
rename from packages/@react-spectrum/layout/docs/Flex.mdx
rename to packages/@adobe/react-spectrum/docs/layout/Flex.mdx
diff --git a/packages/@react-spectrum/layout/docs/Grid.mdx b/packages/@adobe/react-spectrum/docs/layout/Grid.mdx
similarity index 100%
rename from packages/@react-spectrum/layout/docs/Grid.mdx
rename to packages/@adobe/react-spectrum/docs/layout/Grid.mdx
diff --git a/packages/@react-spectrum/link/docs/Link.mdx b/packages/@adobe/react-spectrum/docs/link/Link.mdx
similarity index 100%
rename from packages/@react-spectrum/link/docs/Link.mdx
rename to packages/@adobe/react-spectrum/docs/link/Link.mdx
diff --git a/packages/@react-spectrum/list/docs/ListView.mdx b/packages/@adobe/react-spectrum/docs/list/ListView.mdx
similarity index 100%
rename from packages/@react-spectrum/list/docs/ListView.mdx
rename to packages/@adobe/react-spectrum/docs/list/ListView.mdx
diff --git a/packages/@react-spectrum/list/docs/anatomy.svg b/packages/@adobe/react-spectrum/docs/list/anatomy.svg
similarity index 100%
rename from packages/@react-spectrum/list/docs/anatomy.svg
rename to packages/@adobe/react-spectrum/docs/list/anatomy.svg
diff --git a/packages/@react-spectrum/listbox/docs/ListBox.mdx b/packages/@adobe/react-spectrum/docs/listbox/ListBox.mdx
similarity index 100%
rename from packages/@react-spectrum/listbox/docs/ListBox.mdx
rename to packages/@adobe/react-spectrum/docs/listbox/ListBox.mdx
diff --git a/packages/@react-spectrum/menu/docs/ActionMenu.mdx b/packages/@adobe/react-spectrum/docs/menu/ActionMenu.mdx
similarity index 100%
rename from packages/@react-spectrum/menu/docs/ActionMenu.mdx
rename to packages/@adobe/react-spectrum/docs/menu/ActionMenu.mdx
diff --git a/packages/@react-spectrum/menu/docs/Menu.mdx b/packages/@adobe/react-spectrum/docs/menu/Menu.mdx
similarity index 100%
rename from packages/@react-spectrum/menu/docs/Menu.mdx
rename to packages/@adobe/react-spectrum/docs/menu/Menu.mdx
diff --git a/packages/@react-spectrum/menu/docs/MenuTrigger.mdx b/packages/@adobe/react-spectrum/docs/menu/MenuTrigger.mdx
similarity index 100%
rename from packages/@react-spectrum/menu/docs/MenuTrigger.mdx
rename to packages/@adobe/react-spectrum/docs/menu/MenuTrigger.mdx
diff --git a/packages/@react-spectrum/meter/docs/Meter.mdx b/packages/@adobe/react-spectrum/docs/meter/Meter.mdx
similarity index 100%
rename from packages/@react-spectrum/meter/docs/Meter.mdx
rename to packages/@adobe/react-spectrum/docs/meter/Meter.mdx
diff --git a/packages/@react-spectrum/numberfield/docs/NumberField.mdx b/packages/@adobe/react-spectrum/docs/numberfield/NumberField.mdx
similarity index 100%
rename from packages/@react-spectrum/numberfield/docs/NumberField.mdx
rename to packages/@adobe/react-spectrum/docs/numberfield/NumberField.mdx
diff --git a/packages/@react-spectrum/picker/docs/Picker.mdx b/packages/@adobe/react-spectrum/docs/picker/Picker.mdx
similarity index 100%
rename from packages/@react-spectrum/picker/docs/Picker.mdx
rename to packages/@adobe/react-spectrum/docs/picker/Picker.mdx
diff --git a/packages/@react-spectrum/progress/docs/ProgressBar.mdx b/packages/@adobe/react-spectrum/docs/progress/ProgressBar.mdx
similarity index 100%
rename from packages/@react-spectrum/progress/docs/ProgressBar.mdx
rename to packages/@adobe/react-spectrum/docs/progress/ProgressBar.mdx
diff --git a/packages/@react-spectrum/progress/docs/ProgressCircle.mdx b/packages/@adobe/react-spectrum/docs/progress/ProgressCircle.mdx
similarity index 100%
rename from packages/@react-spectrum/progress/docs/ProgressCircle.mdx
rename to packages/@adobe/react-spectrum/docs/progress/ProgressCircle.mdx
diff --git a/packages/@react-spectrum/provider/docs/Provider.mdx b/packages/@adobe/react-spectrum/docs/provider/Provider.mdx
similarity index 100%
rename from packages/@react-spectrum/provider/docs/Provider.mdx
rename to packages/@adobe/react-spectrum/docs/provider/Provider.mdx
diff --git a/packages/@react-spectrum/radio/docs/RadioGroup.mdx b/packages/@adobe/react-spectrum/docs/radio/RadioGroup.mdx
similarity index 100%
rename from packages/@react-spectrum/radio/docs/RadioGroup.mdx
rename to packages/@adobe/react-spectrum/docs/radio/RadioGroup.mdx
diff --git a/packages/@react-spectrum/searchfield/docs/SearchField.mdx b/packages/@adobe/react-spectrum/docs/searchfield/SearchField.mdx
similarity index 100%
rename from packages/@react-spectrum/searchfield/docs/SearchField.mdx
rename to packages/@adobe/react-spectrum/docs/searchfield/SearchField.mdx
diff --git a/packages/@react-spectrum/slider/docs/RangeSlider.mdx b/packages/@adobe/react-spectrum/docs/slider/RangeSlider.mdx
similarity index 100%
rename from packages/@react-spectrum/slider/docs/RangeSlider.mdx
rename to packages/@adobe/react-spectrum/docs/slider/RangeSlider.mdx
diff --git a/packages/@react-spectrum/slider/docs/Slider.mdx b/packages/@adobe/react-spectrum/docs/slider/Slider.mdx
similarity index 100%
rename from packages/@react-spectrum/slider/docs/Slider.mdx
rename to packages/@adobe/react-spectrum/docs/slider/Slider.mdx
diff --git a/packages/@react-spectrum/statuslight/docs/StatusLight.mdx b/packages/@adobe/react-spectrum/docs/statuslight/StatusLight.mdx
similarity index 100%
rename from packages/@react-spectrum/statuslight/docs/StatusLight.mdx
rename to packages/@adobe/react-spectrum/docs/statuslight/StatusLight.mdx
diff --git a/packages/@react-spectrum/steplist/docs/StepList.mdx b/packages/@adobe/react-spectrum/docs/steplist/StepList.mdx
similarity index 100%
rename from packages/@react-spectrum/steplist/docs/StepList.mdx
rename to packages/@adobe/react-spectrum/docs/steplist/StepList.mdx
diff --git a/packages/@react-spectrum/switch/docs/Switch.mdx b/packages/@adobe/react-spectrum/docs/switch/Switch.mdx
similarity index 100%
rename from packages/@react-spectrum/switch/docs/Switch.mdx
rename to packages/@adobe/react-spectrum/docs/switch/Switch.mdx
diff --git a/packages/@react-spectrum/table/docs/TableView.mdx b/packages/@adobe/react-spectrum/docs/table/TableView.mdx
similarity index 100%
rename from packages/@react-spectrum/table/docs/TableView.mdx
rename to packages/@adobe/react-spectrum/docs/table/TableView.mdx
diff --git a/packages/@react-spectrum/tabs/docs/Tabs.mdx b/packages/@adobe/react-spectrum/docs/tabs/Tabs.mdx
similarity index 100%
rename from packages/@react-spectrum/tabs/docs/Tabs.mdx
rename to packages/@adobe/react-spectrum/docs/tabs/Tabs.mdx
diff --git a/packages/@react-spectrum/tag/docs/TagGroup.mdx b/packages/@adobe/react-spectrum/docs/tag/TagGroup.mdx
similarity index 100%
rename from packages/@react-spectrum/tag/docs/TagGroup.mdx
rename to packages/@adobe/react-spectrum/docs/tag/TagGroup.mdx
diff --git a/packages/@react-spectrum/text/docs/Heading.mdx b/packages/@adobe/react-spectrum/docs/text/Heading.mdx
similarity index 100%
rename from packages/@react-spectrum/text/docs/Heading.mdx
rename to packages/@adobe/react-spectrum/docs/text/Heading.mdx
diff --git a/packages/@react-spectrum/text/docs/Keyboard.mdx b/packages/@adobe/react-spectrum/docs/text/Keyboard.mdx
similarity index 100%
rename from packages/@react-spectrum/text/docs/Keyboard.mdx
rename to packages/@adobe/react-spectrum/docs/text/Keyboard.mdx
diff --git a/packages/@react-spectrum/text/docs/Text.mdx b/packages/@adobe/react-spectrum/docs/text/Text.mdx
similarity index 100%
rename from packages/@react-spectrum/text/docs/Text.mdx
rename to packages/@adobe/react-spectrum/docs/text/Text.mdx
diff --git a/packages/@react-spectrum/textfield/docs/TextArea.mdx b/packages/@adobe/react-spectrum/docs/textfield/TextArea.mdx
similarity index 100%
rename from packages/@react-spectrum/textfield/docs/TextArea.mdx
rename to packages/@adobe/react-spectrum/docs/textfield/TextArea.mdx
diff --git a/packages/@react-spectrum/textfield/docs/TextField.mdx b/packages/@adobe/react-spectrum/docs/textfield/TextField.mdx
similarity index 100%
rename from packages/@react-spectrum/textfield/docs/TextField.mdx
rename to packages/@adobe/react-spectrum/docs/textfield/TextField.mdx
diff --git a/packages/@react-spectrum/toast/docs/Toast.mdx b/packages/@adobe/react-spectrum/docs/toast/Toast.mdx
similarity index 100%
rename from packages/@react-spectrum/toast/docs/Toast.mdx
rename to packages/@adobe/react-spectrum/docs/toast/Toast.mdx
diff --git a/packages/@react-spectrum/tooltip/docs/Tooltip.mdx b/packages/@adobe/react-spectrum/docs/tooltip/Tooltip.mdx
similarity index 100%
rename from packages/@react-spectrum/tooltip/docs/Tooltip.mdx
rename to packages/@adobe/react-spectrum/docs/tooltip/Tooltip.mdx
diff --git a/packages/@react-spectrum/tree/docs/TreeView.mdx b/packages/@adobe/react-spectrum/docs/tree/TreeView.mdx
similarity index 100%
rename from packages/@react-spectrum/tree/docs/TreeView.mdx
rename to packages/@adobe/react-spectrum/docs/tree/TreeView.mdx
diff --git a/packages/@react-spectrum/view/docs/Content.mdx b/packages/@adobe/react-spectrum/docs/view/Content.mdx
similarity index 100%
rename from packages/@react-spectrum/view/docs/Content.mdx
rename to packages/@adobe/react-spectrum/docs/view/Content.mdx
diff --git a/packages/@react-spectrum/view/docs/Footer.mdx b/packages/@adobe/react-spectrum/docs/view/Footer.mdx
similarity index 100%
rename from packages/@react-spectrum/view/docs/Footer.mdx
rename to packages/@adobe/react-spectrum/docs/view/Footer.mdx
diff --git a/packages/@react-spectrum/view/docs/Header.mdx b/packages/@adobe/react-spectrum/docs/view/Header.mdx
similarity index 100%
rename from packages/@react-spectrum/view/docs/Header.mdx
rename to packages/@adobe/react-spectrum/docs/view/Header.mdx
diff --git a/packages/@react-spectrum/view/docs/View.mdx b/packages/@adobe/react-spectrum/docs/view/View.mdx
similarity index 100%
rename from packages/@react-spectrum/view/docs/View.mdx
rename to packages/@adobe/react-spectrum/docs/view/View.mdx
diff --git a/packages/@react-spectrum/well/docs/Well.mdx b/packages/@adobe/react-spectrum/docs/well/Well.mdx
similarity index 100%
rename from packages/@react-spectrum/well/docs/Well.mdx
rename to packages/@adobe/react-spectrum/docs/well/Well.mdx
diff --git a/packages/@adobe/react-spectrum/exports/Accordion.ts b/packages/@adobe/react-spectrum/exports/Accordion.ts
new file mode 100644
index 00000000000..ed130c0feef
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Accordion.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {Disclosure, Accordion, DisclosureTitle, DisclosurePanel} from '../src/accordion/Accordion';
+export type {SpectrumAccordionProps, SpectrumDisclosureProps, SpectrumDisclosurePanelProps, SpectrumDisclosureTitleProps} from '../src/accordion/Accordion';
diff --git a/packages/@adobe/react-spectrum/exports/ActionBar.ts b/packages/@adobe/react-spectrum/exports/ActionBar.ts
new file mode 100644
index 00000000000..b3e4a001475
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ActionBar.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {ActionBar} from '../src/actionbar/ActionBar';
+export {ActionBarContainer} from '../src/actionbar/ActionBarContainer';
+export {Item} from 'react-stately/Item';
+export type {SpectrumActionBarContainerProps} from '@react-types/actionbar';
+export type {SpectrumActionBarProps} from '@react-types/actionbar';
diff --git a/packages/@adobe/react-spectrum/exports/ActionButton.ts b/packages/@adobe/react-spectrum/exports/ActionButton.ts
new file mode 100644
index 00000000000..0f6d828876c
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ActionButton.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {ActionButton} from '../src/button/ActionButton';
+export type {SpectrumActionButtonProps, SpectrumButtonProps, SpectrumLogicButtonProps, SpectrumToggleButtonProps} from '@react-types/button';
diff --git a/packages/@adobe/react-spectrum/exports/ActionGroup.ts b/packages/@adobe/react-spectrum/exports/ActionGroup.ts
new file mode 100644
index 00000000000..3559a9b3500
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ActionGroup.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {ActionGroup} from '../src/actiongroup/ActionGroup';
+export {Item} from 'react-stately/Item';
+export type {SpectrumActionGroupProps} from '@react-types/actiongroup';
diff --git a/packages/@adobe/react-spectrum/exports/ActionMenu.ts b/packages/@adobe/react-spectrum/exports/ActionMenu.ts
new file mode 100644
index 00000000000..16c81770e17
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ActionMenu.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {ActionMenu} from '../src/menu/ActionMenu';
+export {Item} from 'react-stately/Item';
+export {Section} from 'react-stately/Section';
+export type {SpectrumActionMenuProps, SpectrumMenuProps, SpectrumMenuTriggerProps} from '@react-types/menu';
diff --git a/packages/@adobe/react-spectrum/exports/AlertDialog.ts b/packages/@adobe/react-spectrum/exports/AlertDialog.ts
new file mode 100644
index 00000000000..20eaca8e4d8
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/AlertDialog.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {AlertDialog} from '../src/dialog/AlertDialog';
+
+export type {SpectrumAlertDialogProps, SpectrumDialogProps, SpectrumDialogContainerProps, SpectrumDialogTriggerProps} from '@react-types/dialog';
diff --git a/packages/@react-spectrum/avatar/index.ts b/packages/@adobe/react-spectrum/exports/Avatar.ts
similarity index 80%
rename from packages/@react-spectrum/avatar/index.ts
rename to packages/@adobe/react-spectrum/exports/Avatar.ts
index b1a5da03bc4..f6344cf4b9c 100644
--- a/packages/@react-spectrum/avatar/index.ts
+++ b/packages/@adobe/react-spectrum/exports/Avatar.ts
@@ -9,5 +9,6 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-
-export * from './src';
+/// <reference types="css-module-types" />
+export {Avatar} from '../src/avatar/Avatar';
+export type {SpectrumAvatarProps} from '@react-types/avatar';
diff --git a/packages/@react-aria/gridlist/index.ts b/packages/@adobe/react-spectrum/exports/Badge.ts
similarity index 80%
rename from packages/@react-aria/gridlist/index.ts
rename to packages/@adobe/react-spectrum/exports/Badge.ts
index 4e9931530d8..7929b1977ff 100644
--- a/packages/@react-aria/gridlist/index.ts
+++ b/packages/@adobe/react-spectrum/exports/Badge.ts
@@ -10,4 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-export * from './src';
+/// <reference types="css-module-types" />
+
+export {Badge} from '../src/badge/Badge';
+export type {SpectrumBadgeProps} from '@react-types/badge';
diff --git a/packages/@adobe/react-spectrum/exports/Breadcrumbs.ts b/packages/@adobe/react-spectrum/exports/Breadcrumbs.ts
new file mode 100644
index 00000000000..0517d9d3134
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Breadcrumbs.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {Breadcrumbs} from '../src/breadcrumbs/Breadcrumbs';
+export {Item} from 'react-stately/Item';
+export type {SpectrumBreadcrumbsProps} from '@react-types/breadcrumbs';
diff --git a/packages/@adobe/react-spectrum/exports/Button.ts b/packages/@adobe/react-spectrum/exports/Button.ts
new file mode 100644
index 00000000000..1c71346ab97
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Button.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {Button} from '../src/button/Button';
+export type {SpectrumActionButtonProps, SpectrumButtonProps, SpectrumLogicButtonProps, SpectrumToggleButtonProps} from '@react-types/button';
diff --git a/packages/@adobe/react-spectrum/exports/ButtonGroup.ts b/packages/@adobe/react-spectrum/exports/ButtonGroup.ts
new file mode 100644
index 00000000000..f6341562d58
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ButtonGroup.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {ButtonGroup} from '../src/buttongroup/ButtonGroup';
+export type {SpectrumButtonGroupProps} from '@react-types/buttongroup';
diff --git a/packages/@adobe/react-spectrum/exports/Calendar.ts b/packages/@adobe/react-spectrum/exports/Calendar.ts
new file mode 100644
index 00000000000..9b3b4b92e74
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Calendar.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Calendar} from '../src/calendar/Calendar';
+export type {SpectrumCalendarProps, SpectrumRangeCalendarProps} from '@react-types/calendar';
diff --git a/packages/@adobe/react-spectrum/exports/Checkbox.ts b/packages/@adobe/react-spectrum/exports/Checkbox.ts
new file mode 100644
index 00000000000..153ab801d55
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Checkbox.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {Checkbox} from '../src/checkbox/Checkbox';
+export type {SpectrumCheckboxProps, SpectrumCheckboxGroupProps} from '@react-types/checkbox';
diff --git a/packages/@adobe/react-spectrum/exports/CheckboxGroup.ts b/packages/@adobe/react-spectrum/exports/CheckboxGroup.ts
new file mode 100644
index 00000000000..94896f137b8
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/CheckboxGroup.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {CheckboxGroup} from '../src/checkbox/CheckboxGroup';
+export type {SpectrumCheckboxProps, SpectrumCheckboxGroupProps} from '@react-types/checkbox';
diff --git a/packages/@adobe/react-spectrum/exports/ColorArea.ts b/packages/@adobe/react-spectrum/exports/ColorArea.ts
new file mode 100644
index 00000000000..846bbf235d4
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ColorArea.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+export {ColorArea} from '../src/color/ColorArea';
+export {parseColor, getColorChannels} from 'react-stately/Color';
+export type {SpectrumColorAreaProps, SpectrumColorFieldProps, SpectrumColorSliderProps, SpectrumColorWheelProps} from '@react-types/color';
+export type {Color, ColorSpace, ColorFormat} from '@react-types/color';
diff --git a/packages/@adobe/react-spectrum/exports/ColorField.ts b/packages/@adobe/react-spectrum/exports/ColorField.ts
new file mode 100644
index 00000000000..0583f9dcbea
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ColorField.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+export {ColorField} from '../src/color/ColorField';
+export {parseColor, getColorChannels} from 'react-stately/Color';
+export type {SpectrumColorAreaProps, SpectrumColorFieldProps, SpectrumColorSliderProps, SpectrumColorWheelProps} from '@react-types/color';
+export type {Color, ColorSpace, ColorFormat} from '@react-types/color';
diff --git a/packages/@adobe/react-spectrum/exports/ColorPicker.ts b/packages/@adobe/react-spectrum/exports/ColorPicker.ts
new file mode 100644
index 00000000000..1475d219683
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ColorPicker.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+export {ColorPicker} from '../src/color/ColorPicker';
+export {ColorEditor} from '../src/color/ColorEditor';
+export type {SpectrumColorPickerProps} from '../src/color/ColorPicker';
+export type {SpectrumColorEditorProps} from '../src/color/ColorEditor';
+export {parseColor, getColorChannels} from 'react-stately/Color';
+export type {SpectrumColorAreaProps, SpectrumColorFieldProps, SpectrumColorSliderProps, SpectrumColorWheelProps} from '@react-types/color';
+export type {Color, ColorSpace, ColorFormat} from '@react-types/color';
diff --git a/packages/@adobe/react-spectrum/exports/ColorSlider.ts b/packages/@adobe/react-spectrum/exports/ColorSlider.ts
new file mode 100644
index 00000000000..1c98d638f7c
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ColorSlider.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+export {ColorSlider} from '../src/color/ColorSlider';
+export {parseColor, getColorChannels} from 'react-stately/Color';
+export type {SpectrumColorAreaProps, SpectrumColorFieldProps, SpectrumColorSliderProps, SpectrumColorWheelProps} from '@react-types/color';
+export type {Color, ColorSpace, ColorFormat} from '@react-types/color';
diff --git a/packages/@adobe/react-spectrum/exports/ColorSwatch.ts b/packages/@adobe/react-spectrum/exports/ColorSwatch.ts
new file mode 100644
index 00000000000..805012b4547
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ColorSwatch.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+export {ColorSwatch} from '../src/color/ColorSwatch';
+export type {SpectrumColorSwatchProps} from '../src/color/ColorSwatch';
+export {parseColor, getColorChannels} from 'react-stately/Color';
+export type {SpectrumColorAreaProps, SpectrumColorFieldProps, SpectrumColorSliderProps, SpectrumColorWheelProps} from '@react-types/color';
+export type {Color, ColorSpace, ColorFormat} from '@react-types/color';
diff --git a/packages/@adobe/react-spectrum/exports/ColorSwatchPicker.ts b/packages/@adobe/react-spectrum/exports/ColorSwatchPicker.ts
new file mode 100644
index 00000000000..0d60d6c0537
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ColorSwatchPicker.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+export {ColorSwatchPicker} from '../src/color/ColorSwatchPicker';
+export type {SpectrumColorSwatchPickerProps} from '../src/color/ColorSwatchPicker';
+export {parseColor, getColorChannels} from 'react-stately/Color';
+export type {SpectrumColorAreaProps, SpectrumColorFieldProps, SpectrumColorSliderProps, SpectrumColorWheelProps} from '@react-types/color';
+export type {Color, ColorSpace, ColorFormat} from '@react-types/color';
diff --git a/packages/@adobe/react-spectrum/exports/ColorWheel.ts b/packages/@adobe/react-spectrum/exports/ColorWheel.ts
new file mode 100644
index 00000000000..b16d700a2b7
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ColorWheel.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+export {ColorWheel} from '../src/color/ColorWheel';
+export {parseColor, getColorChannels} from 'react-stately/Color';
+export type {SpectrumColorAreaProps, SpectrumColorFieldProps, SpectrumColorSliderProps, SpectrumColorWheelProps} from '@react-types/color';
+export type {Color, ColorSpace, ColorFormat} from '@react-types/color';
diff --git a/packages/@adobe/react-spectrum/exports/ComboBox.ts b/packages/@adobe/react-spectrum/exports/ComboBox.ts
new file mode 100644
index 00000000000..f8c605623d4
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ComboBox.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {ComboBox} from '../src/combobox/ComboBox';
+export {Item} from 'react-stately/Item';
+export {Section} from 'react-stately/Section';
+export type {SpectrumComboBoxProps} from '@react-types/combobox';
diff --git a/packages/@adobe/react-spectrum/exports/Content.ts b/packages/@adobe/react-spectrum/exports/Content.ts
new file mode 100644
index 00000000000..b733cd4de22
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Content.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {Content} from '../src/view/Content';
+export type {ContentProps, FooterProps, HeaderProps, ViewProps} from '@react-types/view';
diff --git a/packages/@react-spectrum/autocomplete/index.ts b/packages/@adobe/react-spectrum/exports/ContextualHelp.ts
similarity index 80%
rename from packages/@react-spectrum/autocomplete/index.ts
rename to packages/@adobe/react-spectrum/exports/ContextualHelp.ts
index b1a5da03bc4..07963b6ae69 100644
--- a/packages/@react-spectrum/autocomplete/index.ts
+++ b/packages/@adobe/react-spectrum/exports/ContextualHelp.ts
@@ -10,4 +10,5 @@
  * governing permissions and limitations under the License.
  */
 
-export * from './src';
+export {ContextualHelp} from '../src/contextualhelp/ContextualHelp';
+export type {SpectrumContextualHelpProps} from '@react-types/contextualhelp';
diff --git a/packages/@adobe/react-spectrum/exports/DateField.ts b/packages/@adobe/react-spectrum/exports/DateField.ts
new file mode 100644
index 00000000000..02eb978499b
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/DateField.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {DateField} from '../src/datepicker/DateField';
+export type {SpectrumDateFieldProps, SpectrumDatePickerProps, SpectrumDateRangePickerProps, SpectrumTimeFieldProps} from '@react-types/datepicker';
diff --git a/packages/@adobe/react-spectrum/exports/DatePicker.ts b/packages/@adobe/react-spectrum/exports/DatePicker.ts
new file mode 100644
index 00000000000..f92e8154805
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/DatePicker.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {DatePicker} from '../src/datepicker/DatePicker';
+export type {SpectrumDateFieldProps, SpectrumDatePickerProps, SpectrumDateRangePickerProps, SpectrumTimeFieldProps} from '@react-types/datepicker';
diff --git a/packages/@adobe/react-spectrum/exports/DateRangePicker.ts b/packages/@adobe/react-spectrum/exports/DateRangePicker.ts
new file mode 100644
index 00000000000..448165e9aa1
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/DateRangePicker.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {DateRangePicker} from '../src/datepicker/DateRangePicker';
+export type {SpectrumDateFieldProps, SpectrumDatePickerProps, SpectrumDateRangePickerProps, SpectrumTimeFieldProps} from '@react-types/datepicker';
diff --git a/packages/@adobe/react-spectrum/exports/Dialog.ts b/packages/@adobe/react-spectrum/exports/Dialog.ts
new file mode 100644
index 00000000000..e11b84465be
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Dialog.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Dialog} from '../src/dialog/Dialog';
+
+export type {SpectrumAlertDialogProps, SpectrumDialogProps, SpectrumDialogContainerProps, SpectrumDialogTriggerProps} from '@react-types/dialog';
diff --git a/packages/@adobe/react-spectrum/exports/DialogContainer.ts b/packages/@adobe/react-spectrum/exports/DialogContainer.ts
new file mode 100644
index 00000000000..27b46914f42
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/DialogContainer.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {DialogContainer} from '../src/dialog/DialogContainer';
+export {useDialogContainer} from '../src/dialog/useDialogContainer';
+
+export type {DialogContainerValue} from '../src/dialog/useDialogContainer';
+
+export type {SpectrumAlertDialogProps, SpectrumDialogProps, SpectrumDialogContainerProps, SpectrumDialogTriggerProps} from '@react-types/dialog';
diff --git a/packages/@adobe/react-spectrum/exports/DialogTrigger.ts b/packages/@adobe/react-spectrum/exports/DialogTrigger.ts
new file mode 100644
index 00000000000..7c42a2b7b14
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/DialogTrigger.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {DialogTrigger} from '../src/dialog/DialogTrigger';
+
+export type {SpectrumAlertDialogProps, SpectrumDialogProps, SpectrumDialogContainerProps, SpectrumDialogTriggerProps} from '@react-types/dialog';
diff --git a/packages/@adobe/react-spectrum/exports/Divider.ts b/packages/@adobe/react-spectrum/exports/Divider.ts
new file mode 100644
index 00000000000..c4478f0bded
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Divider.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Divider} from '../src/divider/Divider';
+export type {SpectrumDividerProps} from '@react-types/divider';
diff --git a/packages/@react-aria/form/index.ts b/packages/@adobe/react-spectrum/exports/DropZone.ts
similarity index 79%
rename from packages/@react-aria/form/index.ts
rename to packages/@adobe/react-spectrum/exports/DropZone.ts
index 7e5b036e91f..20c813eaac1 100644
--- a/packages/@react-aria/form/index.ts
+++ b/packages/@adobe/react-spectrum/exports/DropZone.ts
@@ -10,4 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-export * from './src';
+/// <reference types="css-module-types" />
+
+export {DropZone} from '../src/dropzone/DropZone';
+export type {SpectrumDropZoneProps} from '../src/dropzone/DropZone';
diff --git a/packages/@adobe/react-spectrum/exports/Flex.ts b/packages/@adobe/react-spectrum/exports/Flex.ts
new file mode 100644
index 00000000000..1f10b119825
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Flex.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Flex} from '../src/layout/Flex';
+export type {DimensionValue} from '@react-types/shared';
+export type {FlexProps, GridProps} from '@react-types/layout';
diff --git a/packages/@adobe/react-spectrum/exports/Footer.ts b/packages/@adobe/react-spectrum/exports/Footer.ts
new file mode 100644
index 00000000000..53cf257bf72
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Footer.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {Footer} from '../src/view/Footer';
+export type {ContentProps, FooterProps, HeaderProps, ViewProps} from '@react-types/view';
diff --git a/packages/@adobe/react-spectrum/exports/Form.ts b/packages/@adobe/react-spectrum/exports/Form.ts
new file mode 100644
index 00000000000..1ab04f458cc
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Form.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Form} from '../src/form/Form';
+export type {SpectrumFormProps} from '@react-types/form';
diff --git a/packages/@adobe/react-spectrum/exports/Grid.ts b/packages/@adobe/react-spectrum/exports/Grid.ts
new file mode 100644
index 00000000000..06d0e4ba262
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Grid.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {repeat, minmax, fitContent, Grid} from '../src/layout/Grid';
+export type {DimensionValue} from '@react-types/shared';
+export type {FlexProps, GridProps} from '@react-types/layout';
diff --git a/packages/@adobe/react-spectrum/exports/Header.ts b/packages/@adobe/react-spectrum/exports/Header.ts
new file mode 100644
index 00000000000..1038b98777a
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Header.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {Header} from '../src/view/Header';
+export type {ContentProps, FooterProps, HeaderProps, ViewProps} from '@react-types/view';
diff --git a/packages/@adobe/react-spectrum/exports/Heading.ts b/packages/@adobe/react-spectrum/exports/Heading.ts
new file mode 100644
index 00000000000..f9108327284
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Heading.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Heading} from '../src/text/Heading';
+export type {HeadingProps, KeyboardProps, TextProps} from '@react-types/text';
diff --git a/packages/@adobe/react-spectrum/exports/Icon.ts b/packages/@adobe/react-spectrum/exports/Icon.ts
new file mode 100644
index 00000000000..2d4699f0ae1
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Icon.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Icon} from '../src/icon/Icon';
+
+export type {IconProps} from '../src/icon/Icon';
diff --git a/packages/@adobe/react-spectrum/exports/IllustratedMessage.ts b/packages/@adobe/react-spectrum/exports/IllustratedMessage.ts
new file mode 100644
index 00000000000..f6d56f6a19d
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/IllustratedMessage.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {IllustratedMessage} from '../src/illustratedmessage/IllustratedMessage';
+export type {SpectrumIllustratedMessageProps} from '@react-types/illustratedmessage';
diff --git a/packages/@adobe/react-spectrum/exports/Image.ts b/packages/@adobe/react-spectrum/exports/Image.ts
new file mode 100644
index 00000000000..873b7e45aab
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Image.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Image} from '../src/image/Image';
+export type {SpectrumImageProps} from '@react-types/image';
diff --git a/packages/@react-aria/toolbar/index.ts b/packages/@adobe/react-spectrum/exports/InlineAlert.ts
similarity index 77%
rename from packages/@react-aria/toolbar/index.ts
rename to packages/@adobe/react-spectrum/exports/InlineAlert.ts
index 7e5b036e91f..a689b08d558 100644
--- a/packages/@react-aria/toolbar/index.ts
+++ b/packages/@adobe/react-spectrum/exports/InlineAlert.ts
@@ -10,4 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-export * from './src';
+/// <reference types="css-module-types" />
+
+export {InlineAlert} from '../src/inlinealert/InlineAlert';
+export type {SpectrumInlineAlertProps} from '../src/inlinealert/InlineAlert';
diff --git a/packages/@adobe/react-spectrum/exports/Keyboard.ts b/packages/@adobe/react-spectrum/exports/Keyboard.ts
new file mode 100644
index 00000000000..9aecf75f9d3
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Keyboard.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Keyboard} from '../src/text/Keyboard';
+export type {HeadingProps, KeyboardProps, TextProps} from '@react-types/text';
diff --git a/packages/@react-spectrum/dnd/index.ts b/packages/@adobe/react-spectrum/exports/LabeledValue.ts
similarity index 76%
rename from packages/@react-spectrum/dnd/index.ts
rename to packages/@adobe/react-spectrum/exports/LabeledValue.ts
index 4e9931530d8..e7f075a7cf4 100644
--- a/packages/@react-spectrum/dnd/index.ts
+++ b/packages/@adobe/react-spectrum/exports/LabeledValue.ts
@@ -10,4 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-export * from './src';
+/// <reference types="css-module-types" />
+
+export type {SpectrumLabeledValueProps} from '../src/labeledvalue/LabeledValue';
+export {LabeledValue} from '../src/labeledvalue/LabeledValue';
diff --git a/packages/@adobe/react-spectrum/exports/Link.ts b/packages/@adobe/react-spectrum/exports/Link.ts
new file mode 100644
index 00000000000..b53fb32adc6
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Link.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Link} from '../src/link/Link';
+export type {SpectrumLinkProps} from '@react-types/link';
diff --git a/packages/@adobe/react-spectrum/exports/ListBox.ts b/packages/@adobe/react-spectrum/exports/ListBox.ts
new file mode 100644
index 00000000000..a695299de08
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ListBox.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {ListBox} from '../src/listbox/ListBox';
+export {Item} from 'react-stately/Item';
+export {Section} from 'react-stately/Section';
+export type {SpectrumListBoxProps} from '@react-types/listbox';
diff --git a/packages/@react-aria/landmark/index.ts b/packages/@adobe/react-spectrum/exports/ListView.ts
similarity index 80%
rename from packages/@react-aria/landmark/index.ts
rename to packages/@adobe/react-spectrum/exports/ListView.ts
index 4e9931530d8..b53d6a93c82 100644
--- a/packages/@react-aria/landmark/index.ts
+++ b/packages/@adobe/react-spectrum/exports/ListView.ts
@@ -10,4 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-export * from './src';
+export {ListView} from '../src/list/ListView';
+export type {SpectrumListViewProps} from '../src/list/ListView';
+export {Item} from 'react-stately/Item';
diff --git a/packages/@adobe/react-spectrum/exports/LogicButton.ts b/packages/@adobe/react-spectrum/exports/LogicButton.ts
new file mode 100644
index 00000000000..71bf175d76a
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/LogicButton.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {LogicButton} from '../src/button/LogicButton';
+export type {SpectrumActionButtonProps, SpectrumButtonProps, SpectrumLogicButtonProps, SpectrumToggleButtonProps} from '@react-types/button';
diff --git a/packages/@adobe/react-spectrum/exports/Menu.ts b/packages/@adobe/react-spectrum/exports/Menu.ts
new file mode 100644
index 00000000000..b977cffc296
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Menu.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {SubmenuTrigger} from '../src/menu/SubmenuTrigger';
+export {Menu} from '../src/menu/Menu';
+export {ContextualHelpTrigger} from '../src/menu/ContextualHelpTrigger';
+export type {SpectrumMenuDialogTriggerProps} from '../src/menu/ContextualHelpTrigger';
+export type {SpectrumSubmenuTriggerProps} from '../src/menu/SubmenuTrigger';
+export {Item} from 'react-stately/Item';
+export {Section} from 'react-stately/Section';
+export type {SpectrumActionMenuProps, SpectrumMenuProps, SpectrumMenuTriggerProps} from '@react-types/menu';
diff --git a/packages/@adobe/react-spectrum/exports/MenuTrigger.ts b/packages/@adobe/react-spectrum/exports/MenuTrigger.ts
new file mode 100644
index 00000000000..45ef1c14e63
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/MenuTrigger.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {MenuTrigger} from '../src/menu/MenuTrigger';
+export {Item} from 'react-stately/Item';
+export {Section} from 'react-stately/Section';
+export type {SpectrumActionMenuProps, SpectrumMenuProps, SpectrumMenuTriggerProps} from '@react-types/menu';
diff --git a/packages/@adobe/react-spectrum/exports/Meter.ts b/packages/@adobe/react-spectrum/exports/Meter.ts
new file mode 100644
index 00000000000..69981fcc047
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Meter.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Meter} from '../src/meter/Meter';
+export type {SpectrumMeterProps} from '@react-types/meter';
diff --git a/packages/@adobe/react-spectrum/exports/NumberField.ts b/packages/@adobe/react-spectrum/exports/NumberField.ts
new file mode 100644
index 00000000000..46be560cbbe
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/NumberField.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {NumberField} from '../src/numberfield/NumberField';
+export type {SpectrumNumberFieldProps} from '@react-types/numberfield';
diff --git a/packages/@adobe/react-spectrum/exports/Picker.ts b/packages/@adobe/react-spectrum/exports/Picker.ts
new file mode 100644
index 00000000000..d8438eed90d
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Picker.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Picker} from '../src/picker/Picker';
+export {Item} from 'react-stately/Item';
+export {Section} from 'react-stately/Section';
+export type {SpectrumPickerProps} from '@react-types/select';
diff --git a/packages/@adobe/react-spectrum/exports/ProgressBar.ts b/packages/@adobe/react-spectrum/exports/ProgressBar.ts
new file mode 100644
index 00000000000..c4509be5814
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ProgressBar.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {ProgressBar} from '../src/progress/ProgressBar';
+export type {SpectrumProgressBarProps, SpectrumProgressCircleProps} from '@react-types/progress';
diff --git a/packages/@adobe/react-spectrum/exports/ProgressCircle.ts b/packages/@adobe/react-spectrum/exports/ProgressCircle.ts
new file mode 100644
index 00000000000..db3a7b03b63
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ProgressCircle.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {ProgressCircle} from '../src/progress/ProgressCircle';
+export type {SpectrumProgressBarProps, SpectrumProgressCircleProps} from '@react-types/progress';
diff --git a/packages/@adobe/react-spectrum/exports/Provider.ts b/packages/@adobe/react-spectrum/exports/Provider.ts
new file mode 100644
index 00000000000..89580816ba8
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Provider.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Provider, useProvider} from '../src/provider/Provider';
+export type {ProviderContext} from '@react-types/provider';
+export type {ProviderProps} from '@react-types/provider';
diff --git a/packages/@adobe/react-spectrum/exports/RadioGroup.ts b/packages/@adobe/react-spectrum/exports/RadioGroup.ts
new file mode 100644
index 00000000000..3a17bff59b8
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/RadioGroup.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Radio} from '../src/radio/Radio';
+export {RadioGroup} from '../src/radio/RadioGroup';
+export type {SpectrumRadioProps} from '@react-types/radio';
+export type {SpectrumRadioGroupProps} from '@react-types/radio';
diff --git a/packages/@adobe/react-spectrum/exports/RangeCalendar.ts b/packages/@adobe/react-spectrum/exports/RangeCalendar.ts
new file mode 100644
index 00000000000..d51faf4d7fc
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/RangeCalendar.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {RangeCalendar} from '../src/calendar/RangeCalendar';
+export type {SpectrumCalendarProps, SpectrumRangeCalendarProps} from '@react-types/calendar';
diff --git a/packages/@adobe/react-spectrum/exports/RangeSlider.ts b/packages/@adobe/react-spectrum/exports/RangeSlider.ts
new file mode 100644
index 00000000000..33c810f52b4
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/RangeSlider.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {RangeSlider} from '../src/slider/RangeSlider';
+export type {SpectrumRangeSliderProps, SpectrumSliderProps} from '@react-types/slider';
diff --git a/packages/@adobe/react-spectrum/exports/SearchField.ts b/packages/@adobe/react-spectrum/exports/SearchField.ts
new file mode 100644
index 00000000000..affe1a17cee
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/SearchField.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {SearchField} from '../src/searchfield/SearchField';
+export type {SpectrumSearchFieldProps} from '@react-types/searchfield';
diff --git a/packages/@adobe/react-spectrum/exports/Slider.ts b/packages/@adobe/react-spectrum/exports/Slider.ts
new file mode 100644
index 00000000000..7d91d859830
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Slider.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Slider} from '../src/slider/Slider';
+export type {SpectrumRangeSliderProps, SpectrumSliderProps} from '@react-types/slider';
diff --git a/packages/@adobe/react-spectrum/exports/StatusLight.ts b/packages/@adobe/react-spectrum/exports/StatusLight.ts
new file mode 100644
index 00000000000..a5f07339091
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/StatusLight.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {StatusLight} from '../src/statuslight/StatusLight';
+export type {SpectrumStatusLightProps} from '@react-types/statuslight';
diff --git a/packages/@adobe/react-spectrum/exports/Switch.ts b/packages/@adobe/react-spectrum/exports/Switch.ts
new file mode 100644
index 00000000000..6e224452eec
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Switch.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Switch} from '../src/switch/Switch';
+export type {SpectrumSwitchProps} from '@react-types/switch';
diff --git a/packages/@adobe/react-spectrum/exports/TableView.ts b/packages/@adobe/react-spectrum/exports/TableView.ts
new file mode 100644
index 00000000000..200e18cee02
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/TableView.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {
+  TableView,
+  TableHeader,
+  TableBody,
+  Column,
+  Section,
+  Row,
+  Cell
+} from '../src/table/TableView';
+
+export type {SpectrumTableProps} from '../src/table/TableView';
+
+export type {SpectrumColumnProps, TableHeaderProps, TableBodyProps, RowProps, CellProps} from '@react-types/table';
diff --git a/packages/@adobe/react-spectrum/exports/Tabs.ts b/packages/@adobe/react-spectrum/exports/Tabs.ts
new file mode 100644
index 00000000000..2b476864c79
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Tabs.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {TabList, TabPanels, Tabs} from '../src/tabs/Tabs';
+export {Item} from 'react-stately/Item';
+export type {SpectrumTabsProps, SpectrumTabListProps, SpectrumTabPanelsProps} from '@react-types/tabs';
diff --git a/packages/@adobe/react-spectrum/exports/TagGroup.ts b/packages/@adobe/react-spectrum/exports/TagGroup.ts
new file mode 100644
index 00000000000..ea0005d214e
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/TagGroup.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {TagGroup} from '../src/tag/TagGroup';
+export type {SpectrumTagGroupProps} from '../src/tag/TagGroup';
+export {Item} from 'react-stately/Item';
diff --git a/packages/@adobe/react-spectrum/exports/Text.ts b/packages/@adobe/react-spectrum/exports/Text.ts
new file mode 100644
index 00000000000..4facf0b5d7a
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Text.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Text} from '../src/text/Text';
+export type {HeadingProps, KeyboardProps, TextProps} from '@react-types/text';
diff --git a/packages/@adobe/react-spectrum/exports/TextArea.ts b/packages/@adobe/react-spectrum/exports/TextArea.ts
new file mode 100644
index 00000000000..5f4b48d2d6e
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/TextArea.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {TextArea} from '../src/textfield/TextArea';
+export type {SpectrumTextFieldProps, SpectrumTextAreaProps} from '@react-types/textfield';
diff --git a/packages/@adobe/react-spectrum/exports/TextField.ts b/packages/@adobe/react-spectrum/exports/TextField.ts
new file mode 100644
index 00000000000..ce8bae4a1c0
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/TextField.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {TextField} from '../src/textfield/TextField';
+export type {SpectrumTextFieldProps, SpectrumTextAreaProps} from '@react-types/textfield';
diff --git a/packages/@adobe/react-spectrum/exports/TimeField.ts b/packages/@adobe/react-spectrum/exports/TimeField.ts
new file mode 100644
index 00000000000..c7c9bdefb80
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/TimeField.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {TimeField} from '../src/datepicker/TimeField';
+export type {SpectrumDateFieldProps, SpectrumDatePickerProps, SpectrumDateRangePickerProps, SpectrumTimeFieldProps} from '@react-types/datepicker';
diff --git a/packages/@adobe/react-spectrum/exports/Toast.ts b/packages/@adobe/react-spectrum/exports/Toast.ts
new file mode 100644
index 00000000000..272e4b679c3
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Toast.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {ToastContainer, ToastQueue} from '../src/toast/ToastContainer';
+
+export type {SpectrumToastOptions, SpectrumToastContainerProps} from '../src/toast/ToastContainer';
diff --git a/packages/@adobe/react-spectrum/exports/ToggleButton.ts b/packages/@adobe/react-spectrum/exports/ToggleButton.ts
new file mode 100644
index 00000000000..60ea0c99057
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/ToggleButton.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {ToggleButton} from '../src/button/ToggleButton';
+export type {SpectrumActionButtonProps, SpectrumButtonProps, SpectrumLogicButtonProps, SpectrumToggleButtonProps} from '@react-types/button';
diff --git a/packages/@adobe/react-spectrum/exports/Tooltip.ts b/packages/@adobe/react-spectrum/exports/Tooltip.ts
new file mode 100644
index 00000000000..eb4fe176ee9
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Tooltip.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {Tooltip} from '../src/tooltip/Tooltip';
+export {TooltipTrigger} from '../src/tooltip/TooltipTrigger';
+export type {SpectrumTooltipProps, SpectrumTooltipTriggerProps} from '@react-types/tooltip';
diff --git a/packages/@adobe/react-spectrum/exports/TreeView.ts b/packages/@adobe/react-spectrum/exports/TreeView.ts
new file mode 100644
index 00000000000..288a8f40844
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/TreeView.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export {TreeViewItem, TreeView, TreeViewItemContent} from '../src/tree/TreeView';
+export type {SpectrumTreeViewProps, SpectrumTreeViewItemProps, SpectrumTreeViewItemContentProps} from '../src/tree/TreeView';
+export {Collection} from 'react-aria/private/collections/CollectionBuilder';
diff --git a/packages/@adobe/react-spectrum/exports/View.ts b/packages/@adobe/react-spectrum/exports/View.ts
new file mode 100644
index 00000000000..7dd5ead1979
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/View.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {View} from '../src/view/View';
+export type {ContentProps, FooterProps, HeaderProps, ViewProps} from '@react-types/view';
diff --git a/packages/@adobe/react-spectrum/exports/Well.ts b/packages/@adobe/react-spectrum/exports/Well.ts
new file mode 100644
index 00000000000..bd4e114a13b
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/Well.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+/// <reference types="css-module-types" />
+export {Well} from '../src/well/Well';
+export type {SpectrumWellProps} from '@react-types/well';
diff --git a/packages/@adobe/react-spectrum/exports/darkTheme.ts b/packages/@adobe/react-spectrum/exports/darkTheme.ts
new file mode 100644
index 00000000000..5736f11bb55
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/darkTheme.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+export {darkTheme as darkTheme} from '../src/theme-dark/darkTheme';
diff --git a/packages/@adobe/react-spectrum/exports/defaultTheme.ts b/packages/@adobe/react-spectrum/exports/defaultTheme.ts
new file mode 100644
index 00000000000..89e1c6e7337
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/defaultTheme.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+export {defaultTheme as defaultTheme} from '../src/theme-default/defaultTheme';
diff --git a/packages/@adobe/react-spectrum/exports/index.ts b/packages/@adobe/react-spectrum/exports/index.ts
new file mode 100644
index 00000000000..95193451eac
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/index.ts
@@ -0,0 +1,194 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {ActionGroup} from '../src/actiongroup/ActionGroup';
+export {Badge} from '../src/badge/Badge';
+export {Breadcrumbs} from '../src/breadcrumbs/Breadcrumbs';
+export {Accordion, Disclosure, DisclosurePanel, DisclosureTitle} from '../src/accordion/Accordion';
+export {ActionBar} from '../src/actionbar/ActionBar';
+export {ActionBarContainer} from '../src/actionbar/ActionBarContainer';
+export {ActionButton} from '../src/button/ActionButton';
+export {Button} from '../src/button/Button';
+export {LogicButton} from '../src/button/LogicButton';
+export {ToggleButton} from '../src/button/ToggleButton';
+export {Avatar} from '../src/avatar/Avatar';
+export {ButtonGroup} from '../src/buttongroup/ButtonGroup';
+export {Calendar} from '../src/calendar/Calendar';
+export {RangeCalendar} from '../src/calendar/RangeCalendar';
+export {Checkbox} from '../src/checkbox/Checkbox';
+export {CheckboxGroup} from '../src/checkbox/CheckboxGroup';
+export {ColorArea} from '../src/color/ColorArea';
+export {ColorEditor} from '../src/color/ColorEditor';
+export {ColorField} from '../src/color/ColorField';
+export {ColorPicker} from '../src/color/ColorPicker';
+export {ColorSlider} from '../src/color/ColorSlider';
+export {ColorSwatch} from '../src/color/ColorSwatch';
+export {ColorSwatchPicker} from '../src/color/ColorSwatchPicker';
+export {ColorWheel} from '../src/color/ColorWheel';
+export {parseColor, getColorChannels} from 'react-stately/Color';
+export {ComboBox} from '../src/combobox/ComboBox';
+export {ContextualHelp} from '../src/contextualhelp/ContextualHelp';
+export {AlertDialog} from '../src/dialog/AlertDialog';
+export {Dialog} from '../src/dialog/Dialog';
+export {DialogTrigger} from '../src/dialog/DialogTrigger';
+export {DialogContainer} from '../src/dialog/DialogContainer';
+export {useDialogContainer} from '../src/dialog/useDialogContainer';
+export {DateField} from '../src/datepicker/DateField';
+export {DatePicker} from '../src/datepicker/DatePicker';
+export {DateRangePicker} from '../src/datepicker/DateRangePicker';
+export {TimeField} from '../src/datepicker/TimeField';
+export {Divider} from '../src/divider/Divider';
+export {DropZone} from '../src/dropzone/DropZone';
+export {FileTrigger} from 'react-aria-components/FileTrigger';
+export {Form} from '../src/form/Form';
+export {Icon} from '../src/icon/Icon';
+export {IllustratedMessage} from '../src/illustratedmessage/IllustratedMessage';
+export {InlineAlert} from '../src/inlinealert/InlineAlert';
+export {Image} from '../src/image/Image';
+export {Flex} from '../src/layout/Flex';
+export {Grid, fitContent, minmax, repeat} from '../src/layout/Grid';
+export {LabeledValue} from '../src/labeledvalue/LabeledValue';
+export {Link} from '../src/link/Link';
+export {ListBox} from '../src/listbox/ListBox';
+export {ListView} from '../src/list/ListView';
+export {ActionMenu} from '../src/menu/ActionMenu';
+export {ContextualHelpTrigger} from '../src/menu/ContextualHelpTrigger';
+export {Menu} from '../src/menu/Menu';
+export {MenuTrigger} from '../src/menu/MenuTrigger';
+export {SubmenuTrigger} from '../src/menu/SubmenuTrigger';
+export {Meter} from '../src/meter/Meter';
+export {NumberField} from '../src/numberfield/NumberField';
+export {Picker} from '../src/picker/Picker';
+export {ProgressBar} from '../src/progress/ProgressBar';
+export {ProgressCircle} from '../src/progress/ProgressCircle';
+export {Provider, useProvider} from '../src/provider/Provider';
+export {Radio} from '../src/radio/Radio';
+export {RadioGroup} from '../src/radio/RadioGroup';
+export {RangeSlider} from '../src/slider/RangeSlider';
+export {Slider} from '../src/slider/Slider';
+export {SearchField} from '../src/searchfield/SearchField';
+export {StatusLight} from '../src/statuslight/StatusLight';
+export {Switch} from '../src/switch/Switch';
+export {Heading} from '../src/text/Heading';
+export {Keyboard} from '../src/text/Keyboard';
+export {Text} from '../src/text/Text';
+export {TableView, TableHeader, TableBody, Column, Row, Cell} from '../src/table/TableView';
+export {Tabs, TabList, TabPanels} from '../src/tabs/Tabs';
+export {TagGroup} from '../src/tag/TagGroup';
+export {TextArea} from '../src/textfield/TextArea';
+export {TextField} from '../src/textfield/TextField';
+export {darkTheme} from '../src/theme-dark/darkTheme';
+export {defaultTheme} from '../src/theme-default/defaultTheme';
+export {lightTheme} from '../src/theme-light/lightTheme';
+export {ToastContainer, ToastQueue} from '../src/toast/ToastContainer';
+export {Tooltip} from '../src/tooltip/Tooltip';
+export {TooltipTrigger} from '../src/tooltip/TooltipTrigger';
+export {TreeView, TreeViewItem, TreeViewItemContent} from '../src/tree/TreeView';
+export {Content} from '../src/view/Content';
+export {Footer} from '../src/view/Footer';
+export {Header} from '../src/view/Header';
+export {View} from '../src/view/View';
+export {Well} from '../src/well/Well';
+export {Item} from 'react-stately/Item';
+export {Section} from 'react-stately/Section';
+export {useAsyncList} from 'react-stately/useAsyncList';
+export {useListData} from 'react-stately/useListData';
+export {useTreeData} from 'react-stately/useTreeData';
+export {VisuallyHidden} from 'react-aria/VisuallyHidden';
+export {useCollator} from 'react-aria/useCollator';
+export {useDateFormatter} from 'react-aria/useDateFormatter';
+export {useFilter} from 'react-aria/useFilter';
+export {useLocale} from 'react-aria/I18nProvider';
+export {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+export {useMessageFormatter} from 'react-aria/private/i18n/useMessageFormatter';
+export {useNumberFormatter} from 'react-aria/useNumberFormatter';
+export {SSRProvider} from 'react-aria/SSRProvider';
+export {useDragAndDrop} from '../src/dnd/useDragAndDrop';
+export {DIRECTORY_DRAG_TYPE} from 'react-aria/private/dnd/utils';
+export {Collection} from 'react-aria/private/collections/CollectionBuilder';
+export type {SpectrumActionBarContainerProps, SpectrumActionBarProps} from '@react-types/actionbar';
+export type {SpectrumActionGroupProps} from '@react-types/actiongroup';
+export type {SpectrumAvatarProps} from '@react-types/avatar';
+export type {SpectrumBadgeProps} from '@react-types/badge';
+export type {SpectrumBreadcrumbsProps} from '@react-types/breadcrumbs';
+export type {SpectrumActionButtonProps, SpectrumButtonProps, SpectrumLogicButtonProps, SpectrumToggleButtonProps} from '@react-types/button';
+export type {SpectrumButtonGroupProps} from '@react-types/buttongroup';
+export type {SpectrumCalendarProps, SpectrumRangeCalendarProps} from '@react-types/calendar';
+export type {SpectrumCheckboxGroupProps, SpectrumCheckboxProps} from '@react-types/checkbox';
+export type {Color, ColorFormat, ColorSpace, SpectrumColorAreaProps, SpectrumColorFieldProps, SpectrumColorSliderProps, SpectrumColorWheelProps} from '@react-types/color';
+export type {SpectrumColorEditorProps} from '../src/color/ColorEditor';
+export type {SpectrumColorPickerProps} from '../src/color/ColorPicker';
+export type {SpectrumColorSwatchPickerProps} from '../src/color/ColorSwatchPicker';
+export type {SpectrumColorSwatchProps} from '../src/color/ColorSwatch';
+export type {SpectrumComboBoxProps} from '@react-types/combobox';
+export type {SpectrumContextualHelpProps} from '@react-types/contextualhelp';
+export type {DialogContainerValue} from '../src/dialog/useDialogContainer';
+export type {SpectrumAlertDialogProps, SpectrumDialogContainerProps, SpectrumDialogProps, SpectrumDialogTriggerProps} from '@react-types/dialog';
+export type {SpectrumDateFieldProps, SpectrumDatePickerProps, SpectrumDateRangePickerProps, SpectrumTimeFieldProps} from '@react-types/datepicker';
+export type {SpectrumDividerProps} from '@react-types/divider';
+export type {SpectrumDropZoneProps} from '../src/dropzone/DropZone';
+export type {FileTriggerProps} from 'react-aria-components/FileTrigger';
+export type {SpectrumFormProps} from '@react-types/form';
+export type {IconProps} from '../src/icon/Icon';
+export type {IllustrationProps} from '../src/icon/Illustration';
+export type {SpectrumIllustratedMessageProps} from '@react-types/illustratedmessage';
+export type {SpectrumImageProps} from '@react-types/image';
+export type {SpectrumInlineAlertProps} from '../src/inlinealert/InlineAlert';
+export type {DimensionValue} from '@react-types/shared';
+export type {FlexProps, GridProps} from '@react-types/layout';
+export type {SpectrumLabeledValueProps} from '../src/labeledvalue/LabeledValue';
+export type {SpectrumLinkProps} from '@react-types/link';
+export type {SpectrumListBoxProps} from '@react-types/listbox';
+export type {SpectrumListViewProps} from '../src/list/ListView';
+export type {SpectrumActionMenuProps, SpectrumMenuProps, SpectrumMenuTriggerProps} from '@react-types/menu';
+export type {SpectrumMenuDialogTriggerProps} from '../src/menu/ContextualHelpTrigger';
+export type {SpectrumSubmenuTriggerProps} from '../src/menu/SubmenuTrigger';
+export type {SpectrumMeterProps} from '@react-types/meter';
+export type {SpectrumNumberFieldProps} from '@react-types/numberfield';
+export type {SpectrumPickerProps} from '@react-types/select';
+export type {SpectrumProgressBarProps, SpectrumProgressCircleProps} from '@react-types/progress';
+export type {ProviderContext, ProviderProps} from '@react-types/provider';
+export type {SpectrumRadioGroupProps, SpectrumRadioProps} from '@react-types/radio';
+export type {SpectrumRangeSliderProps, SpectrumSliderProps} from '@react-types/slider';
+export type {SpectrumSearchFieldProps} from '@react-types/searchfield';
+export type {SpectrumStatusLightProps} from '@react-types/statuslight';
+export type {SpectrumSwitchProps} from '@react-types/switch';
+export type {HeadingProps, KeyboardProps, TextProps} from '@react-types/text';
+export type {SpectrumTableProps} from '../src/table/TableView';
+export type {SpectrumColumnProps, TableHeaderProps, TableBodyProps, RowProps, CellProps} from '@react-types/table';
+export type {SpectrumTabListProps, SpectrumTabPanelsProps, SpectrumTabsProps} from '@react-types/tabs';
+export type {SpectrumTagGroupProps} from '../src/tag/TagGroup';
+export type {SpectrumTextFieldProps, SpectrumTextAreaProps} from '@react-types/textfield';
+export type {SpectrumToastContainerProps, SpectrumToastOptions} from '../src/toast/ToastContainer';
+export type {SpectrumTooltipProps, SpectrumTooltipTriggerProps} from '@react-types/tooltip';
+export type {SpectrumTreeViewProps, SpectrumTreeViewItemProps, SpectrumTreeViewItemContentProps} from '../src/tree/TreeView';
+export type {ContentProps, FooterProps, HeaderProps, ViewProps} from '@react-types/view';
+export type {SpectrumWellProps} from '@react-types/well';
+export type {AsyncListData, AsyncListOptions} from 'react-stately/useAsyncList';
+export type {ListData, ListOptions} from 'react-stately/useListData';
+export type {TreeData, TreeOptions} from 'react-stately/useTreeData';
+export type {VisuallyHiddenAria, VisuallyHiddenProps} from 'react-aria/VisuallyHidden';
+export type {DateFormatter} from '@internationalized/date';
+export type {DateFormatterOptions} from 'react-aria/useDateFormatter';
+export type {Filter} from 'react-aria/useFilter';
+export type {FormatMessage} from 'react-aria/private/i18n/useMessageFormatter';
+export type {Locale} from 'react-aria/I18nProvider';
+export type {LocalizedStrings} from '@internationalized/message';
+export type {SSRProviderProps} from 'react-aria/SSRProvider';
+export type {DirectoryDropItem, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
+export type {DragAndDropHooks, DragAndDropOptions} from '../src/dnd/useDragAndDrop';
+export type {Key, Selection, ItemProps, SectionProps, RouterConfig} from '@react-types/shared';
+export type {SpectrumAccordionProps, SpectrumDisclosureProps, SpectrumDisclosurePanelProps, SpectrumDisclosureTitleProps} from '../src/accordion/Accordion';
diff --git a/packages/@adobe/react-spectrum/exports/lightTheme.ts b/packages/@adobe/react-spectrum/exports/lightTheme.ts
new file mode 100644
index 00000000000..c0f468f615f
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/lightTheme.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+export {lightTheme as lightTheme} from '../src/theme-light/lightTheme';
diff --git a/packages/@adobe/react-spectrum/exports/private/autocomplete/SearchAutocomplete.ts b/packages/@adobe/react-spectrum/exports/private/autocomplete/SearchAutocomplete.ts
new file mode 100644
index 00000000000..2dd2773c623
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/autocomplete/SearchAutocomplete.ts
@@ -0,0 +1 @@
+export {SearchAutocomplete} from '../../../src/autocomplete/SearchAutocomplete';
diff --git a/packages/@adobe/react-spectrum/exports/private/button/ClearButton.ts b/packages/@adobe/react-spectrum/exports/private/button/ClearButton.ts
new file mode 100644
index 00000000000..e6e707a3572
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/button/ClearButton.ts
@@ -0,0 +1 @@
+export {ClearButton} from '../../../src/button/ClearButton';
diff --git a/packages/@adobe/react-spectrum/exports/private/button/FieldButton.ts b/packages/@adobe/react-spectrum/exports/private/button/FieldButton.ts
new file mode 100644
index 00000000000..8fb70ff9dce
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/button/FieldButton.ts
@@ -0,0 +1 @@
+export {FieldButton} from '../../../src/button/FieldButton';
diff --git a/packages/@adobe/react-spectrum/exports/private/card/Card.ts b/packages/@adobe/react-spectrum/exports/private/card/Card.ts
new file mode 100644
index 00000000000..6338eb9451c
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/card/Card.ts
@@ -0,0 +1 @@
+export {Card} from '../../../src/card/Card';
diff --git a/packages/@adobe/react-spectrum/exports/private/card/CardView.ts b/packages/@adobe/react-spectrum/exports/private/card/CardView.ts
new file mode 100644
index 00000000000..aa61f4887a8
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/card/CardView.ts
@@ -0,0 +1 @@
+export {CardView} from '../../../src/card/CardView';
diff --git a/packages/@adobe/react-spectrum/exports/private/card/GalleryLayout.ts b/packages/@adobe/react-spectrum/exports/private/card/GalleryLayout.ts
new file mode 100644
index 00000000000..e58f1bcef67
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/card/GalleryLayout.ts
@@ -0,0 +1 @@
+export {GalleryLayout, type GalleryLayoutOptions} from '../../../src/card/GalleryLayout';
diff --git a/packages/@adobe/react-spectrum/exports/private/card/GridLayout.ts b/packages/@adobe/react-spectrum/exports/private/card/GridLayout.ts
new file mode 100644
index 00000000000..75f228ceda2
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/card/GridLayout.ts
@@ -0,0 +1 @@
+export {GridLayout, type GridLayoutOptions} from '../../../src/card/GridLayout';
diff --git a/packages/@adobe/react-spectrum/exports/private/card/WaterfallLayout.ts b/packages/@adobe/react-spectrum/exports/private/card/WaterfallLayout.ts
new file mode 100644
index 00000000000..3bf754b0f1e
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/card/WaterfallLayout.ts
@@ -0,0 +1 @@
+export {WaterfallLayout, type WaterfallLayoutOptions} from '../../../src/card/WaterfallLayout';
diff --git a/packages/@adobe/react-spectrum/exports/private/form/Form.ts b/packages/@adobe/react-spectrum/exports/private/form/Form.ts
new file mode 100644
index 00000000000..1a883e47b9c
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/form/Form.ts
@@ -0,0 +1 @@
+export {useFormProps} from '../../../src/form/Form';
diff --git a/packages/@adobe/react-spectrum/exports/private/icon/Icon.ts b/packages/@adobe/react-spectrum/exports/private/icon/Icon.ts
new file mode 100644
index 00000000000..1dde3083137
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/icon/Icon.ts
@@ -0,0 +1 @@
+export {type IconPropsWithoutChildren} from '../../../src/icon/Icon';
diff --git a/packages/@adobe/react-spectrum/exports/private/icon/Illustration.ts b/packages/@adobe/react-spectrum/exports/private/icon/Illustration.ts
new file mode 100644
index 00000000000..d3a8a22b23b
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/icon/Illustration.ts
@@ -0,0 +1 @@
+export {type IllustrationPropsWithoutChildren, Illustration, type IllustrationProps} from '../../../src/icon/Illustration';
diff --git a/packages/@adobe/react-spectrum/exports/private/icon/UIIcon.ts b/packages/@adobe/react-spectrum/exports/private/icon/UIIcon.ts
new file mode 100644
index 00000000000..9e82dd91b4c
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/icon/UIIcon.ts
@@ -0,0 +1 @@
+export {type UIIconPropsWithoutChildren, UIIcon, type UIIconProps} from '../../../src/icon/UIIcon';
diff --git a/packages/@adobe/react-spectrum/exports/private/label/Field.ts b/packages/@adobe/react-spectrum/exports/private/label/Field.ts
new file mode 100644
index 00000000000..0133081f392
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/label/Field.ts
@@ -0,0 +1 @@
+export {Field} from '../../../src/label/Field';
diff --git a/packages/@adobe/react-spectrum/exports/private/label/HelpText.ts b/packages/@adobe/react-spectrum/exports/private/label/HelpText.ts
new file mode 100644
index 00000000000..aab44bd400d
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/label/HelpText.ts
@@ -0,0 +1 @@
+export {HelpText} from '../../../src/label/HelpText';
diff --git a/packages/@adobe/react-spectrum/exports/private/label/Label.ts b/packages/@adobe/react-spectrum/exports/private/label/Label.ts
new file mode 100644
index 00000000000..6447655c560
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/label/Label.ts
@@ -0,0 +1 @@
+export {Label} from '../../../src/label/Label';
diff --git a/packages/@adobe/react-spectrum/exports/private/listbox/ListBoxBase.ts b/packages/@adobe/react-spectrum/exports/private/listbox/ListBoxBase.ts
new file mode 100644
index 00000000000..9758ef33dc3
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/listbox/ListBoxBase.ts
@@ -0,0 +1 @@
+export {useListBoxLayout, ListBoxBase} from '../../../src/listbox/ListBoxBase';
diff --git a/packages/@adobe/react-spectrum/exports/private/overlays/Modal.ts b/packages/@adobe/react-spectrum/exports/private/overlays/Modal.ts
new file mode 100644
index 00000000000..59191cb8cef
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/overlays/Modal.ts
@@ -0,0 +1 @@
+export {Modal} from '../../../src/overlays/Modal';
diff --git a/packages/@adobe/react-spectrum/exports/private/overlays/OpenTransition.ts b/packages/@adobe/react-spectrum/exports/private/overlays/OpenTransition.ts
new file mode 100644
index 00000000000..b1cda558606
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/overlays/OpenTransition.ts
@@ -0,0 +1 @@
+export {OpenTransition} from '../../../src/overlays/OpenTransition';
diff --git a/packages/@adobe/react-spectrum/exports/private/overlays/Overlay.ts b/packages/@adobe/react-spectrum/exports/private/overlays/Overlay.ts
new file mode 100644
index 00000000000..20acbccffe1
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/overlays/Overlay.ts
@@ -0,0 +1 @@
+export {Overlay} from '../../../src/overlays/Overlay';
diff --git a/packages/@adobe/react-spectrum/exports/private/overlays/Popover.ts b/packages/@adobe/react-spectrum/exports/private/overlays/Popover.ts
new file mode 100644
index 00000000000..ec9d3cae1c1
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/overlays/Popover.ts
@@ -0,0 +1 @@
+export {Popover} from '../../../src/overlays/Popover';
diff --git a/packages/@adobe/react-spectrum/exports/private/overlays/Tray.ts b/packages/@adobe/react-spectrum/exports/private/overlays/Tray.ts
new file mode 100644
index 00000000000..1b5cb083611
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/overlays/Tray.ts
@@ -0,0 +1 @@
+export {Tray} from '../../../src/overlays/Tray';
diff --git a/packages/@adobe/react-spectrum/exports/private/progress/ProgressBarBase.ts b/packages/@adobe/react-spectrum/exports/private/progress/ProgressBarBase.ts
new file mode 100644
index 00000000000..84ef3e07c70
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/progress/ProgressBarBase.ts
@@ -0,0 +1 @@
+export {ProgressBarBase} from '../../../src/progress/ProgressBarBase';
diff --git a/packages/@adobe/react-spectrum/exports/private/provider/Provider.ts b/packages/@adobe/react-spectrum/exports/private/provider/Provider.ts
new file mode 100644
index 00000000000..d2931ea1280
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/provider/Provider.ts
@@ -0,0 +1 @@
+export {useProviderProps} from '../../../src/provider/Provider';
diff --git a/packages/@adobe/react-spectrum/exports/private/steplist/StepList.ts b/packages/@adobe/react-spectrum/exports/private/steplist/StepList.ts
new file mode 100644
index 00000000000..b01901d271a
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/steplist/StepList.ts
@@ -0,0 +1 @@
+export {StepList, type SpectrumStepListProps} from '../../../src/steplist/StepList';
diff --git a/packages/@adobe/react-spectrum/exports/private/textfield/TextFieldBase.ts b/packages/@adobe/react-spectrum/exports/private/textfield/TextFieldBase.ts
new file mode 100644
index 00000000000..88680901765
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/textfield/TextFieldBase.ts
@@ -0,0 +1 @@
+export {TextFieldBase} from '../../../src/textfield/TextFieldBase';
diff --git a/packages/@adobe/react-spectrum/exports/private/theme-express/expressTheme.ts b/packages/@adobe/react-spectrum/exports/private/theme-express/expressTheme.ts
new file mode 100644
index 00000000000..fcddd38bfe5
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/theme-express/expressTheme.ts
@@ -0,0 +1 @@
+export {expressTheme} from '../../../src/theme-express/expressTheme';
diff --git a/packages/@adobe/react-spectrum/exports/private/utils/BreakpointProvider.ts b/packages/@adobe/react-spectrum/exports/private/utils/BreakpointProvider.ts
new file mode 100644
index 00000000000..bcb6ef94a8a
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/utils/BreakpointProvider.ts
@@ -0,0 +1 @@
+export {BreakpointProvider, useMatchedBreakpoints, useBreakpoint} from '../../../src/utils/BreakpointProvider';
diff --git a/packages/@adobe/react-spectrum/exports/private/utils/Slots.ts b/packages/@adobe/react-spectrum/exports/private/utils/Slots.ts
new file mode 100644
index 00000000000..2032c0e5e65
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/utils/Slots.ts
@@ -0,0 +1 @@
+export {useSlotProps, cssModuleToSlots, SlotProvider, ClearSlots} from '../../../src/utils/Slots';
diff --git a/packages/@adobe/react-spectrum/exports/private/utils/classNames.ts b/packages/@adobe/react-spectrum/exports/private/utils/classNames.ts
new file mode 100644
index 00000000000..d820e7162fd
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/utils/classNames.ts
@@ -0,0 +1 @@
+export {classNames, shouldKeepSpectrumClassNames, keepSpectrumClassNames} from '../../../src/utils/classNames';
diff --git a/packages/@adobe/react-spectrum/exports/private/utils/getWrappedElement.ts b/packages/@adobe/react-spectrum/exports/private/utils/getWrappedElement.ts
new file mode 100644
index 00000000000..f9592d15785
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/utils/getWrappedElement.ts
@@ -0,0 +1 @@
+export {getWrappedElement} from '../../../src/utils/getWrappedElement';
diff --git a/packages/@adobe/react-spectrum/exports/private/utils/styleProps.ts b/packages/@adobe/react-spectrum/exports/private/utils/styleProps.ts
new file mode 100644
index 00000000000..abe7d498001
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/utils/styleProps.ts
@@ -0,0 +1 @@
+export {useStyleProps, baseStyleProps, viewStyleProps, dimensionValue, responsiveDimensionValue, convertStyleProps, passthroughStyle, getResponsiveProp, type StyleHandlers} from '../../../src/utils/styleProps';
diff --git a/packages/@adobe/react-spectrum/exports/private/utils/useDOMRef.ts b/packages/@adobe/react-spectrum/exports/private/utils/useDOMRef.ts
new file mode 100644
index 00000000000..f0fece6101e
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/utils/useDOMRef.ts
@@ -0,0 +1 @@
+export {useFocusableRef, unwrapDOMRef, createDOMRef, createFocusableRef, useDOMRef, useUnwrapDOMRef} from '../../../src/utils/useDOMRef';
diff --git a/packages/@adobe/react-spectrum/exports/private/utils/useHasChild.ts b/packages/@adobe/react-spectrum/exports/private/utils/useHasChild.ts
new file mode 100644
index 00000000000..e54bf4356cc
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/utils/useHasChild.ts
@@ -0,0 +1 @@
+export {useHasChild} from '../../../src/utils/useHasChild';
diff --git a/packages/@adobe/react-spectrum/exports/private/utils/useIsMobileDevice.ts b/packages/@adobe/react-spectrum/exports/private/utils/useIsMobileDevice.ts
new file mode 100644
index 00000000000..4f99ca0562a
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/utils/useIsMobileDevice.ts
@@ -0,0 +1 @@
+export {useIsMobileDevice} from '../../../src/utils/useIsMobileDevice';
diff --git a/packages/@adobe/react-spectrum/exports/private/utils/useMediaQuery.ts b/packages/@adobe/react-spectrum/exports/private/utils/useMediaQuery.ts
new file mode 100644
index 00000000000..86fb39552de
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/private/utils/useMediaQuery.ts
@@ -0,0 +1 @@
+export {useMediaQuery} from '../../../src/utils/useMediaQuery';
diff --git a/packages/@adobe/react-spectrum/exports/useDragAndDrop.ts b/packages/@adobe/react-spectrum/exports/useDragAndDrop.ts
new file mode 100644
index 00000000000..19ea10aa62f
--- /dev/null
+++ b/packages/@adobe/react-spectrum/exports/useDragAndDrop.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/// <reference types="css-module-types" />
+
+export type {DragAndDropOptions, DragAndDropHooks} from '../src/dnd/useDragAndDrop';
+export {useDragAndDrop} from '../src/dnd/useDragAndDrop';
+export {DIRECTORY_DRAG_TYPE} from 'react-aria/private/dnd/utils';
+
+export type {DirectoryDropItem, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
diff --git a/packages/@react-spectrum/actionbar/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/actionbar/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/actionbar/ar-AE.json
diff --git a/packages/@react-spectrum/actionbar/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/actionbar/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/actionbar/bg-BG.json
diff --git a/packages/@react-spectrum/actionbar/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/actionbar/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/actionbar/cs-CZ.json
diff --git a/packages/@react-spectrum/actionbar/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/actionbar/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/actionbar/da-DK.json
diff --git a/packages/@react-spectrum/actionbar/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/actionbar/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/actionbar/de-DE.json
diff --git a/packages/@react-spectrum/actionbar/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/actionbar/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/actionbar/el-GR.json
diff --git a/packages/@react-spectrum/actionbar/intl/en-US.json b/packages/@adobe/react-spectrum/intl/actionbar/en-US.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/actionbar/en-US.json
diff --git a/packages/@react-spectrum/actionbar/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/actionbar/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/actionbar/es-ES.json
diff --git a/packages/@react-spectrum/actionbar/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/actionbar/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/actionbar/et-EE.json
diff --git a/packages/@react-spectrum/actionbar/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/actionbar/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/actionbar/fi-FI.json
diff --git a/packages/@react-spectrum/actionbar/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/actionbar/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/actionbar/fr-FR.json
diff --git a/packages/@react-spectrum/actionbar/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/actionbar/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/actionbar/he-IL.json
diff --git a/packages/@react-spectrum/actionbar/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/actionbar/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/actionbar/hr-HR.json
diff --git a/packages/@react-spectrum/actionbar/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/actionbar/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/actionbar/hu-HU.json
diff --git a/packages/@react-spectrum/actionbar/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/actionbar/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/actionbar/it-IT.json
diff --git a/packages/@react-spectrum/actionbar/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/actionbar/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/actionbar/ja-JP.json
diff --git a/packages/@react-spectrum/actionbar/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/actionbar/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/actionbar/ko-KR.json
diff --git a/packages/@react-spectrum/actionbar/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/actionbar/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/actionbar/lt-LT.json
diff --git a/packages/@react-spectrum/actionbar/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/actionbar/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/actionbar/lv-LV.json
diff --git a/packages/@react-spectrum/actionbar/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/actionbar/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/actionbar/nb-NO.json
diff --git a/packages/@react-spectrum/actionbar/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/actionbar/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/actionbar/nl-NL.json
diff --git a/packages/@react-spectrum/actionbar/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/actionbar/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/actionbar/pl-PL.json
diff --git a/packages/@react-spectrum/actionbar/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/actionbar/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/actionbar/pt-BR.json
diff --git a/packages/@react-spectrum/actionbar/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/actionbar/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/actionbar/pt-PT.json
diff --git a/packages/@react-spectrum/actionbar/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/actionbar/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/actionbar/ro-RO.json
diff --git a/packages/@react-spectrum/actionbar/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/actionbar/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/actionbar/ru-RU.json
diff --git a/packages/@react-spectrum/actionbar/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/actionbar/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/actionbar/sk-SK.json
diff --git a/packages/@react-spectrum/actionbar/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/actionbar/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/actionbar/sl-SI.json
diff --git a/packages/@react-spectrum/actionbar/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/actionbar/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/actionbar/sr-SP.json
diff --git a/packages/@react-spectrum/actionbar/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/actionbar/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/actionbar/sv-SE.json
diff --git a/packages/@react-spectrum/actionbar/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/actionbar/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/actionbar/tr-TR.json
diff --git a/packages/@react-spectrum/actionbar/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/actionbar/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/actionbar/uk-UA.json
diff --git a/packages/@react-spectrum/actionbar/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/actionbar/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/actionbar/zh-CN.json
diff --git a/packages/@react-spectrum/actionbar/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/actionbar/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/actionbar/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/actionbar/zh-TW.json
diff --git a/packages/@react-spectrum/actiongroup/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/actiongroup/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/ar-AE.json
diff --git a/packages/@react-spectrum/actiongroup/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/actiongroup/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/bg-BG.json
diff --git a/packages/@react-spectrum/actiongroup/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/actiongroup/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/cs-CZ.json
diff --git a/packages/@react-spectrum/actiongroup/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/actiongroup/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/da-DK.json
diff --git a/packages/@react-spectrum/actiongroup/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/actiongroup/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/de-DE.json
diff --git a/packages/@react-spectrum/actiongroup/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/actiongroup/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/el-GR.json
diff --git a/packages/@react-spectrum/actiongroup/intl/en-US.json b/packages/@adobe/react-spectrum/intl/actiongroup/en-US.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/en-US.json
diff --git a/packages/@react-spectrum/actiongroup/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/actiongroup/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/es-ES.json
diff --git a/packages/@react-spectrum/actiongroup/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/actiongroup/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/et-EE.json
diff --git a/packages/@react-spectrum/actiongroup/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/actiongroup/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/fi-FI.json
diff --git a/packages/@react-spectrum/actiongroup/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/actiongroup/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/fr-FR.json
diff --git a/packages/@react-spectrum/actiongroup/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/actiongroup/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/he-IL.json
diff --git a/packages/@react-spectrum/actiongroup/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/actiongroup/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/hr-HR.json
diff --git a/packages/@react-spectrum/actiongroup/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/actiongroup/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/hu-HU.json
diff --git a/packages/@react-spectrum/actiongroup/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/actiongroup/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/it-IT.json
diff --git a/packages/@react-spectrum/actiongroup/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/actiongroup/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/ja-JP.json
diff --git a/packages/@react-spectrum/actiongroup/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/actiongroup/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/ko-KR.json
diff --git a/packages/@react-spectrum/actiongroup/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/actiongroup/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/lt-LT.json
diff --git a/packages/@react-spectrum/actiongroup/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/actiongroup/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/lv-LV.json
diff --git a/packages/@react-spectrum/actiongroup/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/actiongroup/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/nb-NO.json
diff --git a/packages/@react-spectrum/actiongroup/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/actiongroup/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/nl-NL.json
diff --git a/packages/@react-spectrum/actiongroup/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/actiongroup/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/pl-PL.json
diff --git a/packages/@react-spectrum/actiongroup/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/actiongroup/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/pt-BR.json
diff --git a/packages/@react-spectrum/actiongroup/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/actiongroup/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/pt-PT.json
diff --git a/packages/@react-spectrum/actiongroup/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/actiongroup/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/ro-RO.json
diff --git a/packages/@react-spectrum/actiongroup/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/actiongroup/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/ru-RU.json
diff --git a/packages/@react-spectrum/actiongroup/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/actiongroup/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/sk-SK.json
diff --git a/packages/@react-spectrum/actiongroup/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/actiongroup/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/sl-SI.json
diff --git a/packages/@react-spectrum/actiongroup/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/actiongroup/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/sr-SP.json
diff --git a/packages/@react-spectrum/actiongroup/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/actiongroup/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/sv-SE.json
diff --git a/packages/@react-spectrum/actiongroup/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/actiongroup/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/tr-TR.json
diff --git a/packages/@react-spectrum/actiongroup/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/actiongroup/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/uk-UA.json
diff --git a/packages/@react-spectrum/actiongroup/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/actiongroup/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/zh-CN.json
diff --git a/packages/@react-spectrum/actiongroup/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/actiongroup/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/actiongroup/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/actiongroup/zh-TW.json
diff --git a/packages/@react-spectrum/autocomplete/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/autocomplete/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/ar-AE.json
diff --git a/packages/@react-spectrum/autocomplete/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/autocomplete/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/bg-BG.json
diff --git a/packages/@react-spectrum/autocomplete/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/autocomplete/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/cs-CZ.json
diff --git a/packages/@react-spectrum/autocomplete/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/autocomplete/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/da-DK.json
diff --git a/packages/@react-spectrum/autocomplete/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/autocomplete/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/de-DE.json
diff --git a/packages/@react-spectrum/autocomplete/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/autocomplete/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/el-GR.json
diff --git a/packages/@react-spectrum/autocomplete/intl/en-US.json b/packages/@adobe/react-spectrum/intl/autocomplete/en-US.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/en-US.json
diff --git a/packages/@react-spectrum/autocomplete/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/autocomplete/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/es-ES.json
diff --git a/packages/@react-spectrum/autocomplete/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/autocomplete/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/et-EE.json
diff --git a/packages/@react-spectrum/autocomplete/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/autocomplete/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/fi-FI.json
diff --git a/packages/@react-spectrum/autocomplete/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/autocomplete/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/fr-FR.json
diff --git a/packages/@react-spectrum/autocomplete/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/autocomplete/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/he-IL.json
diff --git a/packages/@react-spectrum/autocomplete/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/autocomplete/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/hr-HR.json
diff --git a/packages/@react-spectrum/autocomplete/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/autocomplete/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/hu-HU.json
diff --git a/packages/@react-spectrum/autocomplete/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/autocomplete/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/it-IT.json
diff --git a/packages/@react-spectrum/autocomplete/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/autocomplete/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/ja-JP.json
diff --git a/packages/@react-spectrum/autocomplete/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/autocomplete/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/ko-KR.json
diff --git a/packages/@react-spectrum/autocomplete/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/autocomplete/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/lt-LT.json
diff --git a/packages/@react-spectrum/autocomplete/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/autocomplete/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/lv-LV.json
diff --git a/packages/@react-spectrum/autocomplete/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/autocomplete/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/nb-NO.json
diff --git a/packages/@react-spectrum/autocomplete/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/autocomplete/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/nl-NL.json
diff --git a/packages/@react-spectrum/autocomplete/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/autocomplete/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/pl-PL.json
diff --git a/packages/@react-spectrum/autocomplete/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/autocomplete/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/pt-BR.json
diff --git a/packages/@react-spectrum/autocomplete/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/autocomplete/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/pt-PT.json
diff --git a/packages/@react-spectrum/autocomplete/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/autocomplete/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/ro-RO.json
diff --git a/packages/@react-spectrum/autocomplete/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/autocomplete/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/ru-RU.json
diff --git a/packages/@react-spectrum/autocomplete/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/autocomplete/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/sk-SK.json
diff --git a/packages/@react-spectrum/autocomplete/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/autocomplete/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/sl-SI.json
diff --git a/packages/@react-spectrum/autocomplete/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/autocomplete/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/sr-SP.json
diff --git a/packages/@react-spectrum/autocomplete/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/autocomplete/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/sv-SE.json
diff --git a/packages/@react-spectrum/autocomplete/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/autocomplete/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/tr-TR.json
diff --git a/packages/@react-spectrum/autocomplete/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/autocomplete/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/uk-UA.json
diff --git a/packages/@react-spectrum/autocomplete/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/autocomplete/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/zh-CN.json
diff --git a/packages/@react-spectrum/autocomplete/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/autocomplete/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/autocomplete/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/autocomplete/zh-TW.json
diff --git a/packages/@react-spectrum/button/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/button/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/button/ar-AE.json
diff --git a/packages/@react-spectrum/button/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/button/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/button/bg-BG.json
diff --git a/packages/@react-spectrum/button/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/button/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/button/cs-CZ.json
diff --git a/packages/@react-spectrum/button/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/button/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/button/da-DK.json
diff --git a/packages/@react-spectrum/button/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/button/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/button/de-DE.json
diff --git a/packages/@react-spectrum/button/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/button/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/button/el-GR.json
diff --git a/packages/@react-spectrum/button/intl/en-US.json b/packages/@adobe/react-spectrum/intl/button/en-US.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/button/en-US.json
diff --git a/packages/@react-spectrum/button/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/button/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/button/es-ES.json
diff --git a/packages/@react-spectrum/button/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/button/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/button/et-EE.json
diff --git a/packages/@react-spectrum/button/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/button/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/button/fi-FI.json
diff --git a/packages/@react-spectrum/button/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/button/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/button/fr-FR.json
diff --git a/packages/@react-spectrum/button/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/button/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/button/he-IL.json
diff --git a/packages/@react-spectrum/button/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/button/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/button/hr-HR.json
diff --git a/packages/@react-spectrum/button/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/button/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/button/hu-HU.json
diff --git a/packages/@react-spectrum/button/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/button/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/button/it-IT.json
diff --git a/packages/@react-spectrum/button/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/button/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/button/ja-JP.json
diff --git a/packages/@react-spectrum/button/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/button/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/button/ko-KR.json
diff --git a/packages/@react-spectrum/button/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/button/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/button/lt-LT.json
diff --git a/packages/@react-spectrum/button/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/button/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/button/lv-LV.json
diff --git a/packages/@react-spectrum/button/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/button/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/button/nb-NO.json
diff --git a/packages/@react-spectrum/button/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/button/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/button/nl-NL.json
diff --git a/packages/@react-spectrum/button/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/button/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/button/pl-PL.json
diff --git a/packages/@react-spectrum/button/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/button/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/button/pt-BR.json
diff --git a/packages/@react-spectrum/button/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/button/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/button/pt-PT.json
diff --git a/packages/@react-spectrum/button/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/button/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/button/ro-RO.json
diff --git a/packages/@react-spectrum/button/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/button/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/button/ru-RU.json
diff --git a/packages/@react-spectrum/button/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/button/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/button/sk-SK.json
diff --git a/packages/@react-spectrum/button/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/button/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/button/sl-SI.json
diff --git a/packages/@react-spectrum/button/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/button/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/button/sr-SP.json
diff --git a/packages/@react-spectrum/button/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/button/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/button/sv-SE.json
diff --git a/packages/@react-spectrum/button/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/button/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/button/tr-TR.json
diff --git a/packages/@react-spectrum/button/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/button/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/button/uk-UA.json
diff --git a/packages/@react-spectrum/button/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/button/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/button/zh-CN.json
diff --git a/packages/@react-spectrum/button/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/button/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/button/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/button/zh-TW.json
diff --git a/packages/@react-spectrum/calendar/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/calendar/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/calendar/ar-AE.json
diff --git a/packages/@react-spectrum/calendar/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/calendar/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/calendar/bg-BG.json
diff --git a/packages/@react-spectrum/calendar/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/calendar/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/calendar/cs-CZ.json
diff --git a/packages/@react-spectrum/calendar/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/calendar/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/calendar/da-DK.json
diff --git a/packages/@react-spectrum/calendar/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/calendar/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/calendar/de-DE.json
diff --git a/packages/@react-spectrum/calendar/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/calendar/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/calendar/el-GR.json
diff --git a/packages/@react-spectrum/calendar/intl/en-US.json b/packages/@adobe/react-spectrum/intl/calendar/en-US.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/calendar/en-US.json
diff --git a/packages/@react-spectrum/calendar/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/calendar/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/calendar/es-ES.json
diff --git a/packages/@react-spectrum/calendar/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/calendar/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/calendar/et-EE.json
diff --git a/packages/@react-spectrum/calendar/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/calendar/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/calendar/fi-FI.json
diff --git a/packages/@react-spectrum/calendar/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/calendar/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/calendar/fr-FR.json
diff --git a/packages/@react-spectrum/calendar/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/calendar/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/calendar/he-IL.json
diff --git a/packages/@react-spectrum/calendar/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/calendar/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/calendar/hr-HR.json
diff --git a/packages/@react-spectrum/calendar/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/calendar/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/calendar/hu-HU.json
diff --git a/packages/@react-spectrum/calendar/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/calendar/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/calendar/it-IT.json
diff --git a/packages/@react-spectrum/calendar/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/calendar/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/calendar/ja-JP.json
diff --git a/packages/@react-spectrum/calendar/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/calendar/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/calendar/ko-KR.json
diff --git a/packages/@react-spectrum/calendar/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/calendar/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/calendar/lt-LT.json
diff --git a/packages/@react-spectrum/calendar/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/calendar/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/calendar/lv-LV.json
diff --git a/packages/@react-spectrum/calendar/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/calendar/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/calendar/nb-NO.json
diff --git a/packages/@react-spectrum/calendar/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/calendar/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/calendar/nl-NL.json
diff --git a/packages/@react-spectrum/calendar/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/calendar/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/calendar/pl-PL.json
diff --git a/packages/@react-spectrum/calendar/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/calendar/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/calendar/pt-BR.json
diff --git a/packages/@react-spectrum/calendar/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/calendar/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/calendar/pt-PT.json
diff --git a/packages/@react-spectrum/calendar/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/calendar/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/calendar/ro-RO.json
diff --git a/packages/@react-spectrum/calendar/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/calendar/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/calendar/ru-RU.json
diff --git a/packages/@react-spectrum/calendar/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/calendar/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/calendar/sk-SK.json
diff --git a/packages/@react-spectrum/calendar/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/calendar/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/calendar/sl-SI.json
diff --git a/packages/@react-spectrum/calendar/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/calendar/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/calendar/sr-SP.json
diff --git a/packages/@react-spectrum/calendar/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/calendar/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/calendar/sv-SE.json
diff --git a/packages/@react-spectrum/calendar/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/calendar/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/calendar/tr-TR.json
diff --git a/packages/@react-spectrum/calendar/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/calendar/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/calendar/uk-UA.json
diff --git a/packages/@react-spectrum/calendar/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/calendar/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/calendar/zh-CN.json
diff --git a/packages/@react-spectrum/calendar/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/calendar/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/calendar/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/calendar/zh-TW.json
diff --git a/packages/@react-spectrum/card/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/card/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/card/ar-AE.json
diff --git a/packages/@react-spectrum/card/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/card/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/card/bg-BG.json
diff --git a/packages/@react-spectrum/card/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/card/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/card/cs-CZ.json
diff --git a/packages/@react-spectrum/card/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/card/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/card/da-DK.json
diff --git a/packages/@react-spectrum/card/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/card/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/card/de-DE.json
diff --git a/packages/@react-spectrum/card/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/card/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/card/el-GR.json
diff --git a/packages/@react-spectrum/card/intl/en-US.json b/packages/@adobe/react-spectrum/intl/card/en-US.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/card/en-US.json
diff --git a/packages/@react-spectrum/card/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/card/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/card/es-ES.json
diff --git a/packages/@react-spectrum/card/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/card/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/card/et-EE.json
diff --git a/packages/@react-spectrum/card/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/card/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/card/fi-FI.json
diff --git a/packages/@react-spectrum/card/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/card/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/card/fr-FR.json
diff --git a/packages/@react-spectrum/card/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/card/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/card/he-IL.json
diff --git a/packages/@react-spectrum/card/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/card/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/card/hr-HR.json
diff --git a/packages/@react-spectrum/card/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/card/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/card/hu-HU.json
diff --git a/packages/@react-spectrum/card/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/card/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/card/it-IT.json
diff --git a/packages/@react-spectrum/card/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/card/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/card/ja-JP.json
diff --git a/packages/@react-spectrum/card/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/card/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/card/ko-KR.json
diff --git a/packages/@react-spectrum/card/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/card/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/card/lt-LT.json
diff --git a/packages/@react-spectrum/card/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/card/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/card/lv-LV.json
diff --git a/packages/@react-spectrum/card/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/card/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/card/nb-NO.json
diff --git a/packages/@react-spectrum/card/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/card/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/card/nl-NL.json
diff --git a/packages/@react-spectrum/card/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/card/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/card/pl-PL.json
diff --git a/packages/@react-spectrum/card/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/card/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/card/pt-BR.json
diff --git a/packages/@react-spectrum/card/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/card/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/card/pt-PT.json
diff --git a/packages/@react-spectrum/card/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/card/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/card/ro-RO.json
diff --git a/packages/@react-spectrum/card/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/card/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/card/ru-RU.json
diff --git a/packages/@react-spectrum/card/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/card/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/card/sk-SK.json
diff --git a/packages/@react-spectrum/card/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/card/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/card/sl-SI.json
diff --git a/packages/@react-spectrum/card/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/card/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/card/sr-SP.json
diff --git a/packages/@react-spectrum/card/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/card/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/card/sv-SE.json
diff --git a/packages/@react-spectrum/card/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/card/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/card/tr-TR.json
diff --git a/packages/@react-spectrum/card/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/card/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/card/uk-UA.json
diff --git a/packages/@react-spectrum/card/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/card/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/card/zh-CN.json
diff --git a/packages/@react-spectrum/card/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/card/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/card/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/card/zh-TW.json
diff --git a/packages/@react-spectrum/color/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/color/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/color/ar-AE.json
diff --git a/packages/@react-spectrum/color/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/color/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/color/bg-BG.json
diff --git a/packages/@react-spectrum/color/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/color/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/color/cs-CZ.json
diff --git a/packages/@react-spectrum/color/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/color/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/color/da-DK.json
diff --git a/packages/@react-spectrum/color/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/color/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/color/de-DE.json
diff --git a/packages/@react-spectrum/color/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/color/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/color/el-GR.json
diff --git a/packages/@react-spectrum/color/intl/en-US.json b/packages/@adobe/react-spectrum/intl/color/en-US.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/color/en-US.json
diff --git a/packages/@react-spectrum/color/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/color/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/color/es-ES.json
diff --git a/packages/@react-spectrum/color/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/color/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/color/et-EE.json
diff --git a/packages/@react-spectrum/color/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/color/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/color/fi-FI.json
diff --git a/packages/@react-spectrum/color/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/color/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/color/fr-FR.json
diff --git a/packages/@react-spectrum/color/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/color/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/color/he-IL.json
diff --git a/packages/@react-spectrum/color/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/color/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/color/hr-HR.json
diff --git a/packages/@react-spectrum/color/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/color/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/color/hu-HU.json
diff --git a/packages/@react-spectrum/color/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/color/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/color/it-IT.json
diff --git a/packages/@react-spectrum/color/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/color/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/color/ja-JP.json
diff --git a/packages/@react-spectrum/color/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/color/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/color/ko-KR.json
diff --git a/packages/@react-spectrum/color/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/color/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/color/lt-LT.json
diff --git a/packages/@react-spectrum/color/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/color/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/color/lv-LV.json
diff --git a/packages/@react-spectrum/color/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/color/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/color/nb-NO.json
diff --git a/packages/@react-spectrum/color/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/color/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/color/nl-NL.json
diff --git a/packages/@react-spectrum/color/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/color/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/color/pl-PL.json
diff --git a/packages/@react-spectrum/color/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/color/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/color/pt-BR.json
diff --git a/packages/@react-spectrum/color/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/color/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/color/pt-PT.json
diff --git a/packages/@react-spectrum/color/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/color/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/color/ro-RO.json
diff --git a/packages/@react-spectrum/color/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/color/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/color/ru-RU.json
diff --git a/packages/@react-spectrum/color/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/color/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/color/sk-SK.json
diff --git a/packages/@react-spectrum/color/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/color/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/color/sl-SI.json
diff --git a/packages/@react-spectrum/color/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/color/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/color/sr-SP.json
diff --git a/packages/@react-spectrum/color/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/color/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/color/sv-SE.json
diff --git a/packages/@react-spectrum/color/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/color/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/color/tr-TR.json
diff --git a/packages/@react-spectrum/color/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/color/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/color/uk-UA.json
diff --git a/packages/@react-spectrum/color/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/color/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/color/zh-CN.json
diff --git a/packages/@react-spectrum/color/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/color/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/color/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/color/zh-TW.json
diff --git a/packages/@react-spectrum/combobox/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/combobox/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/combobox/ar-AE.json
diff --git a/packages/@react-spectrum/combobox/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/combobox/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/combobox/bg-BG.json
diff --git a/packages/@react-spectrum/combobox/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/combobox/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/combobox/cs-CZ.json
diff --git a/packages/@react-spectrum/combobox/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/combobox/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/combobox/da-DK.json
diff --git a/packages/@react-spectrum/combobox/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/combobox/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/combobox/de-DE.json
diff --git a/packages/@react-spectrum/combobox/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/combobox/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/combobox/el-GR.json
diff --git a/packages/@react-spectrum/combobox/intl/en-US.json b/packages/@adobe/react-spectrum/intl/combobox/en-US.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/combobox/en-US.json
diff --git a/packages/@react-spectrum/combobox/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/combobox/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/combobox/es-ES.json
diff --git a/packages/@react-spectrum/combobox/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/combobox/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/combobox/et-EE.json
diff --git a/packages/@react-spectrum/combobox/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/combobox/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/combobox/fi-FI.json
diff --git a/packages/@react-spectrum/combobox/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/combobox/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/combobox/fr-FR.json
diff --git a/packages/@react-spectrum/combobox/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/combobox/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/combobox/he-IL.json
diff --git a/packages/@react-spectrum/combobox/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/combobox/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/combobox/hr-HR.json
diff --git a/packages/@react-spectrum/combobox/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/combobox/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/combobox/hu-HU.json
diff --git a/packages/@react-spectrum/combobox/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/combobox/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/combobox/it-IT.json
diff --git a/packages/@react-spectrum/combobox/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/combobox/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/combobox/ja-JP.json
diff --git a/packages/@react-spectrum/combobox/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/combobox/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/combobox/ko-KR.json
diff --git a/packages/@react-spectrum/combobox/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/combobox/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/combobox/lt-LT.json
diff --git a/packages/@react-spectrum/combobox/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/combobox/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/combobox/lv-LV.json
diff --git a/packages/@react-spectrum/combobox/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/combobox/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/combobox/nb-NO.json
diff --git a/packages/@react-spectrum/combobox/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/combobox/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/combobox/nl-NL.json
diff --git a/packages/@react-spectrum/combobox/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/combobox/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/combobox/pl-PL.json
diff --git a/packages/@react-spectrum/combobox/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/combobox/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/combobox/pt-BR.json
diff --git a/packages/@react-spectrum/combobox/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/combobox/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/combobox/pt-PT.json
diff --git a/packages/@react-spectrum/combobox/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/combobox/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/combobox/ro-RO.json
diff --git a/packages/@react-spectrum/combobox/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/combobox/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/combobox/ru-RU.json
diff --git a/packages/@react-spectrum/combobox/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/combobox/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/combobox/sk-SK.json
diff --git a/packages/@react-spectrum/combobox/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/combobox/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/combobox/sl-SI.json
diff --git a/packages/@react-spectrum/combobox/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/combobox/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/combobox/sr-SP.json
diff --git a/packages/@react-spectrum/combobox/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/combobox/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/combobox/sv-SE.json
diff --git a/packages/@react-spectrum/combobox/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/combobox/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/combobox/tr-TR.json
diff --git a/packages/@react-spectrum/combobox/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/combobox/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/combobox/uk-UA.json
diff --git a/packages/@react-spectrum/combobox/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/combobox/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/combobox/zh-CN.json
diff --git a/packages/@react-spectrum/combobox/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/combobox/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/combobox/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/combobox/zh-TW.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/contextualhelp/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/ar-AE.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/contextualhelp/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/bg-BG.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/contextualhelp/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/cs-CZ.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/contextualhelp/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/da-DK.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/contextualhelp/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/de-DE.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/contextualhelp/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/el-GR.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/en-US.json b/packages/@adobe/react-spectrum/intl/contextualhelp/en-US.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/en-US.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/contextualhelp/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/es-ES.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/contextualhelp/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/et-EE.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/contextualhelp/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/fi-FI.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/contextualhelp/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/fr-FR.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/contextualhelp/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/he-IL.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/contextualhelp/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/hr-HR.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/contextualhelp/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/hu-HU.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/contextualhelp/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/it-IT.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/contextualhelp/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/ja-JP.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/contextualhelp/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/ko-KR.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/contextualhelp/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/lt-LT.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/contextualhelp/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/lv-LV.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/contextualhelp/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/nb-NO.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/contextualhelp/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/nl-NL.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/contextualhelp/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/pl-PL.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/contextualhelp/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/pt-BR.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/contextualhelp/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/pt-PT.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/contextualhelp/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/ro-RO.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/contextualhelp/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/ru-RU.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/contextualhelp/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/sk-SK.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/contextualhelp/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/sl-SI.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/contextualhelp/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/sr-SP.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/contextualhelp/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/sv-SE.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/contextualhelp/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/tr-TR.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/contextualhelp/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/uk-UA.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/contextualhelp/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/zh-CN.json
diff --git a/packages/@react-spectrum/contextualhelp/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/contextualhelp/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/contextualhelp/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/contextualhelp/zh-TW.json
diff --git a/packages/@react-spectrum/datepicker/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/datepicker/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/datepicker/ar-AE.json
diff --git a/packages/@react-spectrum/datepicker/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/datepicker/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/datepicker/bg-BG.json
diff --git a/packages/@react-spectrum/datepicker/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/datepicker/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/datepicker/cs-CZ.json
diff --git a/packages/@react-spectrum/datepicker/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/datepicker/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/datepicker/da-DK.json
diff --git a/packages/@react-spectrum/datepicker/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/datepicker/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/datepicker/de-DE.json
diff --git a/packages/@react-spectrum/datepicker/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/datepicker/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/datepicker/el-GR.json
diff --git a/packages/@react-spectrum/datepicker/intl/en-US.json b/packages/@adobe/react-spectrum/intl/datepicker/en-US.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/datepicker/en-US.json
diff --git a/packages/@react-spectrum/datepicker/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/datepicker/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/datepicker/es-ES.json
diff --git a/packages/@react-spectrum/datepicker/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/datepicker/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/datepicker/et-EE.json
diff --git a/packages/@react-spectrum/datepicker/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/datepicker/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/datepicker/fi-FI.json
diff --git a/packages/@react-spectrum/datepicker/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/datepicker/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/datepicker/fr-FR.json
diff --git a/packages/@react-spectrum/datepicker/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/datepicker/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/datepicker/he-IL.json
diff --git a/packages/@react-spectrum/datepicker/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/datepicker/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/datepicker/hr-HR.json
diff --git a/packages/@react-spectrum/datepicker/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/datepicker/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/datepicker/hu-HU.json
diff --git a/packages/@react-spectrum/datepicker/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/datepicker/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/datepicker/it-IT.json
diff --git a/packages/@react-spectrum/datepicker/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/datepicker/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/datepicker/ja-JP.json
diff --git a/packages/@react-spectrum/datepicker/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/datepicker/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/datepicker/ko-KR.json
diff --git a/packages/@react-spectrum/datepicker/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/datepicker/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/datepicker/lt-LT.json
diff --git a/packages/@react-spectrum/datepicker/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/datepicker/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/datepicker/lv-LV.json
diff --git a/packages/@react-spectrum/datepicker/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/datepicker/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/datepicker/nb-NO.json
diff --git a/packages/@react-spectrum/datepicker/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/datepicker/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/datepicker/nl-NL.json
diff --git a/packages/@react-spectrum/datepicker/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/datepicker/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/datepicker/pl-PL.json
diff --git a/packages/@react-spectrum/datepicker/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/datepicker/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/datepicker/pt-BR.json
diff --git a/packages/@react-spectrum/datepicker/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/datepicker/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/datepicker/pt-PT.json
diff --git a/packages/@react-spectrum/datepicker/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/datepicker/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/datepicker/ro-RO.json
diff --git a/packages/@react-spectrum/datepicker/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/datepicker/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/datepicker/ru-RU.json
diff --git a/packages/@react-spectrum/datepicker/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/datepicker/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/datepicker/sk-SK.json
diff --git a/packages/@react-spectrum/datepicker/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/datepicker/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/datepicker/sl-SI.json
diff --git a/packages/@react-spectrum/datepicker/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/datepicker/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/datepicker/sr-SP.json
diff --git a/packages/@react-spectrum/datepicker/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/datepicker/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/datepicker/sv-SE.json
diff --git a/packages/@react-spectrum/datepicker/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/datepicker/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/datepicker/tr-TR.json
diff --git a/packages/@react-spectrum/datepicker/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/datepicker/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/datepicker/uk-UA.json
diff --git a/packages/@react-spectrum/datepicker/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/datepicker/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/datepicker/zh-CN.json
diff --git a/packages/@react-spectrum/datepicker/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/datepicker/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/datepicker/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/datepicker/zh-TW.json
diff --git a/packages/@react-spectrum/dialog/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/dialog/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/dialog/ar-AE.json
diff --git a/packages/@react-spectrum/dialog/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/dialog/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/dialog/bg-BG.json
diff --git a/packages/@react-spectrum/dialog/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/dialog/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/dialog/cs-CZ.json
diff --git a/packages/@react-spectrum/dialog/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/dialog/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/dialog/da-DK.json
diff --git a/packages/@react-spectrum/dialog/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/dialog/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/dialog/de-DE.json
diff --git a/packages/@react-spectrum/dialog/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/dialog/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/dialog/el-GR.json
diff --git a/packages/@react-spectrum/dialog/intl/en-US.json b/packages/@adobe/react-spectrum/intl/dialog/en-US.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/dialog/en-US.json
diff --git a/packages/@react-spectrum/dialog/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/dialog/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/dialog/es-ES.json
diff --git a/packages/@react-spectrum/dialog/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/dialog/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/dialog/et-EE.json
diff --git a/packages/@react-spectrum/dialog/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/dialog/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/dialog/fi-FI.json
diff --git a/packages/@react-spectrum/dialog/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/dialog/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/dialog/fr-FR.json
diff --git a/packages/@react-spectrum/dialog/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/dialog/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/dialog/he-IL.json
diff --git a/packages/@react-spectrum/dialog/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/dialog/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/dialog/hr-HR.json
diff --git a/packages/@react-spectrum/dialog/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/dialog/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/dialog/hu-HU.json
diff --git a/packages/@react-spectrum/dialog/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/dialog/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/dialog/it-IT.json
diff --git a/packages/@react-spectrum/dialog/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/dialog/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/dialog/ja-JP.json
diff --git a/packages/@react-spectrum/dialog/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/dialog/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/dialog/ko-KR.json
diff --git a/packages/@react-spectrum/dialog/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/dialog/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/dialog/lt-LT.json
diff --git a/packages/@react-spectrum/dialog/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/dialog/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/dialog/lv-LV.json
diff --git a/packages/@react-spectrum/dialog/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/dialog/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/dialog/nb-NO.json
diff --git a/packages/@react-spectrum/dialog/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/dialog/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/dialog/nl-NL.json
diff --git a/packages/@react-spectrum/dialog/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/dialog/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/dialog/pl-PL.json
diff --git a/packages/@react-spectrum/dialog/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/dialog/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/dialog/pt-BR.json
diff --git a/packages/@react-spectrum/dialog/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/dialog/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/dialog/pt-PT.json
diff --git a/packages/@react-spectrum/dialog/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/dialog/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/dialog/ro-RO.json
diff --git a/packages/@react-spectrum/dialog/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/dialog/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/dialog/ru-RU.json
diff --git a/packages/@react-spectrum/dialog/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/dialog/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/dialog/sk-SK.json
diff --git a/packages/@react-spectrum/dialog/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/dialog/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/dialog/sl-SI.json
diff --git a/packages/@react-spectrum/dialog/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/dialog/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/dialog/sr-SP.json
diff --git a/packages/@react-spectrum/dialog/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/dialog/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/dialog/sv-SE.json
diff --git a/packages/@react-spectrum/dialog/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/dialog/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/dialog/tr-TR.json
diff --git a/packages/@react-spectrum/dialog/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/dialog/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/dialog/uk-UA.json
diff --git a/packages/@react-spectrum/dialog/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/dialog/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/dialog/zh-CN.json
diff --git a/packages/@react-spectrum/dialog/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/dialog/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/dialog/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/dialog/zh-TW.json
diff --git a/packages/@react-spectrum/dropzone/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/dropzone/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/dropzone/ar-AE.json
diff --git a/packages/@react-spectrum/dropzone/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/dropzone/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/dropzone/bg-BG.json
diff --git a/packages/@react-spectrum/dropzone/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/dropzone/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/dropzone/cs-CZ.json
diff --git a/packages/@react-spectrum/dropzone/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/dropzone/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/dropzone/da-DK.json
diff --git a/packages/@react-spectrum/dropzone/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/dropzone/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/dropzone/de-DE.json
diff --git a/packages/@react-spectrum/dropzone/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/dropzone/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/dropzone/el-GR.json
diff --git a/packages/@react-spectrum/dropzone/intl/en-US.json b/packages/@adobe/react-spectrum/intl/dropzone/en-US.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/dropzone/en-US.json
diff --git a/packages/@react-spectrum/dropzone/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/dropzone/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/dropzone/es-ES.json
diff --git a/packages/@react-spectrum/dropzone/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/dropzone/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/dropzone/et-EE.json
diff --git a/packages/@react-spectrum/dropzone/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/dropzone/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/dropzone/fi-FI.json
diff --git a/packages/@react-spectrum/dropzone/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/dropzone/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/dropzone/fr-FR.json
diff --git a/packages/@react-spectrum/dropzone/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/dropzone/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/dropzone/he-IL.json
diff --git a/packages/@react-spectrum/dropzone/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/dropzone/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/dropzone/hr-HR.json
diff --git a/packages/@react-spectrum/dropzone/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/dropzone/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/dropzone/hu-HU.json
diff --git a/packages/@react-spectrum/dropzone/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/dropzone/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/dropzone/it-IT.json
diff --git a/packages/@react-spectrum/dropzone/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/dropzone/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/dropzone/ja-JP.json
diff --git a/packages/@react-spectrum/dropzone/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/dropzone/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/dropzone/ko-KR.json
diff --git a/packages/@react-spectrum/dropzone/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/dropzone/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/dropzone/lt-LT.json
diff --git a/packages/@react-spectrum/dropzone/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/dropzone/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/dropzone/lv-LV.json
diff --git a/packages/@react-spectrum/dropzone/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/dropzone/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/dropzone/nb-NO.json
diff --git a/packages/@react-spectrum/dropzone/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/dropzone/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/dropzone/nl-NL.json
diff --git a/packages/@react-spectrum/dropzone/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/dropzone/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/dropzone/pl-PL.json
diff --git a/packages/@react-spectrum/dropzone/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/dropzone/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/dropzone/pt-BR.json
diff --git a/packages/@react-spectrum/dropzone/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/dropzone/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/dropzone/pt-PT.json
diff --git a/packages/@react-spectrum/dropzone/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/dropzone/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/dropzone/ro-RO.json
diff --git a/packages/@react-spectrum/dropzone/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/dropzone/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/dropzone/ru-RU.json
diff --git a/packages/@react-spectrum/dropzone/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/dropzone/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/dropzone/sk-SK.json
diff --git a/packages/@react-spectrum/dropzone/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/dropzone/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/dropzone/sl-SI.json
diff --git a/packages/@react-spectrum/dropzone/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/dropzone/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/dropzone/sr-SP.json
diff --git a/packages/@react-spectrum/dropzone/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/dropzone/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/dropzone/sv-SE.json
diff --git a/packages/@react-spectrum/dropzone/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/dropzone/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/dropzone/tr-TR.json
diff --git a/packages/@react-spectrum/dropzone/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/dropzone/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/dropzone/uk-UA.json
diff --git a/packages/@react-spectrum/dropzone/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/dropzone/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/dropzone/zh-CN.json
diff --git a/packages/@react-spectrum/dropzone/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/dropzone/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/dropzone/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/dropzone/zh-TW.json
diff --git a/packages/@react-spectrum/inlinealert/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/inlinealert/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/ar-AE.json
diff --git a/packages/@react-spectrum/inlinealert/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/inlinealert/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/bg-BG.json
diff --git a/packages/@react-spectrum/inlinealert/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/inlinealert/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/cs-CZ.json
diff --git a/packages/@react-spectrum/inlinealert/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/inlinealert/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/da-DK.json
diff --git a/packages/@react-spectrum/inlinealert/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/inlinealert/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/de-DE.json
diff --git a/packages/@react-spectrum/inlinealert/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/inlinealert/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/el-GR.json
diff --git a/packages/@react-spectrum/inlinealert/intl/en-US.json b/packages/@adobe/react-spectrum/intl/inlinealert/en-US.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/en-US.json
diff --git a/packages/@react-spectrum/inlinealert/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/inlinealert/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/es-ES.json
diff --git a/packages/@react-spectrum/inlinealert/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/inlinealert/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/et-EE.json
diff --git a/packages/@react-spectrum/inlinealert/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/inlinealert/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/fi-FI.json
diff --git a/packages/@react-spectrum/inlinealert/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/inlinealert/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/fr-FR.json
diff --git a/packages/@react-spectrum/inlinealert/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/inlinealert/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/he-IL.json
diff --git a/packages/@react-spectrum/inlinealert/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/inlinealert/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/hr-HR.json
diff --git a/packages/@react-spectrum/inlinealert/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/inlinealert/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/hu-HU.json
diff --git a/packages/@react-spectrum/inlinealert/intl/index.js b/packages/@adobe/react-spectrum/intl/inlinealert/index.js
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/index.js
rename to packages/@adobe/react-spectrum/intl/inlinealert/index.js
diff --git a/packages/@react-spectrum/inlinealert/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/inlinealert/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/it-IT.json
diff --git a/packages/@react-spectrum/inlinealert/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/inlinealert/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/ja-JP.json
diff --git a/packages/@react-spectrum/inlinealert/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/inlinealert/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/ko-KR.json
diff --git a/packages/@react-spectrum/inlinealert/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/inlinealert/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/lt-LT.json
diff --git a/packages/@react-spectrum/inlinealert/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/inlinealert/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/lv-LV.json
diff --git a/packages/@react-spectrum/inlinealert/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/inlinealert/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/nb-NO.json
diff --git a/packages/@react-spectrum/inlinealert/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/inlinealert/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/nl-NL.json
diff --git a/packages/@react-spectrum/inlinealert/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/inlinealert/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/pl-PL.json
diff --git a/packages/@react-spectrum/inlinealert/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/inlinealert/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/pt-BR.json
diff --git a/packages/@react-spectrum/inlinealert/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/inlinealert/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/pt-PT.json
diff --git a/packages/@react-spectrum/inlinealert/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/inlinealert/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/ro-RO.json
diff --git a/packages/@react-spectrum/inlinealert/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/inlinealert/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/ru-RU.json
diff --git a/packages/@react-spectrum/inlinealert/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/inlinealert/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/sk-SK.json
diff --git a/packages/@react-spectrum/inlinealert/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/inlinealert/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/sl-SI.json
diff --git a/packages/@react-spectrum/inlinealert/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/inlinealert/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/sr-SP.json
diff --git a/packages/@react-spectrum/inlinealert/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/inlinealert/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/sv-SE.json
diff --git a/packages/@react-spectrum/inlinealert/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/inlinealert/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/tr-TR.json
diff --git a/packages/@react-spectrum/inlinealert/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/inlinealert/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/uk-UA.json
diff --git a/packages/@react-spectrum/inlinealert/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/inlinealert/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/zh-CN.json
diff --git a/packages/@react-spectrum/inlinealert/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/inlinealert/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/inlinealert/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/inlinealert/zh-TW.json
diff --git a/packages/@react-spectrum/label/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/label/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/label/ar-AE.json
diff --git a/packages/@react-spectrum/label/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/label/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/label/bg-BG.json
diff --git a/packages/@react-spectrum/label/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/label/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/label/cs-CZ.json
diff --git a/packages/@react-spectrum/label/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/label/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/label/da-DK.json
diff --git a/packages/@react-spectrum/label/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/label/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/label/de-DE.json
diff --git a/packages/@react-spectrum/label/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/label/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/label/el-GR.json
diff --git a/packages/@react-spectrum/label/intl/en-US.json b/packages/@adobe/react-spectrum/intl/label/en-US.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/label/en-US.json
diff --git a/packages/@react-spectrum/label/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/label/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/label/es-ES.json
diff --git a/packages/@react-spectrum/label/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/label/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/label/et-EE.json
diff --git a/packages/@react-spectrum/label/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/label/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/label/fi-FI.json
diff --git a/packages/@react-spectrum/label/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/label/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/label/fr-FR.json
diff --git a/packages/@react-spectrum/label/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/label/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/label/he-IL.json
diff --git a/packages/@react-spectrum/label/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/label/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/label/hr-HR.json
diff --git a/packages/@react-spectrum/label/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/label/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/label/hu-HU.json
diff --git a/packages/@react-spectrum/label/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/label/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/label/it-IT.json
diff --git a/packages/@react-spectrum/label/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/label/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/label/ja-JP.json
diff --git a/packages/@react-spectrum/label/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/label/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/label/ko-KR.json
diff --git a/packages/@react-spectrum/label/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/label/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/label/lt-LT.json
diff --git a/packages/@react-spectrum/label/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/label/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/label/lv-LV.json
diff --git a/packages/@react-spectrum/label/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/label/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/label/nb-NO.json
diff --git a/packages/@react-spectrum/label/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/label/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/label/nl-NL.json
diff --git a/packages/@react-spectrum/label/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/label/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/label/pl-PL.json
diff --git a/packages/@react-spectrum/label/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/label/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/label/pt-BR.json
diff --git a/packages/@react-spectrum/label/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/label/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/label/pt-PT.json
diff --git a/packages/@react-spectrum/label/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/label/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/label/ro-RO.json
diff --git a/packages/@react-spectrum/label/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/label/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/label/ru-RU.json
diff --git a/packages/@react-spectrum/label/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/label/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/label/sk-SK.json
diff --git a/packages/@react-spectrum/label/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/label/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/label/sl-SI.json
diff --git a/packages/@react-spectrum/label/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/label/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/label/sr-SP.json
diff --git a/packages/@react-spectrum/label/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/label/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/label/sv-SE.json
diff --git a/packages/@react-spectrum/label/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/label/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/label/tr-TR.json
diff --git a/packages/@react-spectrum/label/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/label/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/label/uk-UA.json
diff --git a/packages/@react-spectrum/label/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/label/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/label/zh-CN.json
diff --git a/packages/@react-spectrum/label/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/label/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/label/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/label/zh-TW.json
diff --git a/packages/@react-spectrum/list/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/list/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/list/ar-AE.json
diff --git a/packages/@react-spectrum/list/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/list/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/list/bg-BG.json
diff --git a/packages/@react-spectrum/list/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/list/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/list/cs-CZ.json
diff --git a/packages/@react-spectrum/list/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/list/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/list/da-DK.json
diff --git a/packages/@react-spectrum/list/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/list/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/list/de-DE.json
diff --git a/packages/@react-spectrum/list/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/list/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/list/el-GR.json
diff --git a/packages/@react-spectrum/list/intl/en-US.json b/packages/@adobe/react-spectrum/intl/list/en-US.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/list/en-US.json
diff --git a/packages/@react-spectrum/list/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/list/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/list/es-ES.json
diff --git a/packages/@react-spectrum/list/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/list/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/list/et-EE.json
diff --git a/packages/@react-spectrum/list/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/list/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/list/fi-FI.json
diff --git a/packages/@react-spectrum/list/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/list/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/list/fr-FR.json
diff --git a/packages/@react-spectrum/list/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/list/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/list/he-IL.json
diff --git a/packages/@react-spectrum/list/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/list/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/list/hr-HR.json
diff --git a/packages/@react-spectrum/list/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/list/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/list/hu-HU.json
diff --git a/packages/@react-spectrum/list/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/list/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/list/it-IT.json
diff --git a/packages/@react-spectrum/list/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/list/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/list/ja-JP.json
diff --git a/packages/@react-spectrum/list/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/list/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/list/ko-KR.json
diff --git a/packages/@react-spectrum/list/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/list/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/list/lt-LT.json
diff --git a/packages/@react-spectrum/list/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/list/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/list/lv-LV.json
diff --git a/packages/@react-spectrum/list/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/list/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/list/nb-NO.json
diff --git a/packages/@react-spectrum/list/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/list/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/list/nl-NL.json
diff --git a/packages/@react-spectrum/list/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/list/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/list/pl-PL.json
diff --git a/packages/@react-spectrum/list/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/list/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/list/pt-BR.json
diff --git a/packages/@react-spectrum/list/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/list/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/list/pt-PT.json
diff --git a/packages/@react-spectrum/list/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/list/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/list/ro-RO.json
diff --git a/packages/@react-spectrum/list/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/list/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/list/ru-RU.json
diff --git a/packages/@react-spectrum/list/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/list/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/list/sk-SK.json
diff --git a/packages/@react-spectrum/list/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/list/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/list/sl-SI.json
diff --git a/packages/@react-spectrum/list/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/list/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/list/sr-SP.json
diff --git a/packages/@react-spectrum/list/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/list/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/list/sv-SE.json
diff --git a/packages/@react-spectrum/list/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/list/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/list/tr-TR.json
diff --git a/packages/@react-spectrum/list/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/list/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/list/uk-UA.json
diff --git a/packages/@react-spectrum/list/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/list/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/list/zh-CN.json
diff --git a/packages/@react-spectrum/list/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/list/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/list/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/list/zh-TW.json
diff --git a/packages/@react-spectrum/listbox/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/listbox/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/listbox/ar-AE.json
diff --git a/packages/@react-spectrum/listbox/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/listbox/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/listbox/bg-BG.json
diff --git a/packages/@react-spectrum/listbox/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/listbox/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/listbox/cs-CZ.json
diff --git a/packages/@react-spectrum/listbox/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/listbox/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/listbox/da-DK.json
diff --git a/packages/@react-spectrum/listbox/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/listbox/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/listbox/de-DE.json
diff --git a/packages/@react-spectrum/listbox/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/listbox/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/listbox/el-GR.json
diff --git a/packages/@react-spectrum/listbox/intl/en-US.json b/packages/@adobe/react-spectrum/intl/listbox/en-US.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/listbox/en-US.json
diff --git a/packages/@react-spectrum/listbox/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/listbox/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/listbox/es-ES.json
diff --git a/packages/@react-spectrum/listbox/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/listbox/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/listbox/et-EE.json
diff --git a/packages/@react-spectrum/listbox/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/listbox/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/listbox/fi-FI.json
diff --git a/packages/@react-spectrum/listbox/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/listbox/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/listbox/fr-FR.json
diff --git a/packages/@react-spectrum/listbox/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/listbox/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/listbox/he-IL.json
diff --git a/packages/@react-spectrum/listbox/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/listbox/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/listbox/hr-HR.json
diff --git a/packages/@react-spectrum/listbox/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/listbox/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/listbox/hu-HU.json
diff --git a/packages/@react-spectrum/listbox/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/listbox/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/listbox/it-IT.json
diff --git a/packages/@react-spectrum/listbox/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/listbox/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/listbox/ja-JP.json
diff --git a/packages/@react-spectrum/listbox/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/listbox/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/listbox/ko-KR.json
diff --git a/packages/@react-spectrum/listbox/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/listbox/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/listbox/lt-LT.json
diff --git a/packages/@react-spectrum/listbox/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/listbox/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/listbox/lv-LV.json
diff --git a/packages/@react-spectrum/listbox/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/listbox/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/listbox/nb-NO.json
diff --git a/packages/@react-spectrum/listbox/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/listbox/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/listbox/nl-NL.json
diff --git a/packages/@react-spectrum/listbox/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/listbox/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/listbox/pl-PL.json
diff --git a/packages/@react-spectrum/listbox/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/listbox/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/listbox/pt-BR.json
diff --git a/packages/@react-spectrum/listbox/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/listbox/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/listbox/pt-PT.json
diff --git a/packages/@react-spectrum/listbox/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/listbox/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/listbox/ro-RO.json
diff --git a/packages/@react-spectrum/listbox/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/listbox/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/listbox/ru-RU.json
diff --git a/packages/@react-spectrum/listbox/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/listbox/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/listbox/sk-SK.json
diff --git a/packages/@react-spectrum/listbox/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/listbox/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/listbox/sl-SI.json
diff --git a/packages/@react-spectrum/listbox/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/listbox/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/listbox/sr-SP.json
diff --git a/packages/@react-spectrum/listbox/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/listbox/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/listbox/sv-SE.json
diff --git a/packages/@react-spectrum/listbox/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/listbox/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/listbox/tr-TR.json
diff --git a/packages/@react-spectrum/listbox/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/listbox/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/listbox/uk-UA.json
diff --git a/packages/@react-spectrum/listbox/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/listbox/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/listbox/zh-CN.json
diff --git a/packages/@react-spectrum/listbox/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/listbox/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/listbox/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/listbox/zh-TW.json
diff --git a/packages/@react-spectrum/menu/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/menu/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/menu/ar-AE.json
diff --git a/packages/@react-spectrum/menu/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/menu/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/menu/bg-BG.json
diff --git a/packages/@react-spectrum/menu/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/menu/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/menu/cs-CZ.json
diff --git a/packages/@react-spectrum/menu/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/menu/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/menu/da-DK.json
diff --git a/packages/@react-spectrum/menu/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/menu/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/menu/de-DE.json
diff --git a/packages/@react-spectrum/menu/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/menu/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/menu/el-GR.json
diff --git a/packages/@react-spectrum/menu/intl/en-US.json b/packages/@adobe/react-spectrum/intl/menu/en-US.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/menu/en-US.json
diff --git a/packages/@react-spectrum/menu/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/menu/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/menu/es-ES.json
diff --git a/packages/@react-spectrum/menu/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/menu/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/menu/et-EE.json
diff --git a/packages/@react-spectrum/menu/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/menu/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/menu/fi-FI.json
diff --git a/packages/@react-spectrum/menu/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/menu/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/menu/fr-FR.json
diff --git a/packages/@react-spectrum/menu/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/menu/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/menu/he-IL.json
diff --git a/packages/@react-spectrum/menu/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/menu/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/menu/hr-HR.json
diff --git a/packages/@react-spectrum/menu/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/menu/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/menu/hu-HU.json
diff --git a/packages/@react-spectrum/menu/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/menu/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/menu/it-IT.json
diff --git a/packages/@react-spectrum/menu/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/menu/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/menu/ja-JP.json
diff --git a/packages/@react-spectrum/menu/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/menu/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/menu/ko-KR.json
diff --git a/packages/@react-spectrum/menu/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/menu/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/menu/lt-LT.json
diff --git a/packages/@react-spectrum/menu/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/menu/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/menu/lv-LV.json
diff --git a/packages/@react-spectrum/menu/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/menu/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/menu/nb-NO.json
diff --git a/packages/@react-spectrum/menu/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/menu/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/menu/nl-NL.json
diff --git a/packages/@react-spectrum/menu/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/menu/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/menu/pl-PL.json
diff --git a/packages/@react-spectrum/menu/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/menu/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/menu/pt-BR.json
diff --git a/packages/@react-spectrum/menu/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/menu/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/menu/pt-PT.json
diff --git a/packages/@react-spectrum/menu/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/menu/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/menu/ro-RO.json
diff --git a/packages/@react-spectrum/menu/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/menu/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/menu/ru-RU.json
diff --git a/packages/@react-spectrum/menu/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/menu/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/menu/sk-SK.json
diff --git a/packages/@react-spectrum/menu/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/menu/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/menu/sl-SI.json
diff --git a/packages/@react-spectrum/menu/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/menu/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/menu/sr-SP.json
diff --git a/packages/@react-spectrum/menu/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/menu/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/menu/sv-SE.json
diff --git a/packages/@react-spectrum/menu/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/menu/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/menu/tr-TR.json
diff --git a/packages/@react-spectrum/menu/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/menu/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/menu/uk-UA.json
diff --git a/packages/@react-spectrum/menu/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/menu/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/menu/zh-CN.json
diff --git a/packages/@react-spectrum/menu/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/menu/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/menu/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/menu/zh-TW.json
diff --git a/packages/@react-spectrum/picker/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/picker/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/picker/ar-AE.json
diff --git a/packages/@react-spectrum/picker/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/picker/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/picker/bg-BG.json
diff --git a/packages/@react-spectrum/picker/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/picker/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/picker/cs-CZ.json
diff --git a/packages/@react-spectrum/picker/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/picker/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/picker/da-DK.json
diff --git a/packages/@react-spectrum/picker/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/picker/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/picker/de-DE.json
diff --git a/packages/@react-spectrum/picker/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/picker/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/picker/el-GR.json
diff --git a/packages/@react-spectrum/picker/intl/en-US.json b/packages/@adobe/react-spectrum/intl/picker/en-US.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/picker/en-US.json
diff --git a/packages/@react-spectrum/picker/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/picker/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/picker/es-ES.json
diff --git a/packages/@react-spectrum/picker/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/picker/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/picker/et-EE.json
diff --git a/packages/@react-spectrum/picker/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/picker/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/picker/fi-FI.json
diff --git a/packages/@react-spectrum/picker/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/picker/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/picker/fr-FR.json
diff --git a/packages/@react-spectrum/picker/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/picker/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/picker/he-IL.json
diff --git a/packages/@react-spectrum/picker/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/picker/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/picker/hr-HR.json
diff --git a/packages/@react-spectrum/picker/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/picker/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/picker/hu-HU.json
diff --git a/packages/@react-spectrum/picker/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/picker/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/picker/it-IT.json
diff --git a/packages/@react-spectrum/picker/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/picker/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/picker/ja-JP.json
diff --git a/packages/@react-spectrum/picker/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/picker/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/picker/ko-KR.json
diff --git a/packages/@react-spectrum/picker/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/picker/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/picker/lt-LT.json
diff --git a/packages/@react-spectrum/picker/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/picker/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/picker/lv-LV.json
diff --git a/packages/@react-spectrum/picker/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/picker/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/picker/nb-NO.json
diff --git a/packages/@react-spectrum/picker/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/picker/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/picker/nl-NL.json
diff --git a/packages/@react-spectrum/picker/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/picker/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/picker/pl-PL.json
diff --git a/packages/@react-spectrum/picker/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/picker/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/picker/pt-BR.json
diff --git a/packages/@react-spectrum/picker/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/picker/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/picker/pt-PT.json
diff --git a/packages/@react-spectrum/picker/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/picker/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/picker/ro-RO.json
diff --git a/packages/@react-spectrum/picker/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/picker/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/picker/ru-RU.json
diff --git a/packages/@react-spectrum/picker/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/picker/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/picker/sk-SK.json
diff --git a/packages/@react-spectrum/picker/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/picker/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/picker/sl-SI.json
diff --git a/packages/@react-spectrum/picker/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/picker/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/picker/sr-SP.json
diff --git a/packages/@react-spectrum/picker/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/picker/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/picker/sv-SE.json
diff --git a/packages/@react-spectrum/picker/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/picker/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/picker/tr-TR.json
diff --git a/packages/@react-spectrum/picker/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/picker/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/picker/uk-UA.json
diff --git a/packages/@react-spectrum/picker/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/picker/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/picker/zh-CN.json
diff --git a/packages/@react-spectrum/picker/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/picker/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/picker/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/picker/zh-TW.json
diff --git a/packages/@react-spectrum/slider/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/slider/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/slider/ar-AE.json
diff --git a/packages/@react-spectrum/slider/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/slider/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/slider/bg-BG.json
diff --git a/packages/@react-spectrum/slider/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/slider/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/slider/cs-CZ.json
diff --git a/packages/@react-spectrum/slider/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/slider/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/slider/da-DK.json
diff --git a/packages/@react-spectrum/slider/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/slider/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/slider/de-DE.json
diff --git a/packages/@react-spectrum/slider/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/slider/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/slider/el-GR.json
diff --git a/packages/@react-spectrum/slider/intl/en-US.json b/packages/@adobe/react-spectrum/intl/slider/en-US.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/slider/en-US.json
diff --git a/packages/@react-spectrum/slider/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/slider/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/slider/es-ES.json
diff --git a/packages/@react-spectrum/slider/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/slider/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/slider/et-EE.json
diff --git a/packages/@react-spectrum/slider/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/slider/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/slider/fi-FI.json
diff --git a/packages/@react-spectrum/slider/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/slider/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/slider/fr-FR.json
diff --git a/packages/@react-spectrum/slider/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/slider/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/slider/he-IL.json
diff --git a/packages/@react-spectrum/slider/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/slider/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/slider/hr-HR.json
diff --git a/packages/@react-spectrum/slider/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/slider/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/slider/hu-HU.json
diff --git a/packages/@react-spectrum/slider/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/slider/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/slider/it-IT.json
diff --git a/packages/@react-spectrum/slider/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/slider/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/slider/ja-JP.json
diff --git a/packages/@react-spectrum/slider/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/slider/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/slider/ko-KR.json
diff --git a/packages/@react-spectrum/slider/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/slider/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/slider/lt-LT.json
diff --git a/packages/@react-spectrum/slider/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/slider/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/slider/lv-LV.json
diff --git a/packages/@react-spectrum/slider/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/slider/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/slider/nb-NO.json
diff --git a/packages/@react-spectrum/slider/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/slider/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/slider/nl-NL.json
diff --git a/packages/@react-spectrum/slider/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/slider/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/slider/pl-PL.json
diff --git a/packages/@react-spectrum/slider/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/slider/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/slider/pt-BR.json
diff --git a/packages/@react-spectrum/slider/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/slider/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/slider/pt-PT.json
diff --git a/packages/@react-spectrum/slider/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/slider/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/slider/ro-RO.json
diff --git a/packages/@react-spectrum/slider/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/slider/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/slider/ru-RU.json
diff --git a/packages/@react-spectrum/slider/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/slider/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/slider/sk-SK.json
diff --git a/packages/@react-spectrum/slider/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/slider/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/slider/sl-SI.json
diff --git a/packages/@react-spectrum/slider/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/slider/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/slider/sr-SP.json
diff --git a/packages/@react-spectrum/slider/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/slider/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/slider/sv-SE.json
diff --git a/packages/@react-spectrum/slider/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/slider/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/slider/tr-TR.json
diff --git a/packages/@react-spectrum/slider/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/slider/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/slider/uk-UA.json
diff --git a/packages/@react-spectrum/slider/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/slider/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/slider/zh-CN.json
diff --git a/packages/@react-spectrum/slider/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/slider/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/slider/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/slider/zh-TW.json
diff --git a/packages/@react-spectrum/steplist/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/steplist/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/steplist/ar-AE.json
diff --git a/packages/@react-spectrum/steplist/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/steplist/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/steplist/bg-BG.json
diff --git a/packages/@react-spectrum/steplist/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/steplist/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/steplist/cs-CZ.json
diff --git a/packages/@react-spectrum/steplist/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/steplist/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/steplist/da-DK.json
diff --git a/packages/@react-spectrum/steplist/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/steplist/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/steplist/de-DE.json
diff --git a/packages/@react-spectrum/steplist/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/steplist/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/steplist/el-GR.json
diff --git a/packages/@react-spectrum/steplist/intl/en-US.json b/packages/@adobe/react-spectrum/intl/steplist/en-US.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/steplist/en-US.json
diff --git a/packages/@react-spectrum/steplist/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/steplist/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/steplist/es-ES.json
diff --git a/packages/@react-spectrum/steplist/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/steplist/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/steplist/et-EE.json
diff --git a/packages/@react-spectrum/steplist/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/steplist/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/steplist/fi-FI.json
diff --git a/packages/@react-spectrum/steplist/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/steplist/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/steplist/fr-FR.json
diff --git a/packages/@react-spectrum/steplist/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/steplist/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/steplist/he-IL.json
diff --git a/packages/@react-spectrum/steplist/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/steplist/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/steplist/hr-HR.json
diff --git a/packages/@react-spectrum/steplist/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/steplist/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/steplist/hu-HU.json
diff --git a/packages/@react-spectrum/steplist/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/steplist/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/steplist/it-IT.json
diff --git a/packages/@react-spectrum/steplist/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/steplist/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/steplist/ja-JP.json
diff --git a/packages/@react-spectrum/steplist/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/steplist/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/steplist/ko-KR.json
diff --git a/packages/@react-spectrum/steplist/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/steplist/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/steplist/lt-LT.json
diff --git a/packages/@react-spectrum/steplist/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/steplist/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/steplist/lv-LV.json
diff --git a/packages/@react-spectrum/steplist/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/steplist/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/steplist/nb-NO.json
diff --git a/packages/@react-spectrum/steplist/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/steplist/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/steplist/nl-NL.json
diff --git a/packages/@react-spectrum/steplist/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/steplist/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/steplist/pl-PL.json
diff --git a/packages/@react-spectrum/steplist/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/steplist/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/steplist/pt-BR.json
diff --git a/packages/@react-spectrum/steplist/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/steplist/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/steplist/pt-PT.json
diff --git a/packages/@react-spectrum/steplist/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/steplist/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/steplist/ro-RO.json
diff --git a/packages/@react-spectrum/steplist/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/steplist/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/steplist/ru-RU.json
diff --git a/packages/@react-spectrum/steplist/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/steplist/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/steplist/sk-SK.json
diff --git a/packages/@react-spectrum/steplist/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/steplist/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/steplist/sl-SI.json
diff --git a/packages/@react-spectrum/steplist/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/steplist/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/steplist/sr-SP.json
diff --git a/packages/@react-spectrum/steplist/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/steplist/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/steplist/sv-SE.json
diff --git a/packages/@react-spectrum/steplist/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/steplist/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/steplist/tr-TR.json
diff --git a/packages/@react-spectrum/steplist/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/steplist/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/steplist/uk-UA.json
diff --git a/packages/@react-spectrum/steplist/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/steplist/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/steplist/zh-CN.json
diff --git a/packages/@react-spectrum/steplist/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/steplist/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/steplist/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/steplist/zh-TW.json
diff --git a/packages/@react-spectrum/table/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/table/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/table/ar-AE.json
diff --git a/packages/@react-spectrum/table/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/table/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/table/bg-BG.json
diff --git a/packages/@react-spectrum/table/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/table/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/table/cs-CZ.json
diff --git a/packages/@react-spectrum/table/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/table/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/table/da-DK.json
diff --git a/packages/@react-spectrum/table/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/table/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/table/de-DE.json
diff --git a/packages/@react-spectrum/table/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/table/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/table/el-GR.json
diff --git a/packages/@react-spectrum/table/intl/en-US.json b/packages/@adobe/react-spectrum/intl/table/en-US.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/table/en-US.json
diff --git a/packages/@react-spectrum/table/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/table/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/table/es-ES.json
diff --git a/packages/@react-spectrum/table/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/table/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/table/et-EE.json
diff --git a/packages/@react-spectrum/table/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/table/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/table/fi-FI.json
diff --git a/packages/@react-spectrum/table/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/table/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/table/fr-FR.json
diff --git a/packages/@react-spectrum/table/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/table/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/table/he-IL.json
diff --git a/packages/@react-spectrum/table/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/table/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/table/hr-HR.json
diff --git a/packages/@react-spectrum/table/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/table/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/table/hu-HU.json
diff --git a/packages/@react-spectrum/table/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/table/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/table/it-IT.json
diff --git a/packages/@react-spectrum/table/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/table/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/table/ja-JP.json
diff --git a/packages/@react-spectrum/table/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/table/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/table/ko-KR.json
diff --git a/packages/@react-spectrum/table/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/table/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/table/lt-LT.json
diff --git a/packages/@react-spectrum/table/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/table/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/table/lv-LV.json
diff --git a/packages/@react-spectrum/table/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/table/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/table/nb-NO.json
diff --git a/packages/@react-spectrum/table/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/table/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/table/nl-NL.json
diff --git a/packages/@react-spectrum/table/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/table/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/table/pl-PL.json
diff --git a/packages/@react-spectrum/table/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/table/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/table/pt-BR.json
diff --git a/packages/@react-spectrum/table/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/table/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/table/pt-PT.json
diff --git a/packages/@react-spectrum/table/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/table/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/table/ro-RO.json
diff --git a/packages/@react-spectrum/table/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/table/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/table/ru-RU.json
diff --git a/packages/@react-spectrum/table/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/table/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/table/sk-SK.json
diff --git a/packages/@react-spectrum/table/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/table/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/table/sl-SI.json
diff --git a/packages/@react-spectrum/table/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/table/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/table/sr-SP.json
diff --git a/packages/@react-spectrum/table/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/table/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/table/sv-SE.json
diff --git a/packages/@react-spectrum/table/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/table/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/table/tr-TR.json
diff --git a/packages/@react-spectrum/table/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/table/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/table/uk-UA.json
diff --git a/packages/@react-spectrum/table/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/table/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/table/zh-CN.json
diff --git a/packages/@react-spectrum/table/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/table/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/table/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/table/zh-TW.json
diff --git a/packages/@react-spectrum/tag/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/tag/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/tag/ar-AE.json
diff --git a/packages/@react-spectrum/tag/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/tag/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/tag/bg-BG.json
diff --git a/packages/@react-spectrum/tag/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/tag/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/tag/cs-CZ.json
diff --git a/packages/@react-spectrum/tag/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/tag/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/tag/da-DK.json
diff --git a/packages/@react-spectrum/tag/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/tag/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/tag/de-DE.json
diff --git a/packages/@react-spectrum/tag/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/tag/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/tag/el-GR.json
diff --git a/packages/@react-spectrum/tag/intl/en-US.json b/packages/@adobe/react-spectrum/intl/tag/en-US.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/tag/en-US.json
diff --git a/packages/@react-spectrum/tag/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/tag/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/tag/es-ES.json
diff --git a/packages/@react-spectrum/tag/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/tag/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/tag/et-EE.json
diff --git a/packages/@react-spectrum/tag/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/tag/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/tag/fi-FI.json
diff --git a/packages/@react-spectrum/tag/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/tag/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/tag/fr-FR.json
diff --git a/packages/@react-spectrum/tag/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/tag/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/tag/he-IL.json
diff --git a/packages/@react-spectrum/tag/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/tag/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/tag/hr-HR.json
diff --git a/packages/@react-spectrum/tag/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/tag/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/tag/hu-HU.json
diff --git a/packages/@react-spectrum/tag/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/tag/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/tag/it-IT.json
diff --git a/packages/@react-spectrum/tag/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/tag/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/tag/ja-JP.json
diff --git a/packages/@react-spectrum/tag/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/tag/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/tag/ko-KR.json
diff --git a/packages/@react-spectrum/tag/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/tag/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/tag/lt-LT.json
diff --git a/packages/@react-spectrum/tag/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/tag/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/tag/lv-LV.json
diff --git a/packages/@react-spectrum/tag/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/tag/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/tag/nb-NO.json
diff --git a/packages/@react-spectrum/tag/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/tag/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/tag/nl-NL.json
diff --git a/packages/@react-spectrum/tag/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/tag/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/tag/pl-PL.json
diff --git a/packages/@react-spectrum/tag/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/tag/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/tag/pt-BR.json
diff --git a/packages/@react-spectrum/tag/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/tag/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/tag/pt-PT.json
diff --git a/packages/@react-spectrum/tag/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/tag/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/tag/ro-RO.json
diff --git a/packages/@react-spectrum/tag/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/tag/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/tag/ru-RU.json
diff --git a/packages/@react-spectrum/tag/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/tag/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/tag/sk-SK.json
diff --git a/packages/@react-spectrum/tag/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/tag/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/tag/sl-SI.json
diff --git a/packages/@react-spectrum/tag/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/tag/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/tag/sr-SP.json
diff --git a/packages/@react-spectrum/tag/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/tag/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/tag/sv-SE.json
diff --git a/packages/@react-spectrum/tag/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/tag/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/tag/tr-TR.json
diff --git a/packages/@react-spectrum/tag/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/tag/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/tag/uk-UA.json
diff --git a/packages/@react-spectrum/tag/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/tag/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/tag/zh-CN.json
diff --git a/packages/@react-spectrum/tag/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/tag/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/tag/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/tag/zh-TW.json
diff --git a/packages/@react-spectrum/textfield/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/textfield/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/textfield/ar-AE.json
diff --git a/packages/@react-spectrum/textfield/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/textfield/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/textfield/bg-BG.json
diff --git a/packages/@react-spectrum/textfield/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/textfield/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/textfield/cs-CZ.json
diff --git a/packages/@react-spectrum/textfield/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/textfield/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/textfield/da-DK.json
diff --git a/packages/@react-spectrum/textfield/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/textfield/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/textfield/de-DE.json
diff --git a/packages/@react-spectrum/textfield/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/textfield/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/textfield/el-GR.json
diff --git a/packages/@react-spectrum/textfield/intl/en-US.json b/packages/@adobe/react-spectrum/intl/textfield/en-US.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/textfield/en-US.json
diff --git a/packages/@react-spectrum/textfield/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/textfield/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/textfield/es-ES.json
diff --git a/packages/@react-spectrum/textfield/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/textfield/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/textfield/et-EE.json
diff --git a/packages/@react-spectrum/textfield/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/textfield/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/textfield/fi-FI.json
diff --git a/packages/@react-spectrum/textfield/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/textfield/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/textfield/fr-FR.json
diff --git a/packages/@react-spectrum/textfield/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/textfield/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/textfield/he-IL.json
diff --git a/packages/@react-spectrum/textfield/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/textfield/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/textfield/hr-HR.json
diff --git a/packages/@react-spectrum/textfield/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/textfield/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/textfield/hu-HU.json
diff --git a/packages/@react-spectrum/textfield/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/textfield/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/textfield/it-IT.json
diff --git a/packages/@react-spectrum/textfield/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/textfield/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/textfield/ja-JP.json
diff --git a/packages/@react-spectrum/textfield/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/textfield/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/textfield/ko-KR.json
diff --git a/packages/@react-spectrum/textfield/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/textfield/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/textfield/lt-LT.json
diff --git a/packages/@react-spectrum/textfield/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/textfield/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/textfield/lv-LV.json
diff --git a/packages/@react-spectrum/textfield/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/textfield/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/textfield/nb-NO.json
diff --git a/packages/@react-spectrum/textfield/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/textfield/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/textfield/nl-NL.json
diff --git a/packages/@react-spectrum/textfield/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/textfield/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/textfield/pl-PL.json
diff --git a/packages/@react-spectrum/textfield/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/textfield/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/textfield/pt-BR.json
diff --git a/packages/@react-spectrum/textfield/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/textfield/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/textfield/pt-PT.json
diff --git a/packages/@react-spectrum/textfield/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/textfield/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/textfield/ro-RO.json
diff --git a/packages/@react-spectrum/textfield/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/textfield/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/textfield/ru-RU.json
diff --git a/packages/@react-spectrum/textfield/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/textfield/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/textfield/sk-SK.json
diff --git a/packages/@react-spectrum/textfield/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/textfield/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/textfield/sl-SI.json
diff --git a/packages/@react-spectrum/textfield/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/textfield/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/textfield/sr-SP.json
diff --git a/packages/@react-spectrum/textfield/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/textfield/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/textfield/sv-SE.json
diff --git a/packages/@react-spectrum/textfield/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/textfield/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/textfield/tr-TR.json
diff --git a/packages/@react-spectrum/textfield/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/textfield/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/textfield/uk-UA.json
diff --git a/packages/@react-spectrum/textfield/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/textfield/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/textfield/zh-CN.json
diff --git a/packages/@react-spectrum/textfield/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/textfield/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/textfield/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/textfield/zh-TW.json
diff --git a/packages/@react-spectrum/toast/intl/ar-AE.json b/packages/@adobe/react-spectrum/intl/toast/ar-AE.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/ar-AE.json
rename to packages/@adobe/react-spectrum/intl/toast/ar-AE.json
diff --git a/packages/@react-spectrum/toast/intl/bg-BG.json b/packages/@adobe/react-spectrum/intl/toast/bg-BG.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/bg-BG.json
rename to packages/@adobe/react-spectrum/intl/toast/bg-BG.json
diff --git a/packages/@react-spectrum/toast/intl/cs-CZ.json b/packages/@adobe/react-spectrum/intl/toast/cs-CZ.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/cs-CZ.json
rename to packages/@adobe/react-spectrum/intl/toast/cs-CZ.json
diff --git a/packages/@react-spectrum/toast/intl/da-DK.json b/packages/@adobe/react-spectrum/intl/toast/da-DK.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/da-DK.json
rename to packages/@adobe/react-spectrum/intl/toast/da-DK.json
diff --git a/packages/@react-spectrum/toast/intl/de-DE.json b/packages/@adobe/react-spectrum/intl/toast/de-DE.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/de-DE.json
rename to packages/@adobe/react-spectrum/intl/toast/de-DE.json
diff --git a/packages/@react-spectrum/toast/intl/el-GR.json b/packages/@adobe/react-spectrum/intl/toast/el-GR.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/el-GR.json
rename to packages/@adobe/react-spectrum/intl/toast/el-GR.json
diff --git a/packages/@react-spectrum/toast/intl/en-US.json b/packages/@adobe/react-spectrum/intl/toast/en-US.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/en-US.json
rename to packages/@adobe/react-spectrum/intl/toast/en-US.json
diff --git a/packages/@react-spectrum/toast/intl/es-ES.json b/packages/@adobe/react-spectrum/intl/toast/es-ES.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/es-ES.json
rename to packages/@adobe/react-spectrum/intl/toast/es-ES.json
diff --git a/packages/@react-spectrum/toast/intl/et-EE.json b/packages/@adobe/react-spectrum/intl/toast/et-EE.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/et-EE.json
rename to packages/@adobe/react-spectrum/intl/toast/et-EE.json
diff --git a/packages/@react-spectrum/toast/intl/fi-FI.json b/packages/@adobe/react-spectrum/intl/toast/fi-FI.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/fi-FI.json
rename to packages/@adobe/react-spectrum/intl/toast/fi-FI.json
diff --git a/packages/@react-spectrum/toast/intl/fr-FR.json b/packages/@adobe/react-spectrum/intl/toast/fr-FR.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/fr-FR.json
rename to packages/@adobe/react-spectrum/intl/toast/fr-FR.json
diff --git a/packages/@react-spectrum/toast/intl/he-IL.json b/packages/@adobe/react-spectrum/intl/toast/he-IL.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/he-IL.json
rename to packages/@adobe/react-spectrum/intl/toast/he-IL.json
diff --git a/packages/@react-spectrum/toast/intl/hr-HR.json b/packages/@adobe/react-spectrum/intl/toast/hr-HR.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/hr-HR.json
rename to packages/@adobe/react-spectrum/intl/toast/hr-HR.json
diff --git a/packages/@react-spectrum/toast/intl/hu-HU.json b/packages/@adobe/react-spectrum/intl/toast/hu-HU.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/hu-HU.json
rename to packages/@adobe/react-spectrum/intl/toast/hu-HU.json
diff --git a/packages/@react-spectrum/toast/intl/it-IT.json b/packages/@adobe/react-spectrum/intl/toast/it-IT.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/it-IT.json
rename to packages/@adobe/react-spectrum/intl/toast/it-IT.json
diff --git a/packages/@react-spectrum/toast/intl/ja-JP.json b/packages/@adobe/react-spectrum/intl/toast/ja-JP.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/ja-JP.json
rename to packages/@adobe/react-spectrum/intl/toast/ja-JP.json
diff --git a/packages/@react-spectrum/toast/intl/ko-KR.json b/packages/@adobe/react-spectrum/intl/toast/ko-KR.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/ko-KR.json
rename to packages/@adobe/react-spectrum/intl/toast/ko-KR.json
diff --git a/packages/@react-spectrum/toast/intl/lt-LT.json b/packages/@adobe/react-spectrum/intl/toast/lt-LT.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/lt-LT.json
rename to packages/@adobe/react-spectrum/intl/toast/lt-LT.json
diff --git a/packages/@react-spectrum/toast/intl/lv-LV.json b/packages/@adobe/react-spectrum/intl/toast/lv-LV.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/lv-LV.json
rename to packages/@adobe/react-spectrum/intl/toast/lv-LV.json
diff --git a/packages/@react-spectrum/toast/intl/nb-NO.json b/packages/@adobe/react-spectrum/intl/toast/nb-NO.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/nb-NO.json
rename to packages/@adobe/react-spectrum/intl/toast/nb-NO.json
diff --git a/packages/@react-spectrum/toast/intl/nl-NL.json b/packages/@adobe/react-spectrum/intl/toast/nl-NL.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/nl-NL.json
rename to packages/@adobe/react-spectrum/intl/toast/nl-NL.json
diff --git a/packages/@react-spectrum/toast/intl/pl-PL.json b/packages/@adobe/react-spectrum/intl/toast/pl-PL.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/pl-PL.json
rename to packages/@adobe/react-spectrum/intl/toast/pl-PL.json
diff --git a/packages/@react-spectrum/toast/intl/pt-BR.json b/packages/@adobe/react-spectrum/intl/toast/pt-BR.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/pt-BR.json
rename to packages/@adobe/react-spectrum/intl/toast/pt-BR.json
diff --git a/packages/@react-spectrum/toast/intl/pt-PT.json b/packages/@adobe/react-spectrum/intl/toast/pt-PT.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/pt-PT.json
rename to packages/@adobe/react-spectrum/intl/toast/pt-PT.json
diff --git a/packages/@react-spectrum/toast/intl/ro-RO.json b/packages/@adobe/react-spectrum/intl/toast/ro-RO.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/ro-RO.json
rename to packages/@adobe/react-spectrum/intl/toast/ro-RO.json
diff --git a/packages/@react-spectrum/toast/intl/ru-RU.json b/packages/@adobe/react-spectrum/intl/toast/ru-RU.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/ru-RU.json
rename to packages/@adobe/react-spectrum/intl/toast/ru-RU.json
diff --git a/packages/@react-spectrum/toast/intl/sk-SK.json b/packages/@adobe/react-spectrum/intl/toast/sk-SK.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/sk-SK.json
rename to packages/@adobe/react-spectrum/intl/toast/sk-SK.json
diff --git a/packages/@react-spectrum/toast/intl/sl-SI.json b/packages/@adobe/react-spectrum/intl/toast/sl-SI.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/sl-SI.json
rename to packages/@adobe/react-spectrum/intl/toast/sl-SI.json
diff --git a/packages/@react-spectrum/toast/intl/sr-SP.json b/packages/@adobe/react-spectrum/intl/toast/sr-SP.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/sr-SP.json
rename to packages/@adobe/react-spectrum/intl/toast/sr-SP.json
diff --git a/packages/@react-spectrum/toast/intl/sv-SE.json b/packages/@adobe/react-spectrum/intl/toast/sv-SE.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/sv-SE.json
rename to packages/@adobe/react-spectrum/intl/toast/sv-SE.json
diff --git a/packages/@react-spectrum/toast/intl/tr-TR.json b/packages/@adobe/react-spectrum/intl/toast/tr-TR.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/tr-TR.json
rename to packages/@adobe/react-spectrum/intl/toast/tr-TR.json
diff --git a/packages/@react-spectrum/toast/intl/uk-UA.json b/packages/@adobe/react-spectrum/intl/toast/uk-UA.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/uk-UA.json
rename to packages/@adobe/react-spectrum/intl/toast/uk-UA.json
diff --git a/packages/@react-spectrum/toast/intl/zh-CN.json b/packages/@adobe/react-spectrum/intl/toast/zh-CN.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/zh-CN.json
rename to packages/@adobe/react-spectrum/intl/toast/zh-CN.json
diff --git a/packages/@react-spectrum/toast/intl/zh-TW.json b/packages/@adobe/react-spectrum/intl/toast/zh-TW.json
similarity index 100%
rename from packages/@react-spectrum/toast/intl/zh-TW.json
rename to packages/@adobe/react-spectrum/intl/toast/zh-TW.json
diff --git a/packages/@adobe/react-spectrum/package.json b/packages/@adobe/react-spectrum/package.json
index b2529786f35..cf1923d26d9 100644
--- a/packages/@adobe/react-spectrum/package.json
+++ b/packages/@adobe/react-spectrum/package.json
@@ -7,13 +7,10 @@
   "module": "dist/module.js",
   "exports": {
     ".": {
-      "source": "./src/index.ts",
-      "types": [
-        "./dist/types.d.ts",
-        "./src/index.ts"
-      ],
-      "import": "./dist/import.mjs",
-      "require": "./dist/main.js"
+      "source": "./exports/index.ts",
+      "types": "./dist/types/exports/index.d.ts",
+      "import": "./dist/exports/index.mjs",
+      "require": "./dist/exports/index.cjs"
     },
     "./i18n": {
       "types": "./i18n/index.d.ts",
@@ -24,15 +21,24 @@
       "types": "./i18n/lang.d.ts",
       "import": "./i18n/*.mjs",
       "require": "./i18n/*.js"
+    },
+    "./package.json": "./package.json",
+    "./*": {
+      "source": "./exports/*.ts",
+      "types": "./dist/types/exports/*.d.ts",
+      "import": "./dist/exports/*.mjs",
+      "require": "./dist/exports/*.cjs"
     }
   },
   "types": "dist/types.d.ts",
-  "source": "src/index.ts",
+  "source": "exports/index.ts",
   "files": [
     "dist",
     "i18n"
   ],
-  "sideEffects": false,
+  "sideEffects": [
+    "*.css"
+  ],
   "scripts": {
     "prepublishOnly": "mkdir -p dist; cp src/index.ts dist/types.d.ts; grep -v '^export type' src/index.ts > dist/module.js; babel --root-mode upward src/index.ts -o dist/main.js"
   },
@@ -41,70 +47,66 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "3.46.2",
+    "@internationalized/date": "^3.12.0",
+    "@internationalized/message": "^3.1.8",
     "@internationalized/string": "^3.2.7",
-    "@react-aria/collections": "^3.0.3",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/ssr": "^3.9.10",
-    "@react-aria/utils": "^3.33.1",
-    "@react-aria/visually-hidden": "^3.8.31",
-    "@react-spectrum/accordion": "^3.0.16",
-    "@react-spectrum/actionbar": "^3.6.17",
-    "@react-spectrum/actiongroup": "^3.11.7",
-    "@react-spectrum/avatar": "^3.0.29",
-    "@react-spectrum/badge": "^3.1.33",
-    "@react-spectrum/breadcrumbs": "^3.9.27",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/buttongroup": "^3.6.29",
-    "@react-spectrum/calendar": "^3.7.11",
-    "@react-spectrum/checkbox": "^3.10.7",
-    "@react-spectrum/color": "^3.1.7",
-    "@react-spectrum/combobox": "^3.16.7",
-    "@react-spectrum/contextualhelp": "^3.6.31",
-    "@react-spectrum/datepicker": "^3.14.11",
-    "@react-spectrum/dialog": "^3.9.7",
-    "@react-spectrum/divider": "^3.5.30",
-    "@react-spectrum/dnd": "^3.6.5",
-    "@react-spectrum/dropzone": "^3.0.21",
-    "@react-spectrum/filetrigger": "^3.0.21",
-    "@react-spectrum/form": "^3.7.22",
-    "@react-spectrum/icon": "^3.8.12",
-    "@react-spectrum/illustratedmessage": "^3.5.17",
-    "@react-spectrum/image": "^3.6.5",
-    "@react-spectrum/inlinealert": "^3.2.23",
-    "@react-spectrum/labeledvalue": "^3.2.10",
-    "@react-spectrum/layout": "^3.6.22",
-    "@react-spectrum/link": "^3.6.25",
-    "@react-spectrum/list": "^3.10.11",
-    "@react-spectrum/listbox": "^3.15.11",
-    "@react-spectrum/menu": "^3.22.11",
-    "@react-spectrum/meter": "^3.5.17",
-    "@react-spectrum/numberfield": "^3.10.5",
-    "@react-spectrum/overlays": "^5.9.3",
-    "@react-spectrum/picker": "^3.16.7",
-    "@react-spectrum/progress": "^3.7.23",
-    "@react-spectrum/provider": "^3.10.14",
-    "@react-spectrum/radio": "^3.7.24",
-    "@react-spectrum/searchfield": "^3.8.26",
-    "@react-spectrum/slider": "^3.8.5",
-    "@react-spectrum/statuslight": "^3.5.29",
-    "@react-spectrum/switch": "^3.6.9",
-    "@react-spectrum/table": "^3.17.11",
-    "@react-spectrum/tabs": "^3.8.30",
-    "@react-spectrum/tag": "^3.3.10",
-    "@react-spectrum/text": "^3.5.25",
-    "@react-spectrum/textfield": "^3.14.5",
-    "@react-spectrum/theme-dark": "^3.5.24",
-    "@react-spectrum/theme-default": "^3.5.24",
-    "@react-spectrum/theme-light": "^3.4.24",
-    "@react-spectrum/toast": "^3.1.7",
-    "@react-spectrum/tooltip": "^3.8.2",
-    "@react-spectrum/tree": "^3.1.11",
-    "@react-spectrum/view": "^3.6.26",
-    "@react-spectrum/well": "^3.4.30",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/data": "^3.15.2",
+    "@react-spectrum/style-macro-s1": "3.0.0-alpha.5",
+    "@react-types/actionbar": "^3.1.21",
+    "@react-types/actiongroup": "^3.4.23",
+    "@react-types/autocomplete": "3.0.0-alpha.38",
+    "@react-types/avatar": "^3.0.21",
+    "@react-types/badge": "^3.1.23",
+    "@react-types/breadcrumbs": "^3.7.19",
+    "@react-types/button": "^3.15.1",
+    "@react-types/buttongroup": "^3.3.23",
+    "@react-types/calendar": "^3.8.3",
+    "@react-types/card": "3.0.0-alpha.43",
+    "@react-types/checkbox": "^3.10.4",
+    "@react-types/color": "^3.1.4",
+    "@react-types/combobox": "^3.14.0",
+    "@react-types/contextualhelp": "^3.2.24",
+    "@react-types/datepicker": "^3.13.5",
+    "@react-types/dialog": "^3.5.24",
+    "@react-types/divider": "^3.3.23",
+    "@react-types/form": "^3.7.18",
+    "@react-types/grid": "^3.3.8",
+    "@react-types/illustratedmessage": "^3.3.23",
+    "@react-types/image": "^3.5.4",
+    "@react-types/label": "^3.9.17",
+    "@react-types/layout": "^3.3.29",
+    "@react-types/link": "^3.6.7",
+    "@react-types/listbox": "^3.7.6",
+    "@react-types/menu": "^3.10.7",
+    "@react-types/meter": "^3.4.15",
+    "@react-types/numberfield": "^3.8.18",
+    "@react-types/overlays": "^3.9.4",
+    "@react-types/progress": "^3.5.18",
+    "@react-types/provider": "^3.8.15",
+    "@react-types/radio": "^3.9.4",
+    "@react-types/searchfield": "^3.6.8",
+    "@react-types/select": "^3.12.2",
     "@react-types/shared": "^3.33.1",
-    "client-only": "^0.0.1"
+    "@react-types/slider": "^3.8.4",
+    "@react-types/statuslight": "^3.3.23",
+    "@react-types/switch": "^3.5.17",
+    "@react-types/table": "^3.13.6",
+    "@react-types/tabs": "^3.3.22",
+    "@react-types/text": "^3.3.23",
+    "@react-types/textfield": "^3.12.8",
+    "@react-types/tooltip": "^3.5.2",
+    "@react-types/view": "^3.4.23",
+    "@react-types/well": "^3.3.23",
+    "@spectrum-icons/ui": "^3.6.23",
+    "@spectrum-icons/workflow": "^4.2.28",
+    "@swc/helpers": "^0.5.0",
+    "client-only": "^0.0.1",
+    "clsx": "^2.0.0",
+    "react-aria": "3.47.0",
+    "react-aria-components": "^1.16.0",
+    "react-stately": "3.45.0",
+    "react-transition-group": "^4.4.5",
+    "use-sync-external-store": "^1.6.0"
   },
   "publishConfig": {
     "access": "public"
@@ -115,6 +117,34 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.12.10",
-    "@babel/core": "^7.24.3"
+    "@babel/core": "^7.24.3",
+    "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
+  },
+  "targets": {
+    "main": false,
+    "module": false,
+    "types": false,
+    "exports-module": {
+      "source": [
+        "exports/**/*.ts"
+      ],
+      "distDir": "dist",
+      "isLibrary": true,
+      "outputFormat": "esmodule",
+      "includeNodeModules": [
+        "@adobe/spectrum-css-temp"
+      ]
+    },
+    "exports-main": {
+      "source": [
+        "exports/**/*.ts"
+      ],
+      "distDir": "dist",
+      "isLibrary": true,
+      "outputFormat": "commonjs",
+      "includeNodeModules": [
+        "@adobe/spectrum-css-temp"
+      ]
+    }
   }
 }
diff --git a/packages/@react-spectrum/accordion/src/Accordion.tsx b/packages/@adobe/react-spectrum/src/accordion/Accordion.tsx
similarity index 90%
rename from packages/@react-spectrum/accordion/src/Accordion.tsx
rename to packages/@adobe/react-spectrum/src/accordion/Accordion.tsx
index e8233f1bc74..6c9d8d05b2e 100644
--- a/packages/@react-spectrum/accordion/src/Accordion.tsx
+++ b/packages/@adobe/react-spectrum/src/accordion/Accordion.tsx
@@ -11,14 +11,27 @@
  */
 
 import {AriaLabelingProps, DOMProps, DOMRef, forwardRefType, StyleProps} from '@react-types/shared';
-import {Button, DisclosureGroup, DisclosureGroupProps, DisclosurePanelProps, DisclosureProps, Heading, Disclosure as RACDisclosure, DisclosurePanel as RACDisclosurePanel} from 'react-aria-components';
+import {Button} from 'react-aria-components/Button';
+
 import ChevronLeftMedium from '@spectrum-icons/ui/ChevronLeftMedium';
+
 import ChevronRightMedium from '@spectrum-icons/ui/ChevronRightMedium';
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+import {
+  DisclosureGroup,
+  DisclosureGroupProps,
+  DisclosurePanelProps,
+  DisclosureProps,
+  Disclosure as RACDisclosure,
+  DisclosurePanel as RACDisclosurePanel
+} from 'react-aria-components/Disclosure';
+import {Heading} from 'react-aria-components/Heading';
 import React, {createContext, forwardRef} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/accordion/vars.css';
-import {useLocale} from '@react-aria/i18n';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
 
 export interface SpectrumAccordionProps extends Omit<DisclosureGroupProps, 'className' | 'style' | 'render' | 'children'>, StyleProps, DOMProps {
   /** Whether the Accordion should be displayed with a quiet style. */
diff --git a/packages/@react-spectrum/actionbar/src/ActionBar.tsx b/packages/@adobe/react-spectrum/src/actionbar/ActionBar.tsx
similarity index 85%
rename from packages/@react-spectrum/actionbar/src/ActionBar.tsx
rename to packages/@adobe/react-spectrum/src/actionbar/ActionBar.tsx
index 0cb940c29b7..afd7b405360 100644
--- a/packages/@react-spectrum/actionbar/src/ActionBar.tsx
+++ b/packages/@adobe/react-spectrum/src/actionbar/ActionBar.tsx
@@ -10,24 +10,27 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
-import {ActionGroup} from '@react-spectrum/actiongroup';
-import {announce} from '@react-aria/live-announcer';
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {ActionButton} from '../button/ActionButton';
+
+import {ActionGroup} from '../actiongroup/ActionGroup';
+import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
+import {classNames} from '../utils/classNames';
 import CrossLarge from '@spectrum-icons/ui/CrossLarge';
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
-import {FocusScope} from '@react-aria/focus';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {FocusScope} from 'react-aria/FocusScope';
+import intlMessages from '../../intl/actionbar/*.json';
+import {OpenTransition} from '../overlays/OpenTransition';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {OpenTransition} from '@react-spectrum/overlays';
 import React, {ReactElement, Ref, useEffect, useRef, useState} from 'react';
 import {SpectrumActionBarProps} from '@react-types/actionbar';
 import styles from './actionbar.css';
-import {Text} from '@react-spectrum/text';
-import {useKeyboard} from '@react-aria/interactions';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useProviderProps} from '@react-spectrum/provider';
+import {Text} from '../text/Text';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useKeyboard} from 'react-aria/useKeyboard';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * Action bars are used for single and bulk selection patterns when a user needs to perform actions on one or more items at the same time.
diff --git a/packages/@react-spectrum/actionbar/src/ActionBarContainer.tsx b/packages/@adobe/react-spectrum/src/actionbar/ActionBarContainer.tsx
similarity index 86%
rename from packages/@react-spectrum/actionbar/src/ActionBarContainer.tsx
rename to packages/@adobe/react-spectrum/src/actionbar/ActionBarContainer.tsx
index ed74c03c882..51ad78fbc38 100644
--- a/packages/@react-spectrum/actionbar/src/ActionBarContainer.tsx
+++ b/packages/@adobe/react-spectrum/src/actionbar/ActionBarContainer.tsx
@@ -10,13 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import React from 'react';
 import {SpectrumActionBarContainerProps} from '@react-types/actionbar';
 import styles from './actionbar.css';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * ActionBarContainer wraps around an ActionBar and a component that supports selection. It handles
diff --git a/packages/@react-spectrum/actionbar/src/actionbar.css b/packages/@adobe/react-spectrum/src/actionbar/actionbar.css
similarity index 100%
rename from packages/@react-spectrum/actionbar/src/actionbar.css
rename to packages/@adobe/react-spectrum/src/actionbar/actionbar.css
diff --git a/packages/@react-spectrum/actiongroup/src/ActionGroup.tsx b/packages/@adobe/react-spectrum/src/actiongroup/ActionGroup.tsx
similarity index 90%
rename from packages/@react-spectrum/actiongroup/src/ActionGroup.tsx
rename to packages/@adobe/react-spectrum/src/actiongroup/ActionGroup.tsx
index 865a651eaba..580d3a434ea 100644
--- a/packages/@react-spectrum/actiongroup/src/ActionGroup.tsx
+++ b/packages/@adobe/react-spectrum/src/actiongroup/ActionGroup.tsx
@@ -10,34 +10,41 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../button/ActionButton';
+
 import {AriaLabelingProps, DOMProps, DOMRef, Key, Node, StyleProps} from '@react-types/shared';
 import buttonStyles from '@adobe/spectrum-css-temp/components/button/vars.css';
 import ChevronDownMedium from '@spectrum-icons/ui/ChevronDownMedium';
-import {
-  classNames,
-  ClearSlots,
-  SlotProvider,
-  useDOMRef,
-  useSlotProps,
-  useStyleProps
-} from '@react-spectrum/utils';
-import {filterDOMProps, mergeProps, useId, useLayoutEffect, useResizeObserver, useValueEffect} from '@react-aria/utils';
-import {FocusScope} from '@react-aria/focus';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
-import {Item, Menu, MenuTrigger} from '@react-spectrum/menu';
-import {ListState, useListState} from '@react-stately/list';
+import {classNames} from '../utils/classNames';
+import {ClearSlots, SlotProvider, useSlotProps} from '../utils/Slots';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {FocusScope} from 'react-aria/FocusScope';
+import intlMessages from '../../intl/actiongroup/*.json';
+import {Item} from 'react-stately/Item';
+import {ListState, useListState} from 'react-stately/useListState';
+import {Menu} from '../menu/Menu';
+import {MenuTrigger} from '../menu/MenuTrigger';
+import {mergeProps} from 'react-aria/mergeProps';
 import More from '@spectrum-icons/workflow/More';
-import {PressResponder, useHover} from '@react-aria/interactions';
-import {Provider, useProviderProps} from '@react-spectrum/provider';
+// @ts-ignore
+import {PressResponder} from 'react-aria/private/interactions/PressResponder';
+import {Provider, useProviderProps} from '../provider/Provider';
 import React, {forwardRef, ReactElement, ReactNode, useCallback, useMemo, useRef, useState} from 'react';
 import {SpectrumActionGroupProps} from '@react-types/actiongroup';
 import styles from '@adobe/spectrum-css-temp/components/actiongroup/vars.css';
-import {Text} from '@react-spectrum/text';
-import {Tooltip, TooltipTrigger} from '@react-spectrum/tooltip';
-import {useActionGroup, useActionGroupItem} from '@react-aria/actiongroup';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {Text} from '../text/Text';
+import {Tooltip} from '../tooltip/Tooltip';
+import {TooltipTrigger} from '../tooltip/TooltipTrigger';
+import {useActionGroup} from 'react-aria/private/actiongroup/useActionGroup';
+import {useActionGroupItem} from 'react-aria/private/actiongroup/useActionGroupItem';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useHover} from 'react-aria/useHover';
+import {useId} from 'react-aria/useId';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
+import {useStyleProps} from '../utils/styleProps';
+import {useValueEffect} from 'react-aria/private/utils/useValueEffect';
 
 
 /**
@@ -301,7 +308,7 @@ function ActionGroupItem<T>({item, state, isDisabled, isEmphasized, staticColor,
   let button = (
     // Use a PressResponder to send DOM props through.
     // ActionButton doesn't allow overriding the role by default.
-    <PressResponder {...mergeProps(buttonProps, hoverProps, domProps)}>
+    (<PressResponder {...mergeProps(buttonProps, hoverProps, domProps)}>
       <ClearSlots>
         <SlotProvider
           slots={{
@@ -341,7 +348,7 @@ function ActionGroupItem<T>({item, state, isDisabled, isEmphasized, staticColor,
           </ActionButton>
         </SlotProvider>
       </ClearSlots>
-    </PressResponder>
+    </PressResponder>)
   );
 
   if (hideButtonText && textContent) {
@@ -430,7 +437,7 @@ function ActionGroupMenu<T>({state, isDisabled, isEmphasized, staticColor, items
 
   return (
     // Use a PressResponder to send DOM props through.
-    <MenuTrigger align={isOnlyItem ? 'start' : 'end'} direction={orientation === 'vertical' ? 'end' : 'bottom'}>
+    (<MenuTrigger align={isOnlyItem ? 'start' : 'end'} direction={orientation === 'vertical' ? 'end' : 'bottom'}>
       <SlotProvider
         slots={{
           text: {
@@ -479,7 +486,7 @@ function ActionGroupMenu<T>({state, isDisabled, isEmphasized, staticColor, items
         onAction={onAction}>
         {node => <Item textValue={node.textValue} {...filterDOMProps(node.props)}>{node.rendered}</Item>}
       </Menu>
-    </MenuTrigger>
+    </MenuTrigger>)
   );
 }
 
diff --git a/packages/@react-spectrum/autocomplete/src/MobileSearchAutocomplete.tsx b/packages/@adobe/react-spectrum/src/autocomplete/MobileSearchAutocomplete.tsx
similarity index 91%
rename from packages/@react-spectrum/autocomplete/src/MobileSearchAutocomplete.tsx
rename to packages/@adobe/react-spectrum/src/autocomplete/MobileSearchAutocomplete.tsx
index d27c1567655..c797ccfd0f8 100644
--- a/packages/@react-spectrum/autocomplete/src/MobileSearchAutocomplete.tsx
+++ b/packages/@adobe/react-spectrum/src/autocomplete/MobileSearchAutocomplete.tsx
@@ -13,20 +13,20 @@
 import AlertMedium from '@spectrum-icons/ui/AlertMedium';
 import {AriaButtonProps} from '@react-types/button';
 import CheckmarkMedium from '@spectrum-icons/ui/CheckmarkMedium';
-import {classNames, useFocusableRef} from '@react-spectrum/utils';
-import {ClearButton} from '@react-spectrum/button';
-import {ComboBoxState, useComboBoxState} from '@react-stately/combobox';
-import {DismissButton, useOverlayTrigger} from '@react-aria/overlays';
-import {Field} from '@react-spectrum/label';
+import {classNames} from '../utils/classNames';
+import {ClearButton} from '../button/ClearButton';
+import {ComboBoxState, useComboBoxState} from 'react-stately/useComboBoxState';
+import {DismissButton} from 'react-aria/Overlay';
+import {Field} from '../label/Field';
 import {FocusableRef, ValidationState} from '@react-types/shared';
-import {focusSafely, setInteractionModality, useHover} from '@react-aria/interactions';
-import {FocusScope, useFocusRing} from '@react-aria/focus';
-import {getActiveElement, mergeProps, useFormReset, useId} from '@react-aria/utils';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
-import {ListBoxBase, useListBoxLayout} from '@react-spectrum/listbox';
+import {focusSafely} from 'react-aria/private/interactions/focusSafely';
+import {FocusScope} from 'react-aria/FocusScope';
+import {getActiveElement} from 'react-aria/private/utils/shadowdom/DOMFunctions';
+import intlMessages from '../../intl/autocomplete/*.json';
+import {ListBoxBase, useListBoxLayout} from '../listbox/ListBoxBase';
 import Magnifier from '@spectrum-icons/ui/Magnifier';
-import {ProgressCircle} from '@react-spectrum/progress';
+import {mergeProps} from 'react-aria/mergeProps';
+import {ProgressCircle} from '../progress/ProgressCircle';
 import React, {
   HTMLAttributes,
   InputHTMLAttributes,
@@ -39,18 +39,27 @@ import React, {
 } from 'react';
 import searchAutocompleteStyles from './searchautocomplete.css';
 import searchStyles from '@adobe/spectrum-css-temp/components/search/vars.css';
+// @ts-ignore
+import {setInteractionModality} from 'react-aria/private/interactions/useFocusVisible';
 import {SpectrumSearchAutocompleteProps} from '@react-types/autocomplete';
 import styles from '@adobe/spectrum-css-temp/components/inputgroup/vars.css';
-import {TextFieldBase} from '@react-spectrum/textfield';
+import {TextFieldBase} from '../textfield/TextFieldBase';
 import textfieldStyles from '@adobe/spectrum-css-temp/components/textfield/vars.css';
-import {Tray} from '@react-spectrum/overlays';
-import {useButton} from '@react-aria/button';
-import {useDialog} from '@react-aria/dialog';
-import {useField} from '@react-aria/label';
-import {useFilter, useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useFormValidation} from '@react-aria/form';
-import {useProviderProps} from '@react-spectrum/provider';
-import {useSearchAutocomplete} from '@react-aria/autocomplete';
+import {Tray} from '../overlays/Tray';
+import {useButton} from 'react-aria/useButton';
+import {useDialog} from 'react-aria/useDialog';
+import {useField} from 'react-aria/useField';
+import {useFilter} from 'react-aria/useFilter';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useFormReset} from 'react-aria/private/utils/useFormReset';
+import {useFormValidation} from 'react-aria/private/form/useFormValidation';
+import {useHover} from 'react-aria/useHover';
+import {useId} from 'react-aria/useId';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useOverlayTrigger} from 'react-aria/useOverlayTrigger';
+import {useProviderProps} from '../provider/Provider';
+import {useSearchAutocomplete} from 'react-aria/private/autocomplete/useSearchAutocomplete';
 
 function ForwardMobileSearchAutocomplete<T extends object>(props: SpectrumSearchAutocompleteProps<T>, ref: FocusableRef<HTMLElement>) {
   props = useProviderProps(props);
diff --git a/packages/@react-spectrum/autocomplete/src/SearchAutocomplete.tsx b/packages/@adobe/react-spectrum/src/autocomplete/SearchAutocomplete.tsx
similarity index 90%
rename from packages/@react-spectrum/autocomplete/src/SearchAutocomplete.tsx
rename to packages/@adobe/react-spectrum/src/autocomplete/SearchAutocomplete.tsx
index 4994ed9bbd4..d28a2064bf8 100644
--- a/packages/@react-spectrum/autocomplete/src/SearchAutocomplete.tsx
+++ b/packages/@adobe/react-spectrum/src/autocomplete/SearchAutocomplete.tsx
@@ -10,19 +10,20 @@
  * governing permissions and limitations under the License.
  */
 import {AriaButtonProps} from '@react-types/button';
-import {classNames, dimensionValue, useFocusableRef, useIsMobileDevice, useResizeObserver, useUnwrapDOMRef} from '@react-spectrum/utils';
-import {ClearButton} from '@react-spectrum/button';
+import {classNames} from '../utils/classNames';
+import {ClearButton} from '../button/ClearButton';
+import {dimensionValue} from '../utils/styleProps';
 import {DOMRefValue, FocusableRef} from '@react-types/shared';
-import {Field} from '@react-spectrum/label';
-import {filterDOMProps, useLayoutEffect} from '@react-aria/utils';
-import {FocusRing} from '@react-aria/focus';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
-import {ListBoxBase, useListBoxLayout} from '@react-spectrum/listbox';
+import {Field} from '../label/Field';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {FocusRing} from 'react-aria/FocusRing';
+import intlMessages from '../../intl/autocomplete/*.json';
+import {ListBoxBase, useListBoxLayout} from '../listbox/ListBoxBase';
 import Magnifier from '@spectrum-icons/ui/Magnifier';
 import {MobileSearchAutocomplete} from './MobileSearchAutocomplete';
-import {Popover} from '@react-spectrum/overlays';
-import {ProgressCircle} from '@react-spectrum/progress';
+// @ts-ignore
+import {Popover} from '../overlays/Popover';
+import {ProgressCircle} from '../progress/ProgressCircle';
 import React, {
   forwardRef,
   InputHTMLAttributes,
@@ -37,14 +38,19 @@ import searchAutocompleteStyles from './searchautocomplete.css';
 import searchStyles from '@adobe/spectrum-css-temp/components/search/vars.css';
 import {SpectrumSearchAutocompleteProps} from '@react-types/autocomplete';
 import styles from '@adobe/spectrum-css-temp/components/inputgroup/vars.css';
-import {TextFieldBase} from '@react-spectrum/textfield';
+import {TextFieldBase} from '../textfield/TextFieldBase';
 import textfieldStyles from '@adobe/spectrum-css-temp/components/textfield/vars.css';
-import {useComboBoxState} from '@react-stately/combobox';
-import {useFilter, useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useFormProps} from '@react-spectrum/form';
-import {useHover} from '@react-aria/interactions';
-import {useProvider, useProviderProps} from '@react-spectrum/provider';
-import {useSearchAutocomplete} from '@react-aria/autocomplete';
+import {useComboBoxState} from 'react-stately/useComboBoxState';
+import {useFilter} from 'react-aria/useFilter';
+import {useFocusableRef, useUnwrapDOMRef} from '../utils/useDOMRef';
+import {useFormProps} from '../form/Form';
+import {useHover} from 'react-aria/useHover';
+import {useIsMobileDevice} from '../utils/useIsMobileDevice';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useProvider, useProviderProps} from '../provider/Provider';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
+import {useSearchAutocomplete} from 'react-aria/private/autocomplete/useSearchAutocomplete';
 
 function SearchAutocomplete<T extends object>(props: SpectrumSearchAutocompleteProps<T>, ref: FocusableRef<HTMLElement>) {
   props = useProviderProps(props);
diff --git a/packages/@react-spectrum/autocomplete/src/searchautocomplete.css b/packages/@adobe/react-spectrum/src/autocomplete/searchautocomplete.css
similarity index 100%
rename from packages/@react-spectrum/autocomplete/src/searchautocomplete.css
rename to packages/@adobe/react-spectrum/src/autocomplete/searchautocomplete.css
diff --git a/packages/@react-spectrum/avatar/src/Avatar.tsx b/packages/@adobe/react-spectrum/src/avatar/Avatar.tsx
similarity index 86%
rename from packages/@react-spectrum/avatar/src/Avatar.tsx
rename to packages/@adobe/react-spectrum/src/avatar/Avatar.tsx
index c3eee993820..2a8a69480e2 100644
--- a/packages/@react-spectrum/avatar/src/Avatar.tsx
+++ b/packages/@adobe/react-spectrum/src/avatar/Avatar.tsx
@@ -10,13 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, dimensionValue, useDOMRef, useSlotProps, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
+import {dimensionValue, useStyleProps} from '../utils/styleProps';
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import React, {forwardRef} from 'react';
 import {SpectrumAvatarProps} from '@react-types/avatar';
 import styles from '@adobe/spectrum-css-temp/components/avatar/vars.css';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useProviderProps} from '../provider/Provider';
+import {useSlotProps} from '../utils/Slots';
 
 const DEFAULT_SIZE = 'avatar-size-100';
 const SIZE_RE = /^size-\d+/;
diff --git a/packages/@react-spectrum/badge/src/Badge.tsx b/packages/@adobe/react-spectrum/src/badge/Badge.tsx
similarity index 85%
rename from packages/@react-spectrum/badge/src/Badge.tsx
rename to packages/@adobe/react-spectrum/src/badge/Badge.tsx
index d9d2c8325aa..b02f80f9a8f 100644
--- a/packages/@react-spectrum/badge/src/Badge.tsx
+++ b/packages/@adobe/react-spectrum/src/badge/Badge.tsx
@@ -10,14 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, ClearSlots, SlotProvider, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
+import {ClearSlots, SlotProvider} from '../utils/Slots';
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import React, {forwardRef} from 'react';
 import {SpectrumBadgeProps} from '@react-types/badge';
 import styles from '@adobe/spectrum-css-temp/components/badge/vars.css';
-import {Text} from '@react-spectrum/text';
-import {useProviderProps} from '@react-spectrum/provider';
+import {Text} from '../text/Text';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
 
 
 /**
diff --git a/packages/@react-spectrum/breadcrumbs/src/BreadcrumbItem.tsx b/packages/@adobe/react-spectrum/src/breadcrumbs/BreadcrumbItem.tsx
similarity index 88%
rename from packages/@react-spectrum/breadcrumbs/src/BreadcrumbItem.tsx
rename to packages/@adobe/react-spectrum/src/breadcrumbs/BreadcrumbItem.tsx
index 371895042e8..bf3dc10d911 100644
--- a/packages/@react-spectrum/breadcrumbs/src/BreadcrumbItem.tsx
+++ b/packages/@adobe/react-spectrum/src/breadcrumbs/BreadcrumbItem.tsx
@@ -12,14 +12,14 @@
 
 import {BreadcrumbItemProps} from '@react-types/breadcrumbs';
 import ChevronRightSmall from '@spectrum-icons/ui/ChevronRightSmall';
-import {classNames} from '@react-spectrum/utils';
-import {FocusRing} from '@react-aria/focus';
-import {mergeProps} from '@react-aria/utils';
+import {classNames} from '../utils/classNames';
+import {FocusRing} from 'react-aria/FocusRing';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {Fragment, JSX, useRef} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/breadcrumb/vars.css';
-import {useBreadcrumbItem} from '@react-aria/breadcrumbs';
-import {useHover} from '@react-aria/interactions';
-import {useLocale} from '@react-aria/i18n';
+import {useBreadcrumbItem} from 'react-aria/useBreadcrumbs';
+import {useHover} from 'react-aria/useHover';
+import {useLocale} from 'react-aria/I18nProvider';
 
 interface SpectrumBreadcrumbItemProps extends BreadcrumbItemProps {
   isMenu?: boolean
diff --git a/packages/@react-spectrum/breadcrumbs/src/Breadcrumbs.tsx b/packages/@adobe/react-spectrum/src/breadcrumbs/Breadcrumbs.tsx
similarity index 92%
rename from packages/@react-spectrum/breadcrumbs/src/Breadcrumbs.tsx
rename to packages/@adobe/react-spectrum/src/breadcrumbs/Breadcrumbs.tsx
index e74fafb891d..022f554b33a 100644
--- a/packages/@react-spectrum/breadcrumbs/src/Breadcrumbs.tsx
+++ b/packages/@adobe/react-spectrum/src/breadcrumbs/Breadcrumbs.tsx
@@ -9,18 +9,24 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../button/ActionButton';
+
 import {BreadcrumbItem} from './BreadcrumbItem';
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {DOMRef, Key} from '@react-types/shared';
 import FolderBreadcrumb from '@spectrum-icons/ui/FolderBreadcrumb';
-import {Menu, MenuTrigger} from '@react-spectrum/menu';
+import {Menu} from '../menu/Menu';
+import {MenuTrigger} from '../menu/MenuTrigger';
 import React, {ReactElement, useCallback, useRef} from 'react';
 import {SpectrumBreadcrumbsProps} from '@react-types/breadcrumbs';
 import styles from '@adobe/spectrum-css-temp/components/breadcrumb/vars.css';
-import {useBreadcrumbs} from '@react-aria/breadcrumbs';
-import {useLayoutEffect, useResizeObserver, useValueEffect} from '@react-aria/utils';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useBreadcrumbs} from 'react-aria/useBreadcrumbs';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useProviderProps} from '../provider/Provider';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
+import {useStyleProps} from '../utils/styleProps';
+import {useValueEffect} from 'react-aria/private/utils/useValueEffect';
 
 const MIN_VISIBLE_ITEMS = 1;
 const MAX_VISIBLE_ITEMS = 4;
diff --git a/packages/@react-spectrum/button/src/ActionButton.tsx b/packages/@adobe/react-spectrum/src/button/ActionButton.tsx
similarity index 87%
rename from packages/@react-spectrum/button/src/ActionButton.tsx
rename to packages/@adobe/react-spectrum/src/button/ActionButton.tsx
index c7969ddd5b7..84bef5f5046 100644
--- a/packages/@react-spectrum/button/src/ActionButton.tsx
+++ b/packages/@adobe/react-spectrum/src/button/ActionButton.tsx
@@ -10,18 +10,22 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, ClearSlots, SlotProvider, useFocusableRef, useSlotProps, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
+import {ClearSlots, SlotProvider, useSlotProps} from '../utils/Slots';
 import CornerTriangle from '@spectrum-icons/ui/CornerTriangle';
 import {FocusableRef} from '@react-types/shared';
-import {FocusRing} from '@react-aria/focus';
-import {mergeProps} from '@react-aria/utils';
+import {FocusRing} from 'react-aria/FocusRing';
+import {mergeProps} from 'react-aria/mergeProps';
 import React from 'react';
 import {SpectrumActionButtonProps} from '@react-types/button';
 import styles from '@adobe/spectrum-css-temp/components/button/vars.css';
-import {Text} from '@react-spectrum/text';
-import {useButton} from '@react-aria/button';
-import {useHover} from '@react-aria/interactions';
-import {useProviderProps} from '@react-spectrum/provider';
+import {Text} from '../text/Text';
+import {useButton} from 'react-aria/useButton';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useHover} from 'react-aria/useHover';
+import {useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * ActionButtons allow users to perform an action.
diff --git a/packages/@react-spectrum/button/src/Button.tsx b/packages/@adobe/react-spectrum/src/button/Button.tsx
similarity index 89%
rename from packages/@react-spectrum/button/src/Button.tsx
rename to packages/@adobe/react-spectrum/src/button/Button.tsx
index e0c196a2ea2..c26e2f49985 100644
--- a/packages/@react-spectrum/button/src/Button.tsx
+++ b/packages/@adobe/react-spectrum/src/button/Button.tsx
@@ -10,28 +10,29 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  classNames,
-  SlotProvider,
-  useFocusableRef,
-  useHasChild,
-  useSlotProps,
-  useStyleProps
-} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {FocusableRef} from '@react-types/shared';
-import {FocusRing} from '@react-aria/focus';
+import {FocusRing} from 'react-aria/FocusRing';
+import intlMessages from '../../intl/button/*.json';
+import {isAppleDevice, isFirefox} from 'react-aria/private/utils/platform';
+import {mergeProps} from 'react-aria/mergeProps';
+import {ProgressCircle} from '../progress/ProgressCircle';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {isAppleDevice, isFirefox, mergeProps, useId} from '@react-aria/utils';
-import {ProgressCircle} from '@react-spectrum/progress';
 import React, {ElementType, ReactElement, useEffect, useState} from 'react';
+import {SlotProvider, useSlotProps} from '../utils/Slots';
 import {SpectrumButtonProps} from '@react-types/button';
 import styles from '@adobe/spectrum-css-temp/components/button/vars.css';
-import {Text} from '@react-spectrum/text';
-import {useButton} from '@react-aria/button';
-import {useFocus, useHover} from '@react-aria/interactions';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useProviderProps} from '@react-spectrum/provider';
+import {Text} from '../text/Text';
+import {useButton} from 'react-aria/useButton';
+import {useFocus} from 'react-aria/useFocus';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useHasChild} from '../utils/useHasChild';
+import {useHover} from 'react-aria/useHover';
+import {useId} from 'react-aria/useId';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
 
 function disablePendingProps(props) {
   // Don't allow interaction while isPending is true
diff --git a/packages/@react-spectrum/button/src/ClearButton.tsx b/packages/@adobe/react-spectrum/src/button/ClearButton.tsx
similarity index 89%
rename from packages/@react-spectrum/button/src/ClearButton.tsx
rename to packages/@adobe/react-spectrum/src/button/ClearButton.tsx
index aed43c43639..8a4429a3f6e 100644
--- a/packages/@react-spectrum/button/src/ClearButton.tsx
+++ b/packages/@adobe/react-spectrum/src/button/ClearButton.tsx
@@ -11,15 +11,17 @@
  */
 
 import {AriaButtonElementTypeProps, ButtonProps} from '@react-types/button';
-import {classNames, useFocusableRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import CrossSmall from '@spectrum-icons/ui/CrossSmall';
 import {DOMProps, FocusableRef, StyleProps} from '@react-types/shared';
-import {FocusRing} from '@react-aria/focus';
-import {mergeProps} from '@react-aria/utils';
+import {FocusRing} from 'react-aria/FocusRing';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {ElementType} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/button/vars.css';
-import {useButton} from '@react-aria/button';
-import {useHover} from '@react-aria/interactions';
+import {useButton} from 'react-aria/useButton';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useHover} from 'react-aria/useHover';
+import {useStyleProps} from '../utils/styleProps';
 
 interface ClearButtonProps<T extends ElementType = 'button'> extends ButtonProps, AriaButtonElementTypeProps<T>, DOMProps, StyleProps {
   focusClassName?: string,
diff --git a/packages/@react-spectrum/button/src/FieldButton.tsx b/packages/@adobe/react-spectrum/src/button/FieldButton.tsx
similarity index 86%
rename from packages/@react-spectrum/button/src/FieldButton.tsx
rename to packages/@adobe/react-spectrum/src/button/FieldButton.tsx
index a6070f06ea5..fe4c3c19b04 100644
--- a/packages/@react-spectrum/button/src/FieldButton.tsx
+++ b/packages/@adobe/react-spectrum/src/button/FieldButton.tsx
@@ -11,14 +11,17 @@
  */
 
 import {ButtonProps} from '@react-types/button';
-import {classNames, SlotProvider, useFocusableRef, useSlotProps, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {DOMProps, FocusableRef, RefObject, StyleProps} from '@react-types/shared';
-import {FocusRing} from '@react-aria/focus';
-import {mergeProps} from '@react-aria/utils';
+import {FocusRing} from 'react-aria/FocusRing';
+import {mergeProps} from 'react-aria/mergeProps';
 import React from 'react';
+import {SlotProvider, useSlotProps} from '../utils/Slots';
 import styles from '@adobe/spectrum-css-temp/components/button/vars.css';
-import {useButton} from '@react-aria/button';
-import {useHover} from '@react-aria/interactions';
+import {useButton} from 'react-aria/useButton';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useHover} from 'react-aria/useHover';
+import {useStyleProps} from '../utils/styleProps';
 
 interface FieldButtonProps extends ButtonProps, DOMProps, StyleProps {
   isQuiet?: boolean,
diff --git a/packages/@react-spectrum/button/src/LogicButton.tsx b/packages/@adobe/react-spectrum/src/button/LogicButton.tsx
similarity index 83%
rename from packages/@react-spectrum/button/src/LogicButton.tsx
rename to packages/@adobe/react-spectrum/src/button/LogicButton.tsx
index ce04abf7d85..1a76be07d8e 100644
--- a/packages/@react-spectrum/button/src/LogicButton.tsx
+++ b/packages/@adobe/react-spectrum/src/button/LogicButton.tsx
@@ -10,16 +10,19 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, useFocusableRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {FocusableRef} from '@react-types/shared';
-import {FocusRing} from '@react-aria/focus';
-import {mergeProps} from '@react-aria/utils';
+import {FocusRing} from 'react-aria/FocusRing';
+import {mergeProps} from 'react-aria/mergeProps';
 import React from 'react';
 import {SpectrumLogicButtonProps} from '@react-types/button';
 import styles from '@adobe/spectrum-css-temp/components/button/vars.css';
-import {useButton} from '@react-aria/button';
-import {useHover} from '@react-aria/interactions';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useButton} from 'react-aria/useButton';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useHover} from 'react-aria/useHover';
+import {useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * A LogicButton displays an operator within a boolean logic sequence.
diff --git a/packages/@react-spectrum/button/src/ToggleButton.tsx b/packages/@adobe/react-spectrum/src/button/ToggleButton.tsx
similarity index 84%
rename from packages/@react-spectrum/button/src/ToggleButton.tsx
rename to packages/@adobe/react-spectrum/src/button/ToggleButton.tsx
index b5356661919..1d853478780 100644
--- a/packages/@react-spectrum/button/src/ToggleButton.tsx
+++ b/packages/@adobe/react-spectrum/src/button/ToggleButton.tsx
@@ -10,18 +10,22 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, SlotProvider, useFocusableRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {FocusableRef} from '@react-types/shared';
-import {FocusRing} from '@react-aria/focus';
-import {mergeProps} from '@react-aria/utils';
+import {FocusRing} from 'react-aria/FocusRing';
+import {mergeProps} from 'react-aria/mergeProps';
 import React from 'react';
+import {SlotProvider} from '../utils/Slots';
 import {SpectrumToggleButtonProps} from '@react-types/button';
 import styles from '@adobe/spectrum-css-temp/components/button/vars.css';
-import {Text} from '@react-spectrum/text';
-import {useHover} from '@react-aria/interactions';
-import {useProviderProps} from '@react-spectrum/provider';
-import {useToggleButton} from '@react-aria/button';
-import {useToggleState} from '@react-stately/toggle';
+import {Text} from '../text/Text';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useHover} from 'react-aria/useHover';
+import {useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
+import {useToggleButton} from 'react-aria/useToggleButton';
+import {useToggleState} from 'react-stately/useToggleState';
 
 /**
  * ToggleButtons allow users to toggle a selection on or off, for example
diff --git a/packages/@react-spectrum/buttongroup/src/ButtonGroup.tsx b/packages/@adobe/react-spectrum/src/buttongroup/ButtonGroup.tsx
similarity index 87%
rename from packages/@react-spectrum/buttongroup/src/ButtonGroup.tsx
rename to packages/@adobe/react-spectrum/src/buttongroup/ButtonGroup.tsx
index f01e328bb8f..4861f6447e1 100644
--- a/packages/@react-spectrum/buttongroup/src/ButtonGroup.tsx
+++ b/packages/@adobe/react-spectrum/src/buttongroup/ButtonGroup.tsx
@@ -10,20 +10,20 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  classNames,
-  SlotProvider,
-  useDOMRef,
-  useResizeObserver,
-  useSlotProps,
-  useStyleProps
-} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps, useLayoutEffect, useValueEffect} from '@react-aria/utils';
-import {Provider, useProvider, useProviderProps} from '@react-spectrum/provider';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {Provider, useProvider, useProviderProps} from '../provider/Provider';
 import React, {useCallback, useRef} from 'react';
+import {SlotProvider, useSlotProps} from '../utils/Slots';
 import {SpectrumButtonGroupProps} from '@react-types/buttongroup';
 import styles from '@adobe/spectrum-css-temp/components/buttongroup/vars.css';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
+import {useStyleProps} from '../utils/styleProps';
+import {useValueEffect} from 'react-aria/private/utils/useValueEffect';
 
 /**
  * ButtonGroup handles overflow for a grouping of buttons whose actions are related to each other.
diff --git a/packages/@react-spectrum/calendar/src/Calendar.tsx b/packages/@adobe/react-spectrum/src/calendar/Calendar.tsx
similarity index 89%
rename from packages/@react-spectrum/calendar/src/Calendar.tsx
rename to packages/@adobe/react-spectrum/src/calendar/Calendar.tsx
index a7577f795d5..ef0a816030e 100644
--- a/packages/@react-spectrum/calendar/src/Calendar.tsx
+++ b/packages/@adobe/react-spectrum/src/calendar/Calendar.tsx
@@ -12,14 +12,14 @@
 
 import {CalendarBase} from './CalendarBase';
 import {createCalendar} from '@internationalized/date';
-import {createDOMRef} from '@react-spectrum/utils';
+import {createDOMRef} from '../utils/useDOMRef';
 import {DateValue, SpectrumCalendarProps} from '@react-types/calendar';
 import {FocusableRef} from '@react-types/shared';
 import React, {ReactElement, useImperativeHandle, useMemo, useRef} from 'react';
-import {useCalendar} from '@react-aria/calendar';
-import {useCalendarState} from '@react-stately/calendar';
-import {useLocale} from '@react-aria/i18n';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useCalendar} from 'react-aria/useCalendar';
+import {useCalendarState} from 'react-stately/useCalendarState';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useProviderProps} from '../provider/Provider';
 
 /**
  * Calendars display a grid of days in one or more months and allow users to select a single date.
diff --git a/packages/@react-spectrum/calendar/src/CalendarBase.tsx b/packages/@adobe/react-spectrum/src/calendar/CalendarBase.tsx
similarity index 90%
rename from packages/@react-spectrum/calendar/src/CalendarBase.tsx
rename to packages/@adobe/react-spectrum/src/calendar/CalendarBase.tsx
index 4a7360d94d8..ef7f78a8eaa 100644
--- a/packages/@react-spectrum/calendar/src/CalendarBase.tsx
+++ b/packages/@adobe/react-spectrum/src/calendar/CalendarBase.tsx
@@ -10,23 +10,27 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../button/ActionButton';
+
 import {AriaButtonProps} from '@react-types/button';
 import {CalendarDate} from '@internationalized/date';
 import {CalendarMonth} from './CalendarMonth';
 import {CalendarPropsBase} from '@react-types/calendar';
-import {CalendarState, RangeCalendarState} from '@react-stately/calendar';
+import {CalendarState, RangeCalendarState} from 'react-stately/private/calendar/types';
 import ChevronLeft from '@spectrum-icons/ui/ChevronLeftLarge';
 import ChevronRight from '@spectrum-icons/ui/ChevronRightLarge';
-import {classNames, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {DOMProps, RefObject, StyleProps} from '@react-types/shared';
-import {HelpText} from '@react-spectrum/label';
+import {HelpText} from '../label/HelpText';
+import intlMessages from '../../intl/calendar/*.json';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
 import React, {HTMLAttributes, JSX} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/calendar/vars.css';
-import {useDateFormatter, useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
-import {VisuallyHidden} from '@react-aria/visually-hidden';
+import {useDateFormatter} from 'react-aria/useDateFormatter';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useStyleProps} from '../utils/styleProps';
+import {VisuallyHidden} from 'react-aria/VisuallyHidden';
 
 interface CalendarBaseProps<T extends CalendarState | RangeCalendarState> extends CalendarPropsBase, DOMProps, StyleProps {
   state: T,
diff --git a/packages/@react-spectrum/calendar/src/CalendarCell.tsx b/packages/@adobe/react-spectrum/src/calendar/CalendarCell.tsx
similarity index 90%
rename from packages/@react-spectrum/calendar/src/CalendarCell.tsx
rename to packages/@adobe/react-spectrum/src/calendar/CalendarCell.tsx
index c657592087e..4cea292188e 100644
--- a/packages/@react-spectrum/calendar/src/CalendarCell.tsx
+++ b/packages/@adobe/react-spectrum/src/calendar/CalendarCell.tsx
@@ -10,16 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaCalendarCellProps, useCalendarCell} from '@react-aria/calendar';
+import {AriaCalendarCellProps, useCalendarCell} from 'react-aria/useCalendar';
 import {CalendarDate, getDayOfWeek, isSameDay, isSameMonth, isToday} from '@internationalized/date';
-import {CalendarState, RangeCalendarState} from '@react-stately/calendar';
-import {classNames} from '@react-spectrum/utils';
-import {mergeProps} from '@react-aria/utils';
+import {CalendarState, RangeCalendarState} from 'react-stately/private/calendar/types';
+import {classNames} from '../utils/classNames';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {JSX, useRef} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/calendar/vars.css';
-import {useFocusRing} from '@react-aria/focus';
-import {useHover} from '@react-aria/interactions';
-import {useLocale} from '@react-aria/i18n';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useLocale} from 'react-aria/I18nProvider';
 
 interface CalendarCellProps extends AriaCalendarCellProps {
   state: CalendarState | RangeCalendarState,
diff --git a/packages/@react-spectrum/calendar/src/CalendarMonth.tsx b/packages/@adobe/react-spectrum/src/calendar/CalendarMonth.tsx
similarity index 92%
rename from packages/@react-spectrum/calendar/src/CalendarMonth.tsx
rename to packages/@adobe/react-spectrum/src/calendar/CalendarMonth.tsx
index c8e03affda5..38c14914678 100644
--- a/packages/@react-spectrum/calendar/src/CalendarMonth.tsx
+++ b/packages/@adobe/react-spectrum/src/calendar/CalendarMonth.tsx
@@ -13,12 +13,12 @@
 import {CalendarCell} from './CalendarCell';
 import {CalendarDate, endOfMonth} from '@internationalized/date';
 import {CalendarPropsBase} from '@react-types/calendar';
-import {CalendarState, RangeCalendarState} from '@react-stately/calendar';
-import {classNames} from '@react-spectrum/utils';
+import {CalendarState, RangeCalendarState} from 'react-stately/private/calendar/types';
+import {classNames} from '../utils/classNames';
 import {DOMProps, StyleProps} from '@react-types/shared';
 import React, {JSX} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/calendar/vars.css';
-import {useCalendarGrid} from '@react-aria/calendar';
+import {useCalendarGrid} from 'react-aria/useCalendar';
 
 interface CalendarMonthProps extends CalendarPropsBase, DOMProps, StyleProps {
   state: CalendarState | RangeCalendarState,
diff --git a/packages/@react-spectrum/calendar/src/RangeCalendar.tsx b/packages/@adobe/react-spectrum/src/calendar/RangeCalendar.tsx
similarity index 88%
rename from packages/@react-spectrum/calendar/src/RangeCalendar.tsx
rename to packages/@adobe/react-spectrum/src/calendar/RangeCalendar.tsx
index 9959f76813c..60898740afa 100644
--- a/packages/@react-spectrum/calendar/src/RangeCalendar.tsx
+++ b/packages/@adobe/react-spectrum/src/calendar/RangeCalendar.tsx
@@ -12,14 +12,14 @@
 
 import {CalendarBase} from './CalendarBase';
 import {createCalendar} from '@internationalized/date';
-import {createDOMRef} from '@react-spectrum/utils';
+import {createDOMRef} from '../utils/useDOMRef';
 import {DateValue, SpectrumRangeCalendarProps} from '@react-types/calendar';
 import {FocusableRef} from '@react-types/shared';
 import React, {ReactElement, useImperativeHandle, useMemo, useRef} from 'react';
-import {useLocale} from '@react-aria/i18n';
-import {useProviderProps} from '@react-spectrum/provider';
-import {useRangeCalendar} from '@react-aria/calendar';
-import {useRangeCalendarState} from '@react-stately/calendar';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useProviderProps} from '../provider/Provider';
+import {useRangeCalendar} from 'react-aria/useRangeCalendar';
+import {useRangeCalendarState} from 'react-stately/useRangeCalendarState';
 
 /**
  * RangeCalendars display a grid of days in one or more months and allow users to select a contiguous range of dates.
diff --git a/packages/@react-spectrum/card/src/BaseLayout.tsx b/packages/@adobe/react-spectrum/src/card/BaseLayout.tsx
similarity index 95%
rename from packages/@react-spectrum/card/src/BaseLayout.tsx
rename to packages/@adobe/react-spectrum/src/card/BaseLayout.tsx
index 03e85fe0135..ddf66e6629a 100644
--- a/packages/@react-spectrum/card/src/BaseLayout.tsx
+++ b/packages/@adobe/react-spectrum/src/card/BaseLayout.tsx
@@ -12,10 +12,14 @@
  */
 
 import {Direction, Key, KeyboardDelegate, Node} from '@react-types/shared';
-import {getChildNodes, getFirstItem} from '@react-stately/collections';
-import {GridCollection} from '@react-stately/grid';
-import {InvalidationContext, Layout, LayoutInfo, Rect, Size} from '@react-stately/virtualizer';
+import {getChildNodes, getFirstItem} from 'react-stately/private/collections/getChildNodes';
+import {GridCollection} from 'react-stately/private/grid/GridCollection';
+import {InvalidationContext} from 'react-stately/private/virtualizer/types';
+import {Layout} from 'react-stately/private/virtualizer/Layout';
+import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
+import {Rect} from 'react-stately/private/virtualizer/Rect';
 import {Scale} from '@react-types/provider';
+import {Size} from 'react-stately/private/virtualizer/Size';
 
 export interface BaseLayoutOptions {
   collator?: Intl.Collator,
diff --git a/packages/@react-spectrum/card/src/Card.tsx b/packages/@adobe/react-spectrum/src/card/Card.tsx
similarity index 96%
rename from packages/@react-spectrum/card/src/Card.tsx
rename to packages/@adobe/react-spectrum/src/card/Card.tsx
index bfe6b3db1ed..ef29ce85dfd 100644
--- a/packages/@react-spectrum/card/src/Card.tsx
+++ b/packages/@adobe/react-spectrum/src/card/Card.tsx
@@ -13,7 +13,7 @@
 
 import {CardBase} from './CardBase';
 import {DOMRef, DOMRefValue, ItemProps} from '@react-types/shared';
-import {PartialNode} from '@react-stately/collections';
+import {PartialNode} from 'react-stately/private/collections/types';
 import React, {forwardRef, ForwardRefExoticComponent, PropsWithoutRef, RefAttributes} from 'react';
 import {SpectrumCardProps} from '@react-types/card';
 import {useCardViewContext} from './CardViewContext';
diff --git a/packages/@react-spectrum/card/src/CardBase.tsx b/packages/@adobe/react-spectrum/src/card/CardBase.tsx
similarity index 87%
rename from packages/@react-spectrum/card/src/CardBase.tsx
rename to packages/@adobe/react-spectrum/src/card/CardBase.tsx
index bc641c5c9a3..cd8032cf324 100644
--- a/packages/@react-spectrum/card/src/CardBase.tsx
+++ b/packages/@adobe/react-spectrum/src/card/CardBase.tsx
@@ -12,16 +12,27 @@
  */
 
 import {AriaCardProps, SpectrumCardProps} from '@react-types/card';
-import {Checkbox} from '@react-spectrum/checkbox';
-import {classNames, SlotProvider, useDOMRef, useHasChild, useStyleProps} from '@react-spectrum/utils';
+import {Checkbox} from '../checkbox/Checkbox';
+import {classNames} from '../utils/classNames';
 import {DOMRef, Node} from '@react-types/shared';
-import {filterDOMProps, mergeProps, nodeContains, useLayoutEffect, useResizeObserver, useSlotId} from '@react-aria/utils';
-import {FocusRing, getFocusableTreeWalker} from '@react-aria/focus';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {FocusRing} from 'react-aria/FocusRing';
+import {getFocusableTreeWalker} from 'react-aria/private/focus/FocusScope';
+import {mergeProps} from 'react-aria/mergeProps';
+import {nodeContains} from 'react-aria/private/utils/shadowdom/DOMFunctions';
 import React, {HTMLAttributes, useCallback, useMemo, useRef, useState} from 'react';
+import {SlotProvider} from '../utils/Slots';
 import styles from '@adobe/spectrum-css-temp/components/card/vars.css';
 import {useCardViewContext} from './CardViewContext';
-import {useFocusWithin, useHover} from '@react-aria/interactions';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useFocusWithin} from 'react-aria/useFocusWithin';
+import {useHasChild} from '../utils/useHasChild';
+import {useHover} from 'react-aria/useHover';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useProviderProps} from '../provider/Provider';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
+import {useSlotId} from 'react-aria/private/utils/useId';
+import {useStyleProps} from '../utils/styleProps';
 
 interface CardBaseProps<T> extends SpectrumCardProps {
   articleProps?: HTMLAttributes<HTMLElement>,
diff --git a/packages/@react-spectrum/card/src/CardView.tsx b/packages/@adobe/react-spectrum/src/card/CardView.tsx
similarity index 86%
rename from packages/@react-spectrum/card/src/CardView.tsx
rename to packages/@adobe/react-spectrum/src/card/CardView.tsx
index e060a2e84a4..9b6e54976ad 100644
--- a/packages/@react-spectrum/card/src/CardView.tsx
+++ b/packages/@adobe/react-spectrum/src/card/CardView.tsx
@@ -13,22 +13,30 @@
 
 import {CardBase} from './CardBase';
 import {CardViewContext, useCardViewContext} from './CardViewContext';
-import {classNames, useDOMRef, useStyleProps, useUnwrapDOMRef} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {DOMRef, DOMRefValue, Node} from '@react-types/shared';
-import {GridCollection, useGridState} from '@react-stately/grid';
+import {GridCollection} from 'react-stately/private/grid/GridCollection';
+import intlMessages from '../../intl/card/*.json';
+import {mergeProps} from 'react-aria/mergeProps';
+import {ProgressCircle} from '../progress/ProgressCircle';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {mergeProps} from '@react-aria/utils';
-import {ProgressCircle} from '@react-spectrum/progress';
 import React, {ReactElement, ReactNode, useCallback, useMemo, useRef} from 'react';
-import {ReusableView} from '@react-stately/virtualizer';
+import {ReusableView} from 'react-stately/private/virtualizer/ReusableView';
 import {SpectrumCardViewProps} from '@react-types/card';
 import styles from '@adobe/spectrum-css-temp/components/card/vars.css';
-import {useCollator, useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useGrid, useGridCell, useGridRow} from '@react-aria/grid';
-import {useListState} from '@react-stately/list';
-import {useProvider} from '@react-spectrum/provider';
-import {Virtualizer, VirtualizerItem} from '@react-aria/virtualizer';
+import {useCollator} from 'react-aria/useCollator';
+import {useDOMRef, useUnwrapDOMRef} from '../utils/useDOMRef';
+import {useGrid} from 'react-aria/private/grid/useGrid';
+import {useGridCell} from 'react-aria/private/grid/useGridCell';
+import {useGridRow} from 'react-aria/private/grid/useGridRow';
+import {useGridState} from 'react-stately/private/grid/useGridState';
+import {useListState} from 'react-stately/useListState';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useProvider} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
+import {Virtualizer} from 'react-aria/private/virtualizer/Virtualizer';
+import {VirtualizerItem} from 'react-aria/private/virtualizer/VirtualizerItem';
 
 /**
  * TODO: Add description of component here.
diff --git a/packages/@react-spectrum/card/src/CardViewContext.tsx b/packages/@adobe/react-spectrum/src/card/CardViewContext.tsx
similarity index 100%
rename from packages/@react-spectrum/card/src/CardViewContext.tsx
rename to packages/@adobe/react-spectrum/src/card/CardViewContext.tsx
diff --git a/packages/@react-spectrum/card/src/GalleryLayout.tsx b/packages/@adobe/react-spectrum/src/card/GalleryLayout.tsx
similarity index 98%
rename from packages/@react-spectrum/card/src/GalleryLayout.tsx
rename to packages/@adobe/react-spectrum/src/card/GalleryLayout.tsx
index 63fffc5ea23..46d3587a2dd 100644
--- a/packages/@react-spectrum/card/src/GalleryLayout.tsx
+++ b/packages/@adobe/react-spectrum/src/card/GalleryLayout.tsx
@@ -12,7 +12,9 @@
  */
 
 import {BaseLayout, BaseLayoutOptions} from './BaseLayout';
-import {LayoutInfo, Rect, Size} from '@react-stately/virtualizer';
+import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
+import {Rect} from 'react-stately/private/virtualizer/Rect';
+import {Size} from 'react-stately/private/virtualizer/Size';
 
 export interface GalleryLayoutOptions extends BaseLayoutOptions {
   // /**
diff --git a/packages/@react-spectrum/card/src/GridLayout.tsx b/packages/@adobe/react-spectrum/src/card/GridLayout.tsx
similarity index 96%
rename from packages/@react-spectrum/card/src/GridLayout.tsx
rename to packages/@adobe/react-spectrum/src/card/GridLayout.tsx
index 69165185adc..ef590a1fb95 100644
--- a/packages/@react-spectrum/card/src/GridLayout.tsx
+++ b/packages/@adobe/react-spectrum/src/card/GridLayout.tsx
@@ -12,9 +12,11 @@
  */
 
 import {BaseLayout, BaseLayoutOptions} from './BaseLayout';
-import {getChildNodes, getFirstItem} from '@react-stately/collections';
+import {getChildNodes, getFirstItem} from 'react-stately/private/collections/getChildNodes';
 import {Key, Node, Orientation} from '@react-types/shared';
-import {LayoutInfo, Rect, Size} from '@react-stately/virtualizer';
+import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
+import {Rect} from 'react-stately/private/virtualizer/Rect';
+import {Size} from 'react-stately/private/virtualizer/Size';
 
 export interface GridLayoutOptions extends BaseLayoutOptions {
   // /**
diff --git a/packages/@react-spectrum/card/src/WaterfallLayout.tsx b/packages/@adobe/react-spectrum/src/card/WaterfallLayout.tsx
similarity index 96%
rename from packages/@react-spectrum/card/src/WaterfallLayout.tsx
rename to packages/@adobe/react-spectrum/src/card/WaterfallLayout.tsx
index 677f97a5401..a13044525e2 100644
--- a/packages/@react-spectrum/card/src/WaterfallLayout.tsx
+++ b/packages/@adobe/react-spectrum/src/card/WaterfallLayout.tsx
@@ -12,9 +12,12 @@
  */
 
 import {BaseLayout, BaseLayoutOptions} from './BaseLayout';
-import {getChildNodes, getFirstItem} from '@react-stately/collections';
-import {InvalidationContext, LayoutInfo, Rect, Size} from '@react-stately/virtualizer';
+import {getChildNodes, getFirstItem} from 'react-stately/private/collections/getChildNodes';
+import {InvalidationContext} from 'react-stately/private/virtualizer/types';
 import {Key, KeyboardDelegate} from '@react-types/shared';
+import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
+import {Rect} from 'react-stately/private/virtualizer/Rect';
+import {Size} from 'react-stately/private/virtualizer/Size';
 
 export interface WaterfallLayoutOptions extends BaseLayoutOptions {
   /**
diff --git a/packages/@react-spectrum/checkbox/src/Checkbox.tsx b/packages/@adobe/react-spectrum/src/checkbox/Checkbox.tsx
similarity index 87%
rename from packages/@react-spectrum/checkbox/src/Checkbox.tsx
rename to packages/@adobe/react-spectrum/src/checkbox/Checkbox.tsx
index 9ce0915c976..89ef056f004 100644
--- a/packages/@react-spectrum/checkbox/src/Checkbox.tsx
+++ b/packages/@adobe/react-spectrum/src/checkbox/Checkbox.tsx
@@ -10,21 +10,26 @@
  * governing permissions and limitations under the License.
  */
 
-import {CheckboxContext, useContextProps} from 'react-aria-components';
+import {CheckboxContext} from 'react-aria-components/Checkbox';
+
 import {CheckboxGroupContext} from './context';
 import CheckmarkSmall from '@spectrum-icons/ui/CheckmarkSmall';
-import {classNames, useFocusableRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import DashSmall from '@spectrum-icons/ui/DashSmall';
 import {FocusableRef} from '@react-types/shared';
-import {FocusRing} from '@react-aria/focus';
+import {FocusRing} from 'react-aria/FocusRing';
 import React, {forwardRef, useContext, useRef} from 'react';
 import {SpectrumCheckboxProps} from '@react-types/checkbox';
 import styles from '@adobe/spectrum-css-temp/components/checkbox/vars.css';
-import {useCheckbox, useCheckboxGroupItem} from '@react-aria/checkbox';
-import {useFormProps} from '@react-spectrum/form';
-import {useHover} from '@react-aria/interactions';
-import {useProviderProps} from '@react-spectrum/provider';
-import {useToggleState} from '@react-stately/toggle';
+import {useCheckbox} from 'react-aria/useCheckbox';
+import {useCheckboxGroupItem} from 'react-aria/useCheckboxGroup';
+import {useContextProps} from 'react-aria-components/utils';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useFormProps} from '../form/Form';
+import {useHover} from 'react-aria/useHover';
+import {useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
+import {useToggleState} from 'react-stately/useToggleState';
 
 /**
  * Checkboxes allow users to select multiple items from a list of individual items,
diff --git a/packages/@react-spectrum/checkbox/src/CheckboxGroup.tsx b/packages/@adobe/react-spectrum/src/checkbox/CheckboxGroup.tsx
similarity index 84%
rename from packages/@react-spectrum/checkbox/src/CheckboxGroup.tsx
rename to packages/@adobe/react-spectrum/src/checkbox/CheckboxGroup.tsx
index 721ab646fff..2a4ed28342c 100644
--- a/packages/@react-spectrum/checkbox/src/CheckboxGroup.tsx
+++ b/packages/@adobe/react-spectrum/src/checkbox/CheckboxGroup.tsx
@@ -11,16 +11,17 @@
  */
 
 import {CheckboxGroupContext} from './context';
-import {classNames, useDOMRef} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {DOMRef} from '@react-types/shared';
-import {Field} from '@react-spectrum/label';
-import {Provider, useProviderProps} from '@react-spectrum/provider';
+import {Field} from '../label/Field';
+import {Provider, useProviderProps} from '../provider/Provider';
 import React from 'react';
 import {SpectrumCheckboxGroupProps} from '@react-types/checkbox';
 import styles from '@adobe/spectrum-css-temp/components/fieldgroup/vars.css';
-import {useCheckboxGroup} from '@react-aria/checkbox';
-import {useCheckboxGroupState} from '@react-stately/checkbox';
-import {useFormProps} from '@react-spectrum/form';
+import {useCheckboxGroup} from 'react-aria/useCheckboxGroup';
+import {useCheckboxGroupState} from 'react-stately/useCheckboxGroupState';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useFormProps} from '../form/Form';
 
 /**
  * A CheckboxGroup allows users to select one or more items from a list of choices.
diff --git a/packages/@react-spectrum/checkbox/src/context.ts b/packages/@adobe/react-spectrum/src/checkbox/context.ts
similarity index 91%
rename from packages/@react-spectrum/checkbox/src/context.ts
rename to packages/@adobe/react-spectrum/src/checkbox/context.ts
index a92ecefa7ff..e894596a251 100644
--- a/packages/@react-spectrum/checkbox/src/context.ts
+++ b/packages/@adobe/react-spectrum/src/checkbox/context.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {CheckboxGroupState} from '@react-stately/checkbox';
+import {CheckboxGroupState} from 'react-stately/useCheckboxGroupState';
 import React from 'react';
 
 export const CheckboxGroupContext = React.createContext<CheckboxGroupState | null>(null);
diff --git a/packages/@react-spectrum/color/src/ColorArea.tsx b/packages/@adobe/react-spectrum/src/color/ColorArea.tsx
similarity index 84%
rename from packages/@react-spectrum/color/src/ColorArea.tsx
rename to packages/@adobe/react-spectrum/src/color/ColorArea.tsx
index fbcd2b069dd..d38864e7d9e 100644
--- a/packages/@react-spectrum/color/src/ColorArea.tsx
+++ b/packages/@adobe/react-spectrum/src/color/ColorArea.tsx
@@ -10,18 +10,22 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, dimensionValue, useFocusableRef, useStyleProps} from '@react-spectrum/utils';
-import {ColorAreaContext, useContextProps} from 'react-aria-components';
+import {classNames} from '../utils/classNames';
+
+import {ColorAreaContext} from 'react-aria-components/ColorArea';
 import {ColorThumb} from './ColorThumb';
+import {dimensionValue, useStyleProps} from '../utils/styleProps';
 import {FocusableRef} from '@react-types/shared';
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {ReactElement, useRef} from 'react';
 import {SpectrumColorAreaProps} from '@react-types/color';
 import styles from '@adobe/spectrum-css-temp/components/colorarea/vars.css';
-import {useColorArea} from '@react-aria/color';
-import {useColorAreaState} from '@react-stately/color';
-import {useFocusRing} from '@react-aria/focus';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useColorArea} from 'react-aria/useColorArea';
+import {useColorAreaState} from 'react-stately/useColorAreaState';
+import {useContextProps} from 'react-aria-components/utils';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useProviderProps} from '../provider/Provider';
 
 /**
  * ColorArea allows users to adjust two channels of an RGB, HSL or HSB color value against a two-dimensional gradient background.
diff --git a/packages/@react-spectrum/color/src/ColorEditor.tsx b/packages/@adobe/react-spectrum/src/color/ColorEditor.tsx
similarity index 88%
rename from packages/@react-spectrum/color/src/ColorEditor.tsx
rename to packages/@adobe/react-spectrum/src/color/ColorEditor.tsx
index b7ce2c39ff5..8a273530cdc 100644
--- a/packages/@react-spectrum/color/src/ColorEditor.tsx
+++ b/packages/@adobe/react-spectrum/src/color/ColorEditor.tsx
@@ -3,14 +3,15 @@ import {ColorField} from './ColorField';
 import {ColorSlider} from './ColorSlider';
 import {ColorSpace} from '@react-types/color';
 import {DOMRef} from '@react-types/shared';
-import {getColorChannels} from '@react-stately/color';
+import {getColorChannels} from 'react-stately/Color';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {Item, Picker} from '@react-spectrum/picker';
+import intlMessages from '../../intl/color/*.json';
+import {Item} from 'react-stately/Item';
+import {Picker} from '../picker/Picker';
 import React, {CSSProperties, useState} from 'react';
 import {style} from '@react-spectrum/style-macro-s1' with {type: 'macro'};
-import {useDOMRef} from '@react-spectrum/utils';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 
 export interface SpectrumColorEditorProps {
   /** Whether to hide the alpha channel color slider and color field. */
diff --git a/packages/@react-spectrum/color/src/ColorField.tsx b/packages/@adobe/react-spectrum/src/color/ColorField.tsx
similarity index 87%
rename from packages/@react-spectrum/color/src/ColorField.tsx
rename to packages/@adobe/react-spectrum/src/color/ColorField.tsx
index 9cbdfba2618..00fb95ccba1 100644
--- a/packages/@react-spectrum/color/src/ColorField.tsx
+++ b/packages/@adobe/react-spectrum/src/color/ColorField.tsx
@@ -10,18 +10,20 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {ColorChannel, SpectrumColorFieldProps} from '@react-types/color';
-import {ColorFieldContext, useContextProps} from 'react-aria-components';
+import {ColorFieldContext} from 'react-aria-components/ColorField';
 import React, {Ref, useEffect, useRef} from 'react';
 import styles from './colorfield.css';
-import {TextFieldBase} from '@react-spectrum/textfield';
+import {TextFieldBase} from '../textfield/TextFieldBase';
 import {TextFieldRef} from '@react-types/textfield';
-import {useColorChannelField, useColorField} from '@react-aria/color';
-import {useColorChannelFieldState, useColorFieldState} from '@react-stately/color';
-import {useFormProps} from '@react-spectrum/form';
-import {useLocale} from '@react-aria/i18n';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useColorChannelField, useColorField} from 'react-aria/useColorField';
+import {useColorChannelFieldState, useColorFieldState} from 'react-stately/useColorFieldState';
+import {useContextProps} from 'react-aria-components/utils';
+import {useFormProps} from '../form/Form';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useProviderProps} from '../provider/Provider';
 
 /**
  * A color field allows users to edit a hex color or individual color channel value.
diff --git a/packages/@react-spectrum/color/src/ColorPicker.tsx b/packages/@adobe/react-spectrum/src/color/ColorPicker.tsx
similarity index 90%
rename from packages/@react-spectrum/color/src/ColorPicker.tsx
rename to packages/@adobe/react-spectrum/src/color/ColorPicker.tsx
index c0be4288e97..699b7355c39 100644
--- a/packages/@react-spectrum/color/src/ColorPicker.tsx
+++ b/packages/@adobe/react-spectrum/src/color/ColorPicker.tsx
@@ -10,15 +10,19 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorPicker as AriaColorPicker, Button, Color} from 'react-aria-components';
+import {ColorPicker as AriaColorPicker} from 'react-aria-components/ColorPicker';
+
 import {AriaLabelingProps, FocusableRef, ValueBase} from '@react-types/shared';
+import {Button} from 'react-aria-components/Button';
+import {Color} from '@react-types/color';
 import {ColorSwatch} from './ColorSwatch';
-import {Content} from '@react-spectrum/view';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
+import {Content} from '../view/Content';
+import {Dialog} from '../dialog/Dialog';
+import {DialogTrigger} from '../dialog/DialogTrigger';
 import React, {ReactNode, useRef} from 'react';
 import {style} from '@react-spectrum/style-macro-s1' with {type: 'macro'};
-import {unwrapDOMRef, useFocusableRef} from '@react-spectrum/utils';
-import {useId} from '@react-aria/utils';
+import {unwrapDOMRef, useFocusableRef} from '../utils/useDOMRef';
+import {useId} from 'react-aria/useId';
 
 export interface SpectrumColorPickerProps extends ValueBase<string | Color, Color>, AriaLabelingProps {
   /** A visual label for the color picker. */
diff --git a/packages/@react-spectrum/color/src/ColorSlider.tsx b/packages/@adobe/react-spectrum/src/color/ColorSlider.tsx
similarity index 86%
rename from packages/@react-spectrum/color/src/ColorSlider.tsx
rename to packages/@adobe/react-spectrum/src/color/ColorSlider.tsx
index f42e5af782c..5899ce13092 100644
--- a/packages/@react-spectrum/color/src/ColorSlider.tsx
+++ b/packages/@adobe/react-spectrum/src/color/ColorSlider.tsx
@@ -10,19 +10,25 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, SlotProvider, useFocusableRef, useStyleProps} from '@react-spectrum/utils';
-import {ColorSliderContext, useContextProps} from 'react-aria-components';
+import {classNames} from '../utils/classNames';
+
+import {ColorSliderContext} from 'react-aria-components/ColorSlider';
 import {ColorThumb} from './ColorThumb';
 import {FocusableRef} from '@react-types/shared';
-import {Label} from '@react-spectrum/label';
+import {Label} from '../label/Label';
 import React, {useRef, useState} from 'react';
+import {SlotProvider} from '../utils/Slots';
 import {SpectrumColorSliderProps} from '@react-types/color';
 import styles from '@adobe/spectrum-css-temp/components/colorslider/vars.css';
-import {useColorSlider} from '@react-aria/color';
-import {useColorSliderState} from '@react-stately/color';
-import {useFocus, useFocusVisible} from '@react-aria/interactions';
-import {useLocale} from '@react-aria/i18n';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useColorSlider} from 'react-aria/useColorSlider';
+import {useColorSliderState} from 'react-stately/useColorSliderState';
+import {useContextProps} from 'react-aria-components/utils';
+import {useFocus} from 'react-aria/useFocus';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useFocusVisible} from 'react-aria/useFocusVisible';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * ColorSliders allow users to adjust an individual channel of a color value.
diff --git a/packages/@react-spectrum/color/src/ColorSwatch.tsx b/packages/@adobe/react-spectrum/src/color/ColorSwatch.tsx
similarity index 92%
rename from packages/@react-spectrum/color/src/ColorSwatch.tsx
rename to packages/@adobe/react-spectrum/src/color/ColorSwatch.tsx
index ff7ba8a0484..74ce9ada892 100644
--- a/packages/@react-spectrum/color/src/ColorSwatch.tsx
+++ b/packages/@adobe/react-spectrum/src/color/ColorSwatch.tsx
@@ -10,13 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaColorSwatchProps, useColorSwatch} from '@react-aria/color';
+import {AriaColorSwatchProps, useColorSwatch} from 'react-aria/useColorSwatch';
+
 import {Color} from '@react-types/color';
-import {ColorSwatchContext, useContextProps} from 'react-aria-components';
+import {ColorSwatchContext} from 'react-aria-components/ColorSwatch';
 import {DOMRef, StyleProps} from '@react-types/shared';
 import React, {createContext, forwardRef, JSX, ReactElement, useContext} from 'react';
 import {style} from '@react-spectrum/style-macro-s1' with {type: 'macro'};
-import {useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {useContextProps} from 'react-aria-components/utils';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useStyleProps} from '../utils/styleProps';
 
 export interface SpectrumColorSwatchProps extends AriaColorSwatchProps, StyleProps {
   /**
diff --git a/packages/@react-spectrum/color/src/ColorSwatchPicker.tsx b/packages/@adobe/react-spectrum/src/color/ColorSwatchPicker.tsx
similarity index 93%
rename from packages/@react-spectrum/color/src/ColorSwatchPicker.tsx
rename to packages/@adobe/react-spectrum/src/color/ColorSwatchPicker.tsx
index 320e8fb0fdc..1f36522deb6 100644
--- a/packages/@react-spectrum/color/src/ColorSwatchPicker.tsx
+++ b/packages/@adobe/react-spectrum/src/color/ColorSwatchPicker.tsx
@@ -10,13 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorSwatchPicker as AriaColorSwatchPicker, ColorSwatchPickerItem as AriaColorSwatchPickerItem} from 'react-aria-components';
+import {
+  ColorSwatchPicker as AriaColorSwatchPicker,
+  ColorSwatchPickerItem as AriaColorSwatchPickerItem
+} from 'react-aria-components/ColorSwatchPicker';
+
 import {Color} from '@react-types/color';
 import {DOMRef, StyleProps, ValueBase} from '@react-types/shared';
 import React, {forwardRef, ReactElement, ReactNode} from 'react';
 import {SpectrumColorSwatchContext, SpectrumColorSwatchProps} from './ColorSwatch';
 import {style} from '@react-spectrum/style-macro-s1' with {type: 'macro'};
-import {useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useStyleProps} from '../utils/styleProps';
 
 export interface SpectrumColorSwatchPickerProps extends ValueBase<string | Color, Color>, StyleProps {
   /** The ColorSwatches within the ColorSwatchPicker. */
diff --git a/packages/@react-spectrum/color/src/ColorThumb.tsx b/packages/@adobe/react-spectrum/src/color/ColorThumb.tsx
similarity index 95%
rename from packages/@react-spectrum/color/src/ColorThumb.tsx
rename to packages/@adobe/react-spectrum/src/color/ColorThumb.tsx
index cdc363a8552..c32a44744d9 100644
--- a/packages/@react-spectrum/color/src/ColorThumb.tsx
+++ b/packages/@adobe/react-spectrum/src/color/ColorThumb.tsx
@@ -10,15 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {Color} from '@react-types/color';
 import {DOMProps, RefObject} from '@react-types/shared';
-import {Overlay} from '@react-spectrum/overlays';
+import {Overlay} from '../overlays/Overlay';
 import React, {CSSProperties, JSX, ReactElement, useRef, useState} from 'react';
 import stylesHandle from '@adobe/spectrum-css-temp/components/colorhandle/vars.css';
 import stylesLoupe from '@adobe/spectrum-css-temp/components/colorloupe/vars.css';
-import {useId, useLayoutEffect} from '@react-aria/utils';
-import {useProvider} from '@react-spectrum/provider';
+import {useId} from 'react-aria/useId';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useProvider} from '../provider/Provider';
 
 interface ColorThumbProps extends DOMProps {
   value: Color,
diff --git a/packages/@react-spectrum/color/src/ColorWheel.tsx b/packages/@adobe/react-spectrum/src/color/ColorWheel.tsx
similarity index 84%
rename from packages/@react-spectrum/color/src/ColorWheel.tsx
rename to packages/@adobe/react-spectrum/src/color/ColorWheel.tsx
index 9c92627e5c7..61d902830ed 100644
--- a/packages/@react-spectrum/color/src/ColorWheel.tsx
+++ b/packages/@adobe/react-spectrum/src/color/ColorWheel.tsx
@@ -10,18 +10,23 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, dimensionValue, useFocusableRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {ColorThumb} from './ColorThumb';
-import {ColorWheelContext, useContextProps} from 'react-aria-components';
+import {ColorWheelContext} from 'react-aria-components/ColorWheel';
+import {dimensionValue, useStyleProps} from '../utils/styleProps';
 import {FocusableRef} from '@react-types/shared';
 import React, {useCallback, useRef, useState} from 'react';
 import {SpectrumColorWheelProps} from '@react-types/color';
 import styles from '@adobe/spectrum-css-temp/components/colorwheel/vars.css';
-import {useColorWheel} from '@react-aria/color';
-import {useColorWheelState} from '@react-stately/color';
-import {useFocusRing} from '@react-aria/focus';
-import {useLayoutEffect, useResizeObserver} from '@react-aria/utils';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useColorWheel} from 'react-aria/useColorWheel';
+import {useColorWheelState} from 'react-stately/useColorWheelState';
+import {useContextProps} from 'react-aria-components/utils';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useProviderProps} from '../provider/Provider';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
 
 const WHEEL_THICKNESS = 24;
 
diff --git a/packages/@react-spectrum/color/src/colorfield.css b/packages/@adobe/react-spectrum/src/color/colorfield.css
similarity index 100%
rename from packages/@react-spectrum/color/src/colorfield.css
rename to packages/@adobe/react-spectrum/src/color/colorfield.css
diff --git a/packages/@react-spectrum/combobox/src/ComboBox.tsx b/packages/@adobe/react-spectrum/src/combobox/ComboBox.tsx
similarity index 90%
rename from packages/@react-spectrum/combobox/src/ComboBox.tsx
rename to packages/@adobe/react-spectrum/src/combobox/ComboBox.tsx
index 70e78af304a..57687d13188 100644
--- a/packages/@react-spectrum/combobox/src/ComboBox.tsx
+++ b/packages/@adobe/react-spectrum/src/combobox/ComboBox.tsx
@@ -12,26 +12,20 @@
 
 import {AriaButtonProps} from '@react-types/button';
 import ChevronDownMedium from '@spectrum-icons/ui/ChevronDownMedium';
-import {
-  classNames,
-  dimensionValue,
-  useFocusableRef,
-  useIsMobileDevice,
-  useResizeObserver,
-  useUnwrapDOMRef
-} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import comboboxStyles from './combobox.css';
+import {dimensionValue} from '../utils/styleProps';
 import {DOMRefValue, FocusableRef, FocusableRefValue} from '@react-types/shared';
-import {Field} from '@react-spectrum/label';
-import {FieldButton} from '@react-spectrum/button';
-import {FocusRing} from '@react-aria/focus';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
-import {ListBoxBase, useListBoxLayout} from '@react-spectrum/listbox';
+import {Field} from '../label/Field';
+import {FieldButton} from '../button/FieldButton';
+import {FocusRing} from 'react-aria/FocusRing';
+import intlMessages from '../../intl/combobox/*.json';
+import {ListBoxBase, useListBoxLayout} from '../listbox/ListBoxBase';
 import {MobileComboBox} from './MobileComboBox';
-import {Popover} from '@react-spectrum/overlays';
-import {PressResponder, useHover} from '@react-aria/interactions';
-import {ProgressCircle} from '@react-spectrum/progress';
+// @ts-ignore
+import {Popover} from '../overlays/Popover';
+import {PressResponder} from 'react-aria/private/interactions/PressResponder';
+import {ProgressCircle} from '../progress/ProgressCircle';
 import React, {
   ForwardedRef,
   InputHTMLAttributes,
@@ -44,14 +38,19 @@ import React, {
 } from 'react';
 import {SpectrumComboBoxProps} from '@react-types/combobox';
 import styles from '@adobe/spectrum-css-temp/components/inputgroup/vars.css';
-import {TextFieldBase} from '@react-spectrum/textfield';
+import {TextFieldBase} from '../textfield/TextFieldBase';
 import textfieldStyles from '@adobe/spectrum-css-temp/components/textfield/vars.css';
-import {useComboBox} from '@react-aria/combobox';
-import {useComboBoxState} from '@react-stately/combobox';
-import {useFilter, useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useFormProps} from '@react-spectrum/form';
-import {useLayoutEffect} from '@react-aria/utils';
-import {useProvider, useProviderProps} from '@react-spectrum/provider';
+import {useComboBox} from 'react-aria/useComboBox';
+import {useComboBoxState} from 'react-stately/useComboBoxState';
+import {useFilter} from 'react-aria/useFilter';
+import {useFocusableRef, useUnwrapDOMRef} from '../utils/useDOMRef';
+import {useFormProps} from '../form/Form';
+import {useHover} from 'react-aria/useHover';
+import {useIsMobileDevice} from '../utils/useIsMobileDevice';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useProvider, useProviderProps} from '../provider/Provider';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
 
 /**
  * ComboBoxes combine a text entry with a picker menu, allowing users to filter longer lists to only the selections matching a query.
diff --git a/packages/@react-spectrum/combobox/src/MobileComboBox.tsx b/packages/@adobe/react-spectrum/src/combobox/MobileComboBox.tsx
similarity index 91%
rename from packages/@react-spectrum/combobox/src/MobileComboBox.tsx
rename to packages/@adobe/react-spectrum/src/combobox/MobileComboBox.tsx
index 804fe66d52a..0dd0e09ca09 100644
--- a/packages/@react-spectrum/combobox/src/MobileComboBox.tsx
+++ b/packages/@adobe/react-spectrum/src/combobox/MobileComboBox.tsx
@@ -15,35 +15,45 @@ import {AriaButtonProps} from '@react-types/button';
 import buttonStyles from '@adobe/spectrum-css-temp/components/button/vars.css';
 import CheckmarkMedium from '@spectrum-icons/ui/CheckmarkMedium';
 import ChevronDownMedium from '@spectrum-icons/ui/ChevronDownMedium';
-import {classNames, unwrapDOMRef, useFocusableRef} from '@react-spectrum/utils';
-import {ClearButton} from '@react-spectrum/button';
-import {ComboBoxState, useComboBoxState} from '@react-stately/combobox';
+import {classNames} from '../utils/classNames';
+import {ClearButton} from '../button/ClearButton';
+import {ComboBoxState, useComboBoxState} from 'react-stately/useComboBoxState';
 import comboboxStyles from './combobox.css';
-import {DismissButton, useOverlayTrigger} from '@react-aria/overlays';
-import {Field} from '@react-spectrum/label';
+import {DismissButton} from 'react-aria/Overlay';
+import {Field} from '../label/Field';
 import {FocusableRef, FocusableRefValue, ValidationState} from '@react-types/shared';
-import {FocusRing, FocusScope} from '@react-aria/focus';
-import {focusSafely, setInteractionModality, useHover} from '@react-aria/interactions';
-import {getActiveElement, mergeProps, useFormReset, useId, useObjectRef} from '@react-aria/utils';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
+import {FocusRing} from 'react-aria/FocusRing';
+import {focusSafely} from 'react-aria/private/interactions/focusSafely';
+import {FocusScope} from 'react-aria/FocusScope';
+import {getActiveElement} from 'react-aria/private/utils/shadowdom/DOMFunctions';
+import intlMessages from '../../intl/combobox/*.json';
 import labelStyles from '@adobe/spectrum-css-temp/components/fieldlabel/vars.css';
-import {ListBoxBase, useListBoxLayout} from '@react-spectrum/listbox';
-import {ProgressCircle} from '@react-spectrum/progress';
+import {ListBoxBase, useListBoxLayout} from '../listbox/ListBoxBase';
+import {mergeProps} from 'react-aria/mergeProps';
+import {ProgressCircle} from '../progress/ProgressCircle';
 import React, {ForwardedRef, HTMLAttributes, InputHTMLAttributes, ReactElement, ReactNode, useCallback, useEffect, useRef, useState} from 'react';
 import searchStyles from '@adobe/spectrum-css-temp/components/search/vars.css';
+import {setInteractionModality} from 'react-aria/private/interactions/useFocusVisible';
+// @ts-ignore
 import {SpectrumComboBoxProps} from '@react-types/combobox';
 import styles from '@adobe/spectrum-css-temp/components/inputgroup/vars.css';
-import {TextFieldBase} from '@react-spectrum/textfield';
+import {TextFieldBase} from '../textfield/TextFieldBase';
 import textfieldStyles from '@adobe/spectrum-css-temp/components/textfield/vars.css';
-import {Tray} from '@react-spectrum/overlays';
-import {useButton} from '@react-aria/button';
-import {useComboBox} from '@react-aria/combobox';
-import {useDialog} from '@react-aria/dialog';
-import {useField} from '@react-aria/label';
-import {useFilter, useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useFormValidation} from '@react-aria/form';
-import {useProviderProps} from '@react-spectrum/provider';
+import {Tray} from '../overlays/Tray';
+import {unwrapDOMRef, useFocusableRef} from '../utils/useDOMRef';
+import {useButton} from 'react-aria/useButton';
+import {useComboBox} from 'react-aria/useComboBox';
+import {useDialog} from 'react-aria/useDialog';
+import {useField} from 'react-aria/useField';
+import {useFilter} from 'react-aria/useFilter';
+import {useFormReset} from 'react-aria/private/utils/useFormReset';
+import {useFormValidation} from 'react-aria/private/form/useFormValidation';
+import {useHover} from 'react-aria/useHover';
+import {useId} from 'react-aria/useId';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useOverlayTrigger} from 'react-aria/useOverlayTrigger';
+import {useProviderProps} from '../provider/Provider';
 
 export const MobileComboBox = React.forwardRef(function MobileComboBox(props: SpectrumComboBoxProps<any>, ref: FocusableRef<HTMLElement>) {
   props = useProviderProps(props);
diff --git a/packages/@react-spectrum/combobox/src/combobox.css b/packages/@adobe/react-spectrum/src/combobox/combobox.css
similarity index 100%
rename from packages/@react-spectrum/combobox/src/combobox.css
rename to packages/@adobe/react-spectrum/src/combobox/combobox.css
diff --git a/packages/@react-spectrum/contextualhelp/src/ContextualHelp.tsx b/packages/@adobe/react-spectrum/src/contextualhelp/ContextualHelp.tsx
similarity index 82%
rename from packages/@react-spectrum/contextualhelp/src/ContextualHelp.tsx
rename to packages/@adobe/react-spectrum/src/contextualhelp/ContextualHelp.tsx
index 4d2857e0032..ced772b056f 100644
--- a/packages/@react-spectrum/contextualhelp/src/ContextualHelp.tsx
+++ b/packages/@adobe/react-spectrum/src/contextualhelp/ContextualHelp.tsx
@@ -10,19 +10,23 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
-import {classNames, ClearSlots, SlotProvider} from '@react-spectrum/utils';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
+import {ActionButton} from '../button/ActionButton';
+
+import {classNames} from '../utils/classNames';
+import {ClearSlots, SlotProvider} from '../utils/Slots';
+import {Dialog} from '../dialog/Dialog';
+import {DialogTrigger} from '../dialog/DialogTrigger';
 import {FocusableRef} from '@react-types/shared';
 import HelpOutline from '@spectrum-icons/workflow/HelpOutline';
 import helpStyles from '@adobe/spectrum-css-temp/components/contextualhelp/vars.css';
 import InfoOutline from '@spectrum-icons/workflow/InfoOutline';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {mergeProps, useLabels} from '@react-aria/utils';
+import intlMessages from '../../intl/contextualhelp/*.json';
+import {mergeProps} from 'react-aria/mergeProps';
 import React from 'react';
 import {SpectrumContextualHelpProps} from '@react-types/contextualhelp';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLabels} from 'react-aria/private/utils/useLabels';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 
 /**
  * Contextual help shows a user extra information about the state of an adjacent component, or a total view.
diff --git a/packages/@react-spectrum/datepicker/src/DateField.tsx b/packages/@adobe/react-spectrum/src/datepicker/DateField.tsx
similarity index 91%
rename from packages/@react-spectrum/datepicker/src/DateField.tsx
rename to packages/@adobe/react-spectrum/src/datepicker/DateField.tsx
index 8d281711bc1..6b580056e70 100644
--- a/packages/@react-spectrum/datepicker/src/DateField.tsx
+++ b/packages/@adobe/react-spectrum/src/datepicker/DateField.tsx
@@ -10,21 +10,21 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {createCalendar} from '@internationalized/date';
 import {DatePickerSegment} from './DatePickerSegment';
 import datepickerStyles from './styles.css';
 import {DateValue, SpectrumDateFieldProps} from '@react-types/datepicker';
-import {Field} from '@react-spectrum/label';
+import {Field} from '../label/Field';
 import {FocusableRef} from '@react-types/shared';
 import {Input} from './Input';
 import React, {ReactElement, useRef} from 'react';
-import {useDateField} from '@react-aria/datepicker';
-import {useDateFieldState} from '@react-stately/datepicker';
+import {useDateField} from 'react-aria/useDateField';
+import {useDateFieldState} from 'react-stately/useDateFieldState';
 import {useFocusManagerRef, useFormatHelpText, useFormattedDateWidth} from './utils';
-import {useFormProps} from '@react-spectrum/form';
-import {useLocale} from '@react-aria/i18n';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useFormProps} from '../form/Form';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useProviderProps} from '../provider/Provider';
 
 /**
  * DateFields allow users to enter and edit date and time values using a keyboard.
diff --git a/packages/@react-spectrum/datepicker/src/DatePicker.tsx b/packages/@adobe/react-spectrum/src/datepicker/DatePicker.tsx
similarity index 89%
rename from packages/@react-spectrum/datepicker/src/DatePicker.tsx
rename to packages/@adobe/react-spectrum/src/datepicker/DatePicker.tsx
index 711e2cd5a24..b1a928eff32 100644
--- a/packages/@react-spectrum/datepicker/src/DatePicker.tsx
+++ b/packages/@adobe/react-spectrum/src/datepicker/DatePicker.tsx
@@ -10,33 +10,36 @@
  * governing permissions and limitations under the License.
  */
 
-import {Calendar} from '@react-spectrum/calendar';
+import {Calendar} from '../calendar/Calendar';
+
 import CalendarIcon from '@spectrum-icons/workflow/Calendar';
-import {classNames} from '@react-spectrum/utils';
-import {Content} from '@react-spectrum/view';
+import {classNames} from '../utils/classNames';
+import {Content} from '../view/Content';
 import {DatePickerField} from './DatePickerField';
 import datepickerStyles from './styles.css';
 import {DateValue, SpectrumDatePickerProps} from '@react-types/datepicker';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
-import {Field} from '@react-spectrum/label';
-import {FieldButton} from '@react-spectrum/button';
+import {Dialog} from '../dialog/Dialog';
+import {DialogTrigger} from '../dialog/DialogTrigger';
+import {Field} from '../label/Field';
+import {FieldButton} from '../button/FieldButton';
 import {FocusableRef} from '@react-types/shared';
 import {Input} from './Input';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {mergeProps} from '@react-aria/utils';
+import intlMessages from '../../intl/datepicker/*.json';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {ReactElement, useRef} from 'react';
 import '@adobe/spectrum-css-temp/components/textfield/vars.css'; // HACK: must be included BEFORE inputgroup
 import styles from '@adobe/spectrum-css-temp/components/inputgroup/vars.css';
 import {TimeField} from './TimeField';
-import {useDatePicker} from '@react-aria/datepicker';
-import {useDatePickerState} from '@react-stately/datepicker';
+import {useDatePicker} from 'react-aria/useDatePicker';
+import {useDatePickerState} from 'react-stately/useDatePickerState';
 import {useFocusManagerRef, useFormatHelpText, useFormattedDateWidth, useVisibleMonths} from './utils';
-import {useFocusRing} from '@react-aria/focus';
-import {useFormProps} from '@react-spectrum/form';
-import {useHover} from '@react-aria/interactions';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useFormProps} from '../form/Form';
+import {useHover} from 'react-aria/useHover';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useProviderProps} from '../provider/Provider';
 
 /**
  * DatePickers combine a DateField and a Calendar popover to allow users to enter or select a date and time value.
diff --git a/packages/@react-spectrum/datepicker/src/DatePickerField.tsx b/packages/@adobe/react-spectrum/src/datepicker/DatePickerField.tsx
similarity index 90%
rename from packages/@react-spectrum/datepicker/src/DatePickerField.tsx
rename to packages/@adobe/react-spectrum/src/datepicker/DatePickerField.tsx
index 116567974f0..da127e3c4a6 100644
--- a/packages/@react-spectrum/datepicker/src/DatePickerField.tsx
+++ b/packages/@adobe/react-spectrum/src/datepicker/DatePickerField.tsx
@@ -10,15 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {createCalendar} from '@internationalized/date';
 import {DatePickerSegment} from './DatePickerSegment';
 import datepickerStyles from './styles.css';
 import {DateValue, SpectrumDatePickerProps} from '@react-types/datepicker';
 import React, {JSX, useRef} from 'react';
-import {useDateField} from '@react-aria/datepicker';
-import {useDateFieldState} from '@react-stately/datepicker';
-import {useLocale} from '@react-aria/i18n';
+import {useDateField} from 'react-aria/useDateField';
+import {useDateFieldState} from 'react-stately/useDateFieldState';
+import {useLocale} from 'react-aria/I18nProvider';
 
 interface DatePickerFieldProps<T extends DateValue> extends SpectrumDatePickerProps<T> {
   inputClassName?: string,
diff --git a/packages/@react-spectrum/datepicker/src/DatePickerSegment.tsx b/packages/@adobe/react-spectrum/src/datepicker/DatePickerSegment.tsx
similarity index 92%
rename from packages/@react-spectrum/datepicker/src/DatePickerSegment.tsx
rename to packages/@adobe/react-spectrum/src/datepicker/DatePickerSegment.tsx
index 05597611dc5..dc6fa2d53b6 100644
--- a/packages/@react-spectrum/datepicker/src/DatePickerSegment.tsx
+++ b/packages/@adobe/react-spectrum/src/datepicker/DatePickerSegment.tsx
@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
-import {DateFieldState, DateSegment} from '@react-stately/datepicker';
+import {classNames} from '../utils/classNames';
+import {DateFieldState, DateSegment} from 'react-stately/useDateFieldState';
 import {DatePickerBase, DateValue} from '@react-types/datepicker';
 import React, {JSX, useRef} from 'react';
 import styles from './styles.css';
-import {useDateSegment} from '@react-aria/datepicker';
+import {useDateSegment} from 'react-aria/useDateField';
 
 interface DatePickerSegmentProps extends DatePickerBase<DateValue> {
   segment: DateSegment,
diff --git a/packages/@react-spectrum/datepicker/src/DateRangePicker.tsx b/packages/@adobe/react-spectrum/src/datepicker/DateRangePicker.tsx
similarity index 90%
rename from packages/@react-spectrum/datepicker/src/DateRangePicker.tsx
rename to packages/@adobe/react-spectrum/src/datepicker/DateRangePicker.tsx
index dc1f9eec342..5324398cfb1 100644
--- a/packages/@react-spectrum/datepicker/src/DateRangePicker.tsx
+++ b/packages/@adobe/react-spectrum/src/datepicker/DateRangePicker.tsx
@@ -11,32 +11,34 @@
  */
 
 import CalendarIcon from '@spectrum-icons/workflow/Calendar';
-import {classNames} from '@react-spectrum/utils';
-import {Content} from '@react-spectrum/view';
+import {classNames} from '../utils/classNames';
+import {Content} from '../view/Content';
 import {DatePickerField} from './DatePickerField';
 import datepickerStyles from './styles.css';
 import {DateValue, SpectrumDateRangePickerProps} from '@react-types/datepicker';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
-import {Field} from '@react-spectrum/label';
-import {FieldButton} from '@react-spectrum/button';
-import {Flex} from '@react-spectrum/layout';
+import {Dialog} from '../dialog/Dialog';
+import {DialogTrigger} from '../dialog/DialogTrigger';
+import {Field} from '../label/Field';
+import {FieldButton} from '../button/FieldButton';
+import {Flex} from '../layout/Flex';
 import {FocusableRef} from '@react-types/shared';
 import {Input} from './Input';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {mergeProps} from '@react-aria/utils';
-import {RangeCalendar} from '@react-spectrum/calendar';
+import intlMessages from '../../intl/datepicker/*.json';
+import {mergeProps} from 'react-aria/mergeProps';
+import {RangeCalendar} from '../calendar/RangeCalendar';
 import React, {ReactElement, useRef} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/inputgroup/vars.css';
 import {TimeField} from './TimeField';
-import {useDateRangePicker} from '@react-aria/datepicker';
-import {useDateRangePickerState} from '@react-stately/datepicker';
+import {useDateRangePicker} from 'react-aria/useDateRangePicker';
+import {useDateRangePickerState} from 'react-stately/useDateRangePickerState';
 import {useFocusManagerRef, useFormatHelpText, useFormattedDateWidth, useVisibleMonths} from './utils';
-import {useFocusRing} from '@react-aria/focus';
-import {useFormProps} from '@react-spectrum/form';
-import {useHover} from '@react-aria/interactions';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useFormProps} from '../form/Form';
+import {useHover} from 'react-aria/useHover';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useProviderProps} from '../provider/Provider';
 
 /**
  * DateRangePickers combine two DateFields and a RangeCalendar popover to allow users
diff --git a/packages/@react-spectrum/datepicker/src/Input.tsx b/packages/@adobe/react-spectrum/src/datepicker/Input.tsx
similarity index 91%
rename from packages/@react-spectrum/datepicker/src/Input.tsx
rename to packages/@adobe/react-spectrum/src/datepicker/Input.tsx
index ba8f56eb937..c4b31a703b2 100644
--- a/packages/@react-spectrum/datepicker/src/Input.tsx
+++ b/packages/@adobe/react-spectrum/src/datepicker/Input.tsx
@@ -12,12 +12,17 @@
 
 import Alert from '@spectrum-icons/ui/AlertMedium';
 import Checkmark from '@spectrum-icons/ui/CheckmarkMedium';
-import {classNames, useValueEffect} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import datepickerStyles from './styles.css';
-import {mergeProps, mergeRefs, useEvent, useLayoutEffect, useResizeObserver} from '@react-aria/utils';
+import {mergeProps} from 'react-aria/mergeProps';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
 import React, {ReactElement, useCallback, useRef} from 'react';
 import textfieldStyles from '@adobe/spectrum-css-temp/components/textfield/vars.css';
-import {useFocusRing} from '@react-aria/focus';
+import {useEvent} from 'react-aria/private/utils/useEvent';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
+import {useValueEffect} from 'react-aria/private/utils/useValueEffect';
 
 export const Input = React.forwardRef(function Input(props: any, ref: any) {
   let inputRef = useRef<HTMLInputElement | null>(null);
diff --git a/packages/@react-spectrum/datepicker/src/TimeField.tsx b/packages/@adobe/react-spectrum/src/datepicker/TimeField.tsx
similarity index 90%
rename from packages/@react-spectrum/datepicker/src/TimeField.tsx
rename to packages/@adobe/react-spectrum/src/datepicker/TimeField.tsx
index 9f831b35194..1add6300669 100644
--- a/packages/@react-spectrum/datepicker/src/TimeField.tsx
+++ b/packages/@adobe/react-spectrum/src/datepicker/TimeField.tsx
@@ -10,20 +10,20 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {DatePickerSegment} from './DatePickerSegment';
 import datepickerStyles from './styles.css';
-import {Field} from '@react-spectrum/label';
+import {Field} from '../label/Field';
 import {FocusableRef} from '@react-types/shared';
 import {Input} from './Input';
 import React, {ReactElement, useRef} from 'react';
 import {SpectrumTimeFieldProps, TimeValue} from '@react-types/datepicker';
 import {useFocusManagerRef, useFormattedDateWidth} from './utils';
-import {useFormProps} from '@react-spectrum/form';
-import {useLocale} from '@react-aria/i18n';
-import {useProviderProps} from '@react-spectrum/provider';
-import {useTimeField} from '@react-aria/datepicker';
-import {useTimeFieldState} from '@react-stately/datepicker';
+import {useFormProps} from '../form/Form';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useProviderProps} from '../provider/Provider';
+import {useTimeField} from 'react-aria/useDateField';
+import {useTimeFieldState} from 'react-stately/useTimeFieldState';
 
 /**
  * TimeFields allow users to enter and edit time values using a keyboard.
diff --git a/packages/@react-spectrum/datepicker/src/styles.css b/packages/@adobe/react-spectrum/src/datepicker/styles.css
similarity index 100%
rename from packages/@react-spectrum/datepicker/src/styles.css
rename to packages/@adobe/react-spectrum/src/datepicker/styles.css
diff --git a/packages/@react-spectrum/datepicker/src/utils.tsx b/packages/@adobe/react-spectrum/src/datepicker/utils.tsx
similarity index 86%
rename from packages/@react-spectrum/datepicker/src/utils.tsx
rename to packages/@adobe/react-spectrum/src/datepicker/utils.tsx
index e64da65dc39..a63545995da 100644
--- a/packages/@react-spectrum/datepicker/src/utils.tsx
+++ b/packages/@adobe/react-spectrum/src/datepicker/utils.tsx
@@ -9,16 +9,19 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {createDOMRef} from '@react-spectrum/utils';
-import {createFocusManager} from '@react-aria/focus';
-import {DateFormatter, useDateFormatter, useLocale} from '@react-aria/i18n';
+import {createDOMRef} from '../utils/useDOMRef';
+
+import {createFocusManager} from 'react-aria/private/focus/FocusScope';
+import {DateFormatter} from '@internationalized/date';
 import {FocusableRef} from '@react-types/shared';
-import {FormatterOptions} from '@react-stately/datepicker';
+import {FormatterOptions} from 'react-stately/private/datepicker/utils';
 import React, {ReactNode, useImperativeHandle, useMemo, useRef, useState} from 'react';
 import {SpectrumDatePickerBase} from '@react-types/datepicker';
-import {useDisplayNames} from '@react-aria/datepicker';
-import {useLayoutEffect} from '@react-aria/utils';
-import {useProvider} from '@react-spectrum/provider';
+import {useDateFormatter} from 'react-aria/useDateFormatter';
+import {useDisplayNames} from 'react-aria/private/datepicker/useDisplayNames';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useProvider} from '../provider/Provider';
 
 export function useFormatHelpText(props: Pick<SpectrumDatePickerBase<any>, 'description' | 'showFormatHelpText'>): ReactNode {
   let formatter = useDateFormatter({dateStyle: 'short'});
diff --git a/packages/@react-spectrum/dialog/src/AlertDialog.tsx b/packages/@adobe/react-spectrum/src/dialog/AlertDialog.tsx
similarity index 86%
rename from packages/@react-spectrum/dialog/src/AlertDialog.tsx
rename to packages/@adobe/react-spectrum/src/dialog/AlertDialog.tsx
index 307657593fd..22ca2107558 100644
--- a/packages/@react-spectrum/dialog/src/AlertDialog.tsx
+++ b/packages/@adobe/react-spectrum/src/dialog/AlertDialog.tsx
@@ -11,23 +11,25 @@
  */
 
 import AlertMedium from '@spectrum-icons/ui/AlertMedium';
-import {Button} from '@react-spectrum/button';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {chain, filterDOMProps} from '@react-aria/utils';
-import {classNames, useStyleProps} from '@react-spectrum/utils';
-import {Content} from '@react-spectrum/view';
+import {Button} from '../button/Button';
+import {ButtonGroup} from '../buttongroup/ButtonGroup';
+import {chain} from 'react-aria/private/utils/chain';
+import {classNames} from '../utils/classNames';
+import {Content} from '../view/Content';
 import {Dialog} from './Dialog';
 import {DialogContext, DialogContextValue} from './context';
-import {Divider} from '@react-spectrum/divider';
+import {Divider} from '../divider/Divider';
 import {DOMRef} from '@react-types/shared';
-import {Heading} from '@react-spectrum/text';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {Heading} from '../text/Heading';
+import intlMessages from '../../intl/dialog/*.json';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
 import React, {forwardRef, useContext} from 'react';
 import {SpectrumAlertDialogProps} from '@react-types/dialog';
 import {SpectrumButtonProps} from '@react-types/button';
 import styles from '@adobe/spectrum-css-temp/components/dialog/vars.css';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * AlertDialogs are a specific type of Dialog. They display important information that users need to acknowledge.
diff --git a/packages/@react-spectrum/dialog/src/Dialog.tsx b/packages/@adobe/react-spectrum/src/dialog/Dialog.tsx
similarity index 88%
rename from packages/@react-spectrum/dialog/src/Dialog.tsx
rename to packages/@adobe/react-spectrum/src/dialog/Dialog.tsx
index 70adf576081..13a2dd31949 100644
--- a/packages/@react-spectrum/dialog/src/Dialog.tsx
+++ b/packages/@adobe/react-spectrum/src/dialog/Dialog.tsx
@@ -10,28 +10,25 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
-import {
-  classNames,
-  SlotProvider,
-  unwrapDOMRef,
-  useDOMRef,
-  useHasChild,
-  useSlotProps,
-  useStyleProps
-} from '@react-spectrum/utils';
+import {ActionButton} from '../button/ActionButton';
+
+import {classNames} from '../utils/classNames';
 import CrossLarge from '@spectrum-icons/ui/CrossLarge';
 import {DialogContext, DialogContextValue} from './context';
 import {DOMRef} from '@react-types/shared';
-import {Grid} from '@react-spectrum/layout';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
-import {mergeProps} from '@react-aria/utils';
+import {Grid} from '../layout/Grid';
+import intlMessages from '../../intl/dialog/*.json';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {useContext, useMemo, useRef} from 'react';
+import {SlotProvider, useSlotProps} from '../utils/Slots';
+// @ts-ignore
 import {SpectrumDialogProps} from '@react-types/dialog';
 import styles from '@adobe/spectrum-css-temp/components/dialog/vars.css';
-import {useDialog} from '@react-aria/dialog';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {unwrapDOMRef, useDOMRef} from '../utils/useDOMRef';
+import {useDialog} from 'react-aria/useDialog';
+import {useHasChild} from '../utils/useHasChild';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useStyleProps} from '../utils/styleProps';
 
 let sizeMap = {
   S: 'small',
diff --git a/packages/@react-spectrum/dialog/src/DialogContainer.tsx b/packages/@adobe/react-spectrum/src/dialog/DialogContainer.tsx
similarity index 95%
rename from packages/@react-spectrum/dialog/src/DialogContainer.tsx
rename to packages/@adobe/react-spectrum/src/dialog/DialogContainer.tsx
index e8baa85c408..82c648275cb 100644
--- a/packages/@react-spectrum/dialog/src/DialogContainer.tsx
+++ b/packages/@adobe/react-spectrum/src/dialog/DialogContainer.tsx
@@ -11,10 +11,10 @@
  */
 
 import {DialogContext} from './context';
-import {Modal} from '@react-spectrum/overlays';
+import {Modal} from '../overlays/Modal';
 import React, {JSX, ReactElement, useState} from 'react';
 import {SpectrumDialogContainerProps} from '@react-types/dialog';
-import {useOverlayTriggerState} from '@react-stately/overlays';
+import {useOverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 
 /**
  * A DialogContainer accepts a single Dialog as a child, and manages showing and hiding
diff --git a/packages/@react-spectrum/dialog/src/DialogTrigger.tsx b/packages/@adobe/react-spectrum/src/dialog/DialogTrigger.tsx
similarity index 93%
rename from packages/@react-spectrum/dialog/src/DialogTrigger.tsx
rename to packages/@adobe/react-spectrum/src/dialog/DialogTrigger.tsx
index 4639858b389..008a309561d 100644
--- a/packages/@react-spectrum/dialog/src/DialogTrigger.tsx
+++ b/packages/@adobe/react-spectrum/src/dialog/DialogTrigger.tsx
@@ -11,13 +11,15 @@
  */
 
 import {DialogContext} from './context';
-import {Modal, Popover, Tray} from '@react-spectrum/overlays';
-import {OverlayTriggerState, useOverlayTriggerState} from '@react-stately/overlays';
-import {PressResponder} from '@react-aria/interactions';
+import {Modal} from '../overlays/Modal';
+import {OverlayTriggerState, useOverlayTriggerState} from 'react-stately/useOverlayTriggerState';
+import {Popover} from '../overlays/Popover';
+import {PressResponder} from 'react-aria/private/interactions/PressResponder';
 import React, {Fragment, JSX, ReactElement, useEffect, useRef} from 'react';
 import {SpectrumDialogClose, SpectrumDialogProps, SpectrumDialogTriggerProps} from '@react-types/dialog';
-import {useIsMobileDevice} from '@react-spectrum/utils';
-import {useOverlayTrigger} from '@react-aria/overlays';
+import {Tray} from '../overlays/Tray';
+import {useIsMobileDevice} from '../utils/useIsMobileDevice';
+import {useOverlayTrigger} from 'react-aria/useOverlayTrigger';
 
 function DialogTrigger(props: SpectrumDialogTriggerProps) {
   let {
diff --git a/packages/@react-spectrum/dialog/src/context.ts b/packages/@adobe/react-spectrum/src/dialog/context.ts
similarity index 100%
rename from packages/@react-spectrum/dialog/src/context.ts
rename to packages/@adobe/react-spectrum/src/dialog/context.ts
diff --git a/packages/@react-spectrum/dialog/src/useDialogContainer.ts b/packages/@adobe/react-spectrum/src/dialog/useDialogContainer.ts
similarity index 100%
rename from packages/@react-spectrum/dialog/src/useDialogContainer.ts
rename to packages/@adobe/react-spectrum/src/dialog/useDialogContainer.ts
diff --git a/packages/@react-spectrum/divider/src/Divider.tsx b/packages/@adobe/react-spectrum/src/divider/Divider.tsx
similarity index 89%
rename from packages/@react-spectrum/divider/src/Divider.tsx
rename to packages/@adobe/react-spectrum/src/divider/Divider.tsx
index f86f766777d..67b4d7fb2cf 100644
--- a/packages/@react-spectrum/divider/src/Divider.tsx
+++ b/packages/@adobe/react-spectrum/src/divider/Divider.tsx
@@ -10,12 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, useDOMRef, useSlotProps, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {DOMRef} from '@react-types/shared';
 import React, {ElementType} from 'react';
 import {SpectrumDividerProps} from '@react-types/divider';
 import styles from '@adobe/spectrum-css-temp/components/rule/vars.css';
-import {useSeparator} from '@react-aria/separator';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useSeparator} from 'react-aria/useSeparator';
+import {useSlotProps} from '../utils/Slots';
+import {useStyleProps} from '../utils/styleProps';
 
 let sizeMap = {
   S: 'small',
diff --git a/packages/@react-spectrum/dnd/src/useDragAndDrop.ts b/packages/@adobe/react-spectrum/src/dnd/useDragAndDrop.ts
similarity index 92%
rename from packages/@react-spectrum/dnd/src/useDragAndDrop.ts
rename to packages/@adobe/react-spectrum/src/dnd/useDragAndDrop.ts
index fa3a30fb8ac..a401c0018b1 100644
--- a/packages/@react-spectrum/dnd/src/useDragAndDrop.ts
+++ b/packages/@adobe/react-spectrum/src/dnd/useDragAndDrop.ts
@@ -14,29 +14,39 @@ import {
   DraggableCollectionOptions,
   DraggableItemProps,
   DraggableItemResult,
-  DragPreview,
+  useDraggableCollection,
+  useDraggableItem
+} from 'react-aria/useDraggableCollection';
+
+import {DraggableCollectionProps, DragItem, DroppableCollectionProps, Key, RefObject} from '@react-types/shared';
+
+import {
+  DraggableCollectionState,
+  DraggableCollectionStateOptions,
+  useDraggableCollectionState
+} from 'react-stately/useDraggableCollectionState';
+
+import {DragPreview} from 'react-aria/DragPreview';
+import {
   DropIndicatorAria,
   DropIndicatorProps,
   DroppableCollectionOptions,
   DroppableCollectionResult,
   DroppableItemOptions,
   DroppableItemResult,
-  isVirtualDragging,
-  useDraggableCollection,
-  useDraggableItem,
   useDropIndicator,
   useDroppableCollection,
   useDroppableItem
-} from '@react-aria/dnd';
-import {DraggableCollectionProps, DragItem, DroppableCollectionProps, Key, RefObject} from '@react-types/shared';
+} from 'react-aria/useDroppableCollection';
+
 import {
-  DraggableCollectionState,
-  DraggableCollectionStateOptions,
   DroppableCollectionState,
   DroppableCollectionStateOptions,
-  useDraggableCollectionState,
   useDroppableCollectionState
-} from '@react-stately/dnd';
+} from 'react-stately/useDroppableCollectionState';
+
+import {isVirtualDragging} from 'react-aria/private/dnd/DragManager';
+
 import {JSX, useMemo} from 'react';
 
 interface DraggableCollectionStateOpts<T> extends Omit<DraggableCollectionStateOptions<T>, 'getItems'> {}
diff --git a/packages/@react-spectrum/dropzone/src/DropZone.tsx b/packages/@adobe/react-spectrum/src/dropzone/DropZone.tsx
similarity index 84%
rename from packages/@react-spectrum/dropzone/src/DropZone.tsx
rename to packages/@adobe/react-spectrum/src/dropzone/DropZone.tsx
index cdfb860dc6b..6e809b4104c 100644
--- a/packages/@react-spectrum/dropzone/src/DropZone.tsx
+++ b/packages/@adobe/react-spectrum/src/dropzone/DropZone.tsx
@@ -11,14 +11,20 @@
  */
 
 import {AriaLabelingProps, DOMProps, DOMRef, StyleProps} from '@react-types/shared';
-import {classNames, SlotProvider, useDOMRef, useStyleProps} from '@react-spectrum/utils';
-import {DropZoneProps, HeadingContext, Provider, DropZone as RACDropZone} from 'react-aria-components';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
-import {mergeProps, useId} from '@react-aria/utils';
+import {classNames} from '../utils/classNames';
+import {DropZoneProps, DropZone as RACDropZone} from 'react-aria-components/DropZone';
+import {HeadingContext} from 'react-aria-components/Heading';
+import intlMessages from '../../intl/dropzone/*.json';
+import {mergeProps} from 'react-aria/mergeProps';
+import {Provider} from 'react-aria-components/utils';
 import React, {ReactNode} from 'react';
+// @ts-ignore
+import {SlotProvider} from '../utils/Slots';
 import styles from '@adobe/spectrum-css-temp/components/dropzone/vars.css';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useId} from 'react-aria/useId';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useStyleProps} from '../utils/styleProps';
 
 export interface SpectrumDropZoneProps extends Omit<DropZoneProps, 'onHoverStart' | 'onHoverChange' | 'onHoverEnd' | 'isDisabled' | 'className' | 'style' | 'render'>, DOMProps, StyleProps, AriaLabelingProps {
   /** The content to display in the drop zone. */
diff --git a/packages/@react-spectrum/form/src/Form.tsx b/packages/@adobe/react-spectrum/src/form/Form.tsx
similarity index 89%
rename from packages/@react-spectrum/form/src/Form.tsx
rename to packages/@adobe/react-spectrum/src/form/Form.tsx
index b15d9012d5f..c4d8f7bbee8 100644
--- a/packages/@react-spectrum/form/src/Form.tsx
+++ b/packages/@adobe/react-spectrum/src/form/Form.tsx
@@ -11,13 +11,15 @@
  */
 
 import {Alignment, DOMRef, LabelPosition, SpectrumLabelableProps} from '@react-types/shared';
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
-import {filterDOMProps} from '@react-aria/utils';
-import {FormValidationContext} from '@react-stately/form';
-import {Provider, useProviderProps} from '@react-spectrum/provider';
+import {classNames} from '../utils/classNames';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {FormValidationContext} from 'react-stately/private/form/useFormValidationState';
+import {Provider, useProviderProps} from '../provider/Provider';
 import React, {useContext} from 'react';
 import {SpectrumFormProps} from '@react-types/form';
 import styles from '@adobe/spectrum-css-temp/components/fieldlabel/vars.css';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useStyleProps} from '../utils/styleProps';
 
 interface FormContextValue extends SpectrumLabelableProps {
   validationBehavior?: 'aria' | 'native'
diff --git a/packages/@react-spectrum/icon/src/Icon.tsx b/packages/@adobe/react-spectrum/src/icon/Icon.tsx
similarity index 89%
rename from packages/@react-spectrum/icon/src/Icon.tsx
rename to packages/@adobe/react-spectrum/src/icon/Icon.tsx
index 66f0764505b..9bedf8a8fdf 100644
--- a/packages/@react-spectrum/icon/src/Icon.tsx
+++ b/packages/@adobe/react-spectrum/src/icon/Icon.tsx
@@ -11,11 +11,14 @@
  */
 
 import {AriaLabelingProps, DOMProps, IconColorValue, StyleProps} from '@react-types/shared';
-import {baseStyleProps, classNames, StyleHandlers, useSlotProps, useStyleProps} from '@react-spectrum/utils';
-import {filterDOMProps} from '@react-aria/utils';
-import {ProviderContext, useProvider} from '@react-spectrum/provider';
+import {baseStyleProps, StyleHandlers, useStyleProps} from '../utils/styleProps';
+import {classNames} from '../utils/classNames';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {ProviderContext} from '@react-types/provider';
 import React, {JSX, ReactElement} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/icon/vars.css';
+import {useProvider} from '../provider/Provider';
+import {useSlotProps} from '../utils/Slots';
 
 export interface IconProps extends DOMProps, AriaLabelingProps, StyleProps {
   /**
diff --git a/packages/@react-spectrum/icon/src/Illustration.tsx b/packages/@adobe/react-spectrum/src/icon/Illustration.tsx
similarity index 92%
rename from packages/@react-spectrum/icon/src/Illustration.tsx
rename to packages/@adobe/react-spectrum/src/icon/Illustration.tsx
index 7116c2bd382..1a4f27f3f71 100644
--- a/packages/@react-spectrum/icon/src/Illustration.tsx
+++ b/packages/@adobe/react-spectrum/src/icon/Illustration.tsx
@@ -11,9 +11,10 @@
  */
 
 import {AriaLabelingProps, DOMProps, StyleProps} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import React, {JSX, ReactElement} from 'react';
-import {useSlotProps, useStyleProps} from '@react-spectrum/utils';
+import {useSlotProps} from '../utils/Slots';
+import {useStyleProps} from '../utils/styleProps';
 
 export interface IllustrationProps extends DOMProps, AriaLabelingProps, StyleProps {
   /**
diff --git a/packages/@react-spectrum/icon/src/UIIcon.tsx b/packages/@adobe/react-spectrum/src/icon/UIIcon.tsx
similarity index 87%
rename from packages/@react-spectrum/icon/src/UIIcon.tsx
rename to packages/@adobe/react-spectrum/src/icon/UIIcon.tsx
index 96465175036..b09b7d90154 100644
--- a/packages/@react-spectrum/icon/src/UIIcon.tsx
+++ b/packages/@adobe/react-spectrum/src/icon/UIIcon.tsx
@@ -11,11 +11,14 @@
  */
 
 import {AriaLabelingProps, DOMProps, StyleProps} from '@react-types/shared';
-import {classNames, useSlotProps, useStyleProps} from '@react-spectrum/utils';
-import {filterDOMProps} from '@react-aria/utils';
-import {ProviderContext, useProvider} from '@react-spectrum/provider';
+import {classNames} from '../utils/classNames';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {ProviderContext} from '@react-types/provider';
 import React, {JSX, ReactElement} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/icon/vars.css';
+import {useProvider} from '../provider/Provider';
+import {useSlotProps} from '../utils/Slots';
+import {useStyleProps} from '../utils/styleProps';
 
 export interface UIIconProps extends DOMProps, AriaLabelingProps, StyleProps {
   children: ReactElement<any>,
diff --git a/packages/@react-spectrum/illustratedmessage/src/IllustratedMessage.tsx b/packages/@adobe/react-spectrum/src/illustratedmessage/IllustratedMessage.tsx
similarity index 87%
rename from packages/@react-spectrum/illustratedmessage/src/IllustratedMessage.tsx
rename to packages/@adobe/react-spectrum/src/illustratedmessage/IllustratedMessage.tsx
index 038545fc671..a26f857e4ae 100644
--- a/packages/@react-spectrum/illustratedmessage/src/IllustratedMessage.tsx
+++ b/packages/@adobe/react-spectrum/src/illustratedmessage/IllustratedMessage.tsx
@@ -10,13 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, ClearSlots, SlotProvider, useSlotProps, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
+import {ClearSlots, SlotProvider, useSlotProps} from '../utils/Slots';
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
-import {Flex} from '@react-spectrum/layout';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {Flex} from '../layout/Flex';
 import React, {forwardRef} from 'react';
 import {SpectrumIllustratedMessageProps} from '@react-types/illustratedmessage';
 import styles from '@adobe/spectrum-css-temp/components/illustratedmessage/vars.css';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * An IllustratedMessage displays an illustration and a message, usually
diff --git a/packages/@react-spectrum/image/src/Image.tsx b/packages/@adobe/react-spectrum/src/image/Image.tsx
similarity index 87%
rename from packages/@react-spectrum/image/src/Image.tsx
rename to packages/@adobe/react-spectrum/src/image/Image.tsx
index 5ac5edba02b..307e91851da 100644
--- a/packages/@react-spectrum/image/src/Image.tsx
+++ b/packages/@adobe/react-spectrum/src/image/Image.tsx
@@ -10,13 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, useDOMRef, useSlotProps, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import React from 'react';
 import {SpectrumImageProps} from '@react-types/image';
 import styles from '@adobe/spectrum-css-temp/components/image/vars.css';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useProviderProps} from '../provider/Provider';
+import {useSlotProps} from '../utils/Slots';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * Image is used to insert and display an image within a component.
diff --git a/packages/@adobe/react-spectrum/src/index.ts b/packages/@adobe/react-spectrum/src/index.ts
deleted file mode 100644
index c9085766e5d..00000000000
--- a/packages/@adobe/react-spectrum/src/index.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-// Mark as a client only package. This will cause a build time error if you try
-// to import it from a React Server Component in a framework like Next.js.
-import 'client-only';
-
-export {ActionGroup} from '@react-spectrum/actiongroup';
-export {Badge} from '@react-spectrum/badge';
-export {Breadcrumbs} from '@react-spectrum/breadcrumbs';
-export {Accordion, Disclosure, DisclosurePanel, DisclosureTitle} from '@react-spectrum/accordion';
-export {ActionBar, ActionBarContainer} from '@react-spectrum/actionbar';
-export {ActionButton, Button, LogicButton, ToggleButton} from '@react-spectrum/button';
-export {Avatar} from '@react-spectrum/avatar';
-export {ButtonGroup} from '@react-spectrum/buttongroup';
-export {Calendar, RangeCalendar} from '@react-spectrum/calendar';
-export {Checkbox, CheckboxGroup} from '@react-spectrum/checkbox';
-export {ColorArea, ColorEditor, ColorField, ColorPicker, ColorSlider, ColorSwatch, ColorSwatchPicker, ColorWheel, parseColor, getColorChannels} from '@react-spectrum/color';
-export {ComboBox} from '@react-spectrum/combobox';
-export {ContextualHelp} from '@react-spectrum/contextualhelp';
-export {AlertDialog, Dialog, DialogTrigger, DialogContainer, useDialogContainer} from '@react-spectrum/dialog';
-export {DateField, DatePicker, DateRangePicker, TimeField} from '@react-spectrum/datepicker';
-export {Divider} from '@react-spectrum/divider';
-export {DropZone} from '@react-spectrum/dropzone';
-export {FileTrigger} from '@react-spectrum/filetrigger';
-export {Form} from '@react-spectrum/form';
-export {Icon} from '@react-spectrum/icon';
-export {IllustratedMessage} from '@react-spectrum/illustratedmessage';
-export {InlineAlert} from '@react-spectrum/inlinealert';
-export {Image} from '@react-spectrum/image';
-export {Flex, Grid, fitContent, minmax, repeat} from '@react-spectrum/layout';
-export {LabeledValue} from '@react-spectrum/labeledvalue';
-export {Link} from '@react-spectrum/link';
-export {ListBox} from '@react-spectrum/listbox';
-export {ListView} from '@react-spectrum/list';
-export {ActionMenu, ContextualHelpTrigger, Menu, MenuTrigger, SubmenuTrigger} from '@react-spectrum/menu';
-export {Meter} from '@react-spectrum/meter';
-export {NumberField} from '@react-spectrum/numberfield';
-export {Picker} from '@react-spectrum/picker';
-export {ProgressBar, ProgressCircle} from '@react-spectrum/progress';
-export {Provider, useProvider} from '@react-spectrum/provider';
-export {Radio, RadioGroup} from '@react-spectrum/radio';
-export {RangeSlider, Slider} from '@react-spectrum/slider';
-export {SearchField} from '@react-spectrum/searchfield';
-export {StatusLight} from '@react-spectrum/statuslight';
-export {Switch} from '@react-spectrum/switch';
-export {Heading, Keyboard, Text} from '@react-spectrum/text';
-export {TableView, TableHeader, TableBody, Column, Row, Cell} from '@react-spectrum/table';
-export {Tabs, TabList, TabPanels} from '@react-spectrum/tabs';
-export {TagGroup} from '@react-spectrum/tag';
-export {TextArea, TextField} from '@react-spectrum/textfield';
-export {theme as darkTheme} from '@react-spectrum/theme-dark';
-export {theme as defaultTheme} from '@react-spectrum/theme-default';
-export {theme as lightTheme} from '@react-spectrum/theme-light';
-export {ToastContainer, ToastQueue} from '@react-spectrum/toast';
-export {Tooltip, TooltipTrigger} from '@react-spectrum/tooltip';
-export {TreeView, TreeViewItem, TreeViewItemContent} from '@react-spectrum/tree';
-export {Content, Footer, Header, View} from '@react-spectrum/view';
-export {Well} from '@react-spectrum/well';
-export {Item, Section} from '@react-stately/collections';
-export {useAsyncList, useListData, useTreeData} from '@react-stately/data';
-export {VisuallyHidden} from '@react-aria/visually-hidden';
-export {useCollator, useDateFormatter, useFilter, useLocale, useLocalizedStringFormatter, useMessageFormatter, useNumberFormatter} from '@react-aria/i18n';
-export {SSRProvider} from '@react-aria/ssr';
-export {useDragAndDrop, DIRECTORY_DRAG_TYPE} from '@react-spectrum/dnd';
-export {Collection} from '@react-aria/collections';
-
-export type {SpectrumActionBarContainerProps, SpectrumActionBarProps} from '@react-spectrum/actionbar';
-export type {SpectrumActionGroupProps} from '@react-spectrum/actiongroup';
-export type {SpectrumAvatarProps} from '@react-spectrum/avatar';
-export type {SpectrumBadgeProps} from '@react-spectrum/badge';
-export type {SpectrumBreadcrumbsProps} from '@react-spectrum/breadcrumbs';
-export type {SpectrumActionButtonProps, SpectrumButtonProps, SpectrumLogicButtonProps, SpectrumToggleButtonProps} from '@react-spectrum/button';
-export type {SpectrumButtonGroupProps} from '@react-spectrum/buttongroup';
-export type {SpectrumCalendarProps, SpectrumRangeCalendarProps} from '@react-spectrum/calendar';
-export type {SpectrumCheckboxGroupProps, SpectrumCheckboxProps} from '@react-spectrum/checkbox';
-export type {Color, ColorFormat, ColorSpace, SpectrumColorAreaProps, SpectrumColorEditorProps, SpectrumColorFieldProps, SpectrumColorPickerProps, SpectrumColorSliderProps, SpectrumColorSwatchPickerProps, SpectrumColorSwatchProps, SpectrumColorWheelProps} from '@react-spectrum/color';
-export type {SpectrumComboBoxProps} from '@react-spectrum/combobox';
-export type {SpectrumContextualHelpProps} from '@react-spectrum/contextualhelp';
-export type {DialogContainerValue, SpectrumAlertDialogProps, SpectrumDialogContainerProps, SpectrumDialogProps, SpectrumDialogTriggerProps} from '@react-spectrum/dialog';
-export type {SpectrumDateFieldProps, SpectrumDatePickerProps, SpectrumDateRangePickerProps, SpectrumTimeFieldProps} from '@react-spectrum/datepicker';
-export type {SpectrumDividerProps} from '@react-spectrum/divider';
-export type {SpectrumDropZoneProps} from '@react-spectrum/dropzone';
-export type {FileTriggerProps} from '@react-spectrum/filetrigger';
-export type {SpectrumFormProps} from '@react-spectrum/form';
-export type {IconProps, IllustrationProps} from '@react-spectrum/icon';
-export type {SpectrumIllustratedMessageProps} from '@react-spectrum/illustratedmessage';
-export type {SpectrumImageProps} from '@react-spectrum/image';
-export type {SpectrumInlineAlertProps} from '@react-spectrum/inlinealert';
-export type {DimensionValue, FlexProps, GridProps} from '@react-spectrum/layout';
-export type {SpectrumLabeledValueProps} from '@react-spectrum/labeledvalue';
-export type {SpectrumLinkProps} from '@react-spectrum/link';
-export type {SpectrumListBoxProps} from '@react-spectrum/listbox';
-export type {SpectrumListViewProps} from '@react-spectrum/list';
-export type {SpectrumActionMenuProps, SpectrumMenuProps, SpectrumMenuTriggerProps, SpectrumMenuDialogTriggerProps, SpectrumSubmenuTriggerProps} from '@react-spectrum/menu';
-export type {SpectrumMeterProps} from '@react-spectrum/meter';
-export type {SpectrumNumberFieldProps} from '@react-spectrum/numberfield';
-export type {SpectrumPickerProps} from '@react-spectrum/picker';
-export type {SpectrumProgressBarProps, SpectrumProgressCircleProps} from '@react-spectrum/progress';
-export type {ProviderContext, ProviderProps} from '@react-spectrum/provider';
-export type {SpectrumRadioGroupProps, SpectrumRadioProps} from '@react-spectrum/radio';
-export type {SpectrumRangeSliderProps, SpectrumSliderProps} from '@react-spectrum/slider';
-export type {SpectrumSearchFieldProps} from '@react-spectrum/searchfield';
-export type {SpectrumStatusLightProps} from '@react-spectrum/statuslight';
-export type {SpectrumSwitchProps} from '@react-spectrum/switch';
-export type {HeadingProps, KeyboardProps, TextProps} from '@react-spectrum/text';
-export type {SpectrumTableProps, SpectrumColumnProps, TableHeaderProps, TableBodyProps, RowProps, CellProps} from '@react-spectrum/table';
-export type {SpectrumTabListProps, SpectrumTabPanelsProps, SpectrumTabsProps} from '@react-spectrum/tabs';
-export type {SpectrumTagGroupProps} from '@react-spectrum/tag';
-export type {SpectrumTextFieldProps, SpectrumTextAreaProps} from '@react-spectrum/textfield';
-export type {SpectrumToastContainerProps, SpectrumToastOptions} from '@react-spectrum/toast';
-export type {SpectrumTooltipProps, SpectrumTooltipTriggerProps} from '@react-spectrum/tooltip';
-export type {SpectrumTreeViewProps, SpectrumTreeViewItemProps, SpectrumTreeViewItemContentProps} from '@react-spectrum/tree';
-export type {ContentProps, FooterProps, HeaderProps, ViewProps} from '@react-spectrum/view';
-export type {SpectrumWellProps} from '@react-spectrum/well';
-export type {AsyncListData, AsyncListOptions, ListData, ListOptions, TreeData, TreeOptions} from '@react-stately/data';
-export type {VisuallyHiddenAria, VisuallyHiddenProps} from '@react-aria/visually-hidden';
-export type {DateFormatter, DateFormatterOptions, Filter, FormatMessage, Locale, LocalizedStrings} from '@react-aria/i18n';
-export type {SSRProviderProps} from '@react-aria/ssr';
-export type {DirectoryDropItem, DragAndDropHooks, DragAndDropOptions, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-spectrum/dnd';
-export type {Key, Selection, ItemProps, SectionProps, RouterConfig} from '@react-types/shared';
-export type {SpectrumAccordionProps, SpectrumDisclosureProps, SpectrumDisclosurePanelProps, SpectrumDisclosureTitleProps} from '@react-spectrum/accordion';
diff --git a/packages/@react-spectrum/inlinealert/src/InlineAlert.tsx b/packages/@adobe/react-spectrum/src/inlinealert/InlineAlert.tsx
similarity index 86%
rename from packages/@react-spectrum/inlinealert/src/InlineAlert.tsx
rename to packages/@adobe/react-spectrum/src/inlinealert/InlineAlert.tsx
index 396647e2cfc..3e1ce1d784a 100644
--- a/packages/@react-spectrum/inlinealert/src/InlineAlert.tsx
+++ b/packages/@adobe/react-spectrum/src/inlinealert/InlineAlert.tsx
@@ -11,19 +11,22 @@
  */
 
 import AlertMedium from '@spectrum-icons/ui/AlertMedium';
-import {classNames, SlotProvider, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {DOMProps, DOMRef, StyleProps} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
-import {FocusRing} from '@react-aria/focus';
-import {Grid} from '@react-spectrum/layout';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {FocusRing} from 'react-aria/FocusRing';
+import {Grid} from '../layout/Grid';
 import InfoMedium from '@spectrum-icons/ui/InfoMedium';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/inlinealert/*.json';
 import React, {ReactNode, useEffect, useRef} from 'react';
+import {SlotProvider} from '../utils/Slots';
+// @ts-ignore
 import styles from '@adobe/spectrum-css-temp/components/inlinealert/vars.css';
 import SuccessMedium from '@spectrum-icons/ui/SuccessMedium';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
 
 export interface SpectrumInlineAlertProps extends DOMProps, StyleProps {
   /**
diff --git a/packages/@react-spectrum/label/src/Field.tsx b/packages/@adobe/react-spectrum/src/label/Field.tsx
similarity index 94%
rename from packages/@react-spectrum/label/src/Field.tsx
rename to packages/@adobe/react-spectrum/src/label/Field.tsx
index 45feae08714..a64947a0a8f 100644
--- a/packages/@react-spectrum/label/src/Field.tsx
+++ b/packages/@adobe/react-spectrum/src/label/Field.tsx
@@ -10,16 +10,20 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, SlotProvider, useStyleProps} from '@react-spectrum/utils';
-import {Flex} from '@react-spectrum/layout';
+import {classNames} from '../utils/classNames';
+
+import {Flex} from '../layout/Flex';
 import {HelpText} from './HelpText';
 import {Label} from './Label';
 import {LabelPosition, RefObject} from '@react-types/shared';
 import labelStyles from '@adobe/spectrum-css-temp/components/fieldlabel/vars.css';
-import {mergeProps, useId} from '@react-aria/utils';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {ReactNode, Ref} from 'react';
+import {SlotProvider} from '../utils/Slots';
 import {SpectrumFieldProps} from '@react-types/label';
-import {useFormProps} from '@react-spectrum/form';
+import {useFormProps} from '../form/Form';
+import {useId} from 'react-aria/useId';
+import {useStyleProps} from '../utils/styleProps';
 
 export const Field = React.forwardRef(function Field(props: SpectrumFieldProps, ref: Ref<HTMLElement>) {
   let formProps = useFormProps(props);
diff --git a/packages/@react-spectrum/label/src/HelpText.tsx b/packages/@adobe/react-spectrum/src/label/HelpText.tsx
similarity index 94%
rename from packages/@react-spectrum/label/src/HelpText.tsx
rename to packages/@adobe/react-spectrum/src/label/HelpText.tsx
index 85f08bc9be6..0737172821c 100644
--- a/packages/@react-spectrum/label/src/HelpText.tsx
+++ b/packages/@adobe/react-spectrum/src/label/HelpText.tsx
@@ -11,10 +11,12 @@
  */
 
 import AlertMedium from '@spectrum-icons/ui/AlertMedium';
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {DOMRef, SpectrumFieldValidation, SpectrumHelpTextProps, StyleProps, Validation} from '@react-types/shared';
 import React, {HTMLAttributes, ReactNode} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/helptext/vars.css';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useStyleProps} from '../utils/styleProps';
 
 interface HelpTextProps extends Omit<SpectrumHelpTextProps, 'errorMessage'>, Omit<Validation<any>, 'validationState'>, SpectrumFieldValidation<any>, StyleProps {
   /** Props for the help text description element. */
diff --git a/packages/@react-spectrum/label/src/Label.tsx b/packages/@adobe/react-spectrum/src/label/Label.tsx
similarity index 88%
rename from packages/@react-spectrum/label/src/Label.tsx
rename to packages/@adobe/react-spectrum/src/label/Label.tsx
index 8e3a5b5893c..382eb2fe564 100644
--- a/packages/@react-spectrum/label/src/Label.tsx
+++ b/packages/@adobe/react-spectrum/src/label/Label.tsx
@@ -11,16 +11,18 @@
  */
 
 import Asterisk from '@spectrum-icons/ui/Asterisk';
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import intlMessages from '../../intl/label/*.json';
 import React from 'react';
+// @ts-ignore
 import {SpectrumLabelProps} from '@react-types/label';
 import styles from '@adobe/spectrum-css-temp/components/fieldlabel/vars.css';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
 
 export const Label = React.forwardRef(function Label(props: SpectrumLabelProps, ref: DOMRef<HTMLLabelElement>) {
   props = useProviderProps(props);
diff --git a/packages/@react-spectrum/labeledvalue/src/LabeledValue.tsx b/packages/@adobe/react-spectrum/src/labeledvalue/LabeledValue.tsx
similarity index 94%
rename from packages/@react-spectrum/labeledvalue/src/LabeledValue.tsx
rename to packages/@adobe/react-spectrum/src/labeledvalue/LabeledValue.tsx
index 0ad3da053cc..24752e8c6e8 100644
--- a/packages/@react-spectrum/labeledvalue/src/LabeledValue.tsx
+++ b/packages/@adobe/react-spectrum/src/labeledvalue/LabeledValue.tsx
@@ -11,13 +11,16 @@
  */
 
 import {CalendarDate, CalendarDateTime, getLocalTimeZone, Time, toCalendarDateTime, today, ZonedDateTime} from '@internationalized/date';
-import {classNames, useDOMRef} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import type {DOMProps, DOMRef, RangeValue, SpectrumLabelableProps, StyleProps} from '@react-types/shared';
-import {Field} from '@react-spectrum/label';
-import {filterDOMProps} from '@react-aria/utils';
+import {Field} from '../label/Field';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import labelStyles from '@adobe/spectrum-css-temp/components/fieldlabel/vars.css';
 import React, {ReactElement, ReactNode, useEffect} from 'react';
-import {useDateFormatter, useListFormatter, useNumberFormatter} from '@react-aria/i18n';
+import {useDateFormatter} from 'react-aria/useDateFormatter';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useListFormatter} from 'react-aria/useListFormatter';
+import {useNumberFormatter} from 'react-aria/useNumberFormatter';
 
 // NOTE: the types here need to be synchronized with the ones in docs/types.ts, which are simpler so the documentation generator can handle them.
 
diff --git a/packages/@react-spectrum/layout/src/Flex.tsx b/packages/@adobe/react-spectrum/src/layout/Flex.tsx
similarity index 89%
rename from packages/@react-spectrum/layout/src/Flex.tsx
rename to packages/@adobe/react-spectrum/src/layout/Flex.tsx
index 494a54cded1..4b60b33d581 100644
--- a/packages/@react-spectrum/layout/src/Flex.tsx
+++ b/packages/@adobe/react-spectrum/src/layout/Flex.tsx
@@ -10,12 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, passthroughStyle, responsiveDimensionValue, StyleHandlers, useBreakpoint, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FlexProps} from '@react-types/layout';
+import {passthroughStyle, responsiveDimensionValue, StyleHandlers, useStyleProps} from '../utils/styleProps';
 import React, {forwardRef} from 'react';
 import styles from './flex-gap.css';
+import {useBreakpoint} from '../utils/BreakpointProvider';
+import {useDOMRef} from '../utils/useDOMRef';
 
 const flexStyleProps: StyleHandlers = {
   direction: ['flexDirection', passthroughStyle],
diff --git a/packages/@react-spectrum/layout/src/Grid.tsx b/packages/@adobe/react-spectrum/src/layout/Grid.tsx
similarity index 96%
rename from packages/@react-spectrum/layout/src/Grid.tsx
rename to packages/@adobe/react-spectrum/src/layout/Grid.tsx
index b09a89705a4..ceae8ac954e 100644
--- a/packages/@react-spectrum/layout/src/Grid.tsx
+++ b/packages/@adobe/react-spectrum/src/layout/Grid.tsx
@@ -15,13 +15,14 @@ import {
   dimensionValue,
   passthroughStyle,
   StyleHandlers,
-  useDOMRef,
   useStyleProps
-} from '@react-spectrum/utils';
+} from '../utils/styleProps';
+
 import {DimensionValue, DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {GridProps} from '@react-types/layout';
 import React, {forwardRef} from 'react';
+import {useDOMRef} from '../utils/useDOMRef';
 
 const gridStyleProps: StyleHandlers = {
   ...baseStyleProps,
diff --git a/packages/@react-spectrum/layout/src/flex-gap.css b/packages/@adobe/react-spectrum/src/layout/flex-gap.css
similarity index 100%
rename from packages/@react-spectrum/layout/src/flex-gap.css
rename to packages/@adobe/react-spectrum/src/layout/flex-gap.css
diff --git a/packages/@react-spectrum/link/src/Link.tsx b/packages/@adobe/react-spectrum/src/link/Link.tsx
similarity index 83%
rename from packages/@react-spectrum/link/src/Link.tsx
rename to packages/@adobe/react-spectrum/src/link/Link.tsx
index 191a1e80b7b..95c6af6bc2a 100644
--- a/packages/@react-spectrum/link/src/Link.tsx
+++ b/packages/@adobe/react-spectrum/src/link/Link.tsx
@@ -10,15 +10,20 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, getWrappedElement, useSlotProps, useStyleProps} from '@react-spectrum/utils';
-import {FocusRing} from '@react-aria/focus';
-import {mergeProps, mergeRefs} from '@react-aria/utils';
+import {classNames} from '../utils/classNames';
+
+import {FocusRing} from 'react-aria/FocusRing';
+import {getWrappedElement} from '../utils/getWrappedElement';
+import {mergeProps} from 'react-aria/mergeProps';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
 import React, {ForwardedRef, JSX, MutableRefObject, useRef} from 'react';
 import {SpectrumLinkProps} from '@react-types/link';
 import styles from '@adobe/spectrum-css-temp/components/link/vars.css';
-import {useHover} from '@react-aria/interactions';
-import {useLink} from '@react-aria/link';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useHover} from 'react-aria/useHover';
+import {useLink} from 'react-aria/useLink';
+import {useProviderProps} from '../provider/Provider';
+import {useSlotProps} from '../utils/Slots';
+import {useStyleProps} from '../utils/styleProps';
 
 let isOldReact = parseInt(React.version, 10) <= 18;
 /**
diff --git a/packages/@react-spectrum/list/src/DragPreview.tsx b/packages/@adobe/react-spectrum/src/list/DragPreview.tsx
similarity index 94%
rename from packages/@react-spectrum/list/src/DragPreview.tsx
rename to packages/@adobe/react-spectrum/src/list/DragPreview.tsx
index 4952ec0006d..d86fda8d3f9 100644
--- a/packages/@react-spectrum/list/src/DragPreview.tsx
+++ b/packages/@adobe/react-spectrum/src/list/DragPreview.tsx
@@ -9,13 +9,15 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {classNames, SlotProvider} from '@react-spectrum/utils';
-import {Grid} from '@react-spectrum/layout';
+import {classNames} from '../utils/classNames';
+
+import {Grid} from '../layout/Grid';
 import {GridNode} from '@react-types/grid';
 import listStyles from './styles.css';
 import React, {JSX} from 'react';
+import {SlotProvider} from '../utils/Slots';
 import type {SpectrumListViewProps} from './ListView';
-import {Text} from '@react-spectrum/text';
+import {Text} from '../text/Text';
 
 interface DragPreviewProps<T> {
   item: GridNode<any>,
diff --git a/packages/@react-spectrum/list/src/InsertionIndicator.tsx b/packages/@adobe/react-spectrum/src/list/InsertionIndicator.tsx
similarity index 92%
rename from packages/@react-spectrum/list/src/InsertionIndicator.tsx
rename to packages/@adobe/react-spectrum/src/list/InsertionIndicator.tsx
index c79d32f2da5..da99588cd5e 100644
--- a/packages/@react-spectrum/list/src/InsertionIndicator.tsx
+++ b/packages/@adobe/react-spectrum/src/list/InsertionIndicator.tsx
@@ -1,9 +1,9 @@
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {ItemDropTarget} from '@react-types/shared';
 import listStyles from './styles.css';
 import {ListViewContext} from './ListView';
 import React, {JSX, useContext, useRef} from 'react';
-import {useVisuallyHidden} from '@react-aria/visually-hidden';
+import {useVisuallyHidden} from 'react-aria/VisuallyHidden';
 
 interface InsertionIndicatorProps {
   target: ItemDropTarget,
diff --git a/packages/@react-spectrum/list/src/ListView.tsx b/packages/@adobe/react-spectrum/src/list/ListView.tsx
similarity index 90%
rename from packages/@react-spectrum/list/src/ListView.tsx
rename to packages/@adobe/react-spectrum/src/list/ListView.tsx
index c34b366d268..e29dd654ae5 100644
--- a/packages/@react-spectrum/list/src/ListView.tsx
+++ b/packages/@adobe/react-spectrum/src/list/ListView.tsx
@@ -10,29 +10,36 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaGridListProps, useGridList} from '@react-aria/gridlist';
+import {AriaGridListProps, useGridList} from 'react-aria/useGridList';
+
 import {AsyncLoadable, DOMRef, Key, LoadingState, Node, SpectrumSelectionProps, StyleProps} from '@react-types/shared';
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
-import type {DragAndDropHooks} from '@react-spectrum/dnd';
-import type {DraggableCollectionState, DroppableCollectionState} from '@react-stately/dnd';
-import type {DroppableCollectionResult} from '@react-aria/dnd';
-import {filterDOMProps, mergeProps, useLayoutEffect} from '@react-aria/utils';
-import {FocusRing, FocusScope} from '@react-aria/focus';
+import {classNames} from '../utils/classNames';
+import type {DragAndDropHooks} from '../dnd/useDragAndDrop';
+import type {DraggableCollectionState} from 'react-stately/useDraggableCollectionState';
+import type {DroppableCollectionResult} from 'react-aria/useDroppableCollection';
+import type {DroppableCollectionState} from 'react-stately/useDroppableCollectionState';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {FocusRing} from 'react-aria/FocusRing';
+import {FocusScope} from 'react-aria/FocusScope';
 import InsertionIndicator from './InsertionIndicator';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
-import {ListKeyboardDelegate} from '@react-aria/selection';
-import {ListState, useListState} from '@react-stately/list';
+import intlMessages from '../../intl/list/*.json';
+import {ListKeyboardDelegate} from 'react-aria/ListKeyboardDelegate';
+import {ListState, useListState} from 'react-stately/useListState';
 import listStyles from './styles.css';
+// @ts-ignore
 import {ListViewItem} from './ListViewItem';
 import {ListViewLayout} from './ListViewLayout';
-import {ProgressCircle} from '@react-spectrum/progress';
+import {mergeProps} from 'react-aria/mergeProps';
+import {ProgressCircle} from '../progress/ProgressCircle';
 import React, {JSX, ReactElement, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
 import RootDropIndicator from './RootDropIndicator';
 import {DragPreview as SpectrumDragPreview} from './DragPreview';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useProvider} from '@react-spectrum/provider';
-import {Virtualizer} from '@react-aria/virtualizer';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useProvider} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
+import {Virtualizer} from 'react-aria/private/virtualizer/Virtualizer';
 
 export interface SpectrumListViewProps<T> extends Omit<AriaGridListProps<T>, 'keyboardNavigationBehavior'>, StyleProps, SpectrumSelectionProps, Omit<AsyncLoadable, 'isLoading'> {
   /**
diff --git a/packages/@react-spectrum/list/src/ListViewItem.tsx b/packages/@adobe/react-spectrum/src/list/ListViewItem.tsx
similarity index 91%
rename from packages/@react-spectrum/list/src/ListViewItem.tsx
rename to packages/@adobe/react-spectrum/src/list/ListViewItem.tsx
index cc5c9283832..c48fcc93f74 100644
--- a/packages/@react-spectrum/list/src/ListViewItem.tsx
+++ b/packages/@adobe/react-spectrum/src/list/ListViewItem.tsx
@@ -9,27 +9,33 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {Checkbox} from '@react-spectrum/checkbox';
+import {Checkbox} from '../checkbox/Checkbox';
+
 import ChevronLeftMedium from '@spectrum-icons/ui/ChevronLeftMedium';
 import ChevronRightMedium from '@spectrum-icons/ui/ChevronRightMedium';
-import {classNames, ClearSlots, SlotProvider, useHasChild} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+import {ClearSlots, SlotProvider} from '../utils/Slots';
 import {CSSTransition} from 'react-transition-group';
-import type {DraggableItemResult, DropIndicatorAria} from '@react-aria/dnd';
+import type {DraggableItemResult} from 'react-aria/useDraggableCollection';
+import type {DropIndicatorAria} from 'react-aria/useDroppableCollection';
 import {DropTarget, Node} from '@react-types/shared';
-import {FocusRing, useFocusRing} from '@react-aria/focus';
-import {Grid} from '@react-spectrum/layout';
-import {isFocusVisible as isGlobalFocusVisible, useHover} from '@react-aria/interactions';
+import {FocusRing} from 'react-aria/FocusRing';
+import {Grid} from '../layout/Grid';
+import {isFocusVisible as isGlobalFocusVisible} from 'react-aria/private/interactions/useFocusVisible';
 import ListGripper from '@spectrum-icons/ui/ListGripper';
 import listStyles from './styles.css';
 import {ListViewContext} from './ListView';
-import {mergeProps} from '@react-aria/utils';
-import {Provider} from '@react-spectrum/provider';
+import {mergeProps} from 'react-aria/mergeProps';
+import {Provider} from '../provider/Provider';
 import React, {JSX, useContext, useRef} from 'react';
-import {Text} from '@react-spectrum/text';
-import {useButton} from '@react-aria/button';
-import {useGridListItem, useGridListSelectionCheckbox} from '@react-aria/gridlist';
-import {useLocale} from '@react-aria/i18n';
-import {useVisuallyHidden} from '@react-aria/visually-hidden';
+import {Text} from '../text/Text';
+import {useButton} from 'react-aria/useButton';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useGridListItem, useGridListSelectionCheckbox} from 'react-aria/useGridList';
+import {useHasChild} from '../utils/useHasChild';
+import {useHover} from 'react-aria/useHover';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useVisuallyHidden} from 'react-aria/VisuallyHidden';
 
 interface ListViewItemProps<T> {
   item: Node<T>,
diff --git a/packages/@react-spectrum/list/src/ListViewLayout.ts b/packages/@adobe/react-spectrum/src/list/ListViewLayout.ts
similarity index 88%
rename from packages/@react-spectrum/list/src/ListViewLayout.ts
rename to packages/@adobe/react-spectrum/src/list/ListViewLayout.ts
index bb9f0d1cce1..a03167e87d8 100644
--- a/packages/@react-spectrum/list/src/ListViewLayout.ts
+++ b/packages/@adobe/react-spectrum/src/list/ListViewLayout.ts
@@ -9,9 +9,12 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {InvalidationContext, LayoutInfo, Rect} from '@react-stately/virtualizer';
-import {LayoutNode, ListLayout, ListLayoutOptions} from '@react-stately/layout';
+import {InvalidationContext} from 'react-stately/private/virtualizer/types';
+
+import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
+import {LayoutNode, ListLayout, ListLayoutOptions} from 'react-stately/private/layout/ListLayout';
 import {Node} from '@react-types/shared';
+import {Rect} from 'react-stately/private/virtualizer/Rect';
 
 interface ListViewLayoutProps extends ListLayoutOptions {
   isLoading?: boolean
diff --git a/packages/@react-spectrum/list/src/RootDropIndicator.tsx b/packages/@adobe/react-spectrum/src/list/RootDropIndicator.tsx
similarity index 93%
rename from packages/@react-spectrum/list/src/RootDropIndicator.tsx
rename to packages/@adobe/react-spectrum/src/list/RootDropIndicator.tsx
index 6996cb5e66a..893b5b360ae 100644
--- a/packages/@react-spectrum/list/src/RootDropIndicator.tsx
+++ b/packages/@adobe/react-spectrum/src/list/RootDropIndicator.tsx
@@ -1,6 +1,6 @@
 import {ListViewContext} from './ListView';
 import React, {JSX, useContext, useRef} from 'react';
-import {useVisuallyHidden} from '@react-aria/visually-hidden';
+import {useVisuallyHidden} from 'react-aria/VisuallyHidden';
 
 export default function RootDropIndicator(): JSX.Element | null {
   let {dropState, dragAndDropHooks} = useContext(ListViewContext)!;
diff --git a/packages/@react-spectrum/list/src/styles.css b/packages/@adobe/react-spectrum/src/list/styles.css
similarity index 100%
rename from packages/@react-spectrum/list/src/styles.css
rename to packages/@adobe/react-spectrum/src/list/styles.css
diff --git a/packages/@react-spectrum/listbox/src/ListBox.tsx b/packages/@adobe/react-spectrum/src/listbox/ListBox.tsx
similarity index 93%
rename from packages/@react-spectrum/listbox/src/ListBox.tsx
rename to packages/@adobe/react-spectrum/src/listbox/ListBox.tsx
index c17db580ef8..398ada53212 100644
--- a/packages/@react-spectrum/listbox/src/ListBox.tsx
+++ b/packages/@adobe/react-spectrum/src/listbox/ListBox.tsx
@@ -14,8 +14,8 @@ import {DOMRef} from '@react-types/shared';
 import {ListBoxBase, useListBoxLayout} from './ListBoxBase';
 import React, {ReactElement} from 'react';
 import {SpectrumListBoxProps} from '@react-types/listbox';
-import {useDOMRef} from '@react-spectrum/utils';
-import {useListState} from '@react-stately/list';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useListState} from 'react-stately/useListState';
 
 // forwardRef doesn't support generic parameters, so cast the result to the correct type
 // https://stackoverflow.com/questions/58469229/react-with-typescript-generics-while-using-react-forwardref
diff --git a/packages/@react-spectrum/listbox/src/ListBoxBase.tsx b/packages/@adobe/react-spectrum/src/listbox/ListBoxBase.tsx
similarity index 87%
rename from packages/@react-spectrum/listbox/src/ListBoxBase.tsx
rename to packages/@adobe/react-spectrum/src/listbox/ListBoxBase.tsx
index 372e1ebeba7..7507d866982 100644
--- a/packages/@react-spectrum/listbox/src/ListBoxBase.tsx
+++ b/packages/@adobe/react-spectrum/src/listbox/ListBoxBase.tsx
@@ -11,24 +11,27 @@
  */
 
 import {AriaLabelingProps, DOMProps, FocusStrategy, Node, RefObject, StyleProps} from '@react-types/shared';
-import {AriaListBoxOptions, useListBox} from '@react-aria/listbox';
-import {classNames, useStyleProps} from '@react-spectrum/utils';
-import {FocusScope} from '@react-aria/focus';
+import {AriaListBoxOptions, useListBox} from 'react-aria/useListBox';
+import {classNames} from '../utils/classNames';
+import {FocusScope} from 'react-aria/FocusScope';
+import intlMessages from '../../intl/listbox/*.json';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
 import {ListBoxContext} from './ListBoxContext';
 import {ListBoxLayout} from './ListBoxLayout';
 import {ListBoxOption} from './ListBoxOption';
 import {ListBoxSection} from './ListBoxSection';
-import {ListState} from '@react-stately/list';
-import {mergeProps, useObjectRef} from '@react-aria/utils';
-import {ProgressCircle} from '@react-spectrum/progress';
+import {ListState} from 'react-stately/useListState';
+import {mergeProps} from 'react-aria/mergeProps';
+import {ProgressCircle} from '../progress/ProgressCircle';
 import React, {ForwardedRef, HTMLAttributes, ReactElement, ReactNode, useCallback, useContext, useMemo} from 'react';
-import {ReusableView} from '@react-stately/virtualizer';
+import {ReusableView} from 'react-stately/private/virtualizer/ReusableView';
 import styles from '@adobe/spectrum-css-temp/components/menu/vars.css';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useProvider} from '@react-spectrum/provider';
-import {Virtualizer, VirtualizerItem} from '@react-aria/virtualizer';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useProvider} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
+import {Virtualizer} from 'react-aria/private/virtualizer/Virtualizer';
+import {VirtualizerItem} from 'react-aria/private/virtualizer/VirtualizerItem';
 
 interface ListBoxBaseProps<T> extends AriaListBoxOptions<T>, DOMProps, AriaLabelingProps, StyleProps {
   layout: ListBoxLayout<T>,
@@ -155,13 +158,13 @@ function LoadingState() {
   return (
     // aria-selected isn't needed here since this option is not selectable.
     // eslint-disable-next-line jsx-a11y/role-has-required-aria-props
-    <div role="option" style={{display: 'flex', alignItems: 'center', justifyContent: 'center', height: '100%'}}>
+    (<div role="option" style={{display: 'flex', alignItems: 'center', justifyContent: 'center', height: '100%'}}>
       <ProgressCircle
         isIndeterminate
         size="S"
         aria-label={state.collection.size > 0 ? stringFormatter.format('loadingMore') : stringFormatter.format('loading')}
         UNSAFE_className={classNames(styles, 'spectrum-Dropdown-progressCircle')} />
-    </div>
+    </div>)
   );
 }
 
diff --git a/packages/@react-spectrum/listbox/src/ListBoxContext.ts b/packages/@adobe/react-spectrum/src/listbox/ListBoxContext.ts
similarity index 94%
rename from packages/@react-spectrum/listbox/src/ListBoxContext.ts
rename to packages/@adobe/react-spectrum/src/listbox/ListBoxContext.ts
index 346d222f2fe..e9790067ce4 100644
--- a/packages/@react-spectrum/listbox/src/ListBoxContext.ts
+++ b/packages/@adobe/react-spectrum/src/listbox/ListBoxContext.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ListState} from '@react-stately/list';
+import {ListState} from 'react-stately/useListState';
 import React, {ReactNode} from 'react';
 
 interface ListBoxContextValue {
diff --git a/packages/@react-spectrum/listbox/src/ListBoxLayout.ts b/packages/@adobe/react-spectrum/src/listbox/ListBoxLayout.ts
similarity index 89%
rename from packages/@react-spectrum/listbox/src/ListBoxLayout.ts
rename to packages/@adobe/react-spectrum/src/listbox/ListBoxLayout.ts
index 212949e66c5..3a4547dd3da 100644
--- a/packages/@react-spectrum/listbox/src/ListBoxLayout.ts
+++ b/packages/@adobe/react-spectrum/src/listbox/ListBoxLayout.ts
@@ -1,6 +1,8 @@
-import {InvalidationContext, LayoutInfo, Rect} from '@react-stately/virtualizer';
-import {LayoutNode, ListLayout, ListLayoutOptions} from '@react-stately/layout';
+import {InvalidationContext} from 'react-stately/private/virtualizer/types';
+import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
+import {LayoutNode, ListLayout, ListLayoutOptions} from 'react-stately/private/layout/ListLayout';
 import {Node} from '@react-types/shared';
+import {Rect} from 'react-stately/private/virtualizer/Rect';
 
 interface ListBoxLayoutProps extends ListLayoutOptions {
   isLoading?: boolean
diff --git a/packages/@react-spectrum/listbox/src/ListBoxOption.tsx b/packages/@adobe/react-spectrum/src/listbox/ListBoxOption.tsx
similarity index 89%
rename from packages/@react-spectrum/listbox/src/ListBoxOption.tsx
rename to packages/@adobe/react-spectrum/src/listbox/ListBoxOption.tsx
index eb760a9342e..7a4022c1aee 100644
--- a/packages/@react-spectrum/listbox/src/ListBoxOption.tsx
+++ b/packages/@adobe/react-spectrum/src/listbox/ListBoxOption.tsx
@@ -11,17 +11,19 @@
  */
 
 import CheckmarkMedium from '@spectrum-icons/ui/CheckmarkMedium';
-import {classNames, ClearSlots, SlotProvider} from '@react-spectrum/utils';
-import {FocusRing} from '@react-aria/focus';
-import {Grid} from '@react-spectrum/layout';
-import {isFocusVisible, useHover} from '@react-aria/interactions';
+import {classNames} from '../utils/classNames';
+import {ClearSlots, SlotProvider} from '../utils/Slots';
+import {FocusRing} from 'react-aria/FocusRing';
+import {Grid} from '../layout/Grid';
+import {isFocusVisible} from 'react-aria/private/interactions/useFocusVisible';
 import {ListBoxContext} from './ListBoxContext';
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from 'react-aria/mergeProps';
 import {Node} from '@react-types/shared';
 import React, {JSX, useContext, useRef} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/menu/vars.css';
-import {Text} from '@react-spectrum/text';
-import {useOption} from '@react-aria/listbox';
+import {Text} from '../text/Text';
+import {useHover} from 'react-aria/useHover';
+import {useOption} from 'react-aria/useListBox';
 
 interface OptionProps<T> {
   item: Node<T>
diff --git a/packages/@react-spectrum/listbox/src/ListBoxSection.tsx b/packages/@adobe/react-spectrum/src/listbox/ListBoxSection.tsx
similarity index 85%
rename from packages/@react-spectrum/listbox/src/ListBoxSection.tsx
rename to packages/@adobe/react-spectrum/src/listbox/ListBoxSection.tsx
index 93fa29ce5ed..701d44cbb91 100644
--- a/packages/@react-spectrum/listbox/src/ListBoxSection.tsx
+++ b/packages/@adobe/react-spectrum/src/listbox/ListBoxSection.tsx
@@ -10,15 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
-import {LayoutInfo} from '@react-stately/virtualizer';
-import {layoutInfoToStyle, useVirtualizerItem, VirtualizerItemOptions} from '@react-aria/virtualizer';
+import {classNames} from '../utils/classNames';
+
+import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
+import {layoutInfoToStyle} from 'react-aria/private/virtualizer/VirtualizerItem';
 import {ListBoxContext} from './ListBoxContext';
 import {Node} from '@react-types/shared';
 import React, {Fragment, JSX, ReactNode, useContext, useRef} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/menu/vars.css';
-import {useListBoxSection} from '@react-aria/listbox';
-import {useLocale} from '@react-aria/i18n';
+import {useListBoxSection} from 'react-aria/useListBox';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useVirtualizerItem, VirtualizerItemOptions} from 'react-aria/private/virtualizer/useVirtualizerItem';
 
 interface ListBoxSectionProps<T> extends Omit<VirtualizerItemOptions, 'ref' | 'layoutInfo'> {
   layoutInfo: LayoutInfo,
diff --git a/packages/@react-spectrum/menu/src/ActionMenu.tsx b/packages/@adobe/react-spectrum/src/menu/ActionMenu.tsx
similarity index 87%
rename from packages/@react-spectrum/menu/src/ActionMenu.tsx
rename to packages/@adobe/react-spectrum/src/menu/ActionMenu.tsx
index 4b23d10e1f9..0069f2781b4 100644
--- a/packages/@react-spectrum/menu/src/ActionMenu.tsx
+++ b/packages/@adobe/react-spectrum/src/menu/ActionMenu.tsx
@@ -10,18 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
-import {filterDOMProps} from '@react-aria/utils';
+import {ActionButton} from '../button/ActionButton';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FocusableRef} from '@react-types/shared';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/menu/*.json';
 import {Menu} from './Menu';
 import {MenuTrigger} from './MenuTrigger';
 import More from '@spectrum-icons/workflow/More';
 import React, {forwardRef, ReactElement} from 'react';
 import {SpectrumActionMenuProps} from '@react-types/menu';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useSlotProps} from '@react-spectrum/utils';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useSlotProps} from '../utils/Slots';
 
 /**
  * ActionMenu combines an ActionButton with a Menu for simple "more actions" use cases.
diff --git a/packages/@react-spectrum/menu/src/ContextualHelpTrigger.tsx b/packages/@adobe/react-spectrum/src/menu/ContextualHelpTrigger.tsx
similarity index 91%
rename from packages/@react-spectrum/menu/src/ContextualHelpTrigger.tsx
rename to packages/@adobe/react-spectrum/src/menu/ContextualHelpTrigger.tsx
index 4e246b65ec2..ae78d7e6c6e 100644
--- a/packages/@react-spectrum/menu/src/ContextualHelpTrigger.tsx
+++ b/packages/@adobe/react-spectrum/src/menu/ContextualHelpTrigger.tsx
@@ -10,20 +10,24 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, SlotProvider, unwrapDOMRef, useIsMobileDevice} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {DOMRefValue, ItemProps, Key} from '@react-types/shared';
-import {FocusScope} from '@react-aria/focus';
-import {getInteractionModality} from '@react-aria/interactions';
+import {FocusScope} from 'react-aria/FocusScope';
+import {getInteractionModality} from 'react-aria/private/interactions/useFocusVisible';
 import helpStyles from '@adobe/spectrum-css-temp/components/contextualhelp/vars.css';
-import {isFocusWithin, nodeContains} from '@react-aria/utils';
-import {Popover} from '@react-spectrum/overlays';
+import {isFocusWithin, nodeContains} from 'react-aria/private/utils/shadowdom/DOMFunctions';
+import {Popover} from '../overlays/Popover';
 import React, {JSX, KeyboardEventHandler, ReactElement, useEffect, useRef, useState} from 'react';
 import ReactDOM from 'react-dom';
+import {SlotProvider} from '../utils/Slots';
 import styles from '@adobe/spectrum-css-temp/components/menu/vars.css';
 import {SubmenuTriggerContext, useMenuStateContext} from './context';
 import {TrayHeaderWrapper} from './Menu';
-import {useSubmenuTrigger} from '@react-aria/menu';
-import {useSubmenuTriggerState} from '@react-stately/menu';
+import {unwrapDOMRef} from '../utils/useDOMRef';
+import {useIsMobileDevice} from '../utils/useIsMobileDevice';
+import {useSubmenuTrigger} from 'react-aria/useMenu';
+import {useSubmenuTriggerState} from 'react-stately/useMenuTriggerState';
 
 interface MenuDialogTriggerProps {
   /** Whether the menu item is currently unavailable. */
diff --git a/packages/@react-spectrum/menu/src/Menu.tsx b/packages/@adobe/react-spectrum/src/menu/Menu.tsx
similarity index 90%
rename from packages/@react-spectrum/menu/src/Menu.tsx
rename to packages/@adobe/react-spectrum/src/menu/Menu.tsx
index 9fbb712d51b..8fccc3b4eaf 100644
--- a/packages/@react-spectrum/menu/src/Menu.tsx
+++ b/packages/@adobe/react-spectrum/src/menu/Menu.tsx
@@ -10,24 +10,32 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../button/ActionButton';
+
 import ArrowDownSmall from '@spectrum-icons/ui/ArrowDownSmall';
-import {classNames, useDOMRef, useIsMobileDevice, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {DOMRef} from '@react-types/shared';
-import {FocusScope} from '@react-aria/focus';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
+import {FocusScope} from 'react-aria/FocusScope';
+import intlMessages from '../../intl/menu/*.json';
 import {MenuContext, MenuStateContext, useMenuStateContext} from './context';
 import {MenuItem} from './MenuItem';
+// @ts-ignore
 import {MenuSection} from './MenuSection';
-import {mergeProps, useLayoutEffect, useSlotId, useSyncRef} from '@react-aria/utils';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {KeyboardEventHandler, ReactElement, ReactNode, RefObject, useContext, useEffect, useRef, useState} from 'react';
-import {RootMenuTriggerState} from '@react-stately/menu';
+import {RootMenuTriggerState} from 'react-stately/useMenuTriggerState';
 import {SpectrumMenuProps} from '@react-types/menu';
 import styles from '@adobe/spectrum-css-temp/components/menu/vars.css';
-import {TreeState, useTreeState} from '@react-stately/tree';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useMenu} from '@react-aria/menu';
+import {TreeState, useTreeState} from 'react-stately/useTreeState';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useIsMobileDevice} from '../utils/useIsMobileDevice';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useMenu} from 'react-aria/useMenu';
+import {useSlotId} from 'react-aria/private/utils/useId';
+import {useStyleProps} from '../utils/styleProps';
+import {useSyncRef} from 'react-aria/private/utils/useSyncRef';
 
 /**
  * Menus display a list of actions or options that a user can choose.
diff --git a/packages/@react-spectrum/menu/src/MenuItem.tsx b/packages/@adobe/react-spectrum/src/menu/MenuItem.tsx
similarity index 88%
rename from packages/@react-spectrum/menu/src/MenuItem.tsx
rename to packages/@adobe/react-spectrum/src/menu/MenuItem.tsx
index 519e514787d..fcbf6b385e4 100644
--- a/packages/@react-spectrum/menu/src/MenuItem.tsx
+++ b/packages/@adobe/react-spectrum/src/menu/MenuItem.tsx
@@ -13,21 +13,25 @@
 import CheckmarkMedium from '@spectrum-icons/ui/CheckmarkMedium';
 import ChevronLeft from '@spectrum-icons/workflow/ChevronLeft';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
-import {classNames, ClearSlots, SlotProvider} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+import {ClearSlots, SlotProvider} from '../utils/Slots';
 import {DOMAttributes, Node} from '@react-types/shared';
-import {FocusRing} from '@react-aria/focus';
-import {Grid} from '@react-spectrum/layout';
+import {FocusRing} from 'react-aria/FocusRing';
+import {Grid} from '../layout/Grid';
 import InfoOutline from '@spectrum-icons/workflow/InfoOutline';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {mergeRefs, useObjectRef, useSlotId} from '@react-aria/utils';
+import intlMessages from '../../intl/menu/*.json';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
 import React, {JSX, useMemo, useRef} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/menu/vars.css';
-import {Text} from '@react-spectrum/text';
-import {TreeState} from '@react-stately/tree';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
+import {Text} from '../text/Text';
+import {TreeState} from 'react-stately/useTreeState';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useMenuContext, useSubmenuTriggerContext} from './context';
-import {useMenuItem} from '@react-aria/menu';
+import {useMenuItem} from 'react-aria/useMenu';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useSlotId} from 'react-aria/private/utils/useId';
 
 interface MenuItemProps<T> {
   item: Node<T>,
diff --git a/packages/@react-spectrum/menu/src/MenuSection.tsx b/packages/@adobe/react-spectrum/src/menu/MenuSection.tsx
similarity index 91%
rename from packages/@react-spectrum/menu/src/MenuSection.tsx
rename to packages/@adobe/react-spectrum/src/menu/MenuSection.tsx
index edee3464b4e..7d9189a30ea 100644
--- a/packages/@react-spectrum/menu/src/MenuSection.tsx
+++ b/packages/@adobe/react-spectrum/src/menu/MenuSection.tsx
@@ -10,15 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
-import {getChildNodes} from '@react-stately/collections';
+import {classNames} from '../utils/classNames';
+import {getChildNodes} from 'react-stately/private/collections/getChildNodes';
 import {MenuItem} from './MenuItem';
 import {Node} from '@react-types/shared';
 import React, {Fragment, JSX} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/menu/vars.css';
-import {TreeState} from '@react-stately/tree';
-import {useMenuSection} from '@react-aria/menu';
-import {useSeparator} from '@react-aria/separator';
+import {TreeState} from 'react-stately/useTreeState';
+import {useMenuSection} from 'react-aria/useMenu';
+import {useSeparator} from 'react-aria/useSeparator';
 
 interface MenuSectionProps<T> {
   item: Node<T>,
diff --git a/packages/@react-spectrum/menu/src/MenuTrigger.tsx b/packages/@adobe/react-spectrum/src/menu/MenuTrigger.tsx
similarity index 86%
rename from packages/@react-spectrum/menu/src/MenuTrigger.tsx
rename to packages/@adobe/react-spectrum/src/menu/MenuTrigger.tsx
index 6f23974af9e..4543157f5e9 100644
--- a/packages/@react-spectrum/menu/src/MenuTrigger.tsx
+++ b/packages/@adobe/react-spectrum/src/menu/MenuTrigger.tsx
@@ -10,17 +10,23 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, SlotProvider, unwrapDOMRef, useDOMRef, useIsMobileDevice} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {DOMRef} from '@react-types/shared';
 import {MenuContext} from './context';
 import {Placement} from '@react-types/overlays';
-import {Popover, Tray} from '@react-spectrum/overlays';
-import {PressResponder, useInteractOutside} from '@react-aria/interactions';
+import {Popover} from '../overlays/Popover';
+import {PressResponder} from 'react-aria/private/interactions/PressResponder';
 import React, {forwardRef, Fragment, useRef} from 'react';
+import {SlotProvider} from '../utils/Slots';
 import {SpectrumMenuTriggerProps} from '@react-types/menu';
 import styles from '@adobe/spectrum-css-temp/components/menu/vars.css';
-import {useMenuTrigger} from '@react-aria/menu';
-import {useMenuTriggerState} from '@react-stately/menu';
+import {Tray} from '../overlays/Tray';
+import {unwrapDOMRef, useDOMRef} from '../utils/useDOMRef';
+import {useInteractOutside} from 'react-aria/private/interactions/useInteractOutside';
+import {useIsMobileDevice} from '../utils/useIsMobileDevice';
+import {useMenuTrigger} from 'react-aria/useMenu';
+import {useMenuTriggerState} from 'react-stately/useMenuTriggerState';
 
 /**
  * The MenuTrigger serves as a wrapper around a Menu and its associated trigger,
diff --git a/packages/@react-spectrum/menu/src/SubmenuTrigger.tsx b/packages/@adobe/react-spectrum/src/menu/SubmenuTrigger.tsx
similarity index 91%
rename from packages/@react-spectrum/menu/src/SubmenuTrigger.tsx
rename to packages/@adobe/react-spectrum/src/menu/SubmenuTrigger.tsx
index e9c2960d1d0..f92623bddeb 100644
--- a/packages/@react-spectrum/menu/src/SubmenuTrigger.tsx
+++ b/packages/@adobe/react-spectrum/src/menu/SubmenuTrigger.tsx
@@ -10,17 +10,20 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, useIsMobileDevice} from '@react-spectrum/utils';
-import {isFocusWithin, mergeProps} from '@react-aria/utils';
+import {classNames} from '../utils/classNames';
+
+import {isFocusWithin} from 'react-aria/private/utils/shadowdom/DOMFunctions';
 import {Key} from '@react-types/shared';
 import {MenuContext, SubmenuTriggerContext, useMenuStateContext} from './context';
-import {Popover} from '@react-spectrum/overlays';
+import {mergeProps} from 'react-aria/mergeProps';
+import {Popover} from '../overlays/Popover';
 import React, {type JSX, ReactElement, useRef} from 'react';
 import ReactDOM from 'react-dom';
 import styles from '@adobe/spectrum-css-temp/components/menu/vars.css';
-import {useLocale} from '@react-aria/i18n';
-import {useSubmenuTrigger} from '@react-aria/menu';
-import {useSubmenuTriggerState} from '@react-stately/menu';
+import {useIsMobileDevice} from '../utils/useIsMobileDevice';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useSubmenuTrigger} from 'react-aria/useMenu';
+import {useSubmenuTriggerState} from 'react-stately/useMenuTriggerState';
 
 interface SubmenuTriggerProps {
   /**
diff --git a/packages/@react-spectrum/menu/src/context.ts b/packages/@adobe/react-spectrum/src/menu/context.ts
similarity index 95%
rename from packages/@react-spectrum/menu/src/context.ts
rename to packages/@adobe/react-spectrum/src/menu/context.ts
index 3ce267adbb8..57ae5ac319c 100644
--- a/packages/@react-spectrum/menu/src/context.ts
+++ b/packages/@adobe/react-spectrum/src/menu/context.ts
@@ -12,8 +12,8 @@
 
 import {DOMProps, FocusStrategy, HoverEvents, KeyboardEvents, PressEvents, RefObject} from '@react-types/shared';
 import React, {HTMLAttributes, useContext} from 'react';
-import {RootMenuTriggerState} from '@react-stately/menu';
-import {TreeState} from '@react-stately/tree';
+import {RootMenuTriggerState} from 'react-stately/useMenuTriggerState';
+import {TreeState} from 'react-stately/useTreeState';
 
 export interface MenuContextValue extends Omit<HTMLAttributes<HTMLElement>, 'autoFocus' | 'onKeyDown'>, Pick<KeyboardEvents, 'onKeyDown'> {
   onClose?: () => void,
diff --git a/packages/@react-spectrum/menu/src/overlays.css b/packages/@adobe/react-spectrum/src/menu/overlays.css
similarity index 100%
rename from packages/@react-spectrum/menu/src/overlays.css
rename to packages/@adobe/react-spectrum/src/menu/overlays.css
diff --git a/packages/@react-spectrum/menu/src/useCloseOnScroll.ts b/packages/@adobe/react-spectrum/src/menu/useCloseOnScroll.ts
similarity index 96%
rename from packages/@react-spectrum/menu/src/useCloseOnScroll.ts
rename to packages/@adobe/react-spectrum/src/menu/useCloseOnScroll.ts
index fff810607f7..e21e9f33f86 100644
--- a/packages/@react-spectrum/menu/src/useCloseOnScroll.ts
+++ b/packages/@adobe/react-spectrum/src/menu/useCloseOnScroll.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {getEventTarget, nodeContains} from '@react-aria/utils';
+import {getEventTarget, nodeContains} from 'react-aria/private/utils/shadowdom/DOMFunctions';
 import {RefObject} from '@react-types/shared';
 import {useEffect} from 'react';
 
diff --git a/packages/@react-spectrum/meter/src/Meter.tsx b/packages/@adobe/react-spectrum/src/meter/Meter.tsx
similarity index 91%
rename from packages/@react-spectrum/meter/src/Meter.tsx
rename to packages/@adobe/react-spectrum/src/meter/Meter.tsx
index 5943fd3fcf2..212c802c1a5 100644
--- a/packages/@react-spectrum/meter/src/Meter.tsx
+++ b/packages/@adobe/react-spectrum/src/meter/Meter.tsx
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {DOMRef} from '@react-types/shared';
-import {ProgressBarBase} from '@react-spectrum/progress';
+import {ProgressBarBase} from '../progress/ProgressBarBase';
 import React from 'react';
 import {SpectrumMeterProps} from '@react-types/meter';
 import styles from '@adobe/spectrum-css-temp/components/barloader/vars.css';
-import {useMeter} from '@react-aria/meter';
+import {useMeter} from 'react-aria/useMeter';
 
 /**
  * Meters are visual representations of a quantity or an achievement.
diff --git a/packages/@react-spectrum/numberfield/src/NumberField.tsx b/packages/@adobe/react-spectrum/src/numberfield/NumberField.tsx
similarity index 89%
rename from packages/@react-spectrum/numberfield/src/NumberField.tsx
rename to packages/@adobe/react-spectrum/src/numberfield/NumberField.tsx
index 44ace71b7c5..7646a665512 100644
--- a/packages/@react-spectrum/numberfield/src/NumberField.tsx
+++ b/packages/@adobe/react-spectrum/src/numberfield/NumberField.tsx
@@ -11,22 +11,24 @@
  */
 
 import {AriaButtonProps} from '@react-types/button';
-import {classNames, useFocusableRef, useStyleProps} from '@react-spectrum/utils';
-import {Field} from '@react-spectrum/label';
+import {classNames} from '../utils/classNames';
+import {Field} from '../label/Field';
 import {FocusableRef, RefObject} from '@react-types/shared';
-import {FocusRing} from '@react-aria/focus';
-import {mergeProps} from '@react-aria/utils';
-import {NumberFieldState, useNumberFieldState} from '@react-stately/numberfield';
+import {FocusRing} from 'react-aria/FocusRing';
+import {mergeProps} from 'react-aria/mergeProps';
+import {NumberFieldState, useNumberFieldState} from 'react-stately/useNumberFieldState';
 import React, {HTMLAttributes, InputHTMLAttributes, Ref, useRef} from 'react';
 import {SpectrumNumberFieldProps} from '@react-types/numberfield';
 import {StepButton} from './StepButton';
 import stepperStyle from '@adobe/spectrum-css-temp/components/stepper/vars.css';
-import {TextFieldBase} from '@react-spectrum/textfield';
-import {useFormProps} from '@react-spectrum/form';
-import {useHover} from '@react-aria/interactions';
-import {useLocale} from '@react-aria/i18n';
-import {useNumberField} from '@react-aria/numberfield';
-import {useProvider, useProviderProps} from '@react-spectrum/provider';
+import {TextFieldBase} from '../textfield/TextFieldBase';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useFormProps} from '../form/Form';
+import {useHover} from 'react-aria/useHover';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useNumberField} from 'react-aria/useNumberField';
+import {useProvider, useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * NumberFields allow users to enter a number, and increment or decrement the value using stepper buttons.
diff --git a/packages/@react-spectrum/numberfield/src/StepButton.tsx b/packages/@adobe/react-spectrum/src/numberfield/StepButton.tsx
similarity index 90%
rename from packages/@react-spectrum/numberfield/src/StepButton.tsx
rename to packages/@adobe/react-spectrum/src/numberfield/StepButton.tsx
index fe48c536ce5..c7a85cba298 100644
--- a/packages/@react-spectrum/numberfield/src/StepButton.tsx
+++ b/packages/@adobe/react-spectrum/src/numberfield/StepButton.tsx
@@ -14,16 +14,17 @@ import Add from '@spectrum-icons/workflow/Add';
 import {AriaButtonProps} from '@react-types/button';
 import ChevronDownSmall from '@spectrum-icons/ui/ChevronDownSmall';
 import ChevronUpSmall from '@spectrum-icons/ui/ChevronUpSmall';
-import {classNames, useFocusableRef} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {FocusableRef} from '@react-types/shared';
-import {FocusRing} from '@react-aria/focus';
-import {mergeProps} from '@react-aria/utils';
+import {FocusRing} from 'react-aria/FocusRing';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {ReactElement} from 'react';
 import Remove from '@spectrum-icons/workflow/Remove';
 import stepperStyle from '@adobe/spectrum-css-temp/components/stepper/vars.css';
-import {useButton} from '@react-aria/button';
-import {useHover} from '@react-aria/interactions';
-import {useProvider, useProviderProps} from '@react-spectrum/provider';
+import {useButton} from 'react-aria/useButton';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useHover} from 'react-aria/useHover';
+import {useProvider, useProviderProps} from '../provider/Provider';
 
 interface StepButtonProps extends AriaButtonProps {
   isQuiet?: boolean,
diff --git a/packages/@react-spectrum/overlays/src/Modal.tsx b/packages/@adobe/react-spectrum/src/overlays/Modal.tsx
similarity index 89%
rename from packages/@react-spectrum/overlays/src/Modal.tsx
rename to packages/@adobe/react-spectrum/src/overlays/Modal.tsx
index 6a8e34450c4..7485f589565 100644
--- a/packages/@react-spectrum/overlays/src/Modal.tsx
+++ b/packages/@adobe/react-spectrum/src/overlays/Modal.tsx
@@ -10,17 +10,21 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaModalOverlayProps, useModalOverlay} from '@react-aria/overlays';
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {AriaModalOverlayProps, useModalOverlay} from 'react-aria/useModalOverlay';
+
+import {classNames} from '../utils/classNames';
 import {DOMRef, RefObject, StyleProps} from '@react-types/shared';
 import modalStyles from '@adobe/spectrum-css-temp/components/modal/vars.css';
 import {Overlay} from './Overlay';
 import {OverlayProps} from '@react-types/overlays';
-import {OverlayTriggerState} from '@react-stately/overlays';
+import {OverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 import overrideStyles from './overlays.css';
 import React, {ForwardedRef, forwardRef, ReactNode, useRef} from 'react';
 import {Underlay} from './Underlay';
-import {useObjectRef, useViewportSize} from '@react-aria/utils';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useStyleProps} from '../utils/styleProps';
+import {useViewportSize} from 'react-aria/private/utils/useViewportSize';
 
 interface ModalProps extends AriaModalOverlayProps, StyleProps, Omit<OverlayProps, 'nodeRef' | 'shouldContainFocus'> {
   children: ReactNode,
diff --git a/packages/@react-spectrum/overlays/src/OpenTransition.tsx b/packages/@adobe/react-spectrum/src/overlays/OpenTransition.tsx
similarity index 100%
rename from packages/@react-spectrum/overlays/src/OpenTransition.tsx
rename to packages/@adobe/react-spectrum/src/overlays/OpenTransition.tsx
diff --git a/packages/@react-spectrum/overlays/src/Overlay.tsx b/packages/@adobe/react-spectrum/src/overlays/Overlay.tsx
similarity index 95%
rename from packages/@react-spectrum/overlays/src/Overlay.tsx
rename to packages/@adobe/react-spectrum/src/overlays/Overlay.tsx
index 7c43194a04e..b2db4878752 100644
--- a/packages/@react-spectrum/overlays/src/Overlay.tsx
+++ b/packages/@adobe/react-spectrum/src/overlays/Overlay.tsx
@@ -13,9 +13,9 @@
 import {DOMRef} from '@react-types/shared';
 import {OpenTransition} from './OpenTransition';
 import {OverlayProps} from '@react-types/overlays';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../provider/Provider';
 import React, {useCallback, useState} from 'react';
-import {Overlay as ReactAriaOverlay} from '@react-aria/overlays';
+import {Overlay as ReactAriaOverlay} from 'react-aria/Overlay';
 
 export const Overlay = React.forwardRef(function Overlay(props: OverlayProps, ref: DOMRef<HTMLDivElement>) {
   let {
diff --git a/packages/@react-spectrum/overlays/src/Popover.tsx b/packages/@adobe/react-spectrum/src/overlays/Popover.tsx
similarity index 93%
rename from packages/@react-spectrum/overlays/src/Popover.tsx
rename to packages/@adobe/react-spectrum/src/overlays/Popover.tsx
index de4b7064334..996be9932b8 100644
--- a/packages/@react-spectrum/overlays/src/Popover.tsx
+++ b/packages/@adobe/react-spectrum/src/overlays/Popover.tsx
@@ -10,17 +10,23 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaPopoverProps, DismissButton, PopoverAria, usePopover} from '@react-aria/overlays';
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {AriaPopoverProps, PopoverAria, usePopover} from 'react-aria/usePopover';
+
+import {classNames} from '../utils/classNames';
+import {DismissButton} from 'react-aria/Overlay';
 import {DOMRef, RefObject, StyleProps} from '@react-types/shared';
-import {FocusWithinProps, useFocusWithin} from '@react-aria/interactions';
-import {mergeProps, useLayoutEffect, useObjectRef} from '@react-aria/utils';
+import {FocusWithinProps, useFocusWithin} from 'react-aria/useFocusWithin';
+import {mergeProps} from 'react-aria/mergeProps';
 import {Overlay} from './Overlay';
-import {OverlayTriggerState} from '@react-stately/overlays';
+import {OverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 import overrideStyles from './overlays.css';
 import React, {ForwardedRef, forwardRef, ReactNode, useRef, useState} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/popover/vars.css';
 import {Underlay} from './Underlay';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useStyleProps} from '../utils/styleProps';
 
 interface PopoverProps extends Omit<AriaPopoverProps, 'popoverRef' | 'maxHeight'>, FocusWithinProps, StyleProps {
   children: ReactNode,
diff --git a/packages/@react-spectrum/overlays/src/Tray.tsx b/packages/@adobe/react-spectrum/src/overlays/Tray.tsx
similarity index 89%
rename from packages/@react-spectrum/overlays/src/Tray.tsx
rename to packages/@adobe/react-spectrum/src/overlays/Tray.tsx
index 2d72318d72d..5e07bd0c86f 100644
--- a/packages/@react-spectrum/overlays/src/Tray.tsx
+++ b/packages/@adobe/react-spectrum/src/overlays/Tray.tsx
@@ -10,17 +10,22 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaModalOverlayProps, DismissButton, useModalOverlay} from '@react-aria/overlays';
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {AriaModalOverlayProps, useModalOverlay} from 'react-aria/useModalOverlay';
+
+import {classNames} from '../utils/classNames';
+import {DismissButton} from 'react-aria/Overlay';
 import {DOMRef, RefObject, StyleProps} from '@react-types/shared';
 import {Overlay} from './Overlay';
 import {OverlayProps} from '@react-types/overlays';
-import {OverlayTriggerState} from '@react-stately/overlays';
+import {OverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 import overrideStyles from './overlays.css';
 import React, {ForwardedRef, forwardRef, ReactNode, useRef} from 'react';
 import trayStyles from '@adobe/spectrum-css-temp/components/tray/vars.css';
 import {Underlay} from './Underlay';
-import {useObjectRef, useViewportSize} from '@react-aria/utils';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useStyleProps} from '../utils/styleProps';
+import {useViewportSize} from 'react-aria/private/utils/useViewportSize';
 
 interface TrayProps extends AriaModalOverlayProps, StyleProps, Omit<OverlayProps, 'nodeRef' | 'shouldContainFocus'> {
   children: ReactNode,
diff --git a/packages/@react-spectrum/overlays/src/Underlay.tsx b/packages/@adobe/react-spectrum/src/overlays/Underlay.tsx
similarity index 93%
rename from packages/@react-spectrum/overlays/src/Underlay.tsx
rename to packages/@adobe/react-spectrum/src/overlays/Underlay.tsx
index da9911834d8..16e3c0d3c32 100644
--- a/packages/@react-spectrum/overlays/src/Underlay.tsx
+++ b/packages/@adobe/react-spectrum/src/overlays/Underlay.tsx
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
-import {isScrollable} from '@react-aria/utils';
+import {classNames} from '../utils/classNames';
+import {isScrollable} from 'react-aria/private/utils/isScrollable';
 import React, {JSX} from 'react';
 import underlayStyles from '@adobe/spectrum-css-temp/components/underlay/vars.css';
 
diff --git a/packages/@react-spectrum/overlays/src/overlays.css b/packages/@adobe/react-spectrum/src/overlays/overlays.css
similarity index 100%
rename from packages/@react-spectrum/overlays/src/overlays.css
rename to packages/@adobe/react-spectrum/src/overlays/overlays.css
diff --git a/packages/@react-spectrum/picker/src/Picker.tsx b/packages/@adobe/react-spectrum/src/picker/Picker.tsx
similarity index 86%
rename from packages/@react-spectrum/picker/src/Picker.tsx
rename to packages/@adobe/react-spectrum/src/picker/Picker.tsx
index 8844db3872c..f4c8abb2562 100644
--- a/packages/@react-spectrum/picker/src/Picker.tsx
+++ b/packages/@adobe/react-spectrum/src/picker/Picker.tsx
@@ -12,34 +12,35 @@
 
 import AlertMedium from '@spectrum-icons/ui/AlertMedium';
 import ChevronDownMedium from '@spectrum-icons/ui/ChevronDownMedium';
-import {
-  classNames,
-  dimensionValue,
-  SlotProvider,
-  useDOMRef,
-  useIsMobileDevice,
-  useSlotProps,
-  useUnwrapDOMRef
-} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+import {dimensionValue} from '../utils/styleProps';
 import {DOMRef, DOMRefValue, FocusableRefValue, LabelPosition} from '@react-types/shared';
-import {Field} from '@react-spectrum/label';
-import {FieldButton} from '@react-spectrum/button';
-import {HiddenSelect, useSelect} from '@react-aria/select';
+import {Field} from '../label/Field';
+import {FieldButton} from '../button/FieldButton';
+import {HiddenSelect, useSelect} from 'react-aria/useSelect';
+import intlMessages from '../../intl/picker/*.json';
+import {ListBoxBase, useListBoxLayout} from '../listbox/ListBoxBase';
+import {mergeProps} from 'react-aria/mergeProps';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {ListBoxBase, useListBoxLayout} from '@react-spectrum/listbox';
-import {mergeProps, useId, useLayoutEffect, useResizeObserver} from '@react-aria/utils';
-import {Popover, Tray} from '@react-spectrum/overlays';
-import {PressResponder, useHover} from '@react-aria/interactions';
-import {ProgressCircle} from '@react-spectrum/progress';
+import {Popover} from '../overlays/Popover';
+import {PressResponder} from 'react-aria/private/interactions/PressResponder';
+import {ProgressCircle} from '../progress/ProgressCircle';
 import React, {ReactElement, useCallback, useRef, useState} from 'react';
+import {SlotProvider, useSlotProps} from '../utils/Slots';
 import {SpectrumPickerProps} from '@react-types/select';
 import styles from '@adobe/spectrum-css-temp/components/dropdown/vars.css';
-import {Text} from '@react-spectrum/text';
-import {useFormProps} from '@react-spectrum/form';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useProvider, useProviderProps} from '@react-spectrum/provider';
-import {useSelectState} from '@react-stately/select';
+import {Text} from '../text/Text';
+import {Tray} from '../overlays/Tray';
+import {useDOMRef, useUnwrapDOMRef} from '../utils/useDOMRef';
+import {useFormProps} from '../form/Form';
+import {useHover} from 'react-aria/useHover';
+import {useId} from 'react-aria/useId';
+import {useIsMobileDevice} from '../utils/useIsMobileDevice';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useProvider, useProviderProps} from '../provider/Provider';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
+import {useSelectState} from 'react-stately/useSelectState';
 
 /**
  * Pickers allow users to choose a single option from a collapsible list of options when space is limited.
diff --git a/packages/@react-spectrum/progress/src/ProgressBar.tsx b/packages/@adobe/react-spectrum/src/progress/ProgressBar.tsx
similarity index 94%
rename from packages/@react-spectrum/progress/src/ProgressBar.tsx
rename to packages/@adobe/react-spectrum/src/progress/ProgressBar.tsx
index 65146a01ea1..69298bd98df 100644
--- a/packages/@react-spectrum/progress/src/ProgressBar.tsx
+++ b/packages/@adobe/react-spectrum/src/progress/ProgressBar.tsx
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {DOMRef} from '@react-types/shared';
 import {ProgressBarBase} from './ProgressBarBase';
 import React from 'react';
 import {SpectrumProgressBarProps} from '@react-types/progress';
 import styles from '@adobe/spectrum-css-temp/components/barloader/vars.css';
-import {useProgressBar} from '@react-aria/progress';
+import {useProgressBar} from 'react-aria/useProgressBar';
 
 /**
  * ProgressBars show the progression of a system operation: downloading, uploading, processing, etc., in a visual way.
diff --git a/packages/@react-spectrum/progress/src/ProgressBarBase.tsx b/packages/@adobe/react-spectrum/src/progress/ProgressBarBase.tsx
similarity index 94%
rename from packages/@react-spectrum/progress/src/ProgressBarBase.tsx
rename to packages/@adobe/react-spectrum/src/progress/ProgressBarBase.tsx
index d89c565cdba..dba48bf895f 100644
--- a/packages/@react-spectrum/progress/src/ProgressBarBase.tsx
+++ b/packages/@adobe/react-spectrum/src/progress/ProgressBarBase.tsx
@@ -10,12 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {clamp} from '@react-aria/utils';
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {clamp} from 'react-stately/private/utils/number';
+
+import {classNames} from '../utils/classNames';
 import {DOMRef} from '@react-types/shared';
 import {ProgressBarProps, SpectrumProgressBarBaseProps} from '@react-types/progress';
 import React, {CSSProperties, HTMLAttributes} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/barloader/vars.css';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useStyleProps} from '../utils/styleProps';
 
 interface ProgressBarBaseProps extends SpectrumProgressBarBaseProps, ProgressBarProps {
   barClassName?: string,
diff --git a/packages/@react-spectrum/progress/src/ProgressCircle.tsx b/packages/@adobe/react-spectrum/src/progress/ProgressCircle.tsx
similarity index 93%
rename from packages/@react-spectrum/progress/src/ProgressCircle.tsx
rename to packages/@adobe/react-spectrum/src/progress/ProgressCircle.tsx
index 134f59d8992..982c0b6e933 100644
--- a/packages/@react-spectrum/progress/src/ProgressCircle.tsx
+++ b/packages/@adobe/react-spectrum/src/progress/ProgressCircle.tsx
@@ -10,13 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {clamp} from '@react-aria/utils';
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {clamp} from 'react-stately/private/utils/number';
+
+import {classNames} from '../utils/classNames';
 import {DOMRef} from '@react-types/shared';
 import React, {CSSProperties} from 'react';
 import {SpectrumProgressCircleProps} from '@react-types/progress';
 import styles from '@adobe/spectrum-css-temp/components/circleloader/vars.css';
-import {useProgressBar} from '@react-aria/progress';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useProgressBar} from 'react-aria/useProgressBar';
+import {useStyleProps} from '../utils/styleProps';
 
 
 /**
diff --git a/packages/@react-spectrum/provider/src/Provider.tsx b/packages/@adobe/react-spectrum/src/provider/Provider.tsx
similarity index 92%
rename from packages/@react-spectrum/provider/src/Provider.tsx
rename to packages/@adobe/react-spectrum/src/provider/Provider.tsx
index 53fde2faf3c..93e09d8140b 100644
--- a/packages/@react-spectrum/provider/src/Provider.tsx
+++ b/packages/@adobe/react-spectrum/src/provider/Provider.tsx
@@ -10,26 +10,25 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  BreakpointProvider,
-  shouldKeepSpectrumClassNames,
-  useDOMRef,
-  useMatchedBreakpoints,
-  useStyleProps
-} from '@react-spectrum/utils';
+import {BreakpointProvider, useMatchedBreakpoints} from '../utils/BreakpointProvider';
+
 import clsx from 'clsx';
 import {Context} from './context';
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps, RouterProvider} from '@react-aria/utils';
-import {I18nProvider, useLocale} from '@react-aria/i18n';
-import {ModalProvider, useModalProvider} from '@react-aria/overlays';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {I18nProvider, useLocale} from 'react-aria/I18nProvider';
+import {ModalProvider, useModalProvider} from 'react-aria/private/overlays/useModal';
 import {ProviderContext, ProviderProps} from '@react-types/provider';
 import React, {useContext, useEffect, useRef} from 'react';
+import {RouterProvider} from 'react-aria/private/utils/openLink';
+import {shouldKeepSpectrumClassNames} from '../utils/classNames';
 import styles from '@adobe/spectrum-css-temp/components/page/vars.css';
 import typographyStyles from '@adobe/spectrum-css-temp/components/typography/index.css';
 import {useColorScheme, useScale} from './mediaQueries';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useStyleProps} from '../utils/styleProps';
 // @ts-ignore
-import {version} from '../package.json';
+import {version} from '../../package.json';
 
 const DEFAULT_BREAKPOINTS = {S: 640, M: 768, L: 1024, XL: 1280, XXL: 1536};
 
diff --git a/packages/@react-spectrum/provider/src/context.ts b/packages/@adobe/react-spectrum/src/provider/context.ts
similarity index 100%
rename from packages/@react-spectrum/provider/src/context.ts
rename to packages/@adobe/react-spectrum/src/provider/context.ts
diff --git a/packages/@react-spectrum/provider/src/mediaQueries.ts b/packages/@adobe/react-spectrum/src/provider/mediaQueries.ts
similarity index 96%
rename from packages/@react-spectrum/provider/src/mediaQueries.ts
rename to packages/@adobe/react-spectrum/src/provider/mediaQueries.ts
index f01180c368e..f31758c289e 100644
--- a/packages/@react-spectrum/provider/src/mediaQueries.ts
+++ b/packages/@adobe/react-spectrum/src/provider/mediaQueries.ts
@@ -11,7 +11,7 @@
  */
 
 import {ColorScheme, Scale, Theme} from '@react-types/provider';
-import {useMediaQuery} from '@react-spectrum/utils';
+import {useMediaQuery} from '../utils/useMediaQuery';
 
 export function useColorScheme(theme: Theme, defaultColorScheme: ColorScheme): ColorScheme {
   let matchesDark = useMediaQuery('(prefers-color-scheme: dark)');
diff --git a/packages/@react-spectrum/radio/src/Radio.tsx b/packages/@adobe/react-spectrum/src/radio/Radio.tsx
similarity index 90%
rename from packages/@react-spectrum/radio/src/Radio.tsx
rename to packages/@adobe/react-spectrum/src/radio/Radio.tsx
index a0d586fb4cd..d65d84641b3 100644
--- a/packages/@react-spectrum/radio/src/Radio.tsx
+++ b/packages/@adobe/react-spectrum/src/radio/Radio.tsx
@@ -10,15 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, useFocusableRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {FocusableRef} from '@react-types/shared';
-import {FocusRing} from '@react-aria/focus';
+import {FocusRing} from 'react-aria/FocusRing';
 import React, {forwardRef, useRef} from 'react';
 import {SpectrumRadioProps} from '@react-types/radio';
 import styles from '@adobe/spectrum-css-temp/components/radio/vars.css';
-import {useHover} from '@react-aria/interactions';
-import {useRadio} from '@react-aria/radio';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useHover} from 'react-aria/useHover';
+import {useRadio} from 'react-aria/useRadioGroup';
 import {useRadioProvider} from './context';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * Radio buttons allow users to select a single option from a list of mutually exclusive options.
diff --git a/packages/@react-spectrum/radio/src/RadioGroup.tsx b/packages/@adobe/react-spectrum/src/radio/RadioGroup.tsx
similarity index 85%
rename from packages/@react-spectrum/radio/src/RadioGroup.tsx
rename to packages/@adobe/react-spectrum/src/radio/RadioGroup.tsx
index 33c0fcfda37..4bb3b4bb949 100644
--- a/packages/@react-spectrum/radio/src/RadioGroup.tsx
+++ b/packages/@adobe/react-spectrum/src/radio/RadioGroup.tsx
@@ -10,17 +10,19 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, useDOMRef} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {DOMRef} from '@react-types/shared';
-import {Field} from '@react-spectrum/label';
+import {Field} from '../label/Field';
 import {RadioContext} from './context';
 import React from 'react';
 import {SpectrumRadioGroupProps} from '@react-types/radio';
 import styles from '@adobe/spectrum-css-temp/components/fieldgroup/vars.css';
-import {useFormProps} from '@react-spectrum/form';
-import {useProviderProps} from '@react-spectrum/provider';
-import {useRadioGroup} from '@react-aria/radio';
-import {useRadioGroupState} from '@react-stately/radio';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useFormProps} from '../form/Form';
+import {useProviderProps} from '../provider/Provider';
+import {useRadioGroup} from 'react-aria/useRadioGroup';
+import {useRadioGroupState} from 'react-stately/useRadioGroupState';
 
 /**
  * Radio groups allow users to select a single option from a list of mutually exclusive options.
diff --git a/packages/@react-spectrum/radio/src/context.ts b/packages/@adobe/react-spectrum/src/radio/context.ts
similarity index 93%
rename from packages/@react-spectrum/radio/src/context.ts
rename to packages/@adobe/react-spectrum/src/radio/context.ts
index 4f8a3bf3e41..418a2ff628f 100644
--- a/packages/@react-spectrum/radio/src/context.ts
+++ b/packages/@adobe/react-spectrum/src/radio/context.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {RadioGroupState} from '@react-stately/radio';
+import {RadioGroupState} from 'react-stately/useRadioGroupState';
 import React, {useContext} from 'react';
 
 interface RadioGroupContext {
diff --git a/packages/@react-spectrum/searchfield/src/SearchField.tsx b/packages/@adobe/react-spectrum/src/searchfield/SearchField.tsx
similarity index 88%
rename from packages/@react-spectrum/searchfield/src/SearchField.tsx
rename to packages/@adobe/react-spectrum/src/searchfield/SearchField.tsx
index 9946bf7b00b..06b8176e876 100644
--- a/packages/@react-spectrum/searchfield/src/SearchField.tsx
+++ b/packages/@adobe/react-spectrum/src/searchfield/SearchField.tsx
@@ -10,18 +10,20 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, useSlotProps} from '@react-spectrum/utils';
-import {ClearButton} from '@react-spectrum/button';
+import {classNames} from '../utils/classNames';
+
+import {ClearButton} from '../button/ClearButton';
 import Magnifier from '@spectrum-icons/ui/Magnifier';
 import React, {forwardRef, ReactElement, Ref, useEffect, useRef} from 'react';
 import {SpectrumSearchFieldProps} from '@react-types/searchfield';
 import styles from '@adobe/spectrum-css-temp/components/search/vars.css';
-import {TextFieldBase} from '@react-spectrum/textfield';
+import {TextFieldBase} from '../textfield/TextFieldBase';
 import {TextFieldRef} from '@react-types/textfield';
-import {useFormProps} from '@react-spectrum/form';
-import {useProviderProps} from '@react-spectrum/provider';
-import {useSearchField} from '@react-aria/searchfield';
-import {useSearchFieldState} from '@react-stately/searchfield';
+import {useFormProps} from '../form/Form';
+import {useProviderProps} from '../provider/Provider';
+import {useSearchField} from 'react-aria/useSearchField';
+import {useSearchFieldState} from 'react-stately/useSearchFieldState';
+import {useSlotProps} from '../utils/Slots';
 
 /**
  * A SearchField is a text field designed for searches.
diff --git a/packages/@react-spectrum/slider/src/RangeSlider.tsx b/packages/@adobe/react-spectrum/src/slider/RangeSlider.tsx
similarity index 94%
rename from packages/@react-spectrum/slider/src/RangeSlider.tsx
rename to packages/@adobe/react-spectrum/src/slider/RangeSlider.tsx
index d6b59529e3c..ad1b9c453bf 100644
--- a/packages/@react-spectrum/slider/src/RangeSlider.tsx
+++ b/packages/@adobe/react-spectrum/src/slider/RangeSlider.tsx
@@ -10,16 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {FocusableRef} from '@react-types/shared';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/slider/*.json';
 import React from 'react';
 import {SliderBase, SliderBaseChildArguments, SliderBaseProps} from './SliderBase';
 import {SliderThumb} from './SliderThumb';
 import {SpectrumRangeSliderProps} from '@react-types/slider';
 import styles from '@adobe/spectrum-css-temp/components/slider/vars.css';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 
 /**
  * RangeSliders allow users to quickly select a subset range. They should be used when the upper and lower bounds to the range are invariable.
diff --git a/packages/@react-spectrum/slider/src/Slider.tsx b/packages/@adobe/react-spectrum/src/slider/Slider.tsx
similarity index 96%
rename from packages/@react-spectrum/slider/src/Slider.tsx
rename to packages/@adobe/react-spectrum/src/slider/Slider.tsx
index fa531df2a6b..87e7b636e64 100644
--- a/packages/@react-spectrum/slider/src/Slider.tsx
+++ b/packages/@adobe/react-spectrum/src/slider/Slider.tsx
@@ -10,15 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {clamp} from '@react-aria/utils';
-import {classNames} from '@react-spectrum/utils';
+import {clamp} from 'react-stately/private/utils/number';
+import {classNames} from '../utils/classNames';
 import {FocusableRef} from '@react-types/shared';
 import React, {ReactNode} from 'react';
 import {SliderBase, SliderBaseChildArguments, SliderBaseProps} from './SliderBase';
 import {SliderThumb} from './SliderThumb';
 import {SpectrumSliderProps} from '@react-types/slider';
 import styles from '@adobe/spectrum-css-temp/components/slider/vars.css';
-import {useLocale} from '@react-aria/i18n';
+import {useLocale} from 'react-aria/I18nProvider';
 
 /**
  * Sliders allow users to quickly select a value within a range. They should be used when the upper and lower bounds to the range are invariable.
diff --git a/packages/@react-spectrum/slider/src/SliderBase.tsx b/packages/@adobe/react-spectrum/src/slider/SliderBase.tsx
similarity index 93%
rename from packages/@react-spectrum/slider/src/SliderBase.tsx
rename to packages/@adobe/react-spectrum/src/slider/SliderBase.tsx
index dd35c53a6de..5236b4619f6 100644
--- a/packages/@react-spectrum/slider/src/SliderBase.tsx
+++ b/packages/@adobe/react-spectrum/src/slider/SliderBase.tsx
@@ -10,15 +10,19 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, SlotProvider, useFocusableRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {FocusableRef, RefObject} from '@react-types/shared';
 import React, {CSSProperties, ReactNode, useRef} from 'react';
-import {SliderState, useSliderState} from '@react-stately/slider';
+import {SliderState, useSliderState} from 'react-stately/useSliderState';
+import {SlotProvider} from '../utils/Slots';
 import {SpectrumBarSliderBase} from '@react-types/slider';
 import styles from '@adobe/spectrum-css-temp/components/slider/vars.css';
-import {useNumberFormatter} from '@react-aria/i18n';
-import {useProviderProps} from '@react-spectrum/provider';
-import {useSlider} from '@react-aria/slider';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useNumberFormatter} from 'react-aria/useNumberFormatter';
+import {useProviderProps} from '../provider/Provider';
+import {useSlider} from 'react-aria/useSlider';
+import {useStyleProps} from '../utils/styleProps';
 
 export interface SliderBaseChildArguments {
   inputRef: RefObject<HTMLInputElement | null>,
diff --git a/packages/@react-spectrum/slider/src/SliderThumb.tsx b/packages/@adobe/react-spectrum/src/slider/SliderThumb.tsx
similarity index 84%
rename from packages/@react-spectrum/slider/src/SliderThumb.tsx
rename to packages/@adobe/react-spectrum/src/slider/SliderThumb.tsx
index 53b0c43c57c..586ed9a1542 100644
--- a/packages/@react-spectrum/slider/src/SliderThumb.tsx
+++ b/packages/@adobe/react-spectrum/src/slider/SliderThumb.tsx
@@ -11,16 +11,16 @@
  */
 
 import {AriaSliderThumbProps} from '@react-types/slider';
-import {classNames} from '@react-spectrum/utils';
-import {FocusRing} from '@react-aria/focus';
-import {mergeProps} from '@react-aria/utils';
+import {classNames} from '../utils/classNames';
+import {FocusRing} from 'react-aria/FocusRing';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {ReactNode, useRef} from 'react';
 import {RefObject} from '@react-types/shared';
-import {SliderState} from '@react-stately/slider';
+import {SliderState} from 'react-stately/useSliderState';
 import styles from '@adobe/spectrum-css-temp/components/slider/vars.css';
-import {useHover} from '@react-aria/interactions';
-import {useSliderThumb} from '@react-aria/slider';
-import {VisuallyHidden} from '@react-aria/visually-hidden';
+import {useHover} from 'react-aria/useHover';
+import {useSliderThumb} from 'react-aria/useSlider';
+import {VisuallyHidden} from 'react-aria/VisuallyHidden';
 
 interface SliderThumbProps extends AriaSliderThumbProps {
   trackRef: RefObject<HTMLElement | null>,
diff --git a/packages/@react-spectrum/statuslight/src/StatusLight.tsx b/packages/@adobe/react-spectrum/src/statuslight/StatusLight.tsx
similarity index 88%
rename from packages/@react-spectrum/statuslight/src/StatusLight.tsx
rename to packages/@adobe/react-spectrum/src/statuslight/StatusLight.tsx
index fd66f8ac948..ee53da51a96 100644
--- a/packages/@react-spectrum/statuslight/src/StatusLight.tsx
+++ b/packages/@adobe/react-spectrum/src/statuslight/StatusLight.tsx
@@ -10,13 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import React, {forwardRef} from 'react';
 import {SpectrumStatusLightProps} from '@react-types/statuslight';
 import styles from '@adobe/spectrum-css-temp/components/statuslight/vars.css';
-import {useProviderProps} from '@react-spectrum/provider';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * Status lights are used to color code categories and labels commonly found in data visualization.
diff --git a/packages/@react-spectrum/steplist/src/StepList.tsx b/packages/@adobe/react-spectrum/src/steplist/StepList.tsx
similarity index 87%
rename from packages/@react-spectrum/steplist/src/StepList.tsx
rename to packages/@adobe/react-spectrum/src/steplist/StepList.tsx
index 106a88d78d0..d0a04fe8b84 100644
--- a/packages/@react-spectrum/steplist/src/StepList.tsx
+++ b/packages/@adobe/react-spectrum/src/steplist/StepList.tsx
@@ -10,15 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaStepListProps, useStepList} from '@react-aria/steplist';
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {AriaStepListProps, useStepList} from 'react-aria/private/steplist/useStepList';
+
+import {classNames} from '../utils/classNames';
 import {DOMRef, Orientation, StyleProps} from '@react-types/shared';
 import React, {ReactElement} from 'react';
 import {StepListContext} from './StepListContext';
 import {StepListItem} from './StepListItem';
 import styles from '@adobe/spectrum-css-temp/components/steplist/vars.css';
-import {useProviderProps} from '@react-spectrum/provider';
-import {useStepListState} from '@react-stately/steplist';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useProviderProps} from '../provider/Provider';
+import {useStepListState} from 'react-stately/private/steplist/useStepListState';
+import {useStyleProps} from '../utils/styleProps';
 
 export interface SpectrumStepListProps<T> extends AriaStepListProps<T>, StyleProps {
   /**
diff --git a/packages/@react-spectrum/steplist/src/StepListContext.ts b/packages/@adobe/react-spectrum/src/steplist/StepListContext.ts
similarity index 90%
rename from packages/@react-spectrum/steplist/src/StepListContext.ts
rename to packages/@adobe/react-spectrum/src/steplist/StepListContext.ts
index 0bf617a8d2d..46ced276b43 100644
--- a/packages/@react-spectrum/steplist/src/StepListContext.ts
+++ b/packages/@adobe/react-spectrum/src/steplist/StepListContext.ts
@@ -11,6 +11,6 @@
  */
 
 import React from 'react';
-import {StepListState} from '@react-stately/steplist';
+import {StepListState} from 'react-stately/private/steplist/useStepListState';
 
 export const StepListContext = React.createContext<StepListState<unknown> | null>(null);
diff --git a/packages/@react-spectrum/steplist/src/StepListItem.tsx b/packages/@adobe/react-spectrum/src/steplist/StepListItem.tsx
similarity index 86%
rename from packages/@react-spectrum/steplist/src/StepListItem.tsx
rename to packages/@adobe/react-spectrum/src/steplist/StepListItem.tsx
index 5e5c5c81774..057b6044b65 100644
--- a/packages/@react-spectrum/steplist/src/StepListItem.tsx
+++ b/packages/@adobe/react-spectrum/src/steplist/StepListItem.tsx
@@ -10,19 +10,22 @@
  * governing permissions and limitations under the License.
  */
 import ChevronRightMedium from '@spectrum-icons/ui/ChevronRightMedium';
-import {classNames} from '@react-spectrum/utils';
-import {FocusRing} from '@react-aria/focus';
+import {classNames} from '../utils/classNames';
+import {FocusRing} from 'react-aria/FocusRing';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {mergeProps, useId} from '@react-aria/utils';
+import intlMessages from '../../intl/steplist/*.json';
+import {mergeProps} from 'react-aria/mergeProps';
 import {Node} from '@react-types/shared';
 import React, {ReactNode, useContext, useRef} from 'react';
 import {StepListContext} from './StepListContext';
 import styles from '@adobe/spectrum-css-temp/components/steplist/vars.css';
-import {useHover} from '@react-aria/interactions';
-import {useLocale, useLocalizedStringFormatter, useNumberFormatter} from '@react-aria/i18n';
-import {useStepListItem} from '@react-aria/steplist';
-import {VisuallyHidden} from '@react-aria/visually-hidden';
+import {useHover} from 'react-aria/useHover';
+import {useId} from 'react-aria/useId';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useNumberFormatter} from 'react-aria/useNumberFormatter';
+import {useStepListItem} from 'react-aria/private/steplist/useStepListItem';
+import {VisuallyHidden} from 'react-aria/VisuallyHidden';
 
 interface SpectrumStepListItemProps<T> {
   item: Node<T>,
diff --git a/packages/@react-spectrum/switch/src/Switch.tsx b/packages/@adobe/react-spectrum/src/switch/Switch.tsx
similarity index 85%
rename from packages/@react-spectrum/switch/src/Switch.tsx
rename to packages/@adobe/react-spectrum/src/switch/Switch.tsx
index 949b2e0a50d..d91ca570764 100644
--- a/packages/@react-spectrum/switch/src/Switch.tsx
+++ b/packages/@adobe/react-spectrum/src/switch/Switch.tsx
@@ -10,16 +10,19 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, useFocusableRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {FocusableRef} from '@react-types/shared';
-import {FocusRing} from '@react-aria/focus';
+import {FocusRing} from 'react-aria/FocusRing';
 import React, {forwardRef, useRef} from 'react';
 import {SpectrumSwitchProps} from '@react-types/switch';
 import styles from '@adobe/spectrum-css-temp/components/toggle/vars.css';
-import {useHover} from '@react-aria/interactions';
-import {useProviderProps} from '@react-spectrum/provider';
-import {useSwitch} from '@react-aria/switch';
-import {useToggleState} from '@react-stately/toggle';
+import {useFocusableRef} from '../utils/useDOMRef';
+import {useHover} from 'react-aria/useHover';
+import {useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
+import {useSwitch} from 'react-aria/useSwitch';
+import {useToggleState} from 'react-stately/useToggleState';
 
 /**
  * Switches allow users to turn an individual option on or off.
diff --git a/packages/@react-spectrum/table/src/DragPreview.tsx b/packages/@adobe/react-spectrum/src/table/DragPreview.tsx
similarity index 95%
rename from packages/@react-spectrum/table/src/DragPreview.tsx
rename to packages/@adobe/react-spectrum/src/table/DragPreview.tsx
index ccfbf725ec3..51c9f12f40e 100644
--- a/packages/@react-spectrum/table/src/DragPreview.tsx
+++ b/packages/@adobe/react-spectrum/src/table/DragPreview.tsx
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
-import {Flex} from '@react-spectrum/layout';
+import {classNames} from '../utils/classNames';
+import {Flex} from '../layout/Flex';
 import React, {ReactNode} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/table/vars.css';
 import stylesOverrides from './table.css';
diff --git a/packages/@react-spectrum/table/src/InsertionIndicator.tsx b/packages/@adobe/react-spectrum/src/table/InsertionIndicator.tsx
similarity index 95%
rename from packages/@react-spectrum/table/src/InsertionIndicator.tsx
rename to packages/@adobe/react-spectrum/src/table/InsertionIndicator.tsx
index a89eb34f133..b88ac25b6ff 100644
--- a/packages/@react-spectrum/table/src/InsertionIndicator.tsx
+++ b/packages/@adobe/react-spectrum/src/table/InsertionIndicator.tsx
@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {FocusableElement, ItemDropTarget} from '@react-types/shared';
 import React, {DOMAttributes, HTMLAttributes, ReactNode, useRef} from 'react';
 import styles from './table.css';
 import {useTableContext} from './TableViewBase';
-import {useVisuallyHidden} from '@react-aria/visually-hidden';
+import {useVisuallyHidden} from 'react-aria/VisuallyHidden';
 
 interface InsertionIndicatorProps {
   target: ItemDropTarget,
diff --git a/packages/@react-spectrum/table/src/Nubbin.tsx b/packages/@adobe/react-spectrum/src/table/Nubbin.tsx
similarity index 100%
rename from packages/@react-spectrum/table/src/Nubbin.tsx
rename to packages/@adobe/react-spectrum/src/table/Nubbin.tsx
diff --git a/packages/@react-spectrum/table/src/Resizer.tsx b/packages/@adobe/react-spectrum/src/table/Resizer.tsx
similarity index 88%
rename from packages/@react-spectrum/table/src/Resizer.tsx
rename to packages/@adobe/react-spectrum/src/table/Resizer.tsx
index defc24868ea..ac168a95199 100644
--- a/packages/@react-spectrum/table/src/Resizer.tsx
+++ b/packages/@adobe/react-spectrum/src/table/Resizer.tsx
@@ -1,22 +1,25 @@
 
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {ColumnSize} from '@react-types/table';
 import eCursor from 'bundle-text:./cursors/Cur_MoveToRight_9_9.svg';
 import ewCursor from 'bundle-text:./cursors/Cur_MoveHorizontal_9_9.svg';
-import {FocusRing} from '@react-aria/focus';
+import {FocusRing} from 'react-aria/FocusRing';
 import {GridNode} from '@react-types/grid';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {isWebKit, mergeProps, useObjectRef} from '@react-aria/utils';
+import intlMessages from '../../intl/table/*.json';
+import {isWebKit} from 'react-aria/private/utils/platform';
 import {Key, RefObject} from '@react-types/shared';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, useContext, useEffect, useState} from 'react';
 import ReactDOM from 'react-dom';
 import styles from '@adobe/spectrum-css-temp/components/table/vars.css';
-import {TableColumnResizeState} from '@react-stately/table';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useTableColumnResize} from '@react-aria/table';
+import {TableColumnResizeState} from 'react-stately/useTableState';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useTableColumnResize} from 'react-aria/useTable';
 import {useTableContext, useVirtualizerContext} from './TableViewBase';
-import {useUNSAFE_PortalContext} from '@react-aria/overlays';
+import {useUNSAFE_PortalContext} from 'react-aria/PortalProvider';
 // @ts-ignore
 import wCursor from 'bundle-text:./cursors/Cur_MoveToLeft_9_9.svg';
 
diff --git a/packages/@react-spectrum/table/src/RootDropIndicator.tsx b/packages/@adobe/react-spectrum/src/table/RootDropIndicator.tsx
similarity index 96%
rename from packages/@react-spectrum/table/src/RootDropIndicator.tsx
rename to packages/@adobe/react-spectrum/src/table/RootDropIndicator.tsx
index e7fbe85aaa4..21b52f518c5 100644
--- a/packages/@react-spectrum/table/src/RootDropIndicator.tsx
+++ b/packages/@adobe/react-spectrum/src/table/RootDropIndicator.tsx
@@ -12,7 +12,7 @@
 
 import React, {ReactNode, useRef} from 'react';
 import {useTableContext} from './TableViewBase';
-import {useVisuallyHidden} from '@react-aria/visually-hidden';
+import {useVisuallyHidden} from 'react-aria/VisuallyHidden';
 
 export function RootDropIndicator(): ReactNode | null {
   let {dropState, dragAndDropHooks, state} = useTableContext();
diff --git a/packages/@react-spectrum/table/src/TableView.tsx b/packages/@adobe/react-spectrum/src/table/TableView.tsx
similarity index 92%
rename from packages/@react-spectrum/table/src/TableView.tsx
rename to packages/@adobe/react-spectrum/src/table/TableView.tsx
index fb95214489f..8bd1654d066 100644
--- a/packages/@react-spectrum/table/src/TableView.tsx
+++ b/packages/@adobe/react-spectrum/src/table/TableView.tsx
@@ -11,18 +11,16 @@
  */
 
 import type {AriaLabelingProps, DisabledBehavior, DOMProps, DOMRef, Key, SpectrumSelectionProps, StyleProps} from '@react-types/shared';
-import {
-  Cell,
-  Column,
-  Row,
-  Section,
-  TableBody,
-  TableHeader
-} from '@react-stately/table';
+import {Cell} from 'react-stately/Cell';
+import {Column} from 'react-stately/Column';
 import type {ColumnSize, SpectrumColumnProps, TableProps} from '@react-types/table';
-import type {DragAndDropHooks} from '@react-spectrum/dnd';
+import type {DragAndDropHooks} from '../dnd/useDragAndDrop';
 import React, {JSX, ReactElement} from 'react';
-import {tableNestedRows} from '@react-stately/flags';
+import {Row} from 'react-stately/Row';
+import {Section} from 'react-stately/Section';
+import {TableBody} from 'react-stately/TableBody';
+import {TableHeader} from 'react-stately/TableHeader';
+import {tableNestedRows} from 'react-stately/private/flags/flags';
 import {TableViewWithoutExpanding} from './TableViewWithoutExpanding';
 import {TreeGridTableView} from './TreeGridTableView';
 
diff --git a/packages/@react-spectrum/table/src/TableViewBase.tsx b/packages/@adobe/react-spectrum/src/table/TableViewBase.tsx
similarity index 95%
rename from packages/@react-spectrum/table/src/TableViewBase.tsx
rename to packages/@adobe/react-spectrum/src/table/TableViewBase.tsx
index 9fadf189be3..46c7d490453 100644
--- a/packages/@react-spectrum/table/src/TableViewBase.tsx
+++ b/packages/@adobe/react-spectrum/src/table/TableViewBase.tsx
@@ -11,49 +11,64 @@
  */
 
 import ArrowDownSmall from '@spectrum-icons/ui/ArrowDownSmall';
-import {Checkbox} from '@react-spectrum/checkbox';
+import {Checkbox} from '../checkbox/Checkbox';
 import ChevronDownMedium from '@spectrum-icons/ui/ChevronDownMedium';
 import ChevronLeftMedium from '@spectrum-icons/ui/ChevronLeftMedium';
 import ChevronRightMedium from '@spectrum-icons/ui/ChevronRightMedium';
-import {
-  classNames,
-  useDOMRef,
-  useFocusableRef,
-  useStyleProps,
-  useUnwrapDOMRef
-} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {ColumnSize, SpectrumColumnProps, TableCollection} from '@react-types/table';
 import {DOMRef, DropTarget, FocusableElement, FocusableRef, Key, RefObject} from '@react-types/shared';
-import type {DragAndDropHooks} from '@react-spectrum/dnd';
-import type {DraggableCollectionState, DroppableCollectionState} from '@react-stately/dnd';
-import type {DraggableItemResult, DropIndicatorAria, DroppableCollectionResult} from '@react-aria/dnd';
-import {FocusRing, FocusScope, useFocusRing} from '@react-aria/focus';
-import {getActiveElement, isAndroid, isFocusWithin, mergeProps, scrollIntoView, scrollIntoViewport, useLoadMore} from '@react-aria/utils';
-import {getInteractionModality, HoverProps, isFocusVisible, useHover, usePress} from '@react-aria/interactions';
+import type {DragAndDropHooks} from '../dnd/useDragAndDrop';
+import type {DraggableCollectionState} from 'react-stately/useDraggableCollectionState';
+import type {DraggableItemResult} from 'react-aria/useDraggableCollection';
+import type {DropIndicatorAria, DroppableCollectionResult} from 'react-aria/useDroppableCollection';
+import type {DroppableCollectionState} from 'react-stately/useDroppableCollectionState';
+import {FocusRing} from 'react-aria/FocusRing';
+import {FocusScope} from 'react-aria/FocusScope';
+import {getActiveElement, isFocusWithin} from 'react-aria/private/utils/shadowdom/DOMFunctions';
+import {getInteractionModality, isFocusVisible} from 'react-aria/private/interactions/useFocusVisible';
 import {GridNode} from '@react-types/grid';
+import {HoverProps, useHover} from 'react-aria/useHover';
 import {InsertionIndicator} from './InsertionIndicator';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
-import {Item, Menu, MenuTrigger} from '@react-spectrum/menu';
-import {LayoutInfo, Rect, ReusableView, useVirtualizerState} from '@react-stately/virtualizer';
-import {layoutInfoToStyle, ScrollView, setScrollLeft, VirtualizerItem} from '@react-aria/virtualizer';
+import intlMessages from '../../intl/table/*.json';
+import {isAndroid} from 'react-aria/private/utils/platform';
+import {Item} from 'react-stately/Item';
+import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
+import {layoutInfoToStyle, VirtualizerItem} from 'react-aria/private/virtualizer/VirtualizerItem';
 import ListGripper from '@spectrum-icons/ui/ListGripper';
-import {ListKeyboardDelegate} from '@react-aria/selection';
+import {ListKeyboardDelegate} from 'react-aria/ListKeyboardDelegate';
+import {Menu} from '../menu/Menu';
+// @ts-ignore
+import {MenuTrigger} from '../menu/MenuTrigger';
+import {mergeProps} from 'react-aria/mergeProps';
 import {Nubbin} from './Nubbin';
-import {ProgressCircle} from '@react-spectrum/progress';
+import {ProgressCircle} from '../progress/ProgressCircle';
 import React, {DOMAttributes, HTMLAttributes, ReactElement, ReactNode, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
+import {Rect} from 'react-stately/private/virtualizer/Rect';
 import {Resizer, ResizeStateContext} from './Resizer';
+import {ReusableView} from 'react-stately/private/virtualizer/ReusableView';
 import {RootDropIndicator} from './RootDropIndicator';
+import {scrollIntoView, scrollIntoViewport} from 'react-aria/private/utils/scrollIntoView';
+import {ScrollView} from 'react-aria/private/virtualizer/ScrollView';
+import {setScrollLeft} from 'react-aria/private/virtualizer/utils';
 import {DragPreview as SpectrumDragPreview} from './DragPreview';
 import {SpectrumTableProps} from './TableView';
 import styles from '@adobe/spectrum-css-temp/components/table/vars.css';
 import stylesOverrides from './table.css';
-import {TableState, TreeGridState, useTableColumnResizeState} from '@react-stately/table';
+import {TableState, useTableColumnResizeState} from 'react-stately/useTableState';
 import {TableViewLayout} from './TableViewLayout';
-import {Tooltip, TooltipTrigger} from '@react-spectrum/tooltip';
-import {useButton} from '@react-aria/button';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useProvider, useProviderProps} from '@react-spectrum/provider';
+import {Tooltip} from '../tooltip/Tooltip';
+import {TooltipTrigger} from '../tooltip/TooltipTrigger';
+import {TreeGridState} from 'react-stately/private/table/useTreeGridState';
+import {useButton} from 'react-aria/useButton';
+import {useDOMRef, useFocusableRef, useUnwrapDOMRef} from '../utils/useDOMRef';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useLoadMore} from 'react-aria/private/utils/useLoadMore';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {usePress} from 'react-aria/usePress';
+import {useProvider, useProviderProps} from '../provider/Provider';
+import {useStyleProps} from '../utils/styleProps';
 import {
   useTable,
   useTableCell,
@@ -63,8 +78,11 @@ import {
   useTableRowGroup,
   useTableSelectAllCheckbox,
   useTableSelectionCheckbox
-} from '@react-aria/table';
-import {useVisuallyHidden, VisuallyHidden} from '@react-aria/visually-hidden';
+} from 'react-aria/useTable';
+
+import {useVirtualizerState} from 'react-stately/private/virtualizer/useVirtualizerState';
+
+import {useVisuallyHidden, VisuallyHidden} from 'react-aria/VisuallyHidden';
 
 const DEFAULT_HEADER_HEIGHT = {
   medium: 34,
diff --git a/packages/@react-spectrum/table/src/TableViewLayout.ts b/packages/@adobe/react-spectrum/src/table/TableViewLayout.ts
similarity index 91%
rename from packages/@react-spectrum/table/src/TableViewLayout.ts
rename to packages/@adobe/react-spectrum/src/table/TableViewLayout.ts
index 26138c975c1..12f4f7d2193 100644
--- a/packages/@react-spectrum/table/src/TableViewLayout.ts
+++ b/packages/@adobe/react-spectrum/src/table/TableViewLayout.ts
@@ -11,9 +11,11 @@
  */
 import {DropTarget} from '@react-types/shared';
 import {GridNode} from '@react-types/grid';
-import {LayoutInfo, Rect} from '@react-stately/virtualizer';
-import {LayoutNode, TableLayout} from '@react-stately/layout';
-import {TableCollection} from '@react-stately/table';
+import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
+import {LayoutNode} from 'react-stately/private/layout/ListLayout';
+import {Rect} from 'react-stately/private/virtualizer/Rect';
+import {TableCollection} from 'react-stately/private/table/TableCollection';
+import {TableLayout} from 'react-stately/private/layout/TableLayout';
 
 export class TableViewLayout<T> extends TableLayout<T> {
   private isLoading: boolean = false;
diff --git a/packages/@react-spectrum/table/src/TableViewWithoutExpanding.tsx b/packages/@adobe/react-spectrum/src/table/TableViewWithoutExpanding.tsx
similarity index 97%
rename from packages/@react-spectrum/table/src/TableViewWithoutExpanding.tsx
rename to packages/@adobe/react-spectrum/src/table/TableViewWithoutExpanding.tsx
index a6b003d3249..d2ce409b57f 100644
--- a/packages/@react-spectrum/table/src/TableViewWithoutExpanding.tsx
+++ b/packages/@adobe/react-spectrum/src/table/TableViewWithoutExpanding.tsx
@@ -14,7 +14,7 @@ import {DOMRef} from '@react-types/shared';
 import React, {ReactElement, useState} from 'react';
 import {SpectrumTableProps} from './TableView';
 import {TableViewBase} from './TableViewBase';
-import {useTableState} from '@react-stately/table';
+import {useTableState} from 'react-stately/useTableState';
 
 interface TableProps<T> extends Omit<SpectrumTableProps<T>, 'UNSTABLE_allowsExpandableRows'> {}
 
diff --git a/packages/@react-spectrum/table/src/TreeGridTableView.tsx b/packages/@adobe/react-spectrum/src/table/TreeGridTableView.tsx
similarity index 95%
rename from packages/@react-spectrum/table/src/TreeGridTableView.tsx
rename to packages/@adobe/react-spectrum/src/table/TreeGridTableView.tsx
index 629496b5bdc..f5c5e5101c2 100644
--- a/packages/@react-spectrum/table/src/TreeGridTableView.tsx
+++ b/packages/@adobe/react-spectrum/src/table/TreeGridTableView.tsx
@@ -14,7 +14,7 @@ import {DOMRef} from '@react-types/shared';
 import React, {ReactElement, useState} from 'react';
 import {SpectrumTableProps} from './TableView';
 import {TableViewBase} from './TableViewBase';
-import {UNSTABLE_useTreeGridState} from '@react-stately/table';
+import {UNSTABLE_useTreeGridState} from 'react-stately/private/table/useTreeGridState';
 
 export interface TreeGridTableProps<T> extends Omit<SpectrumTableProps<T>, 'UNSTABLE_allowsExpandableRows'> {}
 
diff --git a/packages/@react-spectrum/table/src/cursors/Cur_MoveHorizontal_9_9.svg b/packages/@adobe/react-spectrum/src/table/cursors/Cur_MoveHorizontal_9_9.svg
similarity index 100%
rename from packages/@react-spectrum/table/src/cursors/Cur_MoveHorizontal_9_9.svg
rename to packages/@adobe/react-spectrum/src/table/cursors/Cur_MoveHorizontal_9_9.svg
diff --git a/packages/@react-spectrum/table/src/cursors/Cur_MoveToLeft_9_9.svg b/packages/@adobe/react-spectrum/src/table/cursors/Cur_MoveToLeft_9_9.svg
similarity index 100%
rename from packages/@react-spectrum/table/src/cursors/Cur_MoveToLeft_9_9.svg
rename to packages/@adobe/react-spectrum/src/table/cursors/Cur_MoveToLeft_9_9.svg
diff --git a/packages/@react-spectrum/table/src/cursors/Cur_MoveToRight_9_9.svg b/packages/@adobe/react-spectrum/src/table/cursors/Cur_MoveToRight_9_9.svg
similarity index 100%
rename from packages/@react-spectrum/table/src/cursors/Cur_MoveToRight_9_9.svg
rename to packages/@adobe/react-spectrum/src/table/cursors/Cur_MoveToRight_9_9.svg
diff --git a/packages/@react-spectrum/table/src/table.css b/packages/@adobe/react-spectrum/src/table/table.css
similarity index 100%
rename from packages/@react-spectrum/table/src/table.css
rename to packages/@adobe/react-spectrum/src/table/table.css
diff --git a/packages/@react-spectrum/tabs/src/Tabs.tsx b/packages/@adobe/react-spectrum/src/tabs/Tabs.tsx
similarity index 93%
rename from packages/@react-spectrum/tabs/src/Tabs.tsx
rename to packages/@adobe/react-spectrum/src/tabs/Tabs.tsx
index 4090507353d..0525fb27aba 100644
--- a/packages/@react-spectrum/tabs/src/Tabs.tsx
+++ b/packages/@adobe/react-spectrum/src/tabs/Tabs.tsx
@@ -11,12 +11,14 @@
  */
 
 import {AriaTabPanelProps, SpectrumTabListProps, SpectrumTabPanelsProps, SpectrumTabsProps} from '@react-types/tabs';
-import {classNames, SlotProvider, unwrapDOMRef, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
 import {DOMProps, DOMRef, DOMRefValue, Key, Node, Orientation, RefObject, StyleProps} from '@react-types/shared';
-import {filterDOMProps, mergeProps, useId, useLayoutEffect, useResizeObserver} from '@react-aria/utils';
-import {FocusRing} from '@react-aria/focus';
-import {Item, Picker} from '@react-spectrum/picker';
-import {ListCollection} from '@react-stately/list';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {FocusRing} from 'react-aria/FocusRing';
+import {Item} from 'react-stately/Item';
+import {ListCollection} from 'react-stately/private/list/ListCollection';
+import {mergeProps} from 'react-aria/mergeProps';
+import {Picker} from '../picker/Picker';
 import React, {
   CSSProperties,
   HTMLAttributes,
@@ -28,15 +30,21 @@ import React, {
   useRef,
   useState
 } from 'react';
+import {SlotProvider} from '../utils/Slots';
 import {SpectrumPickerProps} from '@react-types/select';
 import styles from '@adobe/spectrum-css-temp/components/tabs/vars.css';
-import {TabListState, useTabListState} from '@react-stately/tabs';
-import {Text} from '@react-spectrum/text';
-import {useCollection} from '@react-stately/collections';
-import {useHover} from '@react-aria/interactions';
-import {useLocale} from '@react-aria/i18n';
-import {useProvider, useProviderProps} from '@react-spectrum/provider';
-import {useTab, useTabList, useTabPanel} from '@react-aria/tabs';
+import {TabListState, useTabListState} from 'react-stately/useTabListState';
+import {Text} from '../text/Text';
+import {unwrapDOMRef, useDOMRef} from '../utils/useDOMRef';
+import {useCollection} from 'react-stately/private/collections/useCollection';
+import {useHover} from 'react-aria/useHover';
+import {useId} from 'react-aria/useId';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useProvider, useProviderProps} from '../provider/Provider';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
+import {useStyleProps} from '../utils/styleProps';
+import {useTab, useTabList, useTabPanel} from 'react-aria/useTabList';
 
 interface TabsContext<T> {
   tabProps: SpectrumTabsProps<T>,
diff --git a/packages/@react-spectrum/tag/src/Tag.tsx b/packages/@adobe/react-spectrum/src/tag/Tag.tsx
similarity index 83%
rename from packages/@react-spectrum/tag/src/Tag.tsx
rename to packages/@adobe/react-spectrum/src/tag/Tag.tsx
index 9ce8af187e3..6bac3c00412 100644
--- a/packages/@react-spectrum/tag/src/Tag.tsx
+++ b/packages/@adobe/react-spectrum/src/tag/Tag.tsx
@@ -10,16 +10,19 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaTagProps, useTag} from '@react-aria/tag';
-import {classNames, ClearSlots, SlotProvider, useStyleProps} from '@react-spectrum/utils';
-import {ClearButton} from '@react-spectrum/button';
-import type {ListState} from '@react-stately/list';
-import {mergeProps} from '@react-aria/utils';
+import {AriaTagProps, useTag} from 'react-aria/useTagGroup';
+
+import {classNames} from '../utils/classNames';
+import {ClearButton} from '../button/ClearButton';
+import {ClearSlots, SlotProvider} from '../utils/Slots';
+import type {ListState} from 'react-stately/useListState';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {ReactNode, useRef} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/tags/vars.css';
-import {Text} from '@react-spectrum/text';
-import {useFocusRing} from '@react-aria/focus';
-import {useHover} from '@react-aria/interactions';
+import {Text} from '../text/Text';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useStyleProps} from '../utils/styleProps';
 
 export interface SpectrumTagProps<T> extends AriaTagProps<T> {
   state: ListState<T>
diff --git a/packages/@react-spectrum/tag/src/TagGroup.tsx b/packages/@adobe/react-spectrum/src/tag/TagGroup.tsx
similarity index 90%
rename from packages/@react-spectrum/tag/src/TagGroup.tsx
rename to packages/@adobe/react-spectrum/src/tag/TagGroup.tsx
index 00ae8821cea..7d39875b96f 100644
--- a/packages/@react-spectrum/tag/src/TagGroup.tsx
+++ b/packages/@adobe/react-spectrum/src/tag/TagGroup.tsx
@@ -10,23 +10,31 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
-import {AriaTagGroupProps, useTagGroup} from '@react-aria/tag';
-import {classNames, useDOMRef} from '@react-spectrum/utils';
+import {ActionButton} from '../button/ActionButton';
+
+import {AriaTagGroupProps, useTagGroup} from 'react-aria/useTagGroup';
+import {classNames} from '../utils/classNames';
 import {Collection, DOMRef, Node, SpectrumLabelableProps, StyleProps, Validation} from '@react-types/shared';
-import {Field} from '@react-spectrum/label';
-import {FocusRing, FocusScope} from '@react-aria/focus';
+import {Field} from '../label/Field';
+import {FocusRing} from 'react-aria/FocusRing';
+import {FocusScope} from 'react-aria/FocusScope';
+import intlMessages from '../../intl/tag/*.json';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {ListCollection, useListState} from '@react-stately/list';
-import {ListKeyboardDelegate} from '@react-aria/selection';
-import {Provider, useProvider, useProviderProps} from '@react-spectrum/provider';
+import {ListCollection} from 'react-stately/private/list/ListCollection';
+import {ListKeyboardDelegate} from 'react-aria/ListKeyboardDelegate';
+import {Provider, useProvider, useProviderProps} from '../provider/Provider';
 import React, {JSX, ReactNode, useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/tags/vars.css';
 import {Tag} from './Tag';
-import {useFormProps} from '@react-spectrum/form';
-import {useId, useLayoutEffect, useResizeObserver, useValueEffect} from '@react-aria/utils';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useFormProps} from '../form/Form';
+import {useId} from 'react-aria/useId';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useListState} from 'react-stately/useListState';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
+import {useValueEffect} from 'react-aria/private/utils/useValueEffect';
 
 const TAG_STYLES = {
   medium: {
diff --git a/packages/@react-spectrum/text/src/Heading.tsx b/packages/@adobe/react-spectrum/src/text/Heading.tsx
similarity index 80%
rename from packages/@react-spectrum/text/src/Heading.tsx
rename to packages/@adobe/react-spectrum/src/text/Heading.tsx
index 610c84048a6..c65f3c04677 100644
--- a/packages/@react-spectrum/text/src/Heading.tsx
+++ b/packages/@adobe/react-spectrum/src/text/Heading.tsx
@@ -11,11 +11,14 @@
  */
 
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
-import {HeadingContext, useContextProps} from 'react-aria-components';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {HeadingContext} from 'react-aria-components/Heading';
 import {HeadingProps} from '@react-types/text';
 import React, {ElementType, forwardRef} from 'react';
-import {useDOMRef, useSlotProps, useStyleProps} from '@react-spectrum/utils';
+import {useContextProps} from 'react-aria-components/utils';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useSlotProps} from '../utils/Slots';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * Heading is used to create various levels of typographic hierarchies.
diff --git a/packages/@react-spectrum/text/src/Keyboard.tsx b/packages/@adobe/react-spectrum/src/text/Keyboard.tsx
similarity index 84%
rename from packages/@react-spectrum/text/src/Keyboard.tsx
rename to packages/@adobe/react-spectrum/src/text/Keyboard.tsx
index bcb4d49c899..1b7bfe7b0e4 100644
--- a/packages/@react-spectrum/text/src/Keyboard.tsx
+++ b/packages/@adobe/react-spectrum/src/text/Keyboard.tsx
@@ -11,10 +11,12 @@
  */
 
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {KeyboardProps} from '@react-types/text';
 import React, {forwardRef} from 'react';
-import {useDOMRef, useSlotProps, useStyleProps} from '@react-spectrum/utils';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useSlotProps} from '../utils/Slots';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * Keyboard represents text that specifies a keyboard command.
diff --git a/packages/@react-spectrum/text/src/Text.tsx b/packages/@adobe/react-spectrum/src/text/Text.tsx
similarity index 84%
rename from packages/@react-spectrum/text/src/Text.tsx
rename to packages/@adobe/react-spectrum/src/text/Text.tsx
index 1e763a59d7b..8b288734fad 100644
--- a/packages/@react-spectrum/text/src/Text.tsx
+++ b/packages/@adobe/react-spectrum/src/text/Text.tsx
@@ -11,10 +11,12 @@
  */
 
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import React, {forwardRef} from 'react';
 import {TextProps} from '@react-types/text';
-import {useDOMRef, useSlotProps, useStyleProps} from '@react-spectrum/utils';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useSlotProps} from '../utils/Slots';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * Text represents text with no specific semantic meaning.
diff --git a/packages/@react-spectrum/textfield/src/TextArea.tsx b/packages/@adobe/react-spectrum/src/textfield/TextArea.tsx
similarity index 91%
rename from packages/@react-spectrum/textfield/src/TextArea.tsx
rename to packages/@adobe/react-spectrum/src/textfield/TextArea.tsx
index 2424823560b..d67fb8b6f5f 100644
--- a/packages/@react-spectrum/textfield/src/TextArea.tsx
+++ b/packages/@adobe/react-spectrum/src/textfield/TextArea.tsx
@@ -10,14 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {chain, useLayoutEffect} from '@react-aria/utils';
+import {chain} from 'react-aria/private/utils/chain';
+
 import React, {Ref, useCallback, useEffect, useRef} from 'react';
 import {SpectrumTextAreaProps, SpectrumTextFieldBaseProps, TextFieldRef} from '@react-types/textfield';
 import {TextFieldBase} from './TextFieldBase';
-import {useControlledState} from '@react-stately/utils';
-import {useFormProps} from '@react-spectrum/form';
-import {useProviderProps} from '@react-spectrum/provider';
-import {useTextField} from '@react-aria/textfield';
+import {useControlledState} from 'react-stately/private/utils/useControlledState';
+import {useFormProps} from '../form/Form';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useProviderProps} from '../provider/Provider';
+import {useTextField} from 'react-aria/useTextField';
 
 /**
  * TextAreas are multiline text inputs, useful for cases where users have
diff --git a/packages/@react-spectrum/textfield/src/TextField.tsx b/packages/@adobe/react-spectrum/src/textfield/TextField.tsx
similarity index 91%
rename from packages/@react-spectrum/textfield/src/TextField.tsx
rename to packages/@adobe/react-spectrum/src/textfield/TextField.tsx
index 4381c066d60..94c561b0b4d 100644
--- a/packages/@react-spectrum/textfield/src/TextField.tsx
+++ b/packages/@adobe/react-spectrum/src/textfield/TextField.tsx
@@ -13,9 +13,9 @@
 import React, {forwardRef, Ref, useEffect, useRef} from 'react';
 import {SpectrumTextFieldProps, TextFieldRef} from '@react-types/textfield';
 import {TextFieldBase} from './TextFieldBase';
-import {useFormProps} from '@react-spectrum/form';
-import {useProviderProps} from '@react-spectrum/provider';
-import {useTextField} from '@react-aria/textfield';
+import {useFormProps} from '../form/Form';
+import {useProviderProps} from '../provider/Provider';
+import {useTextField} from 'react-aria/useTextField';
 
 /**
  * TextFields are text inputs that allow users to input custom text entries
diff --git a/packages/@react-spectrum/textfield/src/TextFieldBase.tsx b/packages/@adobe/react-spectrum/src/textfield/TextFieldBase.tsx
similarity index 92%
rename from packages/@react-spectrum/textfield/src/TextFieldBase.tsx
rename to packages/@adobe/react-spectrum/src/textfield/TextFieldBase.tsx
index b73670171e6..c35dbd565b3 100644
--- a/packages/@react-spectrum/textfield/src/TextFieldBase.tsx
+++ b/packages/@adobe/react-spectrum/src/textfield/TextFieldBase.tsx
@@ -12,18 +12,20 @@
 
 import AlertMedium from '@spectrum-icons/ui/AlertMedium';
 import CheckmarkMedium from '@spectrum-icons/ui/CheckmarkMedium';
-import {classNames, createFocusableRef} from '@react-spectrum/utils';
-import {Field} from '@react-spectrum/label';
+import {classNames} from '../utils/classNames';
+import {createFocusableRef} from '../utils/useDOMRef';
+import {Field} from '../label/Field';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {mergeProps, useId} from '@react-aria/utils';
+import intlMessages from '../../intl/textfield/*.json';
+import {mergeProps} from 'react-aria/mergeProps';
 import {PressEvents, RefObject, ValidationResult} from '@react-types/shared';
 import React, {cloneElement, forwardRef, HTMLAttributes, InputHTMLAttributes, LabelHTMLAttributes, ReactElement, Ref, TextareaHTMLAttributes, useImperativeHandle, useRef} from 'react';
 import {SpectrumTextFieldProps, TextFieldRef} from '@react-types/textfield';
 import styles from '@adobe/spectrum-css-temp/components/textfield/vars.css';
-import {useFocusRing} from '@react-aria/focus';
-import {useHover} from '@react-aria/interactions';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useId} from 'react-aria/useId';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 
 interface TextFieldBaseProps extends Omit<SpectrumTextFieldProps, 'onChange' | 'validate'>, PressEvents, Partial<ValidationResult> {
   wrapperChildren?: ReactElement | ReactElement[],
diff --git a/packages/@react-spectrum/theme-dark/src/darkTheme.ts b/packages/@adobe/react-spectrum/src/theme-dark/darkTheme.ts
similarity index 100%
rename from packages/@react-spectrum/theme-dark/src/darkTheme.ts
rename to packages/@adobe/react-spectrum/src/theme-dark/darkTheme.ts
diff --git a/packages/@react-spectrum/theme-default/src/defaultTheme.ts b/packages/@adobe/react-spectrum/src/theme-default/defaultTheme.ts
similarity index 100%
rename from packages/@react-spectrum/theme-default/src/defaultTheme.ts
rename to packages/@adobe/react-spectrum/src/theme-default/defaultTheme.ts
diff --git a/packages/@react-spectrum/theme-express/src/expressTheme.ts b/packages/@adobe/react-spectrum/src/theme-express/expressTheme.ts
similarity index 93%
rename from packages/@react-spectrum/theme-express/src/expressTheme.ts
rename to packages/@adobe/react-spectrum/src/theme-express/expressTheme.ts
index 95082fea4eb..fff1ddda6a1 100644
--- a/packages/@react-spectrum/theme-express/src/expressTheme.ts
+++ b/packages/@adobe/react-spectrum/src/theme-express/expressTheme.ts
@@ -12,7 +12,7 @@
 
 /// <reference types="css-module-types" />
 
-import {theme as defaultTheme} from '@react-spectrum/theme-default';
+import {defaultTheme} from '../theme-default/defaultTheme';
 import express from '@adobe/spectrum-css-temp/vars/express.css';
 import {Theme} from '@react-types/provider';
 
diff --git a/packages/@react-spectrum/theme-light/src/lightTheme.ts b/packages/@adobe/react-spectrum/src/theme-light/lightTheme.ts
similarity index 100%
rename from packages/@react-spectrum/theme-light/src/lightTheme.ts
rename to packages/@adobe/react-spectrum/src/theme-light/lightTheme.ts
diff --git a/packages/@react-spectrum/toast/src/Toast.tsx b/packages/@adobe/react-spectrum/src/toast/Toast.tsx
similarity index 85%
rename from packages/@react-spectrum/toast/src/Toast.tsx
rename to packages/@adobe/react-spectrum/src/toast/Toast.tsx
index 30966ca6f6d..a21486d90e9 100644
--- a/packages/@react-spectrum/toast/src/Toast.tsx
+++ b/packages/@adobe/react-spectrum/src/toast/Toast.tsx
@@ -11,22 +11,26 @@
  */
 
 import AlertMedium from '@spectrum-icons/ui/AlertMedium';
-import {Button, ClearButton} from '@react-spectrum/button';
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {Button} from '../button/Button';
+import {classNames} from '../utils/classNames';
+import {ClearButton} from '../button/ClearButton';
 import CrossMedium from '@spectrum-icons/ui/CrossMedium';
 import {DOMProps, DOMRef} from '@react-types/shared';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import InfoMedium from '@spectrum-icons/ui/InfoMedium';
+import intlMessages from '../../intl/toast/*.json';
+import {mergeProps} from 'react-aria/mergeProps';
+import {QueuedToast, ToastState} from 'react-stately/useToastState';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {QueuedToast, ToastState} from '@react-stately/toast';
 import React from 'react';
 import styles from '@adobe/spectrum-css-temp/components/toast/vars.css';
 import SuccessMedium from '@spectrum-icons/ui/SuccessMedium';
 import toastContainerStyles from './toastContainer.css';
-import {useFocusRing} from '@react-aria/focus';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useToast} from '@react-aria/toast';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useStyleProps} from '../utils/styleProps';
+import {useToast} from 'react-aria/useToast';
 
 export interface SpectrumToastValue extends DOMProps {
   children: string,
diff --git a/packages/@react-spectrum/toast/src/ToastContainer.tsx b/packages/@adobe/react-spectrum/src/toast/ToastContainer.tsx
similarity index 96%
rename from packages/@react-spectrum/toast/src/ToastContainer.tsx
rename to packages/@adobe/react-spectrum/src/toast/ToastContainer.tsx
index 59609880943..e4f8d6086ce 100644
--- a/packages/@react-spectrum/toast/src/ToastContainer.tsx
+++ b/packages/@adobe/react-spectrum/src/toast/ToastContainer.tsx
@@ -10,16 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaToastRegionProps} from '@react-aria/toast';
-import {classNames} from '@react-spectrum/utils';
+import {AriaToastRegionProps} from 'react-aria/useToast';
+import {classNames} from '../utils/classNames';
 import {DOMProps} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {flushSync} from 'react-dom';
 import React, {ReactElement, useEffect, useMemo, useRef} from 'react';
 import {SpectrumToastValue, Toast} from './Toast';
 import toastContainerStyles from './toastContainer.css';
 import {Toaster} from './Toaster';
-import {ToastOptions, ToastQueue, useToastQueue} from '@react-stately/toast';
+import {ToastOptions, ToastQueue, useToastQueue} from 'react-stately/useToastState';
 import {useSyncExternalStore} from 'use-sync-external-store/shim/index.js';
 
 export type ToastPlacement = 'top' | 'top end' | 'bottom' | 'bottom end';
diff --git a/packages/@react-spectrum/toast/src/Toaster.tsx b/packages/@adobe/react-spectrum/src/toast/Toaster.tsx
similarity index 83%
rename from packages/@react-spectrum/toast/src/Toaster.tsx
rename to packages/@adobe/react-spectrum/src/toast/Toaster.tsx
index 0fb2ae7ad2e..9979ad932cb 100644
--- a/packages/@react-spectrum/toast/src/Toaster.tsx
+++ b/packages/@adobe/react-spectrum/src/toast/Toaster.tsx
@@ -10,17 +10,19 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaToastRegionProps, useToastRegion} from '@react-aria/toast';
-import {classNames} from '@react-spectrum/utils';
-import {FocusScope, useFocusRing} from '@react-aria/focus';
-import {mergeProps} from '@react-aria/utils';
-import {Provider} from '@react-spectrum/provider';
+import {AriaToastRegionProps, useToastRegion} from 'react-aria/useToast';
+
+import {classNames} from '../utils/classNames';
+import {FocusScope} from 'react-aria/FocusScope';
+import {mergeProps} from 'react-aria/mergeProps';
+import {Provider} from '../provider/Provider';
 import React, {createContext, ReactElement, ReactNode, useMemo, useRef} from 'react';
 import ReactDOM from 'react-dom';
 import toastContainerStyles from './toastContainer.css';
 import type {ToastPlacement} from './ToastContainer';
-import {ToastState} from '@react-stately/toast';
-import {useUNSAFE_PortalContext} from '@react-aria/overlays';
+import {ToastState} from 'react-stately/useToastState';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useUNSAFE_PortalContext} from 'react-aria/PortalProvider';
 
 interface ToastContainerProps extends AriaToastRegionProps {
   children: ReactNode,
diff --git a/packages/@react-spectrum/toast/src/toastContainer.css b/packages/@adobe/react-spectrum/src/toast/toastContainer.css
similarity index 100%
rename from packages/@react-spectrum/toast/src/toastContainer.css
rename to packages/@adobe/react-spectrum/src/toast/toastContainer.css
diff --git a/packages/@react-spectrum/tooltip/src/Tooltip.tsx b/packages/@adobe/react-spectrum/src/tooltip/Tooltip.tsx
similarity index 91%
rename from packages/@react-spectrum/tooltip/src/Tooltip.tsx
rename to packages/@adobe/react-spectrum/src/tooltip/Tooltip.tsx
index 0dfe754ecff..892b1060508 100644
--- a/packages/@react-spectrum/tooltip/src/Tooltip.tsx
+++ b/packages/@adobe/react-spectrum/src/tooltip/Tooltip.tsx
@@ -11,16 +11,18 @@
  */
 
 import AlertSmall from '@spectrum-icons/ui/AlertSmall';
-import {classNames, createDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+import {createDOMRef} from '../utils/useDOMRef';
 import {DOMRef} from '@react-types/shared';
 import InfoSmall from '@spectrum-icons/ui/InfoSmall';
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {useContext, useImperativeHandle, useRef} from 'react';
 import {SpectrumTooltipProps} from '@react-types/tooltip';
 import styles from '@adobe/spectrum-css-temp/components/tooltip/vars.css';
 import SuccessSmall from '@spectrum-icons/ui/SuccessSmall';
 import {TooltipContext} from './context';
-import {useTooltip} from '@react-aria/tooltip';
+import {useStyleProps} from '../utils/styleProps';
+import {useTooltip} from 'react-aria/useTooltipTrigger';
 
 let iconMap = {
   info: InfoSmall,
diff --git a/packages/@react-spectrum/tooltip/src/TooltipTrigger.tsx b/packages/@adobe/react-spectrum/src/tooltip/TooltipTrigger.tsx
similarity index 91%
rename from packages/@react-spectrum/tooltip/src/TooltipTrigger.tsx
rename to packages/@adobe/react-spectrum/src/tooltip/TooltipTrigger.tsx
index 9530a2404b0..ab3ce543522 100644
--- a/packages/@react-spectrum/tooltip/src/TooltipTrigger.tsx
+++ b/packages/@adobe/react-spectrum/src/tooltip/TooltipTrigger.tsx
@@ -10,15 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {FocusableProvider} from '@react-aria/focus';
-import {Overlay} from '@react-spectrum/overlays';
+import {FocusableProvider} from 'react-aria/private/interactions/useFocusable';
+import {Overlay} from '../overlays/Overlay';
 import React, {JSX, ReactElement, useRef, useState} from 'react';
 import {SpectrumTooltipTriggerProps} from '@react-types/tooltip';
 import {TooltipContext} from './context';
-import {useLayoutEffect} from '@react-aria/utils';
-import {useOverlayPosition} from '@react-aria/overlays';
-import {useTooltipTrigger} from '@react-aria/tooltip';
-import {useTooltipTriggerState} from '@react-stately/tooltip';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useOverlayPosition} from 'react-aria/private/overlays/useOverlayPosition';
+import {useTooltipTrigger} from 'react-aria/useTooltipTrigger';
+import {useTooltipTriggerState} from 'react-stately/useTooltipTriggerState';
 
 const DEFAULT_OFFSET = -1; // Offset needed to reach 4px/5px (med/large) distance between tooltip and trigger button
 const DEFAULT_CROSS_OFFSET = 0;
diff --git a/packages/@react-spectrum/tooltip/src/context.ts b/packages/@adobe/react-spectrum/src/tooltip/context.ts
similarity index 93%
rename from packages/@react-spectrum/tooltip/src/context.ts
rename to packages/@adobe/react-spectrum/src/tooltip/context.ts
index 1dcecea82f3..8df45a28ad4 100644
--- a/packages/@react-spectrum/tooltip/src/context.ts
+++ b/packages/@adobe/react-spectrum/src/tooltip/context.ts
@@ -13,7 +13,7 @@
 import {PlacementAxis} from '@react-types/overlays';
 import React, {HTMLAttributes} from 'react';
 import {RefObject, StyleProps} from '@react-types/shared';
-import {TooltipTriggerState} from '@react-stately/tooltip';
+import {TooltipTriggerState} from 'react-stately/useTooltipTriggerState';
 
 interface TooltipContextProps extends StyleProps {
   state?: TooltipTriggerState,
diff --git a/packages/@react-spectrum/tree/src/TreeView.tsx b/packages/@adobe/react-spectrum/src/tree/TreeView.tsx
similarity index 93%
rename from packages/@react-spectrum/tree/src/TreeView.tsx
rename to packages/@adobe/react-spectrum/src/tree/TreeView.tsx
index 0ca1725ae9a..9b2834a7546 100644
--- a/packages/@react-spectrum/tree/src/TreeView.tsx
+++ b/packages/@adobe/react-spectrum/src/tree/TreeView.tsx
@@ -10,9 +10,20 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaTreeProps} from '@react-aria/tree';
+import {AriaTreeProps} from 'react-aria/private/tree/useTree';
+
+import {ButtonContext} from 'react-aria-components/Button';
+
+import {Checkbox} from '../checkbox/Checkbox';
+
+import ChevronLeftMedium from '@spectrum-icons/ui/ChevronLeftMedium';
+import ChevronRightMedium from '@spectrum-icons/ui/ChevronRightMedium';
+import {DOMRef, Expandable, Key, SelectionBehavior, SpectrumSelectionProps, StyleProps} from '@react-types/shared';
+import {focusRing, style} from '@react-spectrum/style-macro-s1' with {type: 'macro'};
+import {isAndroid} from 'react-aria/private/utils/platform';
+import React, {createContext, JSX, JSXElementConstructor, ReactElement, ReactNode, useRef} from 'react';
+import {SlotProvider} from '../utils/Slots';
 import {
-  ButtonContext,
   Tree,
   TreeItem,
   TreeItemContent,
@@ -20,19 +31,13 @@ import {
   TreeItemContentRenderProps,
   TreeItemProps,
   TreeItemRenderProps,
-  TreeRenderProps,
-  useContextProps
-} from 'react-aria-components';
-import {Checkbox} from '@react-spectrum/checkbox';
-import ChevronLeftMedium from '@spectrum-icons/ui/ChevronLeftMedium';
-import ChevronRightMedium from '@spectrum-icons/ui/ChevronRightMedium';
-import {DOMRef, Expandable, Key, SelectionBehavior, SpectrumSelectionProps, StyleProps} from '@react-types/shared';
-import {focusRing, style} from '@react-spectrum/style-macro-s1' with {type: 'macro'};
-import {isAndroid} from '@react-aria/utils';
-import React, {createContext, JSX, JSXElementConstructor, ReactElement, ReactNode, useRef} from 'react';
-import {SlotProvider, useDOMRef, useStyleProps} from '@react-spectrum/utils';
-import {useButton} from '@react-aria/button';
-import {useLocale} from '@react-aria/i18n';
+  TreeRenderProps
+} from 'react-aria-components/Tree';
+import {useButton} from 'react-aria/useButton';
+import {useContextProps} from 'react-aria-components/utils';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useStyleProps} from '../utils/styleProps';
 
 export interface SpectrumTreeViewProps<T> extends Omit<AriaTreeProps<T>, 'children' | 'render'>, StyleProps, SpectrumSelectionProps, Expandable {
   /** Provides content to display when there are no items in the tree. */
@@ -253,18 +258,18 @@ export const TreeViewItemContent = (props: SpectrumTreeViewItemContentProps): Re
   } = props;
 
   return (
-    <TreeItemContent>
+    (<TreeItemContent>
       {({isExpanded, hasChildItems, level, selectionMode, selectionBehavior, isDisabled, isSelected, isFocusVisible, state, id}) => {
         let isFirst = state.collection.getFirstKey() === id;
         return (
-          <div className={treeCellGrid({isDisabled})}>
+          (<div className={treeCellGrid({isDisabled})}>
             {selectionMode !== 'none' && selectionBehavior === 'toggle' && (
               // TODO: add transition?
-              <Checkbox
+              (<Checkbox
                 isEmphasized
                 UNSAFE_className={treeCheckbox()}
                 UNSAFE_style={{paddingInlineEnd: '0px'}}
-                slot="selection" />
+                slot="selection" />)
               )}
             <div style={{gridArea: 'level-padding', marginInlineEnd: `calc(${level - 1} * var(--spectrum-global-dimension-size-200))`}} />
             {/* TODO: revisit when we do async loading, at the moment hasChildItems will only cause the chevron to be rendered, no aria/data attributes indicating the row's expandability are added */}
@@ -289,10 +294,10 @@ export const TreeViewItemContent = (props: SpectrumTreeViewItemContentProps): Re
               {children}
             </SlotProvider>
             <div className={treeRowOutline({isFocusVisible, isSelected, isFirst})} />
-          </div>
+          </div>)
         );
       }}
-    </TreeItemContent>
+    </TreeItemContent>)
   );
 };
 
diff --git a/packages/@react-spectrum/utils/src/BreakpointProvider.tsx b/packages/@adobe/react-spectrum/src/utils/BreakpointProvider.tsx
similarity index 98%
rename from packages/@react-spectrum/utils/src/BreakpointProvider.tsx
rename to packages/@adobe/react-spectrum/src/utils/BreakpointProvider.tsx
index e84deda0bbb..f02862532d8 100644
--- a/packages/@react-spectrum/utils/src/BreakpointProvider.tsx
+++ b/packages/@adobe/react-spectrum/src/utils/BreakpointProvider.tsx
@@ -1,5 +1,5 @@
 import React, {ReactNode, useContext, useEffect, useState} from 'react';
-import {useIsSSR} from '@react-aria/ssr';
+import {useIsSSR} from 'react-aria/SSRProvider';
 
 interface Breakpoints {
   S?: number,
diff --git a/packages/@react-spectrum/utils/src/Slots.tsx b/packages/@adobe/react-spectrum/src/utils/Slots.tsx
similarity index 98%
rename from packages/@react-spectrum/utils/src/Slots.tsx
rename to packages/@adobe/react-spectrum/src/utils/Slots.tsx
index 498b5be4660..2ba37613110 100644
--- a/packages/@react-spectrum/utils/src/Slots.tsx
+++ b/packages/@adobe/react-spectrum/src/utils/Slots.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {ReactNode, useContext, useMemo} from 'react';
 
 interface SlotProps {
diff --git a/packages/@react-spectrum/utils/src/classNames.ts b/packages/@adobe/react-spectrum/src/utils/classNames.ts
similarity index 100%
rename from packages/@react-spectrum/utils/src/classNames.ts
rename to packages/@adobe/react-spectrum/src/utils/classNames.ts
diff --git a/packages/@react-spectrum/utils/src/getWrappedElement.tsx b/packages/@adobe/react-spectrum/src/utils/getWrappedElement.tsx
similarity index 100%
rename from packages/@react-spectrum/utils/src/getWrappedElement.tsx
rename to packages/@adobe/react-spectrum/src/utils/getWrappedElement.tsx
diff --git a/packages/@react-spectrum/utils/src/styleProps.ts b/packages/@adobe/react-spectrum/src/utils/styleProps.ts
similarity index 99%
rename from packages/@react-spectrum/utils/src/styleProps.ts
rename to packages/@adobe/react-spectrum/src/utils/styleProps.ts
index d84c2881d8e..aed81ded3f4 100644
--- a/packages/@react-spectrum/utils/src/styleProps.ts
+++ b/packages/@adobe/react-spectrum/src/utils/styleProps.ts
@@ -13,7 +13,7 @@
 import {BackgroundColorValue, BorderColorValue, BorderRadiusValue, BorderSizeValue, ColorValue, ColorVersion, DimensionValue, Direction, Responsive, ResponsiveProp, StyleProps, ViewStyleProps} from '@react-types/shared';
 import {CSSProperties, HTMLAttributes} from 'react';
 import {useBreakpoint} from './BreakpointProvider';
-import {useLocale} from '@react-aria/i18n';
+import {useLocale} from 'react-aria/I18nProvider';
 
 type Breakpoint = 'base' | 'S' | 'M' | 'L' | string;
 type StyleName = string | string[] | ((dir: Direction) => string);
diff --git a/packages/@react-spectrum/utils/src/useDOMRef.ts b/packages/@adobe/react-spectrum/src/utils/useDOMRef.ts
similarity index 100%
rename from packages/@react-spectrum/utils/src/useDOMRef.ts
rename to packages/@adobe/react-spectrum/src/utils/useDOMRef.ts
diff --git a/packages/@react-spectrum/utils/src/useHasChild.ts b/packages/@adobe/react-spectrum/src/utils/useHasChild.ts
similarity index 93%
rename from packages/@react-spectrum/utils/src/useHasChild.ts
rename to packages/@adobe/react-spectrum/src/utils/useHasChild.ts
index 4523e365575..9879e324b2c 100644
--- a/packages/@react-spectrum/utils/src/useHasChild.ts
+++ b/packages/@adobe/react-spectrum/src/utils/useHasChild.ts
@@ -11,7 +11,7 @@
  */
 
 import {RefObject} from '@react-types/shared';
-import {useLayoutEffect} from '@react-aria/utils';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
 import {useState} from 'react';
 
 export function useHasChild(query: string, ref: RefObject<HTMLElement | null>): boolean {
diff --git a/packages/@react-spectrum/utils/src/useIsMobileDevice.ts b/packages/@adobe/react-spectrum/src/utils/useIsMobileDevice.ts
similarity index 94%
rename from packages/@react-spectrum/utils/src/useIsMobileDevice.ts
rename to packages/@adobe/react-spectrum/src/utils/useIsMobileDevice.ts
index 3bb3ed79de7..9507e3796e9 100644
--- a/packages/@react-spectrum/utils/src/useIsMobileDevice.ts
+++ b/packages/@adobe/react-spectrum/src/utils/useIsMobileDevice.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {useIsSSR} from '@react-aria/ssr';
+import {useIsSSR} from 'react-aria/SSRProvider';
 
 const MOBILE_SCREEN_WIDTH = 700;
 
diff --git a/packages/@react-spectrum/utils/src/useMediaQuery.ts b/packages/@adobe/react-spectrum/src/utils/useMediaQuery.ts
similarity index 96%
rename from packages/@react-spectrum/utils/src/useMediaQuery.ts
rename to packages/@adobe/react-spectrum/src/utils/useMediaQuery.ts
index 361bfef50b2..a273485a39e 100644
--- a/packages/@react-spectrum/utils/src/useMediaQuery.ts
+++ b/packages/@adobe/react-spectrum/src/utils/useMediaQuery.ts
@@ -11,7 +11,7 @@
  */
 
 import {useEffect, useState} from 'react';
-import {useIsSSR} from '@react-aria/ssr';
+import {useIsSSR} from 'react-aria/SSRProvider';
 
 export function useMediaQuery(query: string): boolean {
   let supportsMatchMedia = typeof window !== 'undefined' && typeof window.matchMedia === 'function';
diff --git a/packages/@react-spectrum/view/src/Content.tsx b/packages/@adobe/react-spectrum/src/view/Content.tsx
similarity index 84%
rename from packages/@react-spectrum/view/src/Content.tsx
rename to packages/@adobe/react-spectrum/src/view/Content.tsx
index 9d3ed55fceb..48acf4e7d7c 100644
--- a/packages/@react-spectrum/view/src/Content.tsx
+++ b/packages/@adobe/react-spectrum/src/view/Content.tsx
@@ -10,11 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {ClearSlots, useDOMRef, useSlotProps, useStyleProps} from '@react-spectrum/utils';
+import {ClearSlots, useSlotProps} from '../utils/Slots';
+
 import {ContentProps} from '@react-types/view';
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import React, {forwardRef} from 'react';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * Content represents the primary content within a Spectrum container.
diff --git a/packages/@react-spectrum/view/src/Footer.tsx b/packages/@adobe/react-spectrum/src/view/Footer.tsx
similarity index 84%
rename from packages/@react-spectrum/view/src/Footer.tsx
rename to packages/@adobe/react-spectrum/src/view/Footer.tsx
index 63d44e8d512..b2918cd1bba 100644
--- a/packages/@react-spectrum/view/src/Footer.tsx
+++ b/packages/@adobe/react-spectrum/src/view/Footer.tsx
@@ -10,11 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {ClearSlots, useDOMRef, useSlotProps, useStyleProps} from '@react-spectrum/utils';
+import {ClearSlots, useSlotProps} from '../utils/Slots';
+
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FooterProps} from '@react-types/view';
 import React, {forwardRef} from 'react';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * Footer represents a footer within a Spectrum container.
diff --git a/packages/@react-spectrum/view/src/Header.tsx b/packages/@adobe/react-spectrum/src/view/Header.tsx
similarity index 84%
rename from packages/@react-spectrum/view/src/Header.tsx
rename to packages/@adobe/react-spectrum/src/view/Header.tsx
index 44e81a150ce..aa81a9e6869 100644
--- a/packages/@react-spectrum/view/src/Header.tsx
+++ b/packages/@adobe/react-spectrum/src/view/Header.tsx
@@ -10,11 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {ClearSlots, useDOMRef, useSlotProps, useStyleProps} from '@react-spectrum/utils';
+import {ClearSlots, useSlotProps} from '../utils/Slots';
+
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {HeaderProps} from '@react-types/view';
 import React, {forwardRef} from 'react';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * Header represents a header within a Spectrum container.
diff --git a/packages/@react-spectrum/view/src/View.tsx b/packages/@adobe/react-spectrum/src/view/View.tsx
similarity index 86%
rename from packages/@react-spectrum/view/src/View.tsx
rename to packages/@adobe/react-spectrum/src/view/View.tsx
index 4eb6e29ff48..c5194d02720 100644
--- a/packages/@react-spectrum/view/src/View.tsx
+++ b/packages/@adobe/react-spectrum/src/view/View.tsx
@@ -10,10 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {ClearSlots, useDOMRef, useSlotProps, useStyleProps, viewStyleProps} from '@react-spectrum/utils';
+import {ClearSlots, useSlotProps} from '../utils/Slots';
+
 import {ColorVersion, DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import React, {forwardRef, ReactElement} from 'react';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useStyleProps, viewStyleProps} from '../utils/styleProps';
 import {ViewProps} from '@react-types/view';
 
 /**
diff --git a/packages/@react-spectrum/well/src/Well.tsx b/packages/@adobe/react-spectrum/src/well/Well.tsx
similarity index 88%
rename from packages/@react-spectrum/well/src/Well.tsx
rename to packages/@adobe/react-spectrum/src/well/Well.tsx
index 63159c60206..6481da9a8ec 100644
--- a/packages/@react-spectrum/well/src/Well.tsx
+++ b/packages/@adobe/react-spectrum/src/well/Well.tsx
@@ -10,12 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames, useDOMRef, useStyleProps} from '@react-spectrum/utils';
+import {classNames} from '../utils/classNames';
+
 import {DOMRef} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import React, {forwardRef} from 'react';
 import {SpectrumWellProps} from '@react-types/well';
 import styles from '@adobe/spectrum-css-temp/components/well/vars.css';
+import {useDOMRef} from '../utils/useDOMRef';
+import {useStyleProps} from '../utils/styleProps';
 
 /**
  * A Well is a content container that displays non-editable content separate from other content on the screen.
diff --git a/packages/@react-spectrum/accordion/stories/Accordion.stories.tsx b/packages/@adobe/react-spectrum/stories/accordion/Accordion.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/accordion/stories/Accordion.stories.tsx
rename to packages/@adobe/react-spectrum/stories/accordion/Accordion.stories.tsx
index 9606dc1a498..de90ee635bf 100644
--- a/packages/@react-spectrum/accordion/stories/Accordion.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/accordion/Accordion.stories.tsx
@@ -10,7 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {Accordion, Disclosure, DisclosurePanel, DisclosureTitle, SpectrumAccordionProps} from '../src';
+import {
+  Accordion,
+  Disclosure,
+  DisclosurePanel,
+  DisclosureTitle,
+  SpectrumAccordionProps
+} from '../../src/accordion/Accordion';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/accordion/stories/Disclosure.stories.tsx b/packages/@adobe/react-spectrum/stories/accordion/Disclosure.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/accordion/stories/Disclosure.stories.tsx
rename to packages/@adobe/react-spectrum/stories/accordion/Disclosure.stories.tsx
index 78eaf660175..2531ee38d25 100644
--- a/packages/@react-spectrum/accordion/stories/Disclosure.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/accordion/Disclosure.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Disclosure, DisclosurePanel, DisclosureTitle, SpectrumDisclosureProps} from '../src';
+import {Disclosure, DisclosurePanel, DisclosureTitle, SpectrumDisclosureProps} from '../../src/accordion/Accordion';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/actionbar/stories/ActionBar.stories.tsx b/packages/@adobe/react-spectrum/stories/actionbar/ActionBar.stories.tsx
similarity index 93%
rename from packages/@react-spectrum/actionbar/stories/ActionBar.stories.tsx
rename to packages/@adobe/react-spectrum/stories/actionbar/ActionBar.stories.tsx
index 36e1a890d44..9d95e9c0d64 100644
--- a/packages/@react-spectrum/actionbar/stories/ActionBar.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/actionbar/ActionBar.stories.tsx
@@ -11,11 +11,11 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionBar} from '../src';
+import {ActionBar} from '../../src/actionbar/ActionBar';
 import {Example} from './Example';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {useViewportSize} from '@react-aria/utils';
+import {useViewportSize} from 'react-aria/private/utils/useViewportSize';
 
 export default {
   title: 'ActionBar',
diff --git a/packages/@react-spectrum/actionbar/stories/Example.tsx b/packages/@adobe/react-spectrum/stories/actionbar/Example.tsx
similarity index 95%
rename from packages/@react-spectrum/actionbar/stories/Example.tsx
rename to packages/@adobe/react-spectrum/stories/actionbar/Example.tsx
index debc2e79f83..50d2504a83c 100644
--- a/packages/@react-spectrum/actionbar/stories/Example.tsx
+++ b/packages/@adobe/react-spectrum/stories/actionbar/Example.tsx
@@ -10,18 +10,21 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionBar, ActionBarContainer, Item} from '../';
-import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@react-spectrum/table';
+import {ActionBar} from '../../src/actionbar/ActionBar';
+
+import {ActionBarContainer} from '../../src/actionbar/ActionBarContainer';
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../src/table/TableView';
 import Copy from '@spectrum-icons/workflow/Copy';
 import DataAdd from '@spectrum-icons/workflow/DataAdd';
 import Delete from '@spectrum-icons/workflow/Delete';
 import Duplicate from '@spectrum-icons/workflow/Duplicate';
 import Edit from '@spectrum-icons/workflow/Edit';
-import {mergeProps} from '@react-aria/utils';
+import {Item} from 'react-stately/Item';
+import {mergeProps} from 'react-aria/mergeProps';
 import Move from '@spectrum-icons/workflow/Move';
 import React, {JSX, useRef, useState} from 'react';
 import {Selection} from '@react-types/shared';
-import {Text} from '@react-spectrum/text';
+import {Text} from '../../src/text/Text';
 
 let columns = [
   {name: 'Foo', key: 'foo'},
diff --git a/packages/@react-spectrum/actiongroup/stories/ActionGroup.stories.tsx b/packages/@adobe/react-spectrum/stories/actiongroup/ActionGroup.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/actiongroup/stories/ActionGroup.stories.tsx
rename to packages/@adobe/react-spectrum/stories/actiongroup/ActionGroup.stories.tsx
index aceab735c3b..3dfe5363713 100644
--- a/packages/@react-spectrum/actiongroup/stories/ActionGroup.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/actiongroup/ActionGroup.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionGroup} from '../';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
 import BookIcon from '@spectrum-icons/workflow/Book';
 import Brush from '@spectrum-icons/workflow/Brush';
 import CopyIcon from '@spectrum-icons/workflow/Copy';
@@ -19,10 +19,10 @@ import DeleteIcon from '@spectrum-icons/workflow/Delete';
 import DocumentIcon from '@spectrum-icons/workflow/Document';
 import DrawIcon from '@spectrum-icons/workflow/Draw';
 import DuplicateIcon from '@spectrum-icons/workflow/Duplicate';
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import Heal from '@spectrum-icons/workflow/Heal';
 import InfoIcon from '@spectrum-icons/workflow/Info';
-import {Item} from '@react-stately/collections';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryObj} from '@storybook/react';
 import MoveIcon from '@spectrum-icons/workflow/MoveTo';
 import PropertiesIcon from '@spectrum-icons/workflow/Properties';
@@ -30,11 +30,12 @@ import React from 'react';
 import Sampler from '@spectrum-icons/workflow/Sampler';
 import Select from '@spectrum-icons/workflow/Select';
 import SettingsIcon from '@spectrum-icons/workflow/Settings';
-import {Text} from '@react-spectrum/text';
+import {Text} from '../../src/text/Text';
 import TextIcon from '@spectrum-icons/workflow/Text';
-import {Tooltip, TooltipTrigger} from '@react-spectrum/tooltip';
+import {Tooltip} from '../../src/tooltip/Tooltip';
+import {TooltipTrigger} from '../../src/tooltip/TooltipTrigger';
 import VectorDraw from '@spectrum-icons/workflow/VectorDraw';
-import {View} from '@react-spectrum/view';
+import {View} from '../../src/view/View';
 import ViewCardIcon from '@spectrum-icons/workflow/ViewCard';
 import ViewGridIcon from '@spectrum-icons/workflow/ViewGrid';
 import ViewListIcon from '@spectrum-icons/workflow/ViewList';
diff --git a/packages/@react-spectrum/actiongroup/stories/Toolbar.stories.tsx b/packages/@adobe/react-spectrum/stories/actiongroup/Toolbar.stories.tsx
similarity index 91%
rename from packages/@react-spectrum/actiongroup/stories/Toolbar.stories.tsx
rename to packages/@adobe/react-spectrum/stories/actiongroup/Toolbar.stories.tsx
index d51799992d5..45177468f32 100644
--- a/packages/@react-spectrum/actiongroup/stories/Toolbar.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/actiongroup/Toolbar.stories.tsx
@@ -10,22 +10,25 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionGroup} from '../';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
+
 import {AriaLabelingProps, Orientation} from '@react-types/shared';
-import {classNames, SlotProvider, useSlotProps} from '@react-spectrum/utils';
+import {classNames} from '../../src/utils/classNames';
 import CopyIcon from '@spectrum-icons/workflow/Copy';
 import DeleteIcon from '@spectrum-icons/workflow/Delete';
-import {Divider} from '@react-spectrum/divider';
+import {Divider} from '../../src/divider/Divider';
 import DrawIcon from '@spectrum-icons/workflow/Draw';
 import InfoIcon from '@spectrum-icons/workflow/Info';
-import {Item} from '@react-stately/collections';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryObj} from '@storybook/react';
 import PropertiesIcon from '@spectrum-icons/workflow/Properties';
-import {Toolbar as RACToolbar} from 'react-aria-components';
+import {Toolbar as RACToolbar} from 'react-aria-components/Toolbar';
 import React, {ForwardedRef, forwardRef, ReactElement, ReactNode, useMemo} from 'react';
+import {SlotProvider, useSlotProps} from '../../src/utils/Slots';
 import styles from './toolbar.css';
-import {Tooltip, TooltipTrigger} from '@react-spectrum/tooltip';
-import {useProviderProps} from '@react-spectrum/provider';
+import {Tooltip} from '../../src/tooltip/Tooltip';
+import {TooltipTrigger} from '../../src/tooltip/TooltipTrigger';
+import {useProviderProps} from '../../src/provider/Provider';
 import ViewCardIcon from '@spectrum-icons/workflow/ViewCard';
 import ViewGridIcon from '@spectrum-icons/workflow/ViewGrid';
 import ViewListIcon from '@spectrum-icons/workflow/ViewList';
diff --git a/packages/@react-spectrum/actiongroup/stories/toolbar.css b/packages/@adobe/react-spectrum/stories/actiongroup/toolbar.css
similarity index 100%
rename from packages/@react-spectrum/actiongroup/stories/toolbar.css
rename to packages/@adobe/react-spectrum/stories/actiongroup/toolbar.css
diff --git a/packages/@react-spectrum/autocomplete/stories/SearchAutocomplete.stories.tsx b/packages/@adobe/react-spectrum/stories/autocomplete/SearchAutocomplete.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/autocomplete/stories/SearchAutocomplete.stories.tsx
rename to packages/@adobe/react-spectrum/stories/autocomplete/SearchAutocomplete.stories.tsx
index 12632a908db..637f0cc67b7 100644
--- a/packages/@react-spectrum/autocomplete/stories/SearchAutocomplete.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/autocomplete/SearchAutocomplete.stories.tsx
@@ -12,15 +12,16 @@
  */
 
 import {action} from 'storybook/actions';
-import {Avatar} from '@react-spectrum/avatar';
+import {Avatar} from '../../src/avatar/Avatar';
 import Filter from '@spectrum-icons/workflow/Filter';
-import {Flex} from '@react-spectrum/layout';
-import {Item, SearchAutocomplete} from '@react-spectrum/autocomplete';
-import {mergeProps} from '@react-aria/utils';
+import {Flex} from '../../src/layout/Flex';
+import {Item} from 'react-stately/Item';
+import {mergeProps} from 'react-aria/mergeProps';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {Text} from '@react-spectrum/text';
-import {useAsyncList} from '@react-stately/data';
+import {SearchAutocomplete} from '../../src/autocomplete/SearchAutocomplete';
+import {Text} from '../../src/text/Text';
+import {useAsyncList} from 'react-stately/useAsyncList';
 
 
 type SearchAutocompleteStory = StoryObj<typeof SearchAutocomplete>;
diff --git a/packages/@react-spectrum/avatar/stories/Avatar.stories.tsx b/packages/@adobe/react-spectrum/stories/avatar/Avatar.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/avatar/stories/Avatar.stories.tsx
rename to packages/@adobe/react-spectrum/stories/avatar/Avatar.stories.tsx
index e4c5bc0273c..32e48825da3 100644
--- a/packages/@react-spectrum/avatar/stories/Avatar.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/avatar/Avatar.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Avatar} from '../';
+import {Avatar} from '../../src/avatar/Avatar';
 import {Meta, StoryObj} from '@storybook/react';
 import {SpectrumAvatarProps} from '@react-types/avatar';
 
diff --git a/packages/@react-spectrum/badge/stories/Badge.stories.tsx b/packages/@adobe/react-spectrum/stories/badge/Badge.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/badge/stories/Badge.stories.tsx
rename to packages/@adobe/react-spectrum/stories/badge/Badge.stories.tsx
index 392b5d1a3cf..fe2dad4789f 100644
--- a/packages/@react-spectrum/badge/stories/Badge.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/badge/Badge.stories.tsx
@@ -10,11 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {Badge} from '../';
+import {Badge} from '../../src/badge/Badge';
 import CheckmarkCircle from '@spectrum-icons/workflow/CheckmarkCircle';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {Text} from '@react-spectrum/text';
+import {Text} from '../../src/text/Text';
 
 type BadgeStory = StoryObj<typeof Badge>;
 
diff --git a/packages/@react-spectrum/breadcrumbs/stories/Breadcrumbs.stories.tsx b/packages/@adobe/react-spectrum/stories/breadcrumbs/Breadcrumbs.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/breadcrumbs/stories/Breadcrumbs.stories.tsx
rename to packages/@adobe/react-spectrum/stories/breadcrumbs/Breadcrumbs.stories.tsx
index 7e19b6a7e10..18f68cbfd0b 100644
--- a/packages/@react-spectrum/breadcrumbs/stories/Breadcrumbs.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/breadcrumbs/Breadcrumbs.stories.tsx
@@ -11,8 +11,8 @@
  */
 
 import {action} from 'storybook/actions';
-import {Breadcrumbs} from '../';
-import {Item} from '@react-stately/collections';
+import {Breadcrumbs} from '../../src/breadcrumbs/Breadcrumbs';
+import {Item} from 'react-stately/Item';
 // import {Heading} from '@react-spectrum/text';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
diff --git a/packages/@react-spectrum/button/stories/ActionButton.stories.tsx b/packages/@adobe/react-spectrum/stories/button/ActionButton.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/button/stories/ActionButton.stories.tsx
rename to packages/@adobe/react-spectrum/stories/button/ActionButton.stories.tsx
index 6e1931db739..9d00ed2582e 100644
--- a/packages/@react-spectrum/button/stories/ActionButton.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/button/ActionButton.stories.tsx
@@ -11,13 +11,13 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton} from '../';
+import {ActionButton} from '../../src/button/ActionButton';
 import Add from '@spectrum-icons/workflow/Add';
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {Text} from '@react-spectrum/text';
-import {View} from '@react-spectrum/view';
+import {Text} from '../../src/text/Text';
+import {View} from '../../src/view/View';
 
 export type ActionButtonStory = StoryObj<typeof ActionButton>;
 
diff --git a/packages/@react-spectrum/button/stories/Button.stories.tsx b/packages/@adobe/react-spectrum/stories/button/Button.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/button/stories/Button.stories.tsx
rename to packages/@adobe/react-spectrum/stories/button/Button.stories.tsx
index e45be804ed4..7c183338f15 100644
--- a/packages/@react-spectrum/button/stories/Button.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/button/Button.stories.tsx
@@ -13,15 +13,16 @@
 import {action} from 'storybook/actions';
 import {BackgroundColorValue} from '@react-types/shared';
 import Bell from '@spectrum-icons/workflow/Bell';
-import {Button} from '../';
-import {Flex} from '@react-spectrum/layout';
-import {Form} from '@react-spectrum/form';
+import {Button} from '../../src/button/Button';
+import {Flex} from '../../src/layout/Flex';
+import {Form} from '../../src/form/Form';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {ElementType, useState} from 'react';
 import {SpectrumButtonProps} from '@react-types/button';
-import {Text} from '@react-spectrum/text';
-import {Tooltip, TooltipTrigger} from '@react-spectrum/tooltip';
-import {View} from '@react-spectrum/view';
+import {Text} from '../../src/text/Text';
+import {Tooltip} from '../../src/tooltip/Tooltip';
+import {TooltipTrigger} from '../../src/tooltip/TooltipTrigger';
+import {View} from '../../src/view/View';
 
 export type ButtonStory = StoryObj<typeof Button>;
 
diff --git a/packages/@react-spectrum/button/stories/LogicButton.stories.tsx b/packages/@adobe/react-spectrum/stories/button/LogicButton.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/button/stories/LogicButton.stories.tsx
rename to packages/@adobe/react-spectrum/stories/button/LogicButton.stories.tsx
index c9da0274a7c..c9b333ba487 100644
--- a/packages/@react-spectrum/button/stories/LogicButton.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/button/LogicButton.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {action} from 'storybook/actions';
-import {LogicButton} from '../';
+import {LogicButton} from '../../src/button/LogicButton';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/button/stories/ToggleButton.stories.tsx b/packages/@adobe/react-spectrum/stories/button/ToggleButton.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/button/stories/ToggleButton.stories.tsx
rename to packages/@adobe/react-spectrum/stories/button/ToggleButton.stories.tsx
index 8dcc8cb395b..920375e7c2b 100644
--- a/packages/@react-spectrum/button/stories/ToggleButton.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/button/ToggleButton.stories.tsx
@@ -12,10 +12,12 @@
 
 import {action} from 'storybook/actions';
 import Add from '@spectrum-icons/workflow/Add';
-import {Flex, Text, View} from '@adobe/react-spectrum';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {useState} from 'react';
-import {ToggleButton} from '../';
+import {Text} from '../../src/text/Text';
+import {ToggleButton} from '../../src/button/ToggleButton';
+import {View} from '../../src/view/View';
 
 export type ToggleButtonStory = StoryObj<typeof ToggleButton>;
 
diff --git a/packages/@react-spectrum/buttongroup/stories/ButtonGroup.stories.tsx b/packages/@adobe/react-spectrum/stories/buttongroup/ButtonGroup.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/buttongroup/stories/ButtonGroup.stories.tsx
rename to packages/@adobe/react-spectrum/stories/buttongroup/ButtonGroup.stories.tsx
index b13c86dd5a6..e2a7adacd91 100644
--- a/packages/@react-spectrum/buttongroup/stories/ButtonGroup.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/buttongroup/ButtonGroup.stories.tsx
@@ -12,11 +12,11 @@
 
 import {action} from 'storybook/actions';
 import Bell from '@spectrum-icons/workflow/Bell';
-import {Button} from '@react-spectrum/button';
-import {ButtonGroup} from '../';
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {useState} from 'react';
-import {Text} from '@react-spectrum/text';
+import {Text} from '../../src/text/Text';
 
 export type ButtonGroupStory = StoryObj<typeof ButtonGroup>;
 
diff --git a/packages/@react-spectrum/calendar/stories/Calendar.stories.tsx b/packages/@adobe/react-spectrum/stories/calendar/Calendar.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/calendar/stories/Calendar.stories.tsx
rename to packages/@adobe/react-spectrum/stories/calendar/Calendar.stories.tsx
index 558728b0b51..a8cc3d98543 100644
--- a/packages/@react-spectrum/calendar/stories/Calendar.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/calendar/Calendar.stories.tsx
@@ -10,20 +10,22 @@
  * governing permissions and limitations under the License.
  */
 import {action} from 'storybook/actions';
-import {ActionButton} from '@react-spectrum/button';
-import {Calendar} from '../';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Calendar} from '../../src/calendar/Calendar';
 import {CalendarDate, CalendarDateTime, getLocalTimeZone, parseZonedDateTime, today, ZonedDateTime} from '@internationalized/date';
 import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
 import {DateValue} from '@react-types/calendar';
-import {Flex} from '@react-spectrum/layout';
-import {Item, Picker, Section} from '@react-spectrum/picker';
+import {Flex} from '../../src/layout/Flex';
+import {Item} from 'react-stately/Item';
 import {Key} from '@react-types/shared';
 import {Meta, StoryObj} from '@storybook/react';
-import {Provider} from '@react-spectrum/provider';
+import {Picker} from '../../src/picker/Picker';
+import {Provider} from '../../src/provider/Provider';
 import React, {useState} from 'react';
-import {TimeField} from '@react-spectrum/datepicker';
-import {useLocale} from '@react-aria/i18n';
-import {View} from '@react-spectrum/view';
+import {Section} from 'react-stately/Section';
+import {TimeField} from '../../src/datepicker/TimeField';
+import {useLocale} from 'react-aria/I18nProvider';
+import {View} from '../../src/view/View';
 
 export type CalendarStory = StoryObj<typeof Calendar>;
 
diff --git a/packages/@react-spectrum/calendar/stories/RangeCalendar.stories.tsx b/packages/@adobe/react-spectrum/stories/calendar/RangeCalendar.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/calendar/stories/RangeCalendar.stories.tsx
rename to packages/@adobe/react-spectrum/stories/calendar/RangeCalendar.stories.tsx
index e5b26e19cfa..87657ed7331 100644
--- a/packages/@react-spectrum/calendar/stories/RangeCalendar.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/calendar/RangeCalendar.stories.tsx
@@ -14,13 +14,13 @@ import {action} from 'storybook/actions';
 import {CalendarDate, CalendarDateTime, getLocalTimeZone, isWeekend, parseZonedDateTime, today} from '@internationalized/date';
 import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
 import {DateValue} from '@react-types/calendar';
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryObj} from '@storybook/react';
-import {RangeCalendar} from '../';
+import {RangeCalendar} from '../../src/calendar/RangeCalendar';
 import React, {useState} from 'react';
-import {TimeField} from '@react-spectrum/datepicker';
-import {useLocale} from '@react-aria/i18n';
-import {View} from '@react-spectrum/view';
+import {TimeField} from '../../src/datepicker/TimeField';
+import {useLocale} from 'react-aria/I18nProvider';
+import {View} from '../../src/view/View';
 
 export type RangeCalendarStory = StoryObj<typeof RangeCalendar>;
 
diff --git a/packages/@react-spectrum/calendar/stories/RangeCalendarCell.stories.tsx b/packages/@adobe/react-spectrum/stories/calendar/RangeCalendarCell.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/calendar/stories/RangeCalendarCell.stories.tsx
rename to packages/@adobe/react-spectrum/stories/calendar/RangeCalendarCell.stories.tsx
index 120f79faffd..b51d676c57b 100644
--- a/packages/@react-spectrum/calendar/stories/RangeCalendarCell.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/calendar/RangeCalendarCell.stories.tsx
@@ -1,6 +1,6 @@
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '../../src/utils/classNames';
 import {generatePowerset} from '@react-spectrum/story-utils';
-import {Grid, repeat} from '@react-spectrum/layout';
+import {Grid, repeat} from '../../src/layout/Grid';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/calendar/vars.css';
diff --git a/packages/@react-spectrum/card/stories/Card.stories.tsx b/packages/@adobe/react-spectrum/stories/card/Card.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/card/stories/Card.stories.tsx
rename to packages/@adobe/react-spectrum/stories/card/Card.stories.tsx
index 5466af33b00..c15d7a04183 100644
--- a/packages/@react-spectrum/card/stories/Card.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/card/Card.stories.tsx
@@ -11,19 +11,21 @@
  * governing permissions and limitations under the License.
  */
 
-import {Avatar} from '@react-spectrum/avatar';
-import {Card} from '..';
-import {CardBase} from '../src/CardBase';
-import {CardViewContext} from '../src/CardViewContext';
-import {Content} from '@react-spectrum/view';
+import {Avatar} from '../../src/avatar/Avatar';
+
+import {Card} from '../../src/card/Card';
+import {CardBase} from '../../src/card/CardBase';
+import {CardViewContext} from '../../src/card/CardViewContext';
+import {Content} from '../../src/view/Content';
 import {getDescription, getImage} from './utils';
-import {Heading, Text} from '@react-spectrum/text';
-import {Image} from '@react-spectrum/image';
+import {Heading} from '../../src/text/Heading';
+import {Image} from '../../src/image/Image';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {Dispatch, SetStateAction, useState} from 'react';
 import {SpectrumCardProps} from '@react-types/card';
-import {usePress} from '@react-aria/interactions';
-import {useProvider} from '@react-spectrum/provider';
+import {Text} from '../../src/text/Text';
+import {usePress} from 'react-aria/usePress';
+import {useProvider} from '../../src/provider/Provider';
 
 export default {
   title: 'Card/default',
diff --git a/packages/@react-spectrum/card/stories/GalleryCardView.stories.tsx b/packages/@adobe/react-spectrum/stories/card/GalleryCardView.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/card/stories/GalleryCardView.stories.tsx
rename to packages/@adobe/react-spectrum/stories/card/GalleryCardView.stories.tsx
index 6040270db5a..1ec4e19a57c 100644
--- a/packages/@react-spectrum/card/stories/GalleryCardView.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/card/GalleryCardView.stories.tsx
@@ -29,13 +29,14 @@ import {
   StaticCards,
   StaticCardViewStory
 } from './GridCardView.stories';
-import {CardView, GalleryLayout} from '../';
-import {GalleryLayoutOptions} from '../src/GalleryLayout';
+import {CardView} from '../../src/card/CardView';
+import {GalleryLayout} from '../../src/card/GalleryLayout';
+import {GalleryLayoutOptions} from '../../src/card/GalleryLayout';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX, useMemo} from 'react';
-import {Size} from '@react-stately/virtualizer';
+import {Size} from 'react-stately/private/virtualizer/Size';
 import {SpectrumCardViewProps} from '@react-types/card';
-import {useCollator} from '@react-aria/i18n';
+import {useCollator} from 'react-aria/useCollator';
 
 let itemsLowVariance = [
   {width: 1001, height: 381, src: 'https://i.imgur.com/Z7AzH2c.jpg', id: 1, title: 'Bob 1'},
diff --git a/packages/@react-spectrum/card/stories/GridCardView.stories.tsx b/packages/@adobe/react-spectrum/stories/card/GridCardView.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/card/stories/GridCardView.stories.tsx
rename to packages/@adobe/react-spectrum/stories/card/GridCardView.stories.tsx
index 6fe4c0d84f4..87d1954b180 100644
--- a/packages/@react-spectrum/card/stories/GridCardView.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/card/GridCardView.stories.tsx
@@ -12,25 +12,29 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton} from '@react-spectrum/button';
-import {Card, CardView, GridLayout} from '../';
-import {Content, View} from '@react-spectrum/view';
-import {Flex} from '@react-spectrum/layout';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Card} from '../../src/card/Card';
+import {CardView} from '../../src/card/CardView';
+import {Content} from '../../src/view/Content';
+import {Flex} from '../../src/layout/Flex';
 import {getImageFullData} from './utils';
-import {GridLayoutOptions} from '../src/GridLayout';
-import {Heading, Text} from '@react-spectrum/text';
-import {IllustratedMessage} from '@react-spectrum/illustratedmessage';
-import {Image} from '@react-spectrum/image';
+import {GridLayout} from '../../src/card/GridLayout';
+import {GridLayoutOptions} from '../../src/card/GridLayout';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
+import {Image} from '../../src/image/Image';
 import {JSX, Meta, StoryObj} from '@storybook/react';
 import {Key} from '@react-types/shared';
-import {Link} from '@react-spectrum/link';
+import {Link} from '../../src/link/Link';
 import React, {useMemo, useState} from 'react';
-import {Size} from '@react-stately/virtualizer';
+import {Size} from 'react-stately/private/virtualizer/Size';
 import {SpectrumCardViewProps} from '@react-types/card';
-import {TextField} from '@react-spectrum/textfield';
-import {useAsyncList} from '@react-stately/data';
-import {useCollator} from '@react-aria/i18n';
-import {useProvider} from '@react-spectrum/provider';
+import {Text} from '../../src/text/Text';
+import {TextField} from '../../src/textfield/TextField';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useCollator} from 'react-aria/useCollator';
+import {useProvider} from '../../src/provider/Provider';
+import {View} from '../../src/view/View';
 
 let items = [
   {width: 1001, height: 381, src: 'https://i.imgur.com/Z7AzH2c.jpg', title: 'Bob 1'},
diff --git a/packages/@react-spectrum/card/stories/HorizontalCard.stories.tsx b/packages/@adobe/react-spectrum/stories/card/HorizontalCard.stories.tsx
similarity index 91%
rename from packages/@react-spectrum/card/stories/HorizontalCard.stories.tsx
rename to packages/@adobe/react-spectrum/stories/card/HorizontalCard.stories.tsx
index 156906e6af6..04d7c5bbe23 100644
--- a/packages/@react-spectrum/card/stories/HorizontalCard.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/card/HorizontalCard.stories.tsx
@@ -11,15 +11,17 @@
  * governing permissions and limitations under the License.
  */
 
-import {Card} from '../index';
+import {Card} from '../../src/card/Card';
+
 import {CardStory} from './Card.stories';
-import {Content} from '@react-spectrum/view';
-import {getImage} from '../stories/utils';
-import {Heading, Text} from '@react-spectrum/text';
-import {Horizontal} from '../chromatic/HorizontalCard.stories';
-import {Image} from '@react-spectrum/image';
+import {Content} from '../../src/view/Content';
+import {getImage} from '../../stories/card/utils';
+import {Heading} from '../../src/text/Heading';
+import {Horizontal} from '../../chromatic/card/HorizontalCard.stories';
+import {Image} from '../../src/image/Image';
 import {Meta} from '@storybook/react';
 import React from 'react';
+import {Text} from '../../src/text/Text';
 
 export default {
   title: 'Card/horizontal',
diff --git a/packages/@react-spectrum/card/stories/QuietCard.stories.tsx b/packages/@adobe/react-spectrum/stories/card/QuietCard.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/card/stories/QuietCard.stories.tsx
rename to packages/@adobe/react-spectrum/stories/card/QuietCard.stories.tsx
index c32e4b44cda..421e3e4b5ee 100644
--- a/packages/@react-spectrum/card/stories/QuietCard.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/card/QuietCard.stories.tsx
@@ -11,18 +11,20 @@
  * governing permissions and limitations under the License.
  */
 
-import {Card} from '../index';
+import {Card} from '../../src/card/Card';
+
 import {CardStory} from './Card.stories';
-import {classNames} from '@react-spectrum/utils';
-import {Content} from '@react-spectrum/view';
-import {File} from '../chromatic/Card.stories';
-import {getDescription, getImage} from '../stories/utils';
-import {Heading, Text} from '@react-spectrum/text';
-import {Image} from '@react-spectrum/image';
+import {classNames} from '../../src/utils/classNames';
+import {Content} from '../../src/view/Content';
+import {File} from '../../chromatic/card/Card.stories';
+import {getDescription, getImage} from '../../stories/card/utils';
+import {Heading} from '../../src/text/Heading';
+import {Image} from '../../src/image/Image';
 import {Meta} from '@storybook/react';
-import {Quiet} from '../chromatic/QuietCard.stories';
+import {Quiet} from '../../chromatic/card/QuietCard.stories';
 import React from 'react';
 import styles from '@adobe/spectrum-css-temp/components/card/vars.css';
+import {Text} from '../../src/text/Text';
 
 export default {
   title: 'Card/quiet',
diff --git a/packages/@react-spectrum/card/stories/WaterfallCardView.stories.tsx b/packages/@adobe/react-spectrum/stories/card/WaterfallCardView.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/card/stories/WaterfallCardView.stories.tsx
rename to packages/@adobe/react-spectrum/stories/card/WaterfallCardView.stories.tsx
index efc990d05c9..3e972fab8e2 100644
--- a/packages/@react-spectrum/card/stories/WaterfallCardView.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/card/WaterfallCardView.stories.tsx
@@ -29,13 +29,14 @@ import {
   StaticCards,
   StaticCardViewStory
 } from './GridCardView.stories';
-import {CardView, WaterfallLayout} from '../';
+import {CardView} from '../../src/card/CardView';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {useMemo} from 'react';
-import {Size} from '@react-stately/virtualizer';
+import {Size} from 'react-stately/private/virtualizer/Size';
 import {SpectrumCardViewProps} from '@react-types/card';
-import {useCollator} from '@react-aria/i18n';
-import {WaterfallLayoutOptions} from '../src/WaterfallLayout';
+import {useCollator} from 'react-aria/useCollator';
+import {WaterfallLayout} from '../../src/card/WaterfallLayout';
+import {WaterfallLayoutOptions} from '../../src/card/WaterfallLayout';
 
 let itemsNoSize = [
   {src: 'https://i.imgur.com/Z7AzH2c.jpg', title: 'Bob 1'},
diff --git a/packages/@react-spectrum/card/stories/assets.css b/packages/@adobe/react-spectrum/stories/card/assets.css
similarity index 100%
rename from packages/@react-spectrum/card/stories/assets.css
rename to packages/@adobe/react-spectrum/stories/card/assets.css
diff --git a/packages/@react-spectrum/card/stories/images/starry_sky.jpeg b/packages/@adobe/react-spectrum/stories/card/images/starry_sky.jpeg
similarity index 100%
rename from packages/@react-spectrum/card/stories/images/starry_sky.jpeg
rename to packages/@adobe/react-spectrum/stories/card/images/starry_sky.jpeg
diff --git a/packages/@react-spectrum/card/stories/utils.ts b/packages/@adobe/react-spectrum/stories/card/utils.ts
similarity index 100%
rename from packages/@react-spectrum/card/stories/utils.ts
rename to packages/@adobe/react-spectrum/stories/card/utils.ts
diff --git a/packages/@react-spectrum/checkbox/stories/Checkbox.stories.tsx b/packages/@adobe/react-spectrum/stories/checkbox/Checkbox.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/checkbox/stories/Checkbox.stories.tsx
rename to packages/@adobe/react-spectrum/stories/checkbox/Checkbox.stories.tsx
index ea1561f1642..552f66c231c 100644
--- a/packages/@react-spectrum/checkbox/stories/Checkbox.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/checkbox/Checkbox.stories.tsx
@@ -11,9 +11,9 @@
  */
 
 import {action} from 'storybook/actions';
-import {Checkbox} from '../';
-import {Flex} from '@react-spectrum/layout';
-import {Link} from '@react-spectrum/link';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {Flex} from '../../src/layout/Flex';
+import {Link} from '../../src/link/Link';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/checkbox/stories/CheckboxGroup.stories.tsx b/packages/@adobe/react-spectrum/stories/checkbox/CheckboxGroup.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/checkbox/stories/CheckboxGroup.stories.tsx
rename to packages/@adobe/react-spectrum/stories/checkbox/CheckboxGroup.stories.tsx
index 79475c3ff9e..6509d07c0c5 100644
--- a/packages/@react-spectrum/checkbox/stories/CheckboxGroup.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/checkbox/CheckboxGroup.stories.tsx
@@ -11,8 +11,12 @@
  */
 
 import {action} from 'storybook/actions';
-import {Checkbox, CheckboxGroup} from '../';
-import {Content, ContextualHelp, Flex, Heading} from '@adobe/react-spectrum';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {CheckboxGroup} from '../../src/checkbox/CheckboxGroup';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {useState} from 'react';
 import {SpectrumCheckboxGroupProps} from '@react-types/checkbox';
diff --git a/packages/@react-spectrum/color/stories/ColorArea.stories.tsx b/packages/@adobe/react-spectrum/stories/color/ColorArea.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/color/stories/ColorArea.stories.tsx
rename to packages/@adobe/react-spectrum/stories/color/ColorArea.stories.tsx
index 0cc4d5d0491..d3b5f6224f4 100644
--- a/packages/@react-spectrum/color/stories/ColorArea.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/color/ColorArea.stories.tsx
@@ -11,12 +11,19 @@
  */
 
 import {action} from 'storybook/actions';
-import {ColorArea, ColorField, ColorSlider, ColorSwatch, ColorWheel} from '../';
-import {Flex, Grid, useLocale, View} from '@adobe/react-spectrum';
+import {ColorArea} from '../../src/color/ColorArea';
+import {ColorField} from '../../src/color/ColorField';
+import {ColorSlider} from '../../src/color/ColorSlider';
+import {ColorSwatch} from '../../src/color/ColorSwatch';
+import {ColorWheel} from '../../src/color/ColorWheel';
+import {Flex} from '../../src/layout/Flex';
+import {Grid} from '../../src/layout/Grid';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
-import {parseColor} from '@react-stately/color';
+import {parseColor} from 'react-stately/Color';
 import React, {useState} from 'react';
 import {SpectrumColorAreaProps} from '@react-types/color';
+import {useLocale} from 'react-aria/I18nProvider';
+import {View} from '../../src/view/View';
 
 const meta: Meta<SpectrumColorAreaProps> = {
   title: 'ColorArea',
diff --git a/packages/@react-spectrum/color/stories/ColorField.stories.tsx b/packages/@adobe/react-spectrum/stories/color/ColorField.stories.tsx
similarity index 90%
rename from packages/@react-spectrum/color/stories/ColorField.stories.tsx
rename to packages/@adobe/react-spectrum/stories/color/ColorField.stories.tsx
index 14193add279..5bac26df334 100644
--- a/packages/@react-spectrum/color/stories/ColorField.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/color/ColorField.stories.tsx
@@ -12,16 +12,17 @@
 
 import {action} from 'storybook/actions';
 import {Color, SpectrumColorFieldProps} from '@react-types/color';
-import {ColorField} from '../';
-import {Content, View} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Flex} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
+import {ColorField} from '../../src/color/ColorField';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryObj} from '@storybook/react';
-import {parseColor} from '@react-stately/color';
+import {parseColor} from 'react-stately/Color';
 import React, {useState} from 'react';
-import {useId} from '@react-aria/utils';
-import {VisuallyHidden} from '@react-aria/visually-hidden';
+import {useId} from 'react-aria/useId';
+import {View} from '../../src/view/View';
+import {VisuallyHidden} from 'react-aria/VisuallyHidden';
 
 export type ColorFieldStory = StoryObj<typeof ColorField>;
 
diff --git a/packages/@react-spectrum/color/stories/ColorPicker.stories.tsx b/packages/@adobe/react-spectrum/stories/color/ColorPicker.stories.tsx
similarity index 83%
rename from packages/@react-spectrum/color/stories/ColorPicker.stories.tsx
rename to packages/@adobe/react-spectrum/stories/color/ColorPicker.stories.tsx
index 34b2dd48772..6219f9f40cd 100644
--- a/packages/@react-spectrum/color/stories/ColorPicker.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/color/ColorPicker.stories.tsx
@@ -10,9 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorArea, ColorEditor, ColorSwatch, ColorSwatchPicker, ColorWheel} from '../src';
-import {ColorPicker, SpectrumColorPickerProps} from '../src/ColorPicker';
-import {Flex} from '@react-spectrum/layout';
+import {ColorArea} from '../../src/color/ColorArea';
+
+import {ColorEditor} from '../../src/color/ColorEditor';
+import {ColorPicker, SpectrumColorPickerProps} from '../../src/color/ColorPicker';
+import {ColorSwatch} from '../../src/color/ColorSwatch';
+import {ColorSwatchPicker} from '../../src/color/ColorSwatchPicker';
+import {ColorWheel} from '../../src/color/ColorWheel';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/color/stories/ColorSlider.stories.tsx b/packages/@adobe/react-spectrum/stories/color/ColorSlider.stories.tsx
similarity index 92%
rename from packages/@react-spectrum/color/stories/ColorSlider.stories.tsx
rename to packages/@adobe/react-spectrum/stories/color/ColorSlider.stories.tsx
index eebdf20aa66..ca6144370c3 100644
--- a/packages/@react-spectrum/color/stories/ColorSlider.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/color/ColorSlider.stories.tsx
@@ -11,15 +11,17 @@
  */
 
 import {action} from 'storybook/actions';
-import {ColorSlider, ColorSwatch} from '../';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Flex} from '@react-spectrum/layout';
-import {Heading, Text} from '@react-spectrum/text';
+import {ColorSlider} from '../../src/color/ColorSlider';
+import {ColorSwatch} from '../../src/color/ColorSwatch';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryObj} from '@storybook/react';
-import {parseColor} from '@react-stately/color';
+import {parseColor} from 'react-stately/Color';
 import React, {useState} from 'react';
-import {useLocale} from '@react-aria/i18n';
+import {Text} from '../../src/text/Text';
+import {useLocale} from 'react-aria/I18nProvider';
 
 export type ColorSliderStory = StoryObj<typeof ColorSlider>;
 
diff --git a/packages/@react-spectrum/color/stories/ColorSwatch.stories.tsx b/packages/@adobe/react-spectrum/stories/color/ColorSwatch.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/color/stories/ColorSwatch.stories.tsx
rename to packages/@adobe/react-spectrum/stories/color/ColorSwatch.stories.tsx
index c914db57e59..e6b1cfcd5dd 100644
--- a/packages/@react-spectrum/color/stories/ColorSwatch.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/color/ColorSwatch.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorSwatch, SpectrumColorSwatchProps} from '../src/ColorSwatch';
+import {ColorSwatch, SpectrumColorSwatchProps} from '../../src/color/ColorSwatch';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/color/stories/ColorSwatchPicker.stories.tsx b/packages/@adobe/react-spectrum/stories/color/ColorSwatchPicker.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/color/stories/ColorSwatchPicker.stories.tsx
rename to packages/@adobe/react-spectrum/stories/color/ColorSwatchPicker.stories.tsx
index d2c4d07b140..d31deb4c131 100644
--- a/packages/@react-spectrum/color/stories/ColorSwatchPicker.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/color/ColorSwatchPicker.stories.tsx
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorSwatch} from '../src/ColorSwatch';
-import {ColorSwatchPicker, SpectrumColorSwatchPickerProps} from '../src/ColorSwatchPicker';
+import {ColorSwatch} from '../../src/color/ColorSwatch';
+import {ColorSwatchPicker, SpectrumColorSwatchPickerProps} from '../../src/color/ColorSwatchPicker';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/color/stories/ColorThumb.stories.tsx b/packages/@adobe/react-spectrum/stories/color/ColorThumb.stories.tsx
similarity index 92%
rename from packages/@react-spectrum/color/stories/ColorThumb.stories.tsx
rename to packages/@adobe/react-spectrum/stories/color/ColorThumb.stories.tsx
index dfff61c98b4..642e9de98b5 100644
--- a/packages/@react-spectrum/color/stories/ColorThumb.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/color/ColorThumb.stories.tsx
@@ -10,9 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorThumb} from '../src/ColorThumb';
+import {ColorThumb} from '../../src/color/ColorThumb';
 import {Meta, StoryObj} from '@storybook/react';
-import {parseColor} from '@react-stately/color';
+import {parseColor} from 'react-stately/Color';
 import React from 'react';
 
 export type ColorThumbStory = StoryObj<typeof ColorThumb>;
diff --git a/packages/@react-spectrum/color/stories/ColorWheel.stories.tsx b/packages/@adobe/react-spectrum/stories/color/ColorWheel.stories.tsx
similarity index 90%
rename from packages/@react-spectrum/color/stories/ColorWheel.stories.tsx
rename to packages/@adobe/react-spectrum/stories/color/ColorWheel.stories.tsx
index 08d6aa30024..480ceae1e8e 100644
--- a/packages/@react-spectrum/color/stories/ColorWheel.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/color/ColorWheel.stories.tsx
@@ -11,12 +11,14 @@
  */
 
 import {action} from 'storybook/actions';
-import {ColorSwatch, ColorWheel} from '../';
-import {Flex, useLocale} from '@adobe/react-spectrum';
+import {ColorSwatch} from '../../src/color/ColorSwatch';
+import {ColorWheel} from '../../src/color/ColorWheel';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
-import {parseColor} from '@react-stately/color';
+import {parseColor} from 'react-stately/Color';
 import React, {JSX, useState} from 'react';
 import {SpectrumColorWheelProps} from '@react-types/color';
+import {useLocale} from 'react-aria/I18nProvider';
 
 export type ColorWheelStory = StoryObj<typeof ColorWheel>;
 
diff --git a/packages/@react-spectrum/combobox/stories/ComboBox.stories.tsx b/packages/@adobe/react-spectrum/stories/combobox/ComboBox.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/combobox/stories/ComboBox.stories.tsx
rename to packages/@adobe/react-spectrum/stories/combobox/ComboBox.stories.tsx
index e7bb15573dc..7a8265c9437 100644
--- a/packages/@react-spectrum/combobox/stories/ComboBox.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/combobox/ComboBox.stories.tsx
@@ -11,27 +11,34 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton, Button} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
 import Add from '@spectrum-icons/workflow/Add';
 import Alert from '@spectrum-icons/workflow/Alert';
-import {Avatar} from '@react-spectrum/avatar';
+import {Avatar} from '../../src/avatar/Avatar';
 import Bell from '@spectrum-icons/workflow/Bell';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {chain} from '@react-aria/utils';
-import {ComboBox, Item, Section} from '../';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {chain} from 'react-aria/private/utils/chain';
+import {ComboBox} from '../../src/combobox/ComboBox';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
 import Copy from '@spectrum-icons/workflow/Copy';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
 import Draw from '@spectrum-icons/workflow/Draw';
-import {Flex} from '@react-spectrum/layout';
-import {Heading, Text} from '@react-spectrum/text';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
 import {Key} from '@react-types/shared';
-import {Link} from '@react-spectrum/link';
+import {Link} from '../../src/link/Link';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {useRef, useState} from 'react';
-import {useAsyncList, useListData, useTreeData} from '@react-stately/data';
-import {useFilter} from '@react-aria/i18n';
+import {Section} from 'react-stately/Section';
+import {Text} from '../../src/text/Text';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useFilter} from 'react-aria/useFilter';
+import {useListData} from 'react-stately/useListData';
+import {useTreeData} from 'react-stately/useTreeData';
 
 let items = [
   {name: 'Aardvark', id: '1'},
diff --git a/packages/@react-spectrum/contextualhelp/stories/ContextualHelp.stories.tsx b/packages/@adobe/react-spectrum/stories/contextualhelp/ContextualHelp.stories.tsx
similarity index 89%
rename from packages/@react-spectrum/contextualhelp/stories/ContextualHelp.stories.tsx
rename to packages/@adobe/react-spectrum/stories/contextualhelp/ContextualHelp.stories.tsx
index 54392c595db..1fc0e68e6f0 100644
--- a/packages/@react-spectrum/contextualhelp/stories/ContextualHelp.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/contextualhelp/ContextualHelp.stories.tsx
@@ -10,10 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Content, Flex, Footer, Heading, Link, Text} from '@adobe/react-spectrum';
-import {ContextualHelp} from '../src';
+import {Button} from '../../src/button/Button';
+
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Flex} from '../../src/layout/Flex';
+import {Footer} from '../../src/view/Footer';
+import {Heading} from '../../src/text/Heading';
+import {Link} from '../../src/link/Link';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
+import {Text} from '../../src/text/Text';
 
 export default {
   title: 'ContextualHelp',
diff --git a/packages/@react-spectrum/datepicker/stories/DateField.stories.tsx b/packages/@adobe/react-spectrum/stories/datepicker/DateField.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/datepicker/stories/DateField.stories.tsx
rename to packages/@adobe/react-spectrum/stories/datepicker/DateField.stories.tsx
index bf6e1d38ad8..2fa9fcc0ebb 100644
--- a/packages/@react-spectrum/datepicker/stories/DateField.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/datepicker/DateField.stories.tsx
@@ -12,17 +12,19 @@
 
 import {action} from 'storybook/actions';
 import {CalendarDate, CalendarDateTime, parseAbsolute, parseAbsoluteToLocal, parseDate, parseDateTime, parseZonedDateTime, toZoned} from '@internationalized/date';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {DateField} from '../';
-import {Flex} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
-import {Item, Picker, Section} from '@react-spectrum/picker';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {DateField} from '../../src/datepicker/DateField';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
 import {Key} from '@react-types/shared';
 import {Meta, StoryObj} from '@storybook/react';
-import {Provider} from '@react-spectrum/provider';
+import {Picker} from '../../src/picker/Picker';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {useLocale} from '@react-aria/i18n';
+import {Section} from 'react-stately/Section';
+import {useLocale} from 'react-aria/I18nProvider';
 
 
 export type DateFieldStory = StoryObj<typeof DateField>;
diff --git a/packages/@react-spectrum/datepicker/stories/DatePicker.stories.tsx b/packages/@adobe/react-spectrum/stories/datepicker/DatePicker.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/datepicker/stories/DatePicker.stories.tsx
rename to packages/@adobe/react-spectrum/stories/datepicker/DatePicker.stories.tsx
index d1e606b2b68..4fa5a7a6803 100644
--- a/packages/@react-spectrum/datepicker/stories/DatePicker.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/datepicker/DatePicker.stories.tsx
@@ -11,22 +11,24 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
 import {CalendarDate, CalendarDateTime, getLocalTimeZone, parseAbsolute, parseAbsoluteToLocal, parseDate, parseDateTime, parseZonedDateTime, today, toZoned} from '@internationalized/date';
-import {chain} from '@react-aria/utils';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
+import {chain} from 'react-aria/private/utils/chain';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
 import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
-import {DatePicker} from '../';
+import {DatePicker} from '../../src/datepicker/DatePicker';
 import {DateValue} from '@react-types/calendar';
-import {Flex} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
-import {Item, Picker, Section} from '@react-spectrum/picker';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
 import {Key} from '@react-types/shared';
 import {Meta, StoryObj} from '@storybook/react';
-import {Provider} from '@react-spectrum/provider';
+import {Picker} from '../../src/picker/Picker';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {useLocale} from '@react-aria/i18n';
+import {Section} from 'react-stately/Section';
+import {useLocale} from 'react-aria/I18nProvider';
 
 export type DatePickerStory = StoryObj<typeof DatePicker>;
 const BlockDecorator = storyFn => <div>{storyFn()}</div>;
@@ -393,4 +395,4 @@ function CustomExample(props) {
       <DatePicker label="Custom 4-5-4 calendar" {...props} value={value} onChange={chain(setValue, action('onChange'))} />
     </Flex>
   );
-};
+}
diff --git a/packages/@react-spectrum/datepicker/stories/DateRangePicker.stories.tsx b/packages/@adobe/react-spectrum/stories/datepicker/DateRangePicker.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/datepicker/stories/DateRangePicker.stories.tsx
rename to packages/@adobe/react-spectrum/stories/datepicker/DateRangePicker.stories.tsx
index 378bfe247ac..92f7ddeed72 100644
--- a/packages/@react-spectrum/datepicker/stories/DateRangePicker.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/datepicker/DateRangePicker.stories.tsx
@@ -11,20 +11,22 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
 import {CalendarDate, getLocalTimeZone, isWeekend, parseDate, today, toZoned} from '@internationalized/date';
-import {chain} from '@react-aria/utils';
+import {chain} from 'react-aria/private/utils/chain';
 import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
 import {DateRange} from '@react-types/datepicker';
-import {DateRangePicker} from '../';
+import {DateRangePicker} from '../../src/datepicker/DateRangePicker';
 import {DateValue} from '@react-types/calendar';
-import {Flex} from '@react-spectrum/layout';
-import {Item, Picker, Section} from '@react-spectrum/picker';
+import {Flex} from '../../src/layout/Flex';
+import {Item} from 'react-stately/Item';
 import {Key} from '@react-types/shared';
 import {Meta, StoryFn} from '@storybook/react';
-import {Provider} from '@adobe/react-spectrum';
+import {Picker} from '../../src/picker/Picker';
+import {Provider} from '../../src/provider/Provider';
 import React, {JSX} from 'react';
-import {useLocale} from '@react-aria/i18n';
+import {Section} from 'react-stately/Section';
+import {useLocale} from 'react-aria/I18nProvider';
 
 const BlockDecorator = storyFn => <div>{storyFn()}</div>;
 
@@ -302,4 +304,4 @@ function CustomExample(props) {
         maxVisibleMonths={3} />
     </Flex>
   );
-};
+}
diff --git a/packages/@react-spectrum/datepicker/stories/DateRangePickerStyling.stories.tsx b/packages/@adobe/react-spectrum/stories/datepicker/DateRangePickerStyling.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/datepicker/stories/DateRangePickerStyling.stories.tsx
rename to packages/@adobe/react-spectrum/stories/datepicker/DateRangePickerStyling.stories.tsx
index da75c6b336d..7b57bf676c0 100644
--- a/packages/@react-spectrum/datepicker/stories/DateRangePickerStyling.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/datepicker/DateRangePickerStyling.stories.tsx
@@ -10,10 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {DateRangePicker} from '../';
-import {Heading} from '@react-spectrum/text';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {DateRangePicker} from '../../src/datepicker/DateRangePicker';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryFn} from '@storybook/react';
 import {parseDate, toZoned} from '@internationalized/date';
 import React from 'react';
diff --git a/packages/@react-spectrum/datepicker/stories/TimeField.stories.tsx b/packages/@adobe/react-spectrum/stories/datepicker/TimeField.stories.tsx
similarity index 98%
rename from packages/@react-spectrum/datepicker/stories/TimeField.stories.tsx
rename to packages/@adobe/react-spectrum/stories/datepicker/TimeField.stories.tsx
index cb6c8ad3158..74edcc79a8c 100644
--- a/packages/@react-spectrum/datepicker/stories/TimeField.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/datepicker/TimeField.stories.tsx
@@ -14,7 +14,7 @@ import {action} from 'storybook/actions';
 import {CalendarDateTime, parseTime, parseZonedDateTime, Time, toZoned} from '@internationalized/date';
 import {Meta, StoryFn} from '@storybook/react';
 import React, {JSX} from 'react';
-import {TimeField} from '../';
+import {TimeField} from '../../src/datepicker/TimeField';
 
 const BlockDecorator = storyFn => <div>{storyFn()}</div>;
 
diff --git a/packages/@react-spectrum/datepicker/stories/TimeFieldStyling.stories.tsx b/packages/@adobe/react-spectrum/stories/datepicker/TimeFieldStyling.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/datepicker/stories/TimeFieldStyling.stories.tsx
rename to packages/@adobe/react-spectrum/stories/datepicker/TimeFieldStyling.stories.tsx
index 21bdece7bf5..ff0035d9f76 100644
--- a/packages/@react-spectrum/datepicker/stories/TimeFieldStyling.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/datepicker/TimeFieldStyling.stories.tsx
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Heading} from '@react-spectrum/text';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import {render} from './TimeField.stories';
-import {TimeField} from '../';
+import {TimeField} from '../../src/datepicker/TimeField';
 
 const BlockDecorator = storyFn => <div>{storyFn()}</div>;
 
diff --git a/packages/@react-spectrum/dialog/stories/AlertDialog.stories.tsx b/packages/@adobe/react-spectrum/stories/dialog/AlertDialog.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/dialog/stories/AlertDialog.stories.tsx
rename to packages/@adobe/react-spectrum/stories/dialog/AlertDialog.stories.tsx
index 8e6a3193331..caf6e101fe5 100644
--- a/packages/@react-spectrum/dialog/stories/AlertDialog.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/dialog/AlertDialog.stories.tsx
@@ -10,8 +10,9 @@
  * governing permissions and limitations under the License.
  */
 import {action} from 'storybook/actions';
-import {ActionButton} from '@react-spectrum/button';
-import {AlertDialog, DialogTrigger} from '../';
+import {ActionButton} from '../../src/button/ActionButton';
+import {AlertDialog} from '../../src/dialog/AlertDialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import {singleParagraph} from './Dialog.stories';
diff --git a/packages/@react-spectrum/dialog/stories/Dialog.stories.tsx b/packages/@adobe/react-spectrum/stories/dialog/Dialog.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/dialog/stories/Dialog.stories.tsx
rename to packages/@adobe/react-spectrum/stories/dialog/Dialog.stories.tsx
index 079ad51344a..a6bd305c1fa 100644
--- a/packages/@react-spectrum/dialog/stories/Dialog.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/dialog/Dialog.stories.tsx
@@ -10,21 +10,30 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, Button} from '@react-spectrum/button';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {Checkbox} from '@react-spectrum/checkbox';
-import {Content, Footer, Header} from '@react-spectrum/view';
-import {Dialog, DialogTrigger, SpectrumDialogProps} from '../';
-import {Divider} from '@react-spectrum/divider';
-import {Flex} from '@react-spectrum/layout';
-import {Form} from '@react-spectrum/form';
-import {Heading, Text} from '@react-spectrum/text';
-import {Image} from '@react-spectrum/image';
-import {Item, Picker} from '@react-spectrum/picker';
+import {ActionButton} from '../../src/button/ActionButton';
+
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {Content} from '../../src/view/Content';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
+import {Divider} from '../../src/divider/Divider';
+import {Flex} from '../../src/layout/Flex';
+import {Footer} from '../../src/view/Footer';
+import {Form} from '../../src/form/Form';
+import {Header} from '../../src/view/Header';
+import {Heading} from '../../src/text/Heading';
+import {Image} from '../../src/image/Image';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryFn} from '@storybook/react';
-import {Radio, RadioGroup} from '@react-spectrum/radio';
+import {Picker} from '../../src/picker/Picker';
+import {Radio} from '../../src/radio/Radio';
+import {RadioGroup} from '../../src/radio/RadioGroup';
 import React, {JSX, useState} from 'react';
-import {TextField} from '@react-spectrum/textfield';
+import {SpectrumDialogProps} from '@react-types/dialog';
+import {Text} from '../../src/text/Text';
+import {TextField} from '../../src/textfield/TextField';
 
 export default {
   title: 'Dialog',
diff --git a/packages/@react-spectrum/dialog/stories/DialogContainer.stories.tsx b/packages/@adobe/react-spectrum/stories/dialog/DialogContainer.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/dialog/stories/DialogContainer.stories.tsx
rename to packages/@adobe/react-spectrum/stories/dialog/DialogContainer.stories.tsx
index 83e9a27edcd..da087fd5430 100644
--- a/packages/@react-spectrum/dialog/stories/DialogContainer.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/dialog/DialogContainer.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {DialogContainer} from '../';
+import {DialogContainer} from '../../src/dialog/DialogContainer';
 import {
   DialogContainerExample,
   MenuExample,
diff --git a/packages/@react-spectrum/dialog/stories/DialogContainerExamples.tsx b/packages/@adobe/react-spectrum/stories/dialog/DialogContainerExamples.tsx
similarity index 79%
rename from packages/@react-spectrum/dialog/stories/DialogContainerExamples.tsx
rename to packages/@adobe/react-spectrum/stories/dialog/DialogContainerExamples.tsx
index fed09913df9..7fca17c52e8 100644
--- a/packages/@react-spectrum/dialog/stories/DialogContainerExamples.tsx
+++ b/packages/@adobe/react-spectrum/stories/dialog/DialogContainerExamples.tsx
@@ -1,12 +1,20 @@
-import {ActionButton, Button} from '@react-spectrum/button';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {Content, Header} from '@react-spectrum/view';
-import {Dialog, DialogContainer, SpectrumDialogContainerProps, SpectrumDialogProps, useDialogContainer} from '../';
-import {Divider} from '@react-spectrum/divider';
-import {Heading, Text} from '@react-spectrum/text';
-import {Item, Menu, MenuTrigger} from '@react-spectrum/menu';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {Content} from '../../src/view/Content';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogContainer} from '../../src/dialog/DialogContainer';
+import {Divider} from '../../src/divider/Divider';
+import {Header} from '../../src/view/Header';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
 import {Key} from '@react-types/shared';
+import {Menu} from '../../src/menu/Menu';
+import {MenuTrigger} from '../../src/menu/MenuTrigger';
 import React, {JSX} from 'react';
+import {SpectrumDialogContainerProps, SpectrumDialogProps} from '@react-types/dialog';
+import {Text} from '../../src/text/Text';
+import {useDialogContainer} from '../../src/dialog/useDialogContainer';
 
 export function DialogContainerExample(props: Omit<SpectrumDialogContainerProps, 'children' | 'onDismiss'> & Omit<SpectrumDialogProps, 'children'>): JSX.Element {
   let [isOpen, setOpen] = React.useState(false);
diff --git a/packages/@react-spectrum/dialog/stories/DialogTrigger.stories.tsx b/packages/@adobe/react-spectrum/stories/dialog/DialogTrigger.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/dialog/stories/DialogTrigger.stories.tsx
rename to packages/@adobe/react-spectrum/stories/dialog/DialogTrigger.stories.tsx
index 90c09c0880d..6cc270b43f1 100644
--- a/packages/@react-spectrum/dialog/stories/DialogTrigger.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/dialog/DialogTrigger.stories.tsx
@@ -11,23 +11,34 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton, Button} from '@react-spectrum/button';
-import {AlertDialog, Dialog, DialogTrigger} from '../';
+import {ActionButton} from '../../src/button/ActionButton';
+import {AlertDialog} from '../../src/dialog/AlertDialog';
 import AlertMedium from '@spectrum-icons/ui/AlertMedium';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {chain} from '@react-aria/utils';
-import {Checkbox} from '@react-spectrum/checkbox';
-import {Content, Footer, Header, View} from '@react-spectrum/view';
-import {Divider} from '@react-spectrum/divider';
-import {Flex, Grid} from '@react-spectrum/layout';
-import {Heading, Text} from '@react-spectrum/text';
-import {Image} from '@react-spectrum/image';
-import {Item, Menu, MenuTrigger} from '@react-spectrum/menu';
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {chain} from 'react-aria/private/utils/chain';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {Content} from '../../src/view/Content';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
+import {Divider} from '../../src/divider/Divider';
+import {Flex} from '../../src/layout/Flex';
+import {Footer} from '../../src/view/Footer';
+import {Grid} from '../../src/layout/Grid';
+import {Header} from '../../src/view/Header';
+import {Heading} from '../../src/text/Heading';
+import {Image} from '../../src/image/Image';
+import {Item} from 'react-stately/Item';
+import {Menu} from '../../src/menu/Menu';
+import {MenuTrigger} from '../../src/menu/MenuTrigger';
 import {Meta, StoryFn} from '@storybook/react';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../../src/provider/Provider';
 import React, {useState} from 'react';
-import {Tooltip, TooltipTrigger} from '@react-spectrum/tooltip';
-import {TranslateDialogRender} from './../chromatic/DialogLanguages.stories';
+import {Text} from '../../src/text/Text';
+import {Tooltip} from '../../src/tooltip/Tooltip';
+import {TooltipTrigger} from '../../src/tooltip/TooltipTrigger';
+import {TranslateDialogRender} from './../../chromatic/dialog/DialogLanguages.stories';
+import {View} from '../../src/view/View';
 
 export default {
   title: 'DialogTrigger',
diff --git a/packages/@react-spectrum/divider/stories/Divider.stories.tsx b/packages/@adobe/react-spectrum/stories/divider/Divider.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/divider/stories/Divider.stories.tsx
rename to packages/@adobe/react-spectrum/stories/divider/Divider.stories.tsx
index 63d942ea0c9..4b7b041f749 100644
--- a/packages/@react-spectrum/divider/stories/Divider.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/divider/Divider.stories.tsx
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
-import {Divider} from '../';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Divider} from '../../src/divider/Divider';
 import {Meta, StoryFn} from '@storybook/react';
 import Properties from '@spectrum-icons/workflow/Properties';
 import React from 'react';
diff --git a/packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx b/packages/@adobe/react-spectrum/stories/dropzone/DropZone.stories.tsx
similarity index 92%
rename from packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx
rename to packages/@adobe/react-spectrum/stories/dropzone/DropZone.stories.tsx
index b53ec8fdd03..df825a728ee 100644
--- a/packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/dropzone/DropZone.stories.tsx
@@ -11,23 +11,24 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button} from '@react-spectrum/button';
-import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@react-spectrum/table';
-import {classNames} from '@react-spectrum/utils';
-import {Content} from '@react-spectrum/view';
-import {Draggable} from '/packages/@react-aria/dnd/stories/dnd.stories';
-import {DropEvent, FileDropItem, TextDropItem, useDrag} from 'react-aria';
-import {DropZone} from '../';
+import {Button} from '../../src/button/Button';
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../src/table/TableView';
+import {classNames} from '../../src/utils/classNames';
+import {Content} from '../../src/view/Content';
+import {Draggable} from '../../../../react-aria/stories/dnd/dnd.stories';
+import {DropEvent, FileDropItem, TextDropItem} from '@react-types/shared';
+import {DropZone} from '../../src/dropzone/DropZone';
 import File from '@spectrum-icons/illustrations/File';
-import {FileTrigger} from 'react-aria-components';
-import {Heading} from '@react-spectrum/text';
-import {IllustratedMessage} from '@react-spectrum/illustratedmessage';
+import {FileTrigger} from 'react-aria-components/FileTrigger';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
 import {Meta, StoryObj} from '@storybook/react';
 import NotFound from '@spectrum-icons/illustrations/NotFound';
 import React, {useState} from 'react';
-import {SpectrumDropZoneProps} from '../src/DropZone';
+import {SpectrumDropZoneProps} from '../../src/dropzone/DropZone';
 import styles from './styles.css';
 import Upload from '@spectrum-icons/illustrations/Upload';
+import {useDrag} from 'react-aria/useDrag';
 
 interface FileFilledSource {
   src?: string,
diff --git a/packages/@react-spectrum/dropzone/stories/FileTrigger.stories.tsx b/packages/@adobe/react-spectrum/stories/dropzone/FileTrigger.stories.tsx
similarity index 92%
rename from packages/@react-spectrum/dropzone/stories/FileTrigger.stories.tsx
rename to packages/@adobe/react-spectrum/stories/dropzone/FileTrigger.stories.tsx
index aab6540b542..ee44f8e525f 100644
--- a/packages/@react-spectrum/dropzone/stories/FileTrigger.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/dropzone/FileTrigger.stories.tsx
@@ -10,9 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button} from '@react-spectrum/button';
-import {FileTrigger, FileTriggerProps} from 'react-aria-components';
-import {Link} from '@react-spectrum/link';
+import {Button} from '../../src/button/Button';
+import {FileTrigger, FileTriggerProps} from 'react-aria-components/FileTrigger';
+import {Link} from '../../src/link/Link';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/dropzone/stories/styles.css b/packages/@adobe/react-spectrum/stories/dropzone/styles.css
similarity index 100%
rename from packages/@react-spectrum/dropzone/stories/styles.css
rename to packages/@adobe/react-spectrum/stories/dropzone/styles.css
diff --git a/packages/@react-spectrum/form/stories/Form.stories.tsx b/packages/@adobe/react-spectrum/stories/form/Form.stories.tsx
similarity index 93%
rename from packages/@react-spectrum/form/stories/Form.stories.tsx
rename to packages/@adobe/react-spectrum/stories/form/Form.stories.tsx
index 4a8be889f32..a06bd7c2911 100644
--- a/packages/@react-spectrum/form/stories/Form.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/form/Form.stories.tsx
@@ -11,37 +11,46 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button} from '@react-spectrum/button';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
 import {CalendarDate, parseDate, parseDateTime, parseTime} from '@internationalized/date';
-import {chain} from '@react-aria/utils';
-import {Checkbox, CheckboxGroup} from '@react-spectrum/checkbox';
-import {ColorField} from '@react-spectrum/color';
-import {ComboBox} from '@react-spectrum/combobox';
-import {Content, Header} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
+import {chain} from 'react-aria/private/utils/chain';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {CheckboxGroup} from '../../src/checkbox/CheckboxGroup';
+import {ColorField} from '../../src/color/ColorField';
+import {ComboBox} from '../../src/combobox/ComboBox';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
 import {countries, states} from './data';
-import {DateField, DatePicker, DateRangePicker, TimeField} from '@react-spectrum/datepicker';
-import {Flex} from '@react-spectrum/layout';
-import {Form, SpectrumFormProps} from '../';
-import {Heading} from '@react-spectrum/text';
-import {InlineAlert} from '@react-spectrum/inlinealert';
-import {Item, Picker} from '@react-spectrum/picker';
+import {DateField} from '../../src/datepicker/DateField';
+import {DatePicker} from '../../src/datepicker/DatePicker';
+import {DateRangePicker} from '../../src/datepicker/DateRangePicker';
+import {Flex} from '../../src/layout/Flex';
+import {Form} from '../../src/form/Form';
+import {Header} from '../../src/view/Header';
+import {Heading} from '../../src/text/Heading';
+import {InlineAlert} from '../../src/inlinealert/InlineAlert';
+import {Item} from 'react-stately/Item';
 import {Key, ValidationState} from '@react-types/shared';
 import {Meta, StoryObj} from '@storybook/react';
-import {NumberField} from '@react-spectrum/numberfield';
-import {Radio, RadioGroup} from '@react-spectrum/radio';
+import {NumberField} from '../../src/numberfield/NumberField';
+import {Picker} from '../../src/picker/Picker';
+import {Radio} from '../../src/radio/Radio';
+import {RadioGroup} from '../../src/radio/RadioGroup';
 import React, {useEffect, useState} from 'react';
-import {SearchAutocomplete} from '@react-spectrum/autocomplete';
-import {SearchField} from '@react-spectrum/searchfield';
-import {Slider} from '@react-spectrum/slider';
-import {StatusLight} from '@react-spectrum/statuslight';
-import {Switch} from '@react-spectrum/switch';
-import {TagGroup} from '@react-spectrum/tag';
-import {TextArea, TextField} from '@react-spectrum/textfield';
-import {TranslateForm} from './../chromatic/FormLanguages.stories';
+import {SearchAutocomplete} from '../../src/autocomplete/SearchAutocomplete';
+import {SearchField} from '../../src/searchfield/SearchField';
+import {Slider} from '../../src/slider/Slider';
+import {SpectrumFormProps} from '@react-types/form';
+import {StatusLight} from '../../src/statuslight/StatusLight';
+import {Switch} from '../../src/switch/Switch';
+import {TagGroup} from '../../src/tag/TagGroup';
+import {TextArea} from '../../src/textfield/TextArea';
+import {TextField} from '../../src/textfield/TextField';
+import {TimeField} from '../../src/datepicker/TimeField';
+import {TranslateForm} from './../../chromatic/form/FormLanguages.stories';
 import typographyStyles from '@adobe/spectrum-css-temp/components/typography/vars.css';
-import {Well} from '@react-spectrum/well';
+import {Well} from '../../src/well/Well';
 
 export default {
   title: 'Form',
diff --git a/packages/@react-spectrum/form/stories/data.ts b/packages/@adobe/react-spectrum/stories/form/data.ts
similarity index 100%
rename from packages/@react-spectrum/form/stories/data.ts
rename to packages/@adobe/react-spectrum/stories/form/data.ts
diff --git a/packages/@react-spectrum/icon/stories/Icon.stories.tsx b/packages/@adobe/react-spectrum/stories/icon/Icon.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/icon/stories/Icon.stories.tsx
rename to packages/@adobe/react-spectrum/stories/icon/Icon.stories.tsx
index 24a824a534c..c2528feb6d2 100644
--- a/packages/@react-spectrum/icon/stories/Icon.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/icon/Icon.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Icon} from '../';
+import {Icon} from '../../src/icon/Icon';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/illustratedmessage/stories/IllustratedMessage.stories.tsx b/packages/@adobe/react-spectrum/stories/illustratedmessage/IllustratedMessage.stories.tsx
similarity index 88%
rename from packages/@react-spectrum/illustratedmessage/stories/IllustratedMessage.stories.tsx
rename to packages/@adobe/react-spectrum/stories/illustratedmessage/IllustratedMessage.stories.tsx
index b60d4e661fd..a8a68c00ebe 100644
--- a/packages/@react-spectrum/illustratedmessage/stories/IllustratedMessage.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/illustratedmessage/IllustratedMessage.stories.tsx
@@ -9,9 +9,9 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {Content} from '@react-spectrum/view';
-import {Heading} from '@react-spectrum/text';
-import {IllustratedMessage} from '../';
+import {Content} from '../../src/view/Content';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
 import {Meta, StoryObj} from '@storybook/react';
 import NotFound from '@spectrum-icons/illustrations/NotFound';
 import React from 'react';
diff --git a/packages/@react-spectrum/image/stories/Image.stories.tsx b/packages/@adobe/react-spectrum/stories/image/Image.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/image/stories/Image.stories.tsx
rename to packages/@adobe/react-spectrum/stories/image/Image.stories.tsx
index 6dac30d6a16..c84cdb15aeb 100644
--- a/packages/@react-spectrum/image/stories/Image.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/image/Image.stories.tsx
@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {Image} from '../';
+import {Image} from '../../src/image/Image';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {useState} from 'react';
 
diff --git a/packages/@react-spectrum/inlinealert/stories/InlineAlert.stories.tsx b/packages/@adobe/react-spectrum/stories/inlinealert/InlineAlert.stories.tsx
similarity index 89%
rename from packages/@react-spectrum/inlinealert/stories/InlineAlert.stories.tsx
rename to packages/@adobe/react-spectrum/stories/inlinealert/InlineAlert.stories.tsx
index 00c574d3dd6..add5e89ecb3 100644
--- a/packages/@react-spectrum/inlinealert/stories/InlineAlert.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/inlinealert/InlineAlert.stories.tsx
@@ -10,10 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button} from '@react-spectrum/button';
-import {Content} from '@react-spectrum/view';
-import {Heading} from '@react-spectrum/text';
-import {InlineAlert, SpectrumInlineAlertProps} from '../';
+import {Button} from '../../src/button/Button';
+import {Content} from '../../src/view/Content';
+import {Heading} from '../../src/text/Heading';
+import {InlineAlert, SpectrumInlineAlertProps} from '../../src/inlinealert/InlineAlert';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {useState} from 'react';
 
diff --git a/packages/@react-spectrum/label/stories/HelpText.stories.tsx b/packages/@adobe/react-spectrum/stories/label/HelpText.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/label/stories/HelpText.stories.tsx
rename to packages/@adobe/react-spectrum/stories/label/HelpText.stories.tsx
index 91d733168e6..ebd4ba872e9 100644
--- a/packages/@react-spectrum/label/stories/HelpText.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/label/HelpText.stories.tsx
@@ -9,12 +9,14 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
+
 import {Meta, StoryObj} from '@storybook/react';
-import {Radio, RadioGroup} from '@react-spectrum/radio';
+import {Radio} from '../../src/radio/Radio';
+import {RadioGroup} from '../../src/radio/RadioGroup';
 import React, {useState} from 'react';
 import {SpectrumTextFieldProps} from '@react-types/textfield';
-import {TextField} from '@react-spectrum/textfield';
+import {TextField} from '../../src/textfield/TextField';
 
 const argTypes = {
   label: {
diff --git a/packages/@react-spectrum/label/stories/Label.stories.tsx b/packages/@adobe/react-spectrum/stories/label/Label.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/label/stories/Label.stories.tsx
rename to packages/@adobe/react-spectrum/stories/label/Label.stories.tsx
index 89eb0f1d2d8..879569f3cb4 100644
--- a/packages/@react-spectrum/label/stories/Label.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/label/Label.stories.tsx
@@ -9,10 +9,10 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {Label} from '../';
+import {Label} from '../../src/label/Label';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {TextField} from '@react-spectrum/textfield';
+import {TextField} from '../../src/textfield/TextField';
 
 type LabelStory = StoryObj<typeof Label>;
 
diff --git a/packages/@react-spectrum/labeledvalue/stories/LabeledValue.stories.tsx b/packages/@adobe/react-spectrum/stories/labeledvalue/LabeledValue.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/labeledvalue/stories/LabeledValue.stories.tsx
rename to packages/@adobe/react-spectrum/stories/labeledvalue/LabeledValue.stories.tsx
index be21686e6f7..177d07c40dc 100644
--- a/packages/@react-spectrum/labeledvalue/stories/LabeledValue.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/labeledvalue/LabeledValue.stories.tsx
@@ -11,11 +11,11 @@
  */
 
 import {CalendarDate, CalendarDateTime, Time, ZonedDateTime} from '@internationalized/date';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Heading} from '@react-spectrum/text';
-import {LabeledValue} from '..';
-import {Link} from '@react-spectrum/link';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Heading} from '../../src/text/Heading';
+import {LabeledValue} from '../../src/labeledvalue/LabeledValue';
+import {Link} from '../../src/link/Link';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/layout/stories/Flex.stories.tsx b/packages/@adobe/react-spectrum/stories/layout/Flex.stories.tsx
similarity index 98%
rename from packages/@react-spectrum/layout/stories/Flex.stories.tsx
rename to packages/@adobe/react-spectrum/stories/layout/Flex.stories.tsx
index f1cd197f4ae..f5a9811d8ed 100644
--- a/packages/@react-spectrum/layout/stories/Flex.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/layout/Flex.stories.tsx
@@ -11,10 +11,10 @@
  */
 
 import {BackgroundColorValue, Responsive as TResponsive} from '@react-types/shared';
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
-import {View} from '@react-spectrum/view';
+import {View} from '../../src/view/View';
 
 let baseColors = [
   'celery',
diff --git a/packages/@react-spectrum/layout/stories/Grid.stories.tsx b/packages/@adobe/react-spectrum/stories/layout/Grid.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/layout/stories/Grid.stories.tsx
rename to packages/@adobe/react-spectrum/stories/layout/Grid.stories.tsx
index 0b6fadea5b9..5554d084f8e 100644
--- a/packages/@react-spectrum/layout/stories/Grid.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/layout/Grid.stories.tsx
@@ -11,10 +11,10 @@
  */
 
 import {BackgroundColorValue, Responsive as TResponsive} from '@react-types/shared';
-import {Grid, repeat} from '@react-spectrum/layout';
+import {Grid, repeat} from '../../src/layout/Grid';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
-import {View} from '@react-spectrum/view';
+import {View} from '../../src/view/View';
 
 let baseColors = [
   'celery',
diff --git a/packages/@react-spectrum/layout/stories/styles.css b/packages/@adobe/react-spectrum/stories/layout/styles.css
similarity index 100%
rename from packages/@react-spectrum/layout/stories/styles.css
rename to packages/@adobe/react-spectrum/stories/layout/styles.css
diff --git a/packages/@react-spectrum/link/stories/Link.stories.tsx b/packages/@adobe/react-spectrum/stories/link/Link.stories.tsx
similarity index 98%
rename from packages/@react-spectrum/link/stories/Link.stories.tsx
rename to packages/@adobe/react-spectrum/stories/link/Link.stories.tsx
index fed2ee539bd..d36af1e4390 100644
--- a/packages/@react-spectrum/link/stories/Link.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/link/Link.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {ArgTypes, Meta, StoryObj} from '@storybook/react';
-import {Link} from '../';
+import {Link} from '../../src/link/Link';
 import React from 'react';
 import {SpectrumLinkProps} from '@react-types/link';
 
diff --git a/packages/@react-spectrum/list/stories/ListView.stories.tsx b/packages/@adobe/react-spectrum/stories/list/ListView.stories.tsx
similarity index 93%
rename from packages/@react-spectrum/list/stories/ListView.stories.tsx
rename to packages/@adobe/react-spectrum/stories/list/ListView.stories.tsx
index 1def468dda6..814e0c789a4 100644
--- a/packages/@react-spectrum/list/stories/ListView.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/list/ListView.stories.tsx
@@ -1,27 +1,33 @@
 import {action} from 'storybook/actions';
-import {ActionBar, ActionBarContainer} from '@react-spectrum/actionbar';
-import {ActionButton, Button} from '@react-spectrum/button';
-import {ActionGroup} from '@react-spectrum/actiongroup';
-import {Badge} from '@react-spectrum/badge';
-import {Content} from '@react-spectrum/view';
+import {ActionBar} from '../../src/actionbar/ActionBar';
+import {ActionBarContainer} from '../../src/actionbar/ActionBarContainer';
+import {ActionButton} from '../../src/button/ActionButton';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
+import {Badge} from '../../src/badge/Badge';
+import {Button} from '../../src/button/Button';
+import {Content} from '../../src/view/Content';
 import Copy from '@spectrum-icons/workflow/Copy';
 import Delete from '@spectrum-icons/workflow/Delete';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
-import {Divider} from '@react-spectrum/divider';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
+import {Divider} from '../../src/divider/Divider';
 import Edit from '@spectrum-icons/workflow/Edit';
 import File from '@spectrum-icons/illustrations/File';
-import {Flex} from '@react-spectrum/layout';
-import {FocusScope} from '@react-aria/focus';
+import {Flex} from '../../src/layout/Flex';
+import {FocusScope} from 'react-aria/FocusScope';
 import Folder from '@spectrum-icons/illustrations/Folder';
-import {Heading, Text} from '@react-spectrum/text';
-import {IllustratedMessage} from '@react-spectrum/illustratedmessage';
-import {Image} from '@react-spectrum/image';
-import {Item, ListView, SpectrumListViewProps} from '../';
-import {Link} from '@react-spectrum/link';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
+import {Image} from '../../src/image/Image';
+import {Item} from 'react-stately/Item';
+import {Link} from '../../src/link/Link';
+import {ListView, SpectrumListViewProps} from '../../src/list/ListView';
 import {Meta, StoryObj} from '@storybook/react';
 import NoSearchResults from '@spectrum-icons/illustrations/NoSearchResults';
 import React, {JSX, useEffect, useState} from 'react';
-import {useAsyncList, useListData} from '@react-stately/data';
+import {Text} from '../../src/text/Text';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useListData} from 'react-stately/useListData';
 
 export const items: any = [
   {key: 'a', name: 'Adobe Photoshop', type: 'file'},
diff --git a/packages/@react-spectrum/list/stories/ListViewActions.stories.tsx b/packages/@adobe/react-spectrum/stories/list/ListViewActions.stories.tsx
similarity index 93%
rename from packages/@react-spectrum/list/stories/ListViewActions.stories.tsx
rename to packages/@adobe/react-spectrum/stories/list/ListViewActions.stories.tsx
index ca19dcdbc8b..b6b0b4b4744 100644
--- a/packages/@react-spectrum/list/stories/ListViewActions.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/list/ListViewActions.stories.tsx
@@ -1,18 +1,19 @@
 import {action} from 'storybook/actions';
-import {ActionButton} from '@react-spectrum/button';
-import {ActionGroup} from '@react-spectrum/actiongroup';
-import {ActionMenu} from '@react-spectrum/menu';
+import {ActionButton} from '../../src/button/ActionButton';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
+import {ActionMenu} from '../../src/menu/ActionMenu';
 import Add from '@spectrum-icons/workflow/Add';
 import Copy from '@spectrum-icons/workflow/Copy';
 import Delete from '@spectrum-icons/workflow/Delete';
 import Folder from '@spectrum-icons/illustrations/Folder';
 import Info from '@spectrum-icons/workflow/Info';
-import {Item, ListView, SpectrumListViewProps} from '../';
+import {Item} from 'react-stately/Item';
+import {ListView, SpectrumListViewProps} from '../../src/list/ListView';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
 import RemoveCircle from '@spectrum-icons/workflow/RemoveCircle';
-import {Text} from '@react-spectrum/text';
-import {useListData} from '@react-stately/data';
+import {Text} from '../../src/text/Text';
+import {useListData} from 'react-stately/useListData';
 
 export default {
   title: 'ListView/Actions',
diff --git a/packages/@react-spectrum/list/stories/ListViewDnD.stories.tsx b/packages/@adobe/react-spectrum/stories/list/ListViewDnD.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/list/stories/ListViewDnD.stories.tsx
rename to packages/@adobe/react-spectrum/stories/list/ListViewDnD.stories.tsx
index 6f42a6599eb..287038ef047 100644
--- a/packages/@react-spectrum/list/stories/ListViewDnD.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/list/ListViewDnD.stories.tsx
@@ -1,11 +1,11 @@
 import {action} from 'storybook/actions';
 import {DragBetweenListsExample, DragBetweenListsRootOnlyExample, DragExample, DragIntoItemExample, ReorderExample} from './ListViewDnDExamples';
-import {Droppable} from '/packages/@react-aria/dnd/stories/dnd.stories';
-import {Flex} from '@react-spectrum/layout';
-import {ListView} from '../';
+import {Droppable} from '../../../../react-aria/stories/dnd/dnd.stories';
+import {Flex} from '../../src/layout/Flex';
+import {ListView} from '../../src/list/ListView';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {View} from '@react-spectrum/view';
+import {View} from '../../src/view/View';
 
 export default {
   title: 'ListView/Drag and Drop',
diff --git a/packages/@react-spectrum/list/stories/ListViewDnDExamples.tsx b/packages/@adobe/react-spectrum/stories/list/ListViewDnDExamples.tsx
similarity index 97%
rename from packages/@react-spectrum/list/stories/ListViewDnDExamples.tsx
rename to packages/@adobe/react-spectrum/stories/list/ListViewDnDExamples.tsx
index c1dcb583a3c..7172309bc57 100644
--- a/packages/@react-spectrum/list/stories/ListViewDnDExamples.tsx
+++ b/packages/@adobe/react-spectrum/stories/list/ListViewDnDExamples.tsx
@@ -1,18 +1,19 @@
 import {action} from 'storybook/actions';
-import {ActionMenu} from '@react-spectrum/menu';
-import {chain} from '@react-aria/utils';
+import {ActionMenu} from '../../src/menu/ActionMenu';
+import {chain} from 'react-aria/private/utils/chain';
 import Delete from '@spectrum-icons/workflow/Delete';
-import {DragAndDropOptions, useDragAndDrop} from '@react-spectrum/dnd';
+import {DragAndDropOptions, useDragAndDrop} from '../../src/dnd/useDragAndDrop';
 import Edit from '@spectrum-icons/workflow/Edit';
 import File from '@spectrum-icons/illustrations/File';
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import Folder from '@spectrum-icons/illustrations/Folder';
-import {Item, ListView, SpectrumListViewProps} from '../';
+import {Item} from 'react-stately/Item';
 import {ItemDropTarget, Key} from '@react-types/shared';
 import {items} from './ListView.stories';
+import {ListView, SpectrumListViewProps} from '../../src/list/ListView';
 import React, {JSX} from 'react';
-import {Text} from '@react-spectrum/text';
-import {useListData} from '@react-stately/data';
+import {Text} from '../../src/text/Text';
+import {useListData} from 'react-stately/useListData';
 
 export function DragExample(props: {listViewProps: SpectrumListViewProps<any>, dragHookOptions: DragAndDropOptions, getAllowedDropOperationsAction?: () => void}): JSX.Element {
   let {listViewProps, dragHookOptions} = props;
diff --git a/packages/@react-spectrum/list/stories/ListViewDnDUtil.stories.tsx b/packages/@adobe/react-spectrum/stories/list/ListViewDnDUtil.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/list/stories/ListViewDnDUtil.stories.tsx
rename to packages/@adobe/react-spectrum/stories/list/ListViewDnDUtil.stories.tsx
index 60b5b9384e4..36ce47760b4 100644
--- a/packages/@react-spectrum/list/stories/ListViewDnDUtil.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/list/ListViewDnDUtil.stories.tsx
@@ -1,8 +1,8 @@
 import {action} from 'storybook/actions';
 import {DragBetweenListsComplex, DragBetweenListsOverride, DragExampleUtilHandlers, FinderDropUtilHandlers, InsertExampleUtilHandlers, ItemDropExampleUtilHandlers, ReorderExampleUtilHandlers, RootDropExampleUtilHandlers} from './ListViewDnDUtilExamples';
-import {Droppable} from '/packages/@react-aria/dnd/stories/dnd.stories';
-import {Flex} from '@react-spectrum/layout';
-import {ListView} from '../';
+import {Droppable} from '../../../../react-aria/stories/dnd/dnd.stories';
+import {Flex} from '../../src/layout/Flex';
+import {ListView} from '../../src/list/ListView';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/list/stories/ListViewDnDUtilExamples.tsx b/packages/@adobe/react-spectrum/stories/list/ListViewDnDUtilExamples.tsx
similarity index 98%
rename from packages/@react-spectrum/list/stories/ListViewDnDUtilExamples.tsx
rename to packages/@adobe/react-spectrum/stories/list/ListViewDnDUtilExamples.tsx
index 713b689df48..2cd5591e518 100644
--- a/packages/@react-spectrum/list/stories/ListViewDnDUtilExamples.tsx
+++ b/packages/@adobe/react-spectrum/stories/list/ListViewDnDUtilExamples.tsx
@@ -1,12 +1,13 @@
 import {action} from 'storybook/actions';
-import {DIRECTORY_DRAG_TYPE} from '@react-aria/dnd';
-import {DragAndDropOptions, useDragAndDrop} from '@react-spectrum/dnd';
-import {Flex} from '@react-spectrum/layout';
+import {DIRECTORY_DRAG_TYPE} from 'react-aria/private/dnd/utils';
+import {DragAndDropOptions, useDragAndDrop} from '../../src/dnd/useDragAndDrop';
+import {Flex} from '../../src/layout/Flex';
 import Folder from '@spectrum-icons/illustrations/Folder';
-import {Item, ListView, SpectrumListViewProps} from '../';
+import {Item} from 'react-stately/Item';
+import {ListView, SpectrumListViewProps} from '../../src/list/ListView';
 import React, {JSX} from 'react';
-import {Text} from '@react-spectrum/text';
-import {useListData} from '@react-stately/data';
+import {Text} from '../../src/text/Text';
+import {useListData} from 'react-stately/useListData';
 
 let itemProcessor = async (items, acceptedDragTypes) => {
   let processedItems: any[] = [];
diff --git a/packages/@react-spectrum/list/stories/ListViewSelection.stories.tsx b/packages/@adobe/react-spectrum/stories/list/ListViewSelection.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/list/stories/ListViewSelection.stories.tsx
rename to packages/@adobe/react-spectrum/stories/list/ListViewSelection.stories.tsx
index f0708fc85be..070905fae4d 100644
--- a/packages/@react-spectrum/list/stories/ListViewSelection.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/list/ListViewSelection.stories.tsx
@@ -1,15 +1,16 @@
 import {action} from 'storybook/actions';
-import {ActionMenu} from '@react-spectrum/menu';
+import {ActionMenu} from '../../src/menu/ActionMenu';
 import Add from '@spectrum-icons/workflow/Add';
-import {Breadcrumbs} from '@react-spectrum/breadcrumbs';
-import {chain} from '@react-aria/utils';
+import {Breadcrumbs} from '../../src/breadcrumbs/Breadcrumbs';
+import {chain} from 'react-aria/private/utils/chain';
 import Delete from '@spectrum-icons/workflow/Delete';
 import Folder from '@spectrum-icons/illustrations/Folder';
-import {Item, ListView} from '../';
+import {Item} from 'react-stately/Item';
 import {items} from './ListView.stories';
+import {ListView} from '../../src/list/ListView';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
 import React, {useState} from 'react';
-import {Text} from '@react-spectrum/text';
+import {Text} from '../../src/text/Text';
 
 export default {
   title: 'ListView/Selection',
diff --git a/packages/@react-spectrum/listbox/stories/ListBox.stories.tsx b/packages/@adobe/react-spectrum/stories/listbox/ListBox.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/listbox/stories/ListBox.stories.tsx
rename to packages/@adobe/react-spectrum/stories/listbox/ListBox.stories.tsx
index 35cf6c2afa8..0110d35e628 100644
--- a/packages/@react-spectrum/listbox/stories/ListBox.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/listbox/ListBox.stories.tsx
@@ -11,24 +11,34 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionGroup, AlertDialog, Avatar, Button, DialogContainer, Flex, SpectrumListBoxProps, Text} from '@adobe/react-spectrum';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
+import {AlertDialog} from '../../src/dialog/AlertDialog';
 import AlignCenter from '@spectrum-icons/workflow/AlignCenter';
 import AlignLeft from '@spectrum-icons/workflow/AlignLeft';
 import AlignRight from '@spectrum-icons/workflow/AlignRight';
+import {Avatar} from '../../src/avatar/Avatar';
 import Blower from '@spectrum-icons/workflow/Blower';
 import Book from '@spectrum-icons/workflow/Book';
+import {Button} from '../../src/button/Button';
 import Copy from '@spectrum-icons/workflow/Copy';
 import Cut from '@spectrum-icons/workflow/Cut';
 import Delete from '@spectrum-icons/workflow/Delete';
-import {FocusScope} from '@react-aria/focus';
-import {Item, ListBox, Section} from '../';
+import {DialogContainer} from '../../src/dialog/DialogContainer';
+import {Flex} from '../../src/layout/Flex';
+import {FocusScope} from 'react-aria/FocusScope';
+import {Item} from 'react-stately/Item';
 import {Key} from '@react-types/shared';
-import {Label} from '@react-spectrum/label';
+import {Label} from '../../src/label/Label';
+import {ListBox} from '../../src/listbox/ListBox';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
 import Paste from '@spectrum-icons/workflow/Paste';
 import React, {JSX, useRef, useState} from 'react';
-import {TranslateListBox} from './../chromatic/ListBoxLanguages.stories';
-import {useAsyncList, useTreeData} from '@react-stately/data';
+import {Section} from 'react-stately/Section';
+import {SpectrumListBoxProps} from '@react-types/listbox';
+import {Text} from '../../src/text/Text';
+import {TranslateListBox} from './../../chromatic/listbox/ListBoxLanguages.stories';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useTreeData} from 'react-stately/useTreeData';
 
 let iconMap = {
   AlignCenter,
diff --git a/packages/@react-spectrum/menu/stories/ActionMenu.stories.tsx b/packages/@adobe/react-spectrum/stories/menu/ActionMenu.stories.tsx
similarity index 93%
rename from packages/@react-spectrum/menu/stories/ActionMenu.stories.tsx
rename to packages/@adobe/react-spectrum/stories/menu/ActionMenu.stories.tsx
index d9f919066a5..18135f65a27 100644
--- a/packages/@react-spectrum/menu/stories/ActionMenu.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/menu/ActionMenu.stories.tsx
@@ -11,16 +11,17 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionMenu} from '..';
+import {ActionMenu} from '../../src/menu/ActionMenu';
 import {Alignment} from '@react-types/shared';
-import {Checkbox} from '@react-spectrum/checkbox';
-import {Flex} from '@react-spectrum/layout';
-import {Item} from '../';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {Flex} from '../../src/layout/Flex';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
-import {Picker} from '@react-spectrum/picker';
+import {Picker} from '../../src/picker/Picker';
 import React, {JSX, useState} from 'react';
 import {SpectrumActionMenuProps} from '@react-types/menu';
-import {Tooltip, TooltipTrigger} from '@react-spectrum/tooltip';
+import {Tooltip} from '../../src/tooltip/Tooltip';
+import {TooltipTrigger} from '../../src/tooltip/TooltipTrigger';
 
 const meta: Meta<SpectrumActionMenuProps<object>> = {
   title: 'ActionMenu',
diff --git a/packages/@react-spectrum/menu/stories/MenuTrigger.stories.tsx b/packages/@adobe/react-spectrum/stories/menu/MenuTrigger.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/menu/stories/MenuTrigger.stories.tsx
rename to packages/@adobe/react-spectrum/stories/menu/MenuTrigger.stories.tsx
index d51cd78f6bd..056517e10e1 100644
--- a/packages/@react-spectrum/menu/stories/MenuTrigger.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/menu/MenuTrigger.stories.tsx
@@ -11,24 +11,31 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
 import AlignCenter from '@spectrum-icons/workflow/AlignCenter';
 import AlignLeft from '@spectrum-icons/workflow/AlignLeft';
 import AlignRight from '@spectrum-icons/workflow/AlignRight';
 import Blower from '@spectrum-icons/workflow/Blower';
 import Book from '@spectrum-icons/workflow/Book';
-import {Content, Footer} from '@react-spectrum/view';
-import {ContextualHelpTrigger, Item, Menu, MenuTrigger, Section} from '../';
+import {Content} from '../../src/view/Content';
+import {ContextualHelpTrigger} from '../../src/menu/ContextualHelpTrigger';
 import Copy from '@spectrum-icons/workflow/Copy';
 import Cut from '@spectrum-icons/workflow/Cut';
-import {Dialog} from '@react-spectrum/dialog';
-import {Heading, Keyboard, Text} from '@react-spectrum/text';
-import {Link} from '@react-spectrum/link';
+import {Dialog} from '../../src/dialog/Dialog';
+import {Footer} from '../../src/view/Footer';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
+import {Keyboard} from '../../src/text/Keyboard';
+import {Link} from '../../src/link/Link';
+import {Menu} from '../../src/menu/Menu';
+import {MenuTrigger} from '../../src/menu/MenuTrigger';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
 import Paste from '@spectrum-icons/workflow/Paste';
 import React, {JSX, useState} from 'react';
-import {ToggleButton} from '@adobe/react-spectrum';
-import {TranslateMenu} from './../chromatic/MenuTriggerLanguages.stories';
+import {Section} from 'react-stately/Section';
+import {Text} from '../../src/text/Text';
+import {ToggleButton} from '../../src/button/ToggleButton';
+import {TranslateMenu} from './../../chromatic/menu/MenuTriggerLanguages.stories';
 
 let iconMap = {
   AlignCenter,
diff --git a/packages/@react-spectrum/menu/stories/Submenu.stories.tsx b/packages/@adobe/react-spectrum/stories/menu/Submenu.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/menu/stories/Submenu.stories.tsx
rename to packages/@adobe/react-spectrum/stories/menu/Submenu.stories.tsx
index 5ea710ebb88..e9f4c813368 100644
--- a/packages/@react-spectrum/menu/stories/Submenu.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/menu/Submenu.stories.tsx
@@ -11,21 +11,29 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
 import AlignCenter from '@spectrum-icons/workflow/AlignCenter';
 import AlignLeft from '@spectrum-icons/workflow/AlignLeft';
 import AlignRight from '@spectrum-icons/workflow/AlignRight';
 import AnnotatePen from '@spectrum-icons/workflow/AnnotatePen';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelpTrigger, Item, Menu, MenuTrigger, Section, SubmenuTrigger} from '../';
+import {Content} from '../../src/view/Content';
+import {ContextualHelpTrigger} from '../../src/menu/ContextualHelpTrigger';
 import defaultConfig, {render as renderMenuTrigger} from './MenuTrigger.stories';
-import {Dialog} from '@react-spectrum/dialog';
-import {Heading, Keyboard, Text} from '@react-spectrum/text';
+import {Dialog} from '../../src/dialog/Dialog';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
+import {Keyboard} from '../../src/text/Keyboard';
+import {Menu} from '../../src/menu/Menu';
+import {MenuTrigger} from '../../src/menu/MenuTrigger';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
-import {SpectrumMenuProps, SpectrumMenuTriggerProps, ToggleButton} from '@adobe/react-spectrum';
+import {Section} from 'react-stately/Section';
+import {SpectrumMenuProps, SpectrumMenuTriggerProps} from '@react-types/menu';
+import {SubmenuTrigger} from '../../src/menu/SubmenuTrigger';
+import {Text} from '../../src/text/Text';
 import TextIndentIncrease from '@spectrum-icons/workflow/TextIndentIncrease';
 import TextItalics from '@spectrum-icons/workflow/TextItalic';
+import {ToggleButton} from '../../src/button/ToggleButton';
 
 export default {
   ...defaultConfig,
diff --git a/packages/@react-spectrum/meter/stories/Meter.stories.tsx b/packages/@adobe/react-spectrum/stories/meter/Meter.stories.tsx
similarity index 98%
rename from packages/@react-spectrum/meter/stories/Meter.stories.tsx
rename to packages/@adobe/react-spectrum/stories/meter/Meter.stories.tsx
index b342138c78d..3f22531fa87 100644
--- a/packages/@react-spectrum/meter/stories/Meter.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/meter/Meter.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {Meta, StoryObj} from '@storybook/react';
-import {Meter} from '../';
+import {Meter} from '../../src/meter/Meter';
 import {NumberFormatOptions} from '@internationalized/number';
 import React from 'react';
 
diff --git a/packages/@react-spectrum/numberfield/stories/NumberField.stories.tsx b/packages/@adobe/react-spectrum/stories/numberfield/NumberField.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/numberfield/stories/NumberField.stories.tsx
rename to packages/@adobe/react-spectrum/stories/numberfield/NumberField.stories.tsx
index 0703e37be51..86c9b27444b 100644
--- a/packages/@react-spectrum/numberfield/stories/NumberField.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/numberfield/NumberField.stories.tsx
@@ -11,17 +11,19 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button} from '@react-spectrum/button';
-import {chain} from '@react-aria/utils';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Flex} from '@react-spectrum/layout';
-import {Form} from '@react-spectrum/form';
-import {Heading} from '@react-spectrum/text';
-import {Item, Picker} from '@react-spectrum/picker';
+import {Button} from '../../src/button/Button';
+import {chain} from 'react-aria/private/utils/chain';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Flex} from '../../src/layout/Flex';
+import {Form} from '../../src/form/Form';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryFn} from '@storybook/react';
-import {NumberField, SpectrumNumberFieldProps} from '../src';
+import {NumberField} from '../../src/numberfield/NumberField';
+import {Picker} from '../../src/picker/Picker';
 import React, {ReactNode, useState} from 'react';
+import {SpectrumNumberFieldProps} from '@react-types/numberfield';
 
 export default {
   title: 'NumberField',
diff --git a/packages/@react-spectrum/overlays/stories/Modal.stories.tsx b/packages/@adobe/react-spectrum/stories/overlays/Modal.stories.tsx
similarity index 82%
rename from packages/@react-spectrum/overlays/stories/Modal.stories.tsx
rename to packages/@adobe/react-spectrum/stories/overlays/Modal.stories.tsx
index 119db29b858..83e8be7a03c 100644
--- a/packages/@react-spectrum/overlays/stories/Modal.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/overlays/Modal.stories.tsx
@@ -10,17 +10,21 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, Button} from '@react-spectrum/button';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {Content} from '@react-spectrum/view';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
-import {Divider} from '@react-spectrum/divider';
-import {Flex} from '@react-spectrum/layout';
-import {Heading, Text} from '@react-spectrum/text';
+import {ActionButton} from '../../src/button/ActionButton';
+
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {Content} from '../../src/view/Content';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
+import {Divider} from '../../src/divider/Divider';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryFn} from '@storybook/react';
-import {Modal} from '../';
+import {Modal} from '../../src/overlays/Modal';
 import React, {Fragment, JSX} from 'react';
-import {useOverlayTriggerState} from '@react-stately/overlays';
+import {Text} from '../../src/text/Text';
+import {useOverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 
 export default {
   title: 'Modal',
diff --git a/packages/@react-spectrum/picker/stories/Picker.stories.tsx b/packages/@adobe/react-spectrum/stories/picker/Picker.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/picker/stories/Picker.stories.tsx
rename to packages/@adobe/react-spectrum/stories/picker/Picker.stories.tsx
index 2be411adb96..f360e2721e0 100644
--- a/packages/@react-spectrum/picker/stories/Picker.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/picker/Picker.stories.tsx
@@ -11,23 +11,28 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
 import AlignCenter from '@spectrum-icons/workflow/AlignCenter';
 import AlignLeft from '@spectrum-icons/workflow/AlignLeft';
 import AlignRight from '@spectrum-icons/workflow/AlignRight';
-import {Avatar} from '@react-spectrum/avatar';
-import {Content, View} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
+import {Avatar} from '../../src/avatar/Avatar';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
 import Copy from '@spectrum-icons/workflow/Copy';
 import Cut from '@spectrum-icons/workflow/Cut';
-import {Flex} from '@react-spectrum/layout';
-import {Heading, Text} from '@react-spectrum/text';
-import {Item, Picker, Section, SpectrumPickerProps} from '../';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryObj} from '@storybook/react';
 import Paste from '@spectrum-icons/workflow/Paste';
+import {Picker} from '../../src/picker/Picker';
 import React, {JSX, useState} from 'react';
-import {useAsyncList} from '@react-stately/data';
+import {Section} from 'react-stately/Section';
+import {SpectrumPickerProps} from '@react-types/select';
+import {Text} from '../../src/text/Text';
+import {useAsyncList} from 'react-stately/useAsyncList';
 import {userEvent, within} from 'storybook/test';
+import {View} from '../../src/view/View';
 
 let flatOptions = [
   {id: 1, name: 'Aardvark'},
diff --git a/packages/@react-spectrum/progress/stories/ProgressBar.stories.tsx b/packages/@adobe/react-spectrum/stories/progress/ProgressBar.stories.tsx
similarity index 98%
rename from packages/@react-spectrum/progress/stories/ProgressBar.stories.tsx
rename to packages/@adobe/react-spectrum/stories/progress/ProgressBar.stories.tsx
index bd9f338eda6..0ddc401dac1 100644
--- a/packages/@react-spectrum/progress/stories/ProgressBar.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/progress/ProgressBar.stories.tsx
@@ -11,8 +11,9 @@
  */
 
 import {Meta, StoryFn} from '@storybook/react';
-import {ProgressBar, SpectrumProgressBarProps} from '../';
+import {ProgressBar} from '../../src/progress/ProgressBar';
 import React, {CSSProperties} from 'react';
+import {SpectrumProgressBarProps} from '@react-types/progress';
 
 const formatOptions = {
   style: 'currency',
diff --git a/packages/@react-spectrum/progress/stories/ProgressCircle.stories.tsx b/packages/@adobe/react-spectrum/stories/progress/ProgressCircle.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/progress/stories/ProgressCircle.stories.tsx
rename to packages/@adobe/react-spectrum/stories/progress/ProgressCircle.stories.tsx
index 45f1363c592..3317b9fdc58 100644
--- a/packages/@react-spectrum/progress/stories/ProgressCircle.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/progress/ProgressCircle.stories.tsx
@@ -11,8 +11,9 @@
  */
 
 import {Meta, StoryFn} from '@storybook/react';
-import {ProgressCircle, SpectrumProgressCircleProps} from '../';
+import {ProgressCircle} from '../../src/progress/ProgressCircle';
 import React, {CSSProperties} from 'react';
+import {SpectrumProgressCircleProps} from '@react-types/progress';
 
 const grayedBoxStyle: CSSProperties = {
   width: '100px',
diff --git a/packages/@react-spectrum/provider/stories/Provider.stories.tsx b/packages/@adobe/react-spectrum/stories/provider/Provider.stories.tsx
similarity index 87%
rename from packages/@react-spectrum/provider/stories/Provider.stories.tsx
rename to packages/@adobe/react-spectrum/stories/provider/Provider.stories.tsx
index 732a2a9b4cd..f876bee9f4b 100644
--- a/packages/@react-spectrum/provider/stories/Provider.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/provider/Provider.stories.tsx
@@ -10,24 +10,29 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button} from '@react-spectrum/button';
-import {Checkbox, CheckboxGroup} from '@react-spectrum/checkbox';
-import {ComboBox, Item} from '@react-spectrum/combobox';
+import {Button} from '../../src/button/Button';
+
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {CheckboxGroup} from '../../src/checkbox/CheckboxGroup';
+import {ComboBox} from '../../src/combobox/ComboBox';
 import customTheme from './custom-theme.css';
-import {theme as expressTheme} from '@react-spectrum/theme-express';
-import {Flex} from '@react-spectrum/layout';
-import {Form} from '@react-spectrum/form';
+import {expressTheme} from '../../src/theme-express/expressTheme';
+import {Flex} from '../../src/layout/Flex';
+import {Form} from '../../src/form/Form';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryFn} from '@storybook/react';
-import {NumberField} from '@react-spectrum/numberfield';
-import {Provider, ProviderProps} from '../';
-import {Radio, RadioGroup} from '@react-spectrum/radio';
+import {NumberField} from '../../src/numberfield/NumberField';
+import {Provider} from '../../src/provider/Provider';
+import {ProviderProps} from '@react-types/provider';
+import {Radio} from '../../src/radio/Radio';
+import {RadioGroup} from '../../src/radio/RadioGroup';
 import React from 'react';
 import scaleLarge from '@adobe/spectrum-css-temp/vars/spectrum-large.css';
 import scaleMedium from '@adobe/spectrum-css-temp/vars/spectrum-medium.css';
-import {SearchField} from '@react-spectrum/searchfield';
-import {Switch} from '@react-spectrum/switch';
-import {TextField} from '@react-spectrum/textfield';
-import {useBreakpoint} from '@react-spectrum/utils';
+import {SearchField} from '../../src/searchfield/SearchField';
+import {Switch} from '../../src/switch/Switch';
+import {TextField} from '../../src/textfield/TextField';
+import {useBreakpoint} from '../../src/utils/BreakpointProvider';
 
 const THEME = {
   light: customTheme,
diff --git a/packages/@react-spectrum/provider/stories/custom-theme.css b/packages/@adobe/react-spectrum/stories/provider/custom-theme.css
similarity index 100%
rename from packages/@react-spectrum/provider/stories/custom-theme.css
rename to packages/@adobe/react-spectrum/stories/provider/custom-theme.css
diff --git a/packages/@react-spectrum/radio/stories/Radio.stories.tsx b/packages/@adobe/react-spectrum/stories/radio/Radio.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/radio/stories/Radio.stories.tsx
rename to packages/@adobe/react-spectrum/stories/radio/Radio.stories.tsx
index 8b5e611e68f..eef9876b985 100644
--- a/packages/@react-spectrum/radio/stories/Radio.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/radio/Radio.stories.tsx
@@ -11,10 +11,15 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button, Content, ContextualHelp, Flex, Heading} from '@adobe/react-spectrum';
+import {Button} from '../../src/button/Button';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryFn} from '@storybook/react';
-import {Provider} from '@react-spectrum/provider';
-import {Radio, RadioGroup} from '../src';
+import {Provider} from '../../src/provider/Provider';
+import {Radio} from '../../src/radio/Radio';
+import {RadioGroup} from '../../src/radio/RadioGroup';
 import React, {useState} from 'react';
 
 export default {
diff --git a/packages/@react-spectrum/searchfield/stories/SearchField.stories.tsx b/packages/@adobe/react-spectrum/stories/searchfield/SearchField.stories.tsx
similarity index 92%
rename from packages/@react-spectrum/searchfield/stories/SearchField.stories.tsx
rename to packages/@adobe/react-spectrum/stories/searchfield/SearchField.stories.tsx
index 6d18bf7e826..f58a2e973c2 100644
--- a/packages/@react-spectrum/searchfield/stories/SearchField.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/searchfield/SearchField.stories.tsx
@@ -11,16 +11,17 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton} from '@react-spectrum/button';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
-import {Flex} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import Refresh from '@spectrum-icons/workflow/Refresh';
-import {SearchField} from '../';
+import {SearchField} from '../../src/searchfield/SearchField';
 
 const info =
   'A containing element with `role="search"` has been added to define a **search** landmark region.';
diff --git a/packages/@react-spectrum/slider/stories/RangeSlider.stories.tsx b/packages/@adobe/react-spectrum/stories/slider/RangeSlider.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/slider/stories/RangeSlider.stories.tsx
rename to packages/@adobe/react-spectrum/stories/slider/RangeSlider.stories.tsx
index 78a90ced120..d64bb2f9c4b 100644
--- a/packages/@react-spectrum/slider/stories/RangeSlider.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/slider/RangeSlider.stories.tsx
@@ -11,12 +11,12 @@
  */
 
 import {action} from 'storybook/actions';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
 import {ErrorBoundary} from '@react-spectrum/story-utils';
-import {Heading} from '@react-spectrum/text';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryFn} from '@storybook/react';
-import {RangeSlider} from '../';
+import {RangeSlider} from '../../src/slider/RangeSlider';
 import React from 'react';
 import {SpectrumRangeSliderProps} from '@react-types/slider';
 
diff --git a/packages/@react-spectrum/slider/stories/Slider.stories.tsx b/packages/@adobe/react-spectrum/stories/slider/Slider.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/slider/stories/Slider.stories.tsx
rename to packages/@adobe/react-spectrum/stories/slider/Slider.stories.tsx
index 8f047213a1f..9b7538dc848 100644
--- a/packages/@react-spectrum/slider/stories/Slider.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/slider/Slider.stories.tsx
@@ -11,14 +11,14 @@
  */
 
 import {action} from 'storybook/actions';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
 import {ErrorBoundary} from '@react-spectrum/story-utils';
-import {Flex} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
-import {Slider} from '../';
+import {Slider} from '../../src/slider/Slider';
 import {SpectrumSliderProps} from '@react-types/slider';
 
 let message = 'Your browser may not support this set of format options.';
diff --git a/packages/@react-spectrum/statuslight/stories/StatusLight.stories.tsx b/packages/@adobe/react-spectrum/stories/statuslight/StatusLight.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/statuslight/stories/StatusLight.stories.tsx
rename to packages/@adobe/react-spectrum/stories/statuslight/StatusLight.stories.tsx
index 596b28801ca..b006d7cdbe2 100644
--- a/packages/@react-spectrum/statuslight/stories/StatusLight.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/statuslight/StatusLight.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {Meta, StoryObj} from '@storybook/react';
-import {StatusLight} from '../';
+import {StatusLight} from '../../src/statuslight/StatusLight';
 
 type StatusLightStory = StoryObj<typeof StatusLight>;
 
diff --git a/packages/@react-spectrum/steplist/stories/StepList.stories.tsx b/packages/@adobe/react-spectrum/stories/steplist/StepList.stories.tsx
similarity index 94%
rename from packages/@react-spectrum/steplist/stories/StepList.stories.tsx
rename to packages/@adobe/react-spectrum/stories/steplist/StepList.stories.tsx
index 8e41a59d133..ddc13f452be 100644
--- a/packages/@react-spectrum/steplist/stories/StepList.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/steplist/StepList.stories.tsx
@@ -11,16 +11,16 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button} from '@react-spectrum/button';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {Flex} from '@react-spectrum/layout';
-import {Item} from '@react-stately/collections';
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {Flex} from '../../src/layout/Flex';
+import {Item} from 'react-stately/Item';
 import {Key} from '@react-types/shared';
 import {Meta, StoryObj} from '@storybook/react';
-import {Picker} from '@react-spectrum/picker';
+import {Picker} from '../../src/picker/Picker';
 import React, {JSX, useCallback, useMemo, useState} from 'react';
-import {SpectrumStepListProps, StepList} from '../';
-import {View} from '@react-spectrum/view';
+import {SpectrumStepListProps, StepList} from '../../src/steplist/StepList';
+import {View} from '../../src/view/View';
 
 const options = [{
   key: 'details', value: 'Details'
diff --git a/packages/@react-spectrum/switch/stories/Switch.stories.tsx b/packages/@adobe/react-spectrum/stories/switch/Switch.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/switch/stories/Switch.stories.tsx
rename to packages/@adobe/react-spectrum/stories/switch/Switch.stories.tsx
index 63f5afec253..35d00454246 100644
--- a/packages/@react-spectrum/switch/stories/Switch.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/switch/Switch.stories.tsx
@@ -10,11 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {chain} from '@react-aria/utils';
-import {Flex} from '@react-spectrum/layout';
+import {chain} from 'react-aria/private/utils/chain';
+import {Flex} from '../../src/layout/Flex';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {useState} from 'react';
-import {Switch} from '../';
+import {Switch} from '../../src/switch/Switch';
 
 type SwitchStory = StoryObj<typeof Switch>;
 
diff --git a/packages/@react-spectrum/table/stories/CRUDExample.tsx b/packages/@adobe/react-spectrum/stories/table/CRUDExample.tsx
similarity index 83%
rename from packages/@react-spectrum/table/stories/CRUDExample.tsx
rename to packages/@adobe/react-spectrum/stories/table/CRUDExample.tsx
index 2b319dc0290..55e114615d9 100644
--- a/packages/@react-spectrum/table/stories/CRUDExample.tsx
+++ b/packages/@adobe/react-spectrum/stories/table/CRUDExample.tsx
@@ -10,26 +10,33 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, Button} from '@react-spectrum/button';
-import {ActionGroup} from '@react-spectrum/actiongroup';
+import {ActionButton} from '../../src/button/ActionButton';
+
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
 import Add from '@spectrum-icons/workflow/Add';
-import {AlertDialog, Dialog, DialogContainer, useDialogContainer} from '@react-spectrum/dialog';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../';
-import {Content} from '@react-spectrum/view';
+import {AlertDialog} from '../../src/dialog/AlertDialog';
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../../src/table/TableView';
+import {Content} from '../../src/view/Content';
 import Delete from '@spectrum-icons/workflow/Delete';
-import {Divider} from '@react-spectrum/divider';
-import {Flex} from '@react-spectrum/layout';
-import {Form} from '@react-spectrum/form';
-import {Heading} from '@react-spectrum/text';
-import {IllustratedMessage} from '@react-spectrum/illustratedmessage';
-import {Item, Menu, MenuTrigger} from '@react-spectrum/menu';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogContainer} from '../../src/dialog/DialogContainer';
+import {Divider} from '../../src/divider/Divider';
+import {Flex} from '../../src/layout/Flex';
+import {Form} from '../../src/form/Form';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
+import {Item} from 'react-stately/Item';
 import {Key} from '@react-types/shared';
+import {Menu} from '../../src/menu/Menu';
+import {MenuTrigger} from '../../src/menu/MenuTrigger';
 import More from '@spectrum-icons/workflow/More';
 import NoSearchResults from '@spectrum-icons/illustrations/NoSearchResults';
 import React, {JSX, useState} from 'react';
-import {TextField} from '@react-spectrum/textfield';
-import {useListData} from '@react-stately/data';
+import {TextField} from '../../src/textfield/TextField';
+import {useDialogContainer} from '../../src/dialog/useDialogContainer';
+import {useListData} from 'react-stately/useListData';
 
 export function CRUDExample(props: Omit<SpectrumTableProps<object>, 'children'>): JSX.Element {
   let list = useListData({
diff --git a/packages/@react-spectrum/table/stories/ControllingResize.tsx b/packages/@adobe/react-spectrum/stories/table/ControllingResize.tsx
similarity index 95%
rename from packages/@react-spectrum/table/stories/ControllingResize.tsx
rename to packages/@adobe/react-spectrum/stories/table/ControllingResize.tsx
index 4bcd4750a7e..a9fed253dc2 100644
--- a/packages/@react-spectrum/table/stories/ControllingResize.tsx
+++ b/packages/@adobe/react-spectrum/stories/table/ControllingResize.tsx
@@ -10,11 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button} from '@react-spectrum/button';
-import {Cell, Column, Row, SpectrumColumnProps, TableBody, TableHeader, TableView} from '../';
+import {Button} from '../../src/button/Button';
+
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../src/table/TableView';
 import {ColumnSize} from '@react-types/table';
 import {Key} from '@react-types/shared';
 import React, {JSX, useCallback, useMemo, useState} from 'react';
+import {SpectrumColumnProps} from '@react-types/table';
 
 export interface PokemonColumn extends Omit<SpectrumColumnProps<any>, 'children'> {
   name: string,
diff --git a/packages/@react-spectrum/table/stories/HidingColumns.tsx b/packages/@adobe/react-spectrum/stories/table/HidingColumns.tsx
similarity index 93%
rename from packages/@react-spectrum/table/stories/HidingColumns.tsx
rename to packages/@adobe/react-spectrum/stories/table/HidingColumns.tsx
index d44a85a49b7..fd0e0a61d44 100644
--- a/packages/@react-spectrum/table/stories/HidingColumns.tsx
+++ b/packages/@adobe/react-spectrum/stories/table/HidingColumns.tsx
@@ -10,10 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../';
-import {Checkbox} from '@react-spectrum/checkbox';
-import {Flex} from '@react-spectrum/layout';
-import {Form} from '@react-spectrum/form';
+import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../../src/table/TableView';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {Flex} from '../../src/layout/Flex';
+import {Form} from '../../src/form/Form';
 import React, {JSX} from 'react';
 
 let columns = [
diff --git a/packages/@react-spectrum/table/stories/HidingColumnsAllowsResizing.tsx b/packages/@adobe/react-spectrum/stories/table/HidingColumnsAllowsResizing.tsx
similarity index 93%
rename from packages/@react-spectrum/table/stories/HidingColumnsAllowsResizing.tsx
rename to packages/@adobe/react-spectrum/stories/table/HidingColumnsAllowsResizing.tsx
index 7b042f4dcce..ef84e578746 100644
--- a/packages/@react-spectrum/table/stories/HidingColumnsAllowsResizing.tsx
+++ b/packages/@adobe/react-spectrum/stories/table/HidingColumnsAllowsResizing.tsx
@@ -10,10 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../';
-import {Checkbox} from '@react-spectrum/checkbox';
-import {Flex} from '@react-spectrum/layout';
-import {Form} from '@react-spectrum/form';
+import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../../src/table/TableView';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {Flex} from '../../src/layout/Flex';
+import {Form} from '../../src/form/Form';
 import React, {JSX} from 'react';
 
 let columns = [
diff --git a/packages/@react-spectrum/table/stories/Performance.tsx b/packages/@adobe/react-spectrum/stories/table/Performance.tsx
similarity index 94%
rename from packages/@react-spectrum/table/stories/Performance.tsx
rename to packages/@adobe/react-spectrum/stories/table/Performance.tsx
index 2331ced338c..1b9dbe48e57 100644
--- a/packages/@react-spectrum/table/stories/Performance.tsx
+++ b/packages/@adobe/react-spectrum/stories/table/Performance.tsx
@@ -1,14 +1,15 @@
-import {ActionButton} from '@react-spectrum/button';
-import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../src';
-import {Checkbox} from '@react-spectrum/checkbox';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../src/table/TableView';
+import {Checkbox} from '../../src/checkbox/Checkbox';
 import {faker} from '@faker-js/faker';
-import {Icon} from '@react-spectrum/icon';
-import {Item, TagGroup} from '@react-spectrum/tag';
-import {Link} from '@react-spectrum/link';
-import {ProgressBar} from '@react-spectrum/progress';
+import {Icon} from '../../src/icon/Icon';
+import {Item} from 'react-stately/Item';
+import {Link} from '../../src/link/Link';
+import {ProgressBar} from '../../src/progress/ProgressBar';
 import React, {JSX} from 'react';
 import {SpectrumStatusLightProps} from '@react-types/statuslight';
-import {Text} from '@react-spectrum/text';
+import {TagGroup} from '../../src/tag/TagGroup';
+import {Text} from '../../src/text/Text';
 
 export const DATA_SIZE = 10000;
 export const COLUMN_SIZE = 50;
diff --git a/packages/@react-spectrum/table/stories/Table.stories.tsx b/packages/@adobe/react-spectrum/stories/table/Table.stories.tsx
similarity index 98%
rename from packages/@react-spectrum/table/stories/Table.stories.tsx
rename to packages/@adobe/react-spectrum/stories/table/Table.stories.tsx
index d0b290fd051..565019107e7 100644
--- a/packages/@react-spectrum/table/stories/Table.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/table/Table.stories.tsx
@@ -11,34 +11,40 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton, Button} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
 import Add from '@spectrum-icons/workflow/Add';
-import {Breadcrumbs, Item} from '@react-spectrum/breadcrumbs';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../';
-import {Content, View} from '@react-spectrum/view';
+import {Breadcrumbs} from '../../src/breadcrumbs/Breadcrumbs';
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../../src/table/TableView';
+import {Content} from '../../src/view/Content';
 import {ControllingResize, PokemonColumn} from './ControllingResize';
 import {CRUDExample} from './CRUDExample';
 import Delete from '@spectrum-icons/workflow/Delete';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
-import {Divider} from '@react-spectrum/divider';
-import {Flex} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
+import {Divider} from '../../src/divider/Divider';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
 import {HidingColumns} from './HidingColumns';
 import {HidingColumnsAllowsResizing} from './HidingColumnsAllowsResizing';
-import {IllustratedMessage} from '@react-spectrum/illustratedmessage';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
+import {Item} from 'react-stately/Item';
 import {Key, LoadingState, SortDescriptor} from '@react-types/shared';
-import {Link} from '@react-spectrum/link';
+import {Link} from '../../src/link/Link';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
 import NoSearchResults from '@spectrum-icons/illustrations/NoSearchResults';
-import {Picker} from '@react-spectrum/picker';
-import {Radio, RadioGroup} from '@react-spectrum/radio';
+import {Picker} from '../../src/picker/Picker';
+import {Radio} from '../../src/radio/Radio';
+import {RadioGroup} from '../../src/radio/RadioGroup';
 import React, {JSX, useCallback, useState} from 'react';
-import {SearchField} from '@react-spectrum/searchfield';
-import {Switch} from '@react-spectrum/switch';
-import {TextField} from '@react-spectrum/textfield';
-import {useAsyncList, useListData} from '@react-stately/data';
-import {useFilter} from '@react-aria/i18n';
+import {SearchField} from '../../src/searchfield/SearchField';
+import {Switch} from '../../src/switch/Switch';
+import {TextField} from '../../src/textfield/TextField';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useFilter} from 'react-aria/useFilter';
+import {useListData} from 'react-stately/useListData';
+import {View} from '../../src/view/View';
 
 export default {
   title: 'TableView',
diff --git a/packages/@react-spectrum/table/stories/TableDnD.stories.tsx b/packages/@adobe/react-spectrum/stories/table/TableDnD.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/table/stories/TableDnD.stories.tsx
rename to packages/@adobe/react-spectrum/stories/table/TableDnD.stories.tsx
index 9e04d08581e..36d0f93b44d 100644
--- a/packages/@react-spectrum/table/stories/TableDnD.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/table/TableDnD.stories.tsx
@@ -12,14 +12,14 @@
 
 import {action} from 'storybook/actions';
 import defaultConfig, {TableStory} from './Table.stories';
-import {Divider} from '@react-spectrum/divider';
+import {Divider} from '../../src/divider/Divider';
 import {DragBetweenTablesExample, DragBetweenTablesRootOnlyExample, DragExample, DragOntoRowExample, DragWithoutRowHeaderExample, items, ReorderExample} from './TableDnDExamples';
-import {Droppable} from '/packages/@react-aria/dnd/stories/dnd.stories';
-import {Flex} from '@react-spectrum/layout';
+import {Droppable} from '../../../../react-aria/stories/dnd/dnd.stories';
+import {Flex} from '../../src/layout/Flex';
 import {Meta} from '@storybook/react';
 import React from 'react';
-import {TableView} from '../';
-import {View} from '@react-spectrum/view';
+import {TableView} from '../../src/table/TableView';
+import {View} from '../../src/view/View';
 
 export default {
   ...defaultConfig,
diff --git a/packages/@react-spectrum/table/stories/TableDnDExamples.tsx b/packages/@adobe/react-spectrum/stories/table/TableDnDExamples.tsx
similarity index 98%
rename from packages/@react-spectrum/table/stories/TableDnDExamples.tsx
rename to packages/@adobe/react-spectrum/stories/table/TableDnDExamples.tsx
index 6a19e6c65ee..0ac652d5507 100644
--- a/packages/@react-spectrum/table/stories/TableDnDExamples.tsx
+++ b/packages/@adobe/react-spectrum/stories/table/TableDnDExamples.tsx
@@ -1,13 +1,13 @@
 
 import {action} from 'storybook/actions';
-import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../';
-import {chain} from '@react-aria/utils';
+import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../../src/table/TableView';
+import {chain} from 'react-aria/private/utils/chain';
 import {DragEndEvent, DragStartEvent, DropEvent, ItemDropTarget, Key} from '@react-types/shared';
-import {Flex} from '@react-spectrum/layout';
+import {Flex} from '../../src/layout/Flex';
 import React, {JSX} from 'react';
-import {Text} from '@react-spectrum/text';
-import {useDragAndDrop} from '@react-spectrum/dnd';
-import {useListData} from '@react-stately/data';
+import {Text} from '../../src/text/Text';
+import {useDragAndDrop} from '../../src/dnd/useDragAndDrop';
+import {useListData} from 'react-stately/useListData';
 
 let onSelectionChange = action('onSelectionChange');
 
diff --git a/packages/@react-spectrum/table/stories/TableDnDUtil.stories.tsx b/packages/@adobe/react-spectrum/stories/table/TableDnDUtil.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/table/stories/TableDnDUtil.stories.tsx
rename to packages/@adobe/react-spectrum/stories/table/TableDnDUtil.stories.tsx
index 4b91c3c5da4..baffd5cf576 100644
--- a/packages/@react-spectrum/table/stories/TableDnDUtil.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/table/TableDnDUtil.stories.tsx
@@ -13,11 +13,11 @@
 import {action} from 'storybook/actions';
 import defaultConfig, {TableStory} from './Table.stories';
 import {DragBetweenTablesComplex, DragBetweenTablesOverride, DragExampleUtilHandlers, FinderDropUtilHandlers, InsertExampleUtilHandlers, ItemDropExampleUtilHandlers, ReorderExampleUtilHandlers, RootDropExampleUtilHandlers} from './TableDnDUtilExamples';
-import {Droppable} from '/packages/@react-aria/dnd/stories/dnd.stories';
-import {Flex} from '@react-spectrum/layout';
+import {Droppable} from '../../../../react-aria/stories/dnd/dnd.stories';
+import {Flex} from '../../src/layout/Flex';
 import {Meta} from '@storybook/react';
 import React from 'react';
-import {TableView} from '..';
+import {TableView} from '../../src/table/TableView';
 
 export default {
   ...defaultConfig,
diff --git a/packages/@react-spectrum/table/stories/TableDnDUtilExamples.tsx b/packages/@adobe/react-spectrum/stories/table/TableDnDUtilExamples.tsx
similarity index 98%
rename from packages/@react-spectrum/table/stories/TableDnDUtilExamples.tsx
rename to packages/@adobe/react-spectrum/stories/table/TableDnDUtilExamples.tsx
index 03f975c7f04..25a8465e959 100644
--- a/packages/@react-spectrum/table/stories/TableDnDUtilExamples.tsx
+++ b/packages/@adobe/react-spectrum/stories/table/TableDnDUtilExamples.tsx
@@ -1,11 +1,12 @@
 
 import {action} from 'storybook/actions';
-import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '..';
-import {DIRECTORY_DRAG_TYPE, DragAndDropOptions, useDragAndDrop} from '@react-spectrum/dnd';
-import {Flex} from '@react-spectrum/layout';
+import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../../src/table/TableView';
+import {DIRECTORY_DRAG_TYPE} from 'react-aria/private/dnd/utils';
+import {DragAndDropOptions, useDragAndDrop} from '../../src/dnd/useDragAndDrop';
+import {Flex} from '../../src/layout/Flex';
 import React, {JSX} from 'react';
-import {Text} from '@react-spectrum/text';
-import {useListData} from '@react-stately/data';
+import {Text} from '../../src/text/Text';
+import {useListData} from 'react-stately/useListData';
 
 let onSelectionChange = action('onSelectionChange');
 
diff --git a/packages/@react-spectrum/table/stories/TreeGridTable.stories.tsx b/packages/@adobe/react-spectrum/stories/table/TreeGridTable.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/table/stories/TreeGridTable.stories.tsx
rename to packages/@adobe/react-spectrum/stories/table/TreeGridTable.stories.tsx
index e1ea5fda3b5..7269d036938 100644
--- a/packages/@react-spectrum/table/stories/TreeGridTable.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/table/TreeGridTable.stories.tsx
@@ -11,12 +11,12 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton} from '@react-spectrum/button';
-import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../';
-import {chain} from '@react-aria/utils';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Cell, Column, Row, SpectrumTableProps, TableBody, TableHeader, TableView} from '../../src/table/TableView';
+import {chain} from 'react-aria/private/utils/chain';
 import defaultConfig, {columns, EmptyStateTable, TableStory} from './Table.stories';
-import {enableTableNestedRows} from '@react-stately/flags';
-import {Flex} from '@react-spectrum/layout';
+import {enableTableNestedRows} from 'react-stately/private/flags/flags';
+import {Flex} from '../../src/layout/Flex';
 import {Key} from '@react-types/shared';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX, useState} from 'react';
diff --git a/packages/@react-spectrum/tabs/stories/Tabs.stories.tsx b/packages/@adobe/react-spectrum/stories/tabs/Tabs.stories.tsx
similarity index 98%
rename from packages/@react-spectrum/tabs/stories/Tabs.stories.tsx
rename to packages/@adobe/react-spectrum/stories/tabs/Tabs.stories.tsx
index 14f68150d0f..3054a9bc4c3 100644
--- a/packages/@react-spectrum/tabs/stories/Tabs.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/tabs/Tabs.stories.tsx
@@ -11,20 +11,24 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionGroup, Flex, Heading, Text} from '@adobe/react-spectrum';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
 import Bookmark from '@spectrum-icons/workflow/Bookmark';
-import {Button} from '@react-spectrum/button';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
 import Calendar from '@spectrum-icons/workflow/Calendar';
 import Dashboard from '@spectrum-icons/workflow/Dashboard';
-import {Item, TabList, TabPanels, Tabs} from '..';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
 import {Key} from '@react-types/shared';
 import {Meta, StoryFn} from '@storybook/react';
-import {Picker} from '@react-spectrum/picker';
+import {Picker} from '../../src/picker/Picker';
 import React, {ReactNode, useCallback, useState} from 'react';
-import {RouterProvider} from '@react-aria/utils';
+import {RouterProvider} from 'react-aria/private/utils/openLink';
 import {SpectrumTabsProps} from '@react-types/tabs';
-import {TextField} from '@react-spectrum/textfield';
+import {TabList, TabPanels, Tabs} from '../../src/tabs/Tabs';
+import {Text} from '../../src/text/Text';
+import {TextField} from '../../src/textfield/TextField';
 
 export default {
   title: 'Tabs'
diff --git a/packages/@react-spectrum/tag/stories/TagGroup.stories.tsx b/packages/@adobe/react-spectrum/stories/tag/TagGroup.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/tag/stories/TagGroup.stories.tsx
rename to packages/@adobe/react-spectrum/stories/tag/TagGroup.stories.tsx
index 2244c82b1bb..5a27abe6b56 100644
--- a/packages/@react-spectrum/tag/stories/TagGroup.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/tag/TagGroup.stories.tsx
@@ -12,14 +12,16 @@
 
 import {action} from 'storybook/actions';
 import Audio from '@spectrum-icons/workflow/Audio';
-import {Avatar} from '@react-spectrum/avatar';
-import {Content} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Heading, Text} from '@react-spectrum/text';
-import {Item, SpectrumTagGroupProps, TagGroup} from '../src';
-import {Link} from '@react-spectrum/link';
+import {Avatar} from '../../src/avatar/Avatar';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
+import {Link} from '../../src/link/Link';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {useState} from 'react';
+import {SpectrumTagGroupProps, TagGroup} from '../../src/tag/TagGroup';
+import {Text} from '../../src/text/Text';
 
 let manyItems: {key: number}[] = [];
 for (let i = 0; i < 50; i++) {
diff --git a/packages/@react-spectrum/textfield/stories/TextArea.stories.tsx b/packages/@adobe/react-spectrum/stories/textfield/TextArea.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/textfield/stories/TextArea.stories.tsx
rename to packages/@adobe/react-spectrum/stories/textfield/TextArea.stories.tsx
index 4a4818290f3..1e77bb113b4 100644
--- a/packages/@react-spectrum/textfield/stories/TextArea.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/textfield/TextArea.stories.tsx
@@ -11,14 +11,18 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton, Button} from '@react-spectrum/button';
-import {Content, ContextualHelp, Heading, useLocale} from '@adobe/react-spectrum';
-import {Flex} from '@react-spectrum/layout';
-import {Form} from '@react-spectrum/form';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Button} from '../../src/button/Button';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Flex} from '../../src/layout/Flex';
+import {Form} from '../../src/form/Form';
+import {Heading} from '../../src/text/Heading';
 import Info from '@spectrum-icons/workflow/Info';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
 import React, {useState} from 'react';
-import {TextArea} from '../';
+import {TextArea} from '../../src/textfield/TextArea';
+import {useLocale} from 'react-aria/I18nProvider';
 
 export default {
   title: 'TextArea',
diff --git a/packages/@react-spectrum/textfield/stories/Textfield.stories.tsx b/packages/@adobe/react-spectrum/stories/textfield/Textfield.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/textfield/stories/Textfield.stories.tsx
rename to packages/@adobe/react-spectrum/stories/textfield/Textfield.stories.tsx
index a8bd1991f18..ea348b7cfbf 100644
--- a/packages/@react-spectrum/textfield/stories/Textfield.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/textfield/Textfield.stories.tsx
@@ -11,11 +11,15 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton, Content, ContextualHelp, Heading, useLocale} from '@adobe/react-spectrum';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Heading} from '../../src/text/Heading';
 import Info from '@spectrum-icons/workflow/Info';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {TextField} from '../';
+import {TextField} from '../../src/textfield/TextField';
+import {useLocale} from 'react-aria/I18nProvider';
 
 export default {
   title: 'TextField',
diff --git a/packages/@react-spectrum/toast/stories/Toast.stories.tsx b/packages/@adobe/react-spectrum/stories/toast/Toast.stories.tsx
similarity index 93%
rename from packages/@react-spectrum/toast/stories/Toast.stories.tsx
rename to packages/@adobe/react-spectrum/stories/toast/Toast.stories.tsx
index ea398b8bc65..3a9d3f60704 100644
--- a/packages/@react-spectrum/toast/stories/Toast.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/toast/Toast.stories.tsx
@@ -11,19 +11,22 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton, Button} from '@react-spectrum/button';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {Checkbox} from '@react-spectrum/checkbox';
-import {Content} from '@react-spectrum/view';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
-import {Flex} from '@react-spectrum/layout';
-import {Heading} from '@react-spectrum/text';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {Content} from '../../src/view/Content';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
+import {Flex} from '../../src/layout/Flex';
+import {Heading} from '../../src/text/Heading';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
 import React, {JSX, SyntheticEvent, useEffect, useMemo, useRef, useState} from 'react';
-import {SpectrumToastOptions, ToastPlacement} from '../src/ToastContainer';
-import {ToastContainer, ToastQueue} from '../';
-import {UNSAFE_PortalProvider} from '@react-aria/overlays';
-import {UNSTABLE_createLandmarkController, useLandmark} from '@react-aria/landmark';
+import {SpectrumToastOptions, ToastPlacement} from '../../src/toast/ToastContainer';
+import {ToastContainer, ToastQueue} from '../../src/toast/ToastContainer';
+import {UNSAFE_PortalProvider} from 'react-aria/PortalProvider';
+import {UNSTABLE_createLandmarkController} from 'react-aria/private/landmark/useLandmark';
+import {useLandmark} from 'react-aria/useLandmark';
 
 export default {
   title: 'Toast',
diff --git a/packages/@react-spectrum/tooltip/stories/Tooltip.stories.tsx b/packages/@adobe/react-spectrum/stories/tooltip/Tooltip.stories.tsx
similarity index 97%
rename from packages/@react-spectrum/tooltip/stories/Tooltip.stories.tsx
rename to packages/@adobe/react-spectrum/stories/tooltip/Tooltip.stories.tsx
index 5e9c6744399..c2a2114c8cb 100644
--- a/packages/@react-spectrum/tooltip/stories/Tooltip.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/tooltip/Tooltip.stories.tsx
@@ -11,7 +11,7 @@
  */
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {Tooltip} from '../src';
+import {Tooltip} from '../../src/tooltip/Tooltip';
 
 type TooltipStory = StoryObj<typeof Tooltip>;
 
diff --git a/packages/@react-spectrum/tooltip/stories/TooltipTrigger.stories.tsx b/packages/@adobe/react-spectrum/stories/tooltip/TooltipTrigger.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/tooltip/stories/TooltipTrigger.stories.tsx
rename to packages/@adobe/react-spectrum/stories/tooltip/TooltipTrigger.stories.tsx
index cbb25a33b24..6c5eb16798f 100644
--- a/packages/@react-spectrum/tooltip/stories/TooltipTrigger.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/tooltip/TooltipTrigger.stories.tsx
@@ -10,17 +10,20 @@
  * governing permissions and limitations under the License.
  */
 import {action} from 'storybook/actions';
-import {ActionButton, Button} from '@react-spectrum/button';
-import {ActionGroup, Item} from '@react-spectrum/actiongroup';
+import {ActionButton} from '../../src/button/ActionButton';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
+import {Button} from '../../src/button/Button';
 import Delete from '@spectrum-icons/workflow/Delete';
 import Edit from '@spectrum-icons/workflow/Edit';
-import {Flex} from '@react-spectrum/layout';
-import {Link} from '@react-spectrum/link';
+import {Flex} from '../../src/layout/Flex';
+import {Item} from 'react-stately/Item';
+import {Link} from '../../src/link/Link';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {useState} from 'react';
 import SaveTo from '@spectrum-icons/workflow/SaveTo';
 import {SpectrumTooltipTriggerProps} from '@react-types/tooltip';
-import {Tooltip, TooltipTrigger} from '../src';
+import {Tooltip} from '../../src/tooltip/Tooltip';
+import {TooltipTrigger} from '../../src/tooltip/TooltipTrigger';
 
 interface TooltipTooltipTriggerProps {
   variant?: 'neutral' | 'positive' | 'negative' | 'info',
diff --git a/packages/@react-spectrum/tree/stories/TreeView.stories.tsx b/packages/@adobe/react-spectrum/stories/tree/TreeView.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/tree/stories/TreeView.stories.tsx
rename to packages/@adobe/react-spectrum/stories/tree/TreeView.stories.tsx
index 4b46f2e1d7e..10087eb28d2 100644
--- a/packages/@react-spectrum/tree/stories/TreeView.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/tree/TreeView.stories.tsx
@@ -11,19 +11,21 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionGroup, Item} from '@react-spectrum/actiongroup';
-import {Collection} from 'react-aria-components';
-import {Content} from '@react-spectrum/view';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {Content} from '../../src/view/Content';
 import Delete from '@spectrum-icons/workflow/Delete';
 import Edit from '@spectrum-icons/workflow/Edit';
 import FileTxt from '@spectrum-icons/workflow/FileTxt';
 import Folder from '@spectrum-icons/workflow/Folder';
-import {Heading, Text} from '@react-spectrum/text';
-import {IllustratedMessage} from '@react-spectrum/illustratedmessage';
-import {Link} from '@react-spectrum/link';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
+import {Item} from 'react-stately/Item';
+import {Link} from '../../src/link/Link';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
-import {SpectrumTreeViewProps, TreeView, TreeViewItem, TreeViewItemContent} from '../src';
+import {SpectrumTreeViewProps, TreeView, TreeViewItem, TreeViewItemContent} from '../../src/tree/TreeView';
+import {Text} from '../../src/text/Text';
 
 export default {
   title: 'TreeView',
diff --git a/packages/@react-spectrum/view/stories/View.stories.tsx b/packages/@adobe/react-spectrum/stories/view/View.stories.tsx
similarity index 96%
rename from packages/@react-spectrum/view/stories/View.stories.tsx
rename to packages/@adobe/react-spectrum/stories/view/View.stories.tsx
index 986c0ef6f33..8b913bfd876 100644
--- a/packages/@react-spectrum/view/stories/View.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/view/View.stories.tsx
@@ -11,7 +11,7 @@
  */
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
-import {View} from '../';
+import {View} from '../../src/view/View';
 
 let meta = {
   title: 'View',
diff --git a/packages/@react-spectrum/well/stories/Well.stories.tsx b/packages/@adobe/react-spectrum/stories/well/Well.stories.tsx
similarity index 95%
rename from packages/@react-spectrum/well/stories/Well.stories.tsx
rename to packages/@adobe/react-spectrum/stories/well/Well.stories.tsx
index 09b4aa795f7..e988dfcf31f 100644
--- a/packages/@react-spectrum/well/stories/Well.stories.tsx
+++ b/packages/@adobe/react-spectrum/stories/well/Well.stories.tsx
@@ -12,7 +12,7 @@
 
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {Well} from '../';
+import {Well} from '../../src/well/Well';
 
 type WellStory = StoryObj<typeof Well>;
 
diff --git a/packages/@react-spectrum/accordion/test/Accordion.ssr.test.js b/packages/@adobe/react-spectrum/test/accordion/Accordion.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/accordion/test/Accordion.ssr.test.js
rename to packages/@adobe/react-spectrum/test/accordion/Accordion.ssr.test.js
diff --git a/packages/@react-spectrum/accordion/test/Accordion.test.js b/packages/@adobe/react-spectrum/test/accordion/Accordion.test.js
similarity index 97%
rename from packages/@react-spectrum/accordion/test/Accordion.test.js
rename to packages/@adobe/react-spectrum/test/accordion/Accordion.test.js
index 7f3721c1e0a..003505d5254 100644
--- a/packages/@react-spectrum/accordion/test/Accordion.test.js
+++ b/packages/@adobe/react-spectrum/test/accordion/Accordion.test.js
@@ -10,11 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {Accordion, Disclosure, DisclosurePanel, DisclosureTitle} from '../src';
+import {Accordion, Disclosure, DisclosurePanel, DisclosureTitle} from '../../src/accordion/Accordion';
 import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 let items = [
diff --git a/packages/@react-spectrum/actionbar/test/ActionBar.test.js b/packages/@adobe/react-spectrum/test/actionbar/ActionBar.test.js
similarity index 96%
rename from packages/@react-spectrum/actionbar/test/ActionBar.test.js
rename to packages/@adobe/react-spectrum/test/actionbar/ActionBar.test.js
index dccdc80929b..bac5549167b 100644
--- a/packages/@react-spectrum/actionbar/test/ActionBar.test.js
+++ b/packages/@adobe/react-spectrum/test/actionbar/ActionBar.test.js
@@ -11,14 +11,14 @@
  */
 
 
-jest.mock('@react-aria/live-announcer');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
 import {act, fireEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {announce} from '@react-aria/live-announcer';
-import {Example} from '../stories/Example';
-import {getFocusableTreeWalker} from '@react-aria/focus';
-import {Provider} from '@react-spectrum/provider';
+import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
+import {Example} from '../../stories/actionbar/Example';
+import {getFocusableTreeWalker} from 'react-aria/private/focus/FocusScope';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 describe('ActionBar', () => {
diff --git a/packages/@react-spectrum/actiongroup/test/ActionGroup.ssr.test.js b/packages/@adobe/react-spectrum/test/actiongroup/ActionGroup.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/actiongroup/test/ActionGroup.ssr.test.js
rename to packages/@adobe/react-spectrum/test/actiongroup/ActionGroup.ssr.test.js
diff --git a/packages/@react-spectrum/actiongroup/test/ActionGroup.test.js b/packages/@adobe/react-spectrum/test/actiongroup/ActionGroup.test.js
similarity index 98%
rename from packages/@react-spectrum/actiongroup/test/ActionGroup.test.js
rename to packages/@adobe/react-spectrum/test/actiongroup/ActionGroup.test.js
index 73284a5e747..409f2ccc128 100644
--- a/packages/@react-spectrum/actiongroup/test/ActionGroup.test.js
+++ b/packages/@adobe/react-spectrum/test/actiongroup/ActionGroup.test.js
@@ -11,16 +11,18 @@
  */
 
 import {act, fireEvent, pointerMap, render, screen, within} from '@react-spectrum/test-utils-internal';
-import {ActionGroup} from '../';
-import {Button} from '@react-spectrum/button';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
+import {Button} from '../../src/button/Button';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
 import Edit from '@spectrum-icons/workflow/Edit';
-import {Item} from '@react-stately/collections';
-import {Provider} from '@react-spectrum/provider';
+import {Item} from 'react-stately/Item';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {Text} from '@react-spectrum/text';
-import {theme} from '@react-spectrum/theme-default';
-import {Tooltip, TooltipTrigger} from '@react-spectrum/tooltip';
+import {Text} from '../../src/text/Text';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {Tooltip} from '../../src/tooltip/Tooltip';
+import {TooltipTrigger} from '../../src/tooltip/TooltipTrigger';
 import userEvent from '@testing-library/user-event';
 
 // Describes the tabIndex values of button 1 (column 1), 2, and 3 as focus is moved forward or back.
diff --git a/packages/@react-spectrum/actiongroup/test/Toolbar.test.tsx b/packages/@adobe/react-spectrum/test/actiongroup/Toolbar.test.tsx
similarity index 97%
rename from packages/@react-spectrum/actiongroup/test/Toolbar.test.tsx
rename to packages/@adobe/react-spectrum/test/actiongroup/Toolbar.test.tsx
index 668c9d9467a..0863cbda840 100644
--- a/packages/@react-spectrum/actiongroup/test/Toolbar.test.tsx
+++ b/packages/@adobe/react-spectrum/test/actiongroup/Toolbar.test.tsx
@@ -11,18 +11,16 @@
  */
 
 import {act, fireEvent, render, screen} from '@testing-library/react';
-import {
-  ActionButton,
-  ActionGroup,
-  defaultTheme,
-  Divider,
-  Item,
-  Provider,
-  Text
-} from '@adobe/react-spectrum';
+import {ActionButton} from '../../src/button/ActionButton';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
+import {defaultTheme} from '../../src/theme-default/defaultTheme';
+import {Divider} from '../../src/divider/Divider';
+import {Item} from 'react-stately/Item';
 import {pointerMap} from '@react-spectrum/test-utils-internal';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {Toolbar} from '../stories/Toolbar.stories';
+import {Text} from '../../src/text/Text';
+import {Toolbar} from '../../stories/actiongroup/Toolbar.stories';
 import userEvent from '@testing-library/user-event';
 
 describe('Toolbar', () => {
diff --git a/packages/@react-spectrum/autocomplete/test/SearchAutocomplete.test.js b/packages/@adobe/react-spectrum/test/autocomplete/SearchAutocomplete.test.js
similarity index 99%
rename from packages/@react-spectrum/autocomplete/test/SearchAutocomplete.test.js
rename to packages/@adobe/react-spectrum/test/autocomplete/SearchAutocomplete.test.js
index eb02f61880d..856f5a5d152 100644
--- a/packages/@react-spectrum/autocomplete/test/SearchAutocomplete.test.js
+++ b/packages/@adobe/react-spectrum/test/autocomplete/SearchAutocomplete.test.js
@@ -10,16 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
 import {act, fireEvent, pointerMap, render, simulateDesktop, simulateMobile, waitFor, within} from '@react-spectrum/test-utils-internal';
-import {announce} from '@react-aria/live-announcer';
-import {Button} from '@react-spectrum/button';
+import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
+import {Button} from '../../src/button/Button';
 import Filter from '@spectrum-icons/workflow/Filter';
-import {Form} from '@react-spectrum/form';
-import {Item, SearchAutocomplete, Section} from '../';
-import {Provider} from '@react-spectrum/provider';
+import {Form} from '../../src/form/Form';
+import {Item} from 'react-stately/Item';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
 import scaleMedium from '@adobe/spectrum-css-temp/vars/spectrum-medium-unique.css';
+import {SearchAutocomplete} from '../../src/autocomplete/SearchAutocomplete';
+import {Section} from 'react-stately/Section';
 import themeLight from '@adobe/spectrum-css-temp/vars/spectrum-light-unique.css';
 import userEvent from '@testing-library/user-event';
 
@@ -3269,7 +3271,7 @@ describe('SearchAutocomplete', function () {
         let {getByRole} = render(<ExampleSearchAutocomplete />);
 
         // Use the real live announcer implementation just for this one test
-        let {announce: realAnnounce} = jest.requireActual('@react-aria/live-announcer');
+        let {announce: realAnnounce} = jest.requireActual('react-aria/src/live-announcer/LiveAnnouncer');
         announce.mockImplementationOnce(realAnnounce);
 
         let searchAutocomplete = getByRole('combobox');
diff --git a/packages/@react-spectrum/avatar/test/Avatar.test.js b/packages/@adobe/react-spectrum/test/avatar/Avatar.test.js
similarity index 97%
rename from packages/@react-spectrum/avatar/test/Avatar.test.js
rename to packages/@adobe/react-spectrum/test/avatar/Avatar.test.js
index f42e4a73556..5949761e178 100644
--- a/packages/@react-spectrum/avatar/test/Avatar.test.js
+++ b/packages/@adobe/react-spectrum/test/avatar/Avatar.test.js
@@ -1,4 +1,4 @@
-import {Avatar} from '../';
+import {Avatar} from '../../src/avatar/Avatar';
 import React from 'react';
 import {render, screen} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/@react-spectrum/badge/test/Badge.ssr.test.js b/packages/@adobe/react-spectrum/test/badge/Badge.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/badge/test/Badge.ssr.test.js
rename to packages/@adobe/react-spectrum/test/badge/Badge.ssr.test.js
diff --git a/packages/@react-spectrum/badge/test/Badge.test.js b/packages/@adobe/react-spectrum/test/badge/Badge.test.js
similarity index 96%
rename from packages/@react-spectrum/badge/test/Badge.test.js
rename to packages/@adobe/react-spectrum/test/badge/Badge.test.js
index 35930981543..60e1865d618 100644
--- a/packages/@react-spectrum/badge/test/Badge.test.js
+++ b/packages/@adobe/react-spectrum/test/badge/Badge.test.js
@@ -10,11 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {Badge} from '../';
+import {Badge} from '../../src/badge/Badge';
 import CheckmarkCircle from '@spectrum-icons/workflow/CheckmarkCircle';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
-import {Text} from '@react-spectrum/text';
+import {Text} from '../../src/text/Text';
 import {within} from '@testing-library/dom';
 
 
diff --git a/packages/@react-spectrum/breadcrumbs/test/BreadcrumbItem.test.js b/packages/@adobe/react-spectrum/test/breadcrumbs/BreadcrumbItem.test.js
similarity index 97%
rename from packages/@react-spectrum/breadcrumbs/test/BreadcrumbItem.test.js
rename to packages/@adobe/react-spectrum/test/breadcrumbs/BreadcrumbItem.test.js
index bd44c1f7c58..969d082a0bb 100644
--- a/packages/@react-spectrum/breadcrumbs/test/BreadcrumbItem.test.js
+++ b/packages/@adobe/react-spectrum/test/breadcrumbs/BreadcrumbItem.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {BreadcrumbItem} from '../src/BreadcrumbItem';
+import {BreadcrumbItem} from '../../src/breadcrumbs/BreadcrumbItem';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/@react-spectrum/breadcrumbs/test/Breadcrumbs.ssr.test.js b/packages/@adobe/react-spectrum/test/breadcrumbs/Breadcrumbs.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/breadcrumbs/test/Breadcrumbs.ssr.test.js
rename to packages/@adobe/react-spectrum/test/breadcrumbs/Breadcrumbs.ssr.test.js
diff --git a/packages/@react-spectrum/breadcrumbs/test/Breadcrumbs.test.js b/packages/@adobe/react-spectrum/test/breadcrumbs/Breadcrumbs.test.js
similarity index 98%
rename from packages/@react-spectrum/breadcrumbs/test/Breadcrumbs.test.js
rename to packages/@adobe/react-spectrum/test/breadcrumbs/Breadcrumbs.test.js
index 9a1c2d2b845..2cf74bfd78f 100644
--- a/packages/@react-spectrum/breadcrumbs/test/Breadcrumbs.test.js
+++ b/packages/@adobe/react-spectrum/test/breadcrumbs/Breadcrumbs.test.js
@@ -11,11 +11,11 @@
  */
 
 import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Breadcrumbs} from '../';
-import {Item} from '@react-stately/collections';
-import {Provider} from '@react-spectrum/provider';
+import {Breadcrumbs} from '../../src/breadcrumbs/Breadcrumbs';
+import {Item} from 'react-stately/Item';
+import {Provider} from '../../src/provider/Provider';
 import React, {createRef, forwardRef} from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 describe('Breadcrumbs', function () {
diff --git a/packages/@react-spectrum/button/test/ActionButton.test.js b/packages/@adobe/react-spectrum/test/button/ActionButton.test.js
similarity index 96%
rename from packages/@react-spectrum/button/test/ActionButton.test.js
rename to packages/@adobe/react-spectrum/test/button/ActionButton.test.js
index 3fd868e73b8..267fdad6e9b 100644
--- a/packages/@react-spectrum/button/test/ActionButton.test.js
+++ b/packages/@adobe/react-spectrum/test/button/ActionButton.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '../';
+import {ActionButton} from '../../src/button/ActionButton';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/@react-spectrum/button/test/Button.ssr.test.js b/packages/@adobe/react-spectrum/test/button/Button.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/button/test/Button.ssr.test.js
rename to packages/@adobe/react-spectrum/test/button/Button.ssr.test.js
diff --git a/packages/@react-spectrum/button/test/Button.test.js b/packages/@adobe/react-spectrum/test/button/Button.test.js
similarity index 97%
rename from packages/@react-spectrum/button/test/Button.test.js
rename to packages/@adobe/react-spectrum/test/button/Button.test.js
index 7d732f9707c..12820034489 100644
--- a/packages/@react-spectrum/button/test/Button.test.js
+++ b/packages/@adobe/react-spectrum/test/button/Button.test.js
@@ -11,10 +11,14 @@
  */
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {ActionButton, Button, ClearButton, LogicButton} from '../';
-import {Checkbox, defaultTheme} from '@adobe/react-spectrum';
-import {Form} from '@react-spectrum/form';
-import {Provider} from '@react-spectrum/provider';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Button} from '../../src/button/Button';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {ClearButton} from '../../src/button/ClearButton';
+import {defaultTheme} from '../../src/theme-default/defaultTheme';
+import {Form} from '../../src/form/Form';
+import {LogicButton} from '../../src/button/LogicButton';
+import {Provider} from '../../src/provider/Provider';
 import React, {useState} from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/button/test/ClearButton.test.js b/packages/@adobe/react-spectrum/test/button/ClearButton.test.js
similarity index 97%
rename from packages/@react-spectrum/button/test/ClearButton.test.js
rename to packages/@adobe/react-spectrum/test/button/ClearButton.test.js
index 81e8fef2e2a..9bdbeaeddd7 100644
--- a/packages/@react-spectrum/button/test/ClearButton.test.js
+++ b/packages/@adobe/react-spectrum/test/button/ClearButton.test.js
@@ -11,7 +11,7 @@
  */
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {ClearButton} from '../';
+import {ClearButton} from '../../src/button/ClearButton';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/button/test/ToggleButton.test.js b/packages/@adobe/react-spectrum/test/button/ToggleButton.test.js
similarity index 97%
rename from packages/@react-spectrum/button/test/ToggleButton.test.js
rename to packages/@adobe/react-spectrum/test/button/ToggleButton.test.js
index 985fad1991e..a7c9da4518c 100644
--- a/packages/@react-spectrum/button/test/ToggleButton.test.js
+++ b/packages/@adobe/react-spectrum/test/button/ToggleButton.test.js
@@ -12,7 +12,7 @@
 
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {ToggleButton} from '../';
+import {ToggleButton} from '../../src/button/ToggleButton';
 import userEvent from '@testing-library/user-event';
 
 describe('ToggleButton', function () {
diff --git a/packages/@react-spectrum/buttongroup/test/ButtonGroup.ssr.test.js b/packages/@adobe/react-spectrum/test/buttongroup/ButtonGroup.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/buttongroup/test/ButtonGroup.ssr.test.js
rename to packages/@adobe/react-spectrum/test/buttongroup/ButtonGroup.ssr.test.js
diff --git a/packages/@react-spectrum/buttongroup/test/ButtonGroup.test.js b/packages/@adobe/react-spectrum/test/buttongroup/ButtonGroup.test.js
similarity index 96%
rename from packages/@react-spectrum/buttongroup/test/ButtonGroup.test.js
rename to packages/@adobe/react-spectrum/test/buttongroup/ButtonGroup.test.js
index 43131e96193..8a762531262 100644
--- a/packages/@react-spectrum/buttongroup/test/ButtonGroup.test.js
+++ b/packages/@adobe/react-spectrum/test/buttongroup/ButtonGroup.test.js
@@ -11,11 +11,11 @@
  */
 
 import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Button} from '@react-spectrum/button';
-import {ButtonGroup} from '../';
-import {Provider} from '@react-spectrum/provider';
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {Provider} from '../../src/provider/Provider';
 import React, {useEffect, useRef} from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 let buttonGroupId = 'button-group';
diff --git a/packages/@react-spectrum/calendar/test/Calendar.ssr.test.js b/packages/@adobe/react-spectrum/test/calendar/Calendar.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/calendar/test/Calendar.ssr.test.js
rename to packages/@adobe/react-spectrum/test/calendar/Calendar.ssr.test.js
diff --git a/packages/@react-spectrum/calendar/test/Calendar.test.js b/packages/@adobe/react-spectrum/test/calendar/Calendar.test.js
similarity index 98%
rename from packages/@react-spectrum/calendar/test/Calendar.test.js
rename to packages/@adobe/react-spectrum/test/calendar/Calendar.test.js
index 226b2c413d7..e993ccd4636 100644
--- a/packages/@react-spectrum/calendar/test/Calendar.test.js
+++ b/packages/@adobe/react-spectrum/test/calendar/Calendar.test.js
@@ -12,13 +12,13 @@
 
 import {act} from '@testing-library/react';
 
-jest.mock('@react-aria/live-announcer');
-import {announce} from '@react-aria/live-announcer';
-import {Calendar} from '../';
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
+import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
+import {Calendar} from '../../src/calendar/Calendar';
 import {CalendarDate, isWeekend} from '@internationalized/date';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {useLocale} from '@react-aria/i18n';
+import {useLocale} from 'react-aria/I18nProvider';
 import userEvent from '@testing-library/user-event';
 
 describe('Calendar', () => {
diff --git a/packages/@react-spectrum/calendar/test/CalendarBase.test.js b/packages/@adobe/react-spectrum/test/calendar/CalendarBase.test.js
similarity index 99%
rename from packages/@react-spectrum/calendar/test/CalendarBase.test.js
rename to packages/@adobe/react-spectrum/test/calendar/CalendarBase.test.js
index 1680a007b86..524a0a02a0b 100644
--- a/packages/@react-spectrum/calendar/test/CalendarBase.test.js
+++ b/packages/@adobe/react-spectrum/test/calendar/CalendarBase.test.js
@@ -11,11 +11,12 @@
  */
 
 import {act, fireEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Calendar, RangeCalendar} from '../';
+import {Calendar} from '../../src/calendar/Calendar';
 import {CalendarDate, GregorianCalendar, today} from '@internationalized/date';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../../src/provider/Provider';
+import {RangeCalendar} from '../../src/calendar/RangeCalendar';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 let cellFormatter = new Intl.DateTimeFormat('en-US', {weekday: 'long', day: 'numeric', month: 'long', year: 'numeric'});
diff --git a/packages/@react-spectrum/calendar/test/RangeCalendar.test.js b/packages/@adobe/react-spectrum/test/calendar/RangeCalendar.test.js
similarity index 99%
rename from packages/@react-spectrum/calendar/test/RangeCalendar.test.js
rename to packages/@adobe/react-spectrum/test/calendar/RangeCalendar.test.js
index befe4384ef0..b4c976751cf 100644
--- a/packages/@react-spectrum/calendar/test/RangeCalendar.test.js
+++ b/packages/@adobe/react-spectrum/test/calendar/RangeCalendar.test.js
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
 import {act, fireEvent, installPointerEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {announce} from '@react-aria/live-announcer';
+import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
 import {CalendarDate, isWeekend} from '@internationalized/date';
-import {RangeCalendar} from '../';
+import {RangeCalendar} from '../../src/calendar/RangeCalendar';
 import React from 'react';
-import {useLocale} from '@react-aria/i18n';
+import {useLocale} from 'react-aria/I18nProvider';
 import userEvent from '@testing-library/user-event';
 
 let cellFormatter = new Intl.DateTimeFormat('en-US', {weekday: 'long', day: 'numeric', month: 'long', year: 'numeric'});
diff --git a/packages/@react-spectrum/card/test/Card.test.js b/packages/@adobe/react-spectrum/test/card/Card.test.js
similarity index 94%
rename from packages/@react-spectrum/card/test/Card.test.js
rename to packages/@adobe/react-spectrum/test/card/Card.test.js
index 938bfa561cb..8f88e5af170 100644
--- a/packages/@react-spectrum/card/test/Card.test.js
+++ b/packages/@adobe/react-spectrum/test/card/Card.test.js
@@ -10,11 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {Card} from '../src';
+import {Card} from '../../src/card/Card';
 import {composeStories} from '@storybook/react';
-import * as defaultStories from '../chromatic/Card.stories';
+import * as defaultStories from '../../chromatic/card/Card.stories';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
-import * as quietStories from '../chromatic/QuietCard.stories';
+import * as quietStories from '../../chromatic/card/QuietCard.stories';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/card/test/CardView.test.js b/packages/@adobe/react-spectrum/test/card/CardView.test.js
similarity index 98%
rename from packages/@react-spectrum/card/test/CardView.test.js
rename to packages/@adobe/react-spectrum/test/card/CardView.test.js
index 41260e2fa54..704203f2dae 100644
--- a/packages/@react-spectrum/card/test/CardView.test.js
+++ b/packages/@adobe/react-spectrum/test/card/CardView.test.js
@@ -10,21 +10,26 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/utils/src/scrollIntoView');
+jest.mock('react-aria/src/utils/scrollIntoView');
 import {act, fireEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Card, CardView, GalleryLayout, GridLayout, WaterfallLayout} from '../';
+import {Card} from '../../src/card/Card';
+import {CardView} from '../../src/card/CardView';
 import {composeStories} from '@storybook/react';
-import {Content} from '@react-spectrum/view';
-import {Heading, Text} from '@react-spectrum/text';
-import {Image} from '@react-spectrum/image';
-import {Provider} from '@react-spectrum/provider';
+import {Content} from '../../src/view/Content';
+import {GalleryLayout} from '../../src/card/GalleryLayout';
+import {GridLayout} from '../../src/card/GridLayout';
+import {Heading} from '../../src/text/Heading';
+import {Image} from '../../src/image/Image';
+import {Provider} from '../../src/provider/Provider';
 import React, {useMemo} from 'react';
 import scaleMedium from '@adobe/spectrum-css-temp/vars/spectrum-medium-unique.css';
-import {scrollIntoView} from '@react-aria/utils';
-import * as stories from '../stories/GridCardView.stories';
+import {scrollIntoView} from 'react-aria/private/utils/scrollIntoView';
+import * as stories from '../../stories/card/GridCardView.stories';
+import {Text} from '../../src/text/Text';
 import themeLight from '@adobe/spectrum-css-temp/vars/spectrum-light-unique.css';
-import {useCollator} from '@react-aria/i18n';
+import {useCollator} from 'react-aria/useCollator';
 import userEvent from '@testing-library/user-event';
+import {WaterfallLayout} from '../../src/card/WaterfallLayout';
 
 let isOldReact = parseInt(React.version, 10) < 18;
 
diff --git a/packages/@react-spectrum/checkbox/test/Checkbox.ssr.test.js b/packages/@adobe/react-spectrum/test/checkbox/Checkbox.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/checkbox/test/Checkbox.ssr.test.js
rename to packages/@adobe/react-spectrum/test/checkbox/Checkbox.ssr.test.js
diff --git a/packages/@react-spectrum/checkbox/test/Checkbox.test.js b/packages/@adobe/react-spectrum/test/checkbox/Checkbox.test.js
similarity index 98%
rename from packages/@react-spectrum/checkbox/test/Checkbox.test.js
rename to packages/@adobe/react-spectrum/test/checkbox/Checkbox.test.js
index d8932fbafc3..cf249aee2cc 100644
--- a/packages/@react-spectrum/checkbox/test/Checkbox.test.js
+++ b/packages/@adobe/react-spectrum/test/checkbox/Checkbox.test.js
@@ -11,13 +11,13 @@
  */
 
 import {act} from 'react-dom/test-utils';
-import {Button} from '@react-spectrum/button';
-import {Checkbox} from '../';
-import {Form} from '@react-spectrum/form';
+import {Button} from '../../src/button/Button';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {Form} from '../../src/form/Form';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 describe('Checkbox', function () {
diff --git a/packages/@react-spectrum/checkbox/test/CheckboxGroup.test.js b/packages/@adobe/react-spectrum/test/checkbox/CheckboxGroup.test.js
similarity index 98%
rename from packages/@react-spectrum/checkbox/test/CheckboxGroup.test.js
rename to packages/@adobe/react-spectrum/test/checkbox/CheckboxGroup.test.js
index e86bfd9a968..c69c85c8e1d 100644
--- a/packages/@react-spectrum/checkbox/test/CheckboxGroup.test.js
+++ b/packages/@adobe/react-spectrum/test/checkbox/CheckboxGroup.test.js
@@ -11,12 +11,13 @@
  */
 
 import {act, pointerMap, render, User, within} from '@react-spectrum/test-utils-internal';
-import {Button} from '@react-spectrum/button';
-import {Checkbox, CheckboxGroup} from '../';
-import {Form} from '@react-spectrum/form';
-import {Provider} from '@react-spectrum/provider';
+import {Button} from '../../src/button/Button';
+import {Checkbox} from '../../src/checkbox/Checkbox';
+import {CheckboxGroup} from '../../src/checkbox/CheckboxGroup';
+import {Form} from '../../src/form/Form';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 describe('CheckboxGroup', () => {
diff --git a/packages/@react-spectrum/color/test/ColorArea.test.tsx b/packages/@adobe/react-spectrum/test/color/ColorArea.test.tsx
similarity index 99%
rename from packages/@react-spectrum/color/test/ColorArea.test.tsx
rename to packages/@adobe/react-spectrum/test/color/ColorArea.test.tsx
index 421fecb95ed..2c36f74be24 100644
--- a/packages/@react-spectrum/color/test/ColorArea.test.tsx
+++ b/packages/@adobe/react-spectrum/test/color/ColorArea.test.tsx
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorArea} from '../';
+import {ColorArea} from '../../src/color/ColorArea';
 import {composeStories} from '@storybook/react';
 import {fireEvent, installMouseEvent, installPointerEvent, pointerMap, renderv3 as render} from '@react-spectrum/test-utils-internal';
-import {parseColor} from '@react-stately/color';
-import {ProviderProps} from '@react-spectrum/provider';
+import {parseColor} from 'react-stately/Color';
+import {ProviderProps} from '@react-types/provider';
 import React from 'react';
-import * as stories from '../stories/ColorArea.stories';
+import * as stories from '../../stories/color/ColorArea.stories';
 import userEvent from '@testing-library/user-event';
 
 let {XRedYGreen: DefaultColorArea, XBlueYGreen, XSaturationYBrightness, XSaturationYLightness} = composeStories(stories);
diff --git a/packages/@react-spectrum/color/test/ColorField.test.js b/packages/@adobe/react-spectrum/test/color/ColorField.test.js
similarity index 98%
rename from packages/@react-spectrum/color/test/ColorField.test.js
rename to packages/@adobe/react-spectrum/test/color/ColorField.test.js
index baf568a49cf..1336b64f98e 100644
--- a/packages/@react-spectrum/color/test/ColorField.test.js
+++ b/packages/@adobe/react-spectrum/test/color/ColorField.test.js
@@ -11,14 +11,14 @@
  */
 
 import {act, fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Button} from '@react-spectrum/button';
-import {chain} from '@react-aria/utils';
-import {ColorField} from '../';
-import {Form} from '@react-spectrum/form';
-import {parseColor} from '@react-stately/color';
-import {Provider} from '@react-spectrum/provider';
+import {Button} from '../../src/button/Button';
+import {chain} from 'react-aria/private/utils/chain';
+import {ColorField} from '../../src/color/ColorField';
+import {Form} from '../../src/form/Form';
+import {parseColor} from 'react-stately/Color';
+import {Provider} from '../../src/provider/Provider';
 import React, {useState} from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 function renderComponent(props) {
diff --git a/packages/@react-spectrum/color/test/ColorPicker.test.js b/packages/@adobe/react-spectrum/test/color/ColorPicker.test.js
similarity index 95%
rename from packages/@react-spectrum/color/test/ColorPicker.test.js
rename to packages/@adobe/react-spectrum/test/color/ColorPicker.test.js
index b24852ae5ba..e67b2f2e414 100644
--- a/packages/@react-spectrum/color/test/ColorPicker.test.js
+++ b/packages/@adobe/react-spectrum/test/color/ColorPicker.test.js
@@ -11,10 +11,11 @@
  */
 
 import {act, pointerMap, renderv3 as render, within} from '@react-spectrum/test-utils-internal';
-import {ColorEditor, ColorPicker} from '../src';
-import {Provider} from '@react-spectrum/provider';
+import {ColorEditor} from '../../src/color/ColorEditor';
+import {ColorPicker} from '../../src/color/ColorPicker';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 describe('ColorPicker', function () {
diff --git a/packages/@react-spectrum/color/test/ColorSlider.test.tsx b/packages/@adobe/react-spectrum/test/color/ColorSlider.test.tsx
similarity index 99%
rename from packages/@react-spectrum/color/test/ColorSlider.test.tsx
rename to packages/@adobe/react-spectrum/test/color/ColorSlider.test.tsx
index e48ed53328b..2429ad7b662 100644
--- a/packages/@react-spectrum/color/test/ColorSlider.test.tsx
+++ b/packages/@adobe/react-spectrum/test/color/ColorSlider.test.tsx
@@ -11,8 +11,8 @@
  */
 
 import {act, fireEvent, installMouseEvent, installPointerEvent, pointerMap, renderv3 as render} from '@react-spectrum/test-utils-internal';
-import {ColorSlider} from '../';
-import {parseColor} from '@react-stately/color';
+import {ColorSlider} from '../../src/color/ColorSlider';
+import {parseColor} from 'react-stately/Color';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/color/test/ColorSwatchPicker.test.js b/packages/@adobe/react-spectrum/test/color/ColorSwatchPicker.test.js
similarity index 94%
rename from packages/@react-spectrum/color/test/ColorSwatchPicker.test.js
rename to packages/@adobe/react-spectrum/test/color/ColorSwatchPicker.test.js
index afa607c883e..eb80db9b754 100644
--- a/packages/@react-spectrum/color/test/ColorSwatchPicker.test.js
+++ b/packages/@adobe/react-spectrum/test/color/ColorSwatchPicker.test.js
@@ -10,7 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorSwatch, ColorSwatchPicker, parseColor} from '../src';
+import {ColorSwatch} from '../../src/color/ColorSwatch';
+
+import {ColorSwatchPicker} from '../../src/color/ColorSwatchPicker';
+import {parseColor} from 'react-stately/Color';
 import {pointerMap, render, within} from '@react-spectrum/test-utils-internal';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/@react-spectrum/color/test/ColorWheel.test.tsx b/packages/@adobe/react-spectrum/test/color/ColorWheel.test.tsx
similarity index 99%
rename from packages/@react-spectrum/color/test/ColorWheel.test.tsx
rename to packages/@adobe/react-spectrum/test/color/ColorWheel.test.tsx
index c44402b74e9..794e424cfbf 100644
--- a/packages/@react-spectrum/color/test/ColorWheel.test.tsx
+++ b/packages/@adobe/react-spectrum/test/color/ColorWheel.test.tsx
@@ -11,9 +11,9 @@
  */
 
 import {act, fireEvent, installMouseEvent, installPointerEvent, pointerMap, renderv3 as render} from '@react-spectrum/test-utils-internal';
-import {ColorWheel} from '../';
-import {ControlledHSLRender} from '../stories/ColorWheel.stories';
-import {parseColor} from '@react-stately/color';
+import {ColorWheel} from '../../src/color/ColorWheel';
+import {ControlledHSLRender} from '../../stories/color/ColorWheel.stories';
+import {parseColor} from 'react-stately/Color';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/combobox/test/ComboBox.test.js b/packages/@adobe/react-spectrum/test/combobox/ComboBox.test.js
similarity index 99%
rename from packages/@react-spectrum/combobox/test/ComboBox.test.js
rename to packages/@adobe/react-spectrum/test/combobox/ComboBox.test.js
index 3d7ee5ac14c..a99d2027b73 100644
--- a/packages/@react-spectrum/combobox/test/ComboBox.test.js
+++ b/packages/@adobe/react-spectrum/test/combobox/ComboBox.test.js
@@ -10,20 +10,23 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
 import {act, fireEvent, pointerMap, render, simulateDesktop, simulateMobile, waitFor, within} from '@react-spectrum/test-utils-internal';
-import {announce} from '@react-aria/live-announcer';
-import {Button} from '@react-spectrum/button';
-import {chain} from '@react-aria/utils';
-import {ComboBox, Item, Section} from '../';
-import {Form} from '@react-spectrum/form';
-import {Provider} from '@react-spectrum/provider';
+import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
+import {Button} from '../../src/button/Button';
+import {chain} from 'react-aria/private/utils/chain';
+import {ComboBox} from '../../src/combobox/ComboBox';
+import {Form} from '../../src/form/Form';
+import {Item} from 'react-stately/Item';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
 import scaleMedium from '@adobe/spectrum-css-temp/vars/spectrum-medium-unique.css';
-import {SSRProvider} from '@react-aria/ssr';
+import {Section} from 'react-stately/Section';
+import {SSRProvider} from 'react-aria/SSRProvider';
 import themeLight from '@adobe/spectrum-css-temp/vars/spectrum-light-unique.css';
-import {useAsyncList, useListData} from '@react-stately/data';
-import {useFilter} from '@react-aria/i18n';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useFilter} from 'react-aria/useFilter';
+import {useListData} from 'react-stately/useListData';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
 
@@ -5078,7 +5081,7 @@ describe('ComboBox', function () {
         let {getByRole} = render(<ExampleComboBox />);
 
         // Use the real live announcer implementation just for this one test
-        let {announce: realAnnounce} = jest.requireActual('@react-aria/live-announcer');
+        let {announce: realAnnounce} = jest.requireActual('react-aria/src/live-announcer/LiveAnnouncer');
         announce.mockImplementationOnce(realAnnounce);
 
         let combobox = getByRole('combobox');
diff --git a/packages/@react-spectrum/contextualhelp/test/ContextualHelp.test.js b/packages/@adobe/react-spectrum/test/contextualhelp/ContextualHelp.test.js
similarity index 93%
rename from packages/@react-spectrum/contextualhelp/test/ContextualHelp.test.js
rename to packages/@adobe/react-spectrum/test/contextualhelp/ContextualHelp.test.js
index 659e8f60e04..d8b5a2252b6 100644
--- a/packages/@react-spectrum/contextualhelp/test/ContextualHelp.test.js
+++ b/packages/@adobe/react-spectrum/test/contextualhelp/ContextualHelp.test.js
@@ -11,12 +11,14 @@
  */
 
 import {act, pointerMap, render, simulateDesktop} from '@react-spectrum/test-utils-internal';
-import {Content, Footer, Header} from '@react-spectrum/view';
-import {ContextualHelp} from '../';
-import {Link} from '@react-spectrum/link';
-import {Provider} from '@react-spectrum/provider';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Footer} from '../../src/view/Footer';
+import {Header} from '../../src/view/Header';
+import {Link} from '../../src/link/Link';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 describe('ContextualHelp', function () {
diff --git a/packages/@react-spectrum/datepicker/test/DateField.test.js b/packages/@adobe/react-spectrum/test/datepicker/DateField.test.js
similarity index 99%
rename from packages/@react-spectrum/datepicker/test/DateField.test.js
rename to packages/@adobe/react-spectrum/test/datepicker/DateField.test.js
index 23f67cd79c1..4c62bf2f5eb 100644
--- a/packages/@react-spectrum/datepicker/test/DateField.test.js
+++ b/packages/@adobe/react-spectrum/test/datepicker/DateField.test.js
@@ -11,13 +11,13 @@
  */
 
 import {act, pointerMap, render as render_, within} from '@react-spectrum/test-utils-internal';
-import {Button} from '@react-spectrum/button';
+import {Button} from '../../src/button/Button';
 import {CalendarDate, CalendarDateTime, ZonedDateTime} from '@internationalized/date';
-import {DateField} from '../';
-import {Form} from '@react-spectrum/form';
-import {Provider} from '@react-spectrum/provider';
+import {DateField} from '../../src/datepicker/DateField';
+import {Form} from '../../src/form/Form';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 function render(el) {
diff --git a/packages/@react-spectrum/datepicker/test/DatePicker.ssr.test.js b/packages/@adobe/react-spectrum/test/datepicker/DatePicker.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/datepicker/test/DatePicker.ssr.test.js
rename to packages/@adobe/react-spectrum/test/datepicker/DatePicker.ssr.test.js
diff --git a/packages/@react-spectrum/datepicker/test/DatePicker.test.js b/packages/@adobe/react-spectrum/test/datepicker/DatePicker.test.js
similarity index 99%
rename from packages/@react-spectrum/datepicker/test/DatePicker.test.js
rename to packages/@adobe/react-spectrum/test/datepicker/DatePicker.test.js
index b8e9b492d22..bfb348ecb03 100644
--- a/packages/@react-spectrum/datepicker/test/DatePicker.test.js
+++ b/packages/@adobe/react-spectrum/test/datepicker/DatePicker.test.js
@@ -11,13 +11,13 @@
  */
 
 import {act, fireEvent, pointerMap, render as render_, waitFor, within} from '@react-spectrum/test-utils-internal';
-import {Button} from '@react-spectrum/button';
+import {Button} from '../../src/button/Button';
 import {CalendarDate, CalendarDateTime, DateFormatter, EthiopicCalendar, getLocalTimeZone, JapaneseCalendar, parseZonedDateTime, toCalendarDateTime, today} from '@internationalized/date';
-import {DatePicker} from '../';
-import {Form} from '@react-spectrum/form';
-import {Provider} from '@react-spectrum/provider';
+import {DatePicker} from '../../src/datepicker/DatePicker';
+import {Form} from '../../src/form/Form';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 function beforeInput(target, key) {
diff --git a/packages/@react-spectrum/datepicker/test/DatePickerBase.test.js b/packages/@adobe/react-spectrum/test/datepicker/DatePickerBase.test.js
similarity index 98%
rename from packages/@react-spectrum/datepicker/test/DatePickerBase.test.js
rename to packages/@adobe/react-spectrum/test/datepicker/DatePickerBase.test.js
index 89e8f25b97e..843ed8c4338 100644
--- a/packages/@react-spectrum/datepicker/test/DatePickerBase.test.js
+++ b/packages/@adobe/react-spectrum/test/datepicker/DatePickerBase.test.js
@@ -12,10 +12,11 @@
 
 import {act, fireEvent, installPointerEvent, pointerMap, render as render_, simulateDesktop, within} from '@react-spectrum/test-utils-internal';
 import {CalendarDate, parseZonedDateTime} from '@internationalized/date';
-import {DatePicker, DateRangePicker} from '../';
-import {Provider} from '@react-spectrum/provider';
+import {DatePicker} from '../../src/datepicker/DatePicker';
+import {DateRangePicker} from '../../src/datepicker/DateRangePicker';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 function pointerEvent(type, opts) {
diff --git a/packages/@react-spectrum/datepicker/test/DateRangePicker.test.js b/packages/@adobe/react-spectrum/test/datepicker/DateRangePicker.test.js
similarity index 99%
rename from packages/@react-spectrum/datepicker/test/DateRangePicker.test.js
rename to packages/@adobe/react-spectrum/test/datepicker/DateRangePicker.test.js
index 3c85574f68c..7a3ce730bf2 100644
--- a/packages/@react-spectrum/datepicker/test/DateRangePicker.test.js
+++ b/packages/@adobe/react-spectrum/test/datepicker/DateRangePicker.test.js
@@ -11,13 +11,13 @@
  */
 
 import {act, fireEvent, getAllByRole as getAllByRoleInContainer, pointerMap, render as render_, waitFor, within} from '@react-spectrum/test-utils-internal';
-import {Button} from '@react-spectrum/button';
+import {Button} from '../../src/button/Button';
 import {CalendarDate, CalendarDateTime, getLocalTimeZone, toCalendarDateTime, today} from '@internationalized/date';
-import {DateRangePicker} from '../';
-import {Form} from '@react-spectrum/form';
-import {Provider} from '@react-spectrum/provider';
+import {DateRangePicker} from '../../src/datepicker/DateRangePicker';
+import {Form} from '../../src/form/Form';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 function pointerEvent(type, opts) {
diff --git a/packages/@react-spectrum/datepicker/test/TimeField.test.js b/packages/@adobe/react-spectrum/test/datepicker/TimeField.test.js
similarity index 98%
rename from packages/@react-spectrum/datepicker/test/TimeField.test.js
rename to packages/@adobe/react-spectrum/test/datepicker/TimeField.test.js
index 8abe3c404be..b4eb19ebf19 100644
--- a/packages/@react-spectrum/datepicker/test/TimeField.test.js
+++ b/packages/@adobe/react-spectrum/test/datepicker/TimeField.test.js
@@ -11,13 +11,13 @@
  */
 
 import {act, fireEvent, pointerMap, render as render_, within} from '@react-spectrum/test-utils-internal';
-import {Button} from '@react-spectrum/button';
-import {Form} from '@react-spectrum/form';
+import {Button} from '../../src/button/Button';
+import {Form} from '../../src/form/Form';
 import {parseTime, parseZonedDateTime, Time} from '@internationalized/date';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
-import {TimeField} from '../';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {TimeField} from '../../src/datepicker/TimeField';
 import userEvent from '@testing-library/user-event';
 
 function render(el) {
diff --git a/packages/@react-spectrum/dialog/test/AlertDialog.test.js b/packages/@adobe/react-spectrum/test/dialog/AlertDialog.test.js
similarity index 97%
rename from packages/@react-spectrum/dialog/test/AlertDialog.test.js
rename to packages/@adobe/react-spectrum/test/dialog/AlertDialog.test.js
index bbcba41e118..bfc95c85fb9 100644
--- a/packages/@react-spectrum/dialog/test/AlertDialog.test.js
+++ b/packages/@adobe/react-spectrum/test/dialog/AlertDialog.test.js
@@ -10,11 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {AlertDialog} from '../';
+import {AlertDialog} from '../../src/dialog/AlertDialog';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 describe('AlertDialog', function () {
diff --git a/packages/@react-spectrum/dialog/test/Dialog.ssr.test.js b/packages/@adobe/react-spectrum/test/dialog/Dialog.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/dialog/test/Dialog.ssr.test.js
rename to packages/@adobe/react-spectrum/test/dialog/Dialog.ssr.test.js
diff --git a/packages/@react-spectrum/dialog/test/Dialog.test.js b/packages/@adobe/react-spectrum/test/dialog/Dialog.test.js
similarity index 93%
rename from packages/@react-spectrum/dialog/test/Dialog.test.js
rename to packages/@adobe/react-spectrum/test/dialog/Dialog.test.js
index f225f1fb16b..5380dc2f5da 100644
--- a/packages/@react-spectrum/dialog/test/Dialog.test.js
+++ b/packages/@adobe/react-spectrum/test/dialog/Dialog.test.js
@@ -10,11 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {Dialog} from '../';
-import {DialogContext} from '../src/context';
-import {Header} from '@react-spectrum/view';
-import {Heading} from '@react-spectrum/text';
-import {ModalProvider} from '@react-aria/overlays';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogContext} from '../../src/dialog/context';
+import {Header} from '../../src/view/Header';
+import {Heading} from '../../src/text/Heading';
+import {ModalProvider} from 'react-aria/private/overlays/useModal';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/@react-spectrum/dialog/test/DialogContainer.test.js b/packages/@adobe/react-spectrum/test/dialog/DialogContainer.test.js
similarity index 91%
rename from packages/@react-spectrum/dialog/test/DialogContainer.test.js
rename to packages/@adobe/react-spectrum/test/dialog/DialogContainer.test.js
index 4fe0a03c01d..b7b9583cbc3 100644
--- a/packages/@react-spectrum/dialog/test/DialogContainer.test.js
+++ b/packages/@adobe/react-spectrum/test/dialog/DialogContainer.test.js
@@ -11,17 +11,22 @@
  */
 
 import {act, fireEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {ActionButton, Button} from '@react-spectrum/button';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {Content, Header} from '@react-spectrum/view';
-import {Dialog, DialogContainer, useDialogContainer} from '../src';
-import {DialogContainerExample, MenuExample, NestedDialogContainerExample} from '../stories/DialogContainerExamples';
-import {Divider} from '@react-spectrum/divider';
-import {Heading, Text} from '@react-spectrum/text';
-import {Provider} from '@react-spectrum/provider';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {Content} from '../../src/view/Content';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogContainer} from '../../src/dialog/DialogContainer';
+import {DialogContainerExample, MenuExample, NestedDialogContainerExample} from '../../stories/dialog/DialogContainerExamples';
+import {Divider} from '../../src/divider/Divider';
+import {Header} from '../../src/view/Header';
+import {Heading} from '../../src/text/Heading';
+import {Provider} from '../../src/provider/Provider';
 import React, {useRef, useState} from 'react';
-import {theme} from '@react-spectrum/theme-default';
-import {UNSAFE_PortalProvider} from '@react-aria/overlays';
+import {Text} from '../../src/text/Text';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {UNSAFE_PortalProvider} from 'react-aria/PortalProvider';
+import {useDialogContainer} from '../../src/dialog/useDialogContainer';
 import userEvent from '@testing-library/user-event';
 
 describe('DialogContainer', function () {
diff --git a/packages/@react-spectrum/dialog/test/DialogTrigger.test.js b/packages/@adobe/react-spectrum/test/dialog/DialogTrigger.test.js
similarity index 97%
rename from packages/@react-spectrum/dialog/test/DialogTrigger.test.js
rename to packages/@adobe/react-spectrum/test/dialog/DialogTrigger.test.js
index 97d3a5a35be..795ec1f7afe 100644
--- a/packages/@react-spectrum/dialog/test/DialogTrigger.test.js
+++ b/packages/@adobe/react-spectrum/test/dialog/DialogTrigger.test.js
@@ -11,16 +11,20 @@
  */
 
 import {act, fireEvent, pointerMap, render, simulateDesktop, simulateMobile, User, waitFor, within} from '@react-spectrum/test-utils-internal';
-import {ActionButton, Button} from '@react-spectrum/button';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {Content} from '@react-spectrum/view';
-import {Dialog, DialogTrigger} from '../';
-import {Item, Menu, MenuTrigger} from '@react-spectrum/menu';
-import {Provider} from '@react-spectrum/provider';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {Content} from '../../src/view/Content';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
+import {Item} from 'react-stately/Item';
+import {Menu} from '../../src/menu/Menu';
+import {MenuTrigger} from '../../src/menu/MenuTrigger';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {TextField} from '@react-spectrum/textfield';
-import {theme} from '@react-spectrum/theme-default';
-import {UNSAFE_PortalProvider} from '@react-aria/overlays';
+import {TextField} from '../../src/textfield/TextField';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {UNSAFE_PortalProvider} from 'react-aria/PortalProvider';
 import userEvent from '@testing-library/user-event';
 
 
diff --git a/packages/@react-spectrum/divider/test/Divider.ssr.test.js b/packages/@adobe/react-spectrum/test/divider/Divider.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/divider/test/Divider.ssr.test.js
rename to packages/@adobe/react-spectrum/test/divider/Divider.ssr.test.js
diff --git a/packages/@react-spectrum/divider/test/Divider.test.js b/packages/@adobe/react-spectrum/test/divider/Divider.test.js
similarity index 98%
rename from packages/@react-spectrum/divider/test/Divider.test.js
rename to packages/@adobe/react-spectrum/test/divider/Divider.test.js
index 6aa099312a9..e05398d93c6 100644
--- a/packages/@react-spectrum/divider/test/Divider.test.js
+++ b/packages/@adobe/react-spectrum/test/divider/Divider.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Divider} from '../';
+import {Divider} from '../../src/divider/Divider';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/@react-spectrum/dropzone/test/DropZone.test.js b/packages/@adobe/react-spectrum/test/dropzone/DropZone.test.js
similarity index 91%
rename from packages/@react-spectrum/dropzone/test/DropZone.test.js
rename to packages/@adobe/react-spectrum/test/dropzone/DropZone.test.js
index b4343e0dc6c..08da5c6b2f1 100644
--- a/packages/@react-spectrum/dropzone/test/DropZone.test.js
+++ b/packages/@adobe/react-spectrum/test/dropzone/DropZone.test.js
@@ -11,15 +11,15 @@
  */
 
 import {act, fireEvent, render} from '@react-spectrum/test-utils-internal';
-import {Button} from '@react-spectrum/button';
-import {Content} from '@react-spectrum/view';
-import {DataTransfer, DataTransferItem, DragEvent} from '@react-aria/dnd/test/mocks';
-import {Draggable} from '@react-aria/dnd/test/examples';
-import {DropZone} from '../';
-import {FileTrigger} from 'react-aria-components';
-import {Heading} from '@react-spectrum/text';
-import {IllustratedMessage} from '@react-spectrum/illustratedmessage';
-import {Link} from '@react-spectrum/link';
+import {Button} from '../../src/button/Button';
+import {Content} from '../../src/view/Content';
+import {DataTransfer, DataTransferItem, DragEvent} from 'react-aria/test/dnd/mocks';
+import {Draggable} from 'react-aria/test/dnd/examples';
+import {DropZone} from '../../src/dropzone/DropZone';
+import {FileTrigger} from 'react-aria-components/FileTrigger';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
+import {Link} from '../../src/link/Link';
 import React from 'react';
 
 describe('DropZone', () => {
diff --git a/packages/@react-spectrum/form/test/Form.ssr.test.js b/packages/@adobe/react-spectrum/test/form/Form.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/form/test/Form.ssr.test.js
rename to packages/@adobe/react-spectrum/test/form/Form.ssr.test.js
diff --git a/packages/@react-spectrum/form/test/Form.test.js b/packages/@adobe/react-spectrum/test/form/Form.test.js
similarity index 92%
rename from packages/@react-spectrum/form/test/Form.test.js
rename to packages/@adobe/react-spectrum/test/form/Form.test.js
index 15ba29be69d..3ee51c90978 100644
--- a/packages/@react-spectrum/form/test/Form.test.js
+++ b/packages/@adobe/react-spectrum/test/form/Form.test.js
@@ -11,16 +11,18 @@
  */
 
 import {act} from 'react-dom/test-utils';
-import {Button} from '@react-spectrum/button';
-import {Content, Header} from '@react-spectrum/view';
-import {ContextualHelp} from '@react-spectrum/contextualhelp';
-import {Form} from '../';
-import {Item, Picker} from '@react-spectrum/picker';
+import {Button} from '../../src/button/Button';
+import {Content} from '../../src/view/Content';
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Form} from '../../src/form/Form';
+import {Header} from '../../src/view/Header';
+import {Item} from 'react-stately/Item';
+import {Picker} from '../../src/picker/Picker';
 import {pointerMap, render, simulateMobile} from '@react-spectrum/test-utils-internal';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {TextField} from '@react-spectrum/textfield';
-import {theme} from '@react-spectrum/theme-default';
+import {TextField} from '../../src/textfield/TextField';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 import {within} from '@testing-library/dom';
 
diff --git a/packages/@react-spectrum/icon/test/Icon.test.js b/packages/@adobe/react-spectrum/test/icon/Icon.test.js
similarity index 98%
rename from packages/@react-spectrum/icon/test/Icon.test.js
rename to packages/@adobe/react-spectrum/test/icon/Icon.test.js
index 93f6d5d1f58..3c9407c5d05 100644
--- a/packages/@react-spectrum/icon/test/Icon.test.js
+++ b/packages/@adobe/react-spectrum/test/icon/Icon.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Icon} from '../';
+import {Icon} from '../../src/icon/Icon';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/@react-spectrum/icon/test/Illustration.test.js b/packages/@adobe/react-spectrum/test/icon/Illustration.test.js
similarity index 97%
rename from packages/@react-spectrum/icon/test/Illustration.test.js
rename to packages/@adobe/react-spectrum/test/icon/Illustration.test.js
index 85ec1115203..cb67109d4d2 100644
--- a/packages/@react-spectrum/icon/test/Illustration.test.js
+++ b/packages/@adobe/react-spectrum/test/icon/Illustration.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Illustration} from '../';
+import {Illustration} from '../../src/icon/Illustration';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/@react-spectrum/icon/test/UIIcon.test.js b/packages/@adobe/react-spectrum/test/icon/UIIcon.test.js
similarity index 97%
rename from packages/@react-spectrum/icon/test/UIIcon.test.js
rename to packages/@adobe/react-spectrum/test/icon/UIIcon.test.js
index c093640f8ce..62eb0fba87e 100644
--- a/packages/@react-spectrum/icon/test/UIIcon.test.js
+++ b/packages/@adobe/react-spectrum/test/icon/UIIcon.test.js
@@ -12,7 +12,7 @@
 
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
-import {UIIcon} from '../';
+import {UIIcon} from '../../src/icon/UIIcon';
 
 let FakeIcon = (props) => <svg {...props}><path d="M 10,150 L 70,10 L 130,150 z" /></svg>;
 
diff --git a/packages/@react-spectrum/illustratedmessage/test/IllustratedMessage.ssr.test.js b/packages/@adobe/react-spectrum/test/illustratedmessage/IllustratedMessage.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/illustratedmessage/test/IllustratedMessage.ssr.test.js
rename to packages/@adobe/react-spectrum/test/illustratedmessage/IllustratedMessage.ssr.test.js
diff --git a/packages/@react-spectrum/illustratedmessage/test/IllustratedMessage.test.js b/packages/@adobe/react-spectrum/test/illustratedmessage/IllustratedMessage.test.js
similarity index 93%
rename from packages/@react-spectrum/illustratedmessage/test/IllustratedMessage.test.js
rename to packages/@adobe/react-spectrum/test/illustratedmessage/IllustratedMessage.test.js
index 2794d0aa3f0..6185d251192 100644
--- a/packages/@react-spectrum/illustratedmessage/test/IllustratedMessage.test.js
+++ b/packages/@adobe/react-spectrum/test/illustratedmessage/IllustratedMessage.test.js
@@ -10,9 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {Content} from '@react-spectrum/view';
-import {Heading} from '@react-spectrum/text';
-import {IllustratedMessage} from '../';
+import {Content} from '../../src/view/Content';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/@react-spectrum/image/test/Image.test.js b/packages/@adobe/react-spectrum/test/image/Image.test.js
similarity index 98%
rename from packages/@react-spectrum/image/test/Image.test.js
rename to packages/@adobe/react-spectrum/test/image/Image.test.js
index 9b25023590c..1d827a03658 100644
--- a/packages/@react-spectrum/image/test/Image.test.js
+++ b/packages/@adobe/react-spectrum/test/image/Image.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 import {fireEvent, render, screen} from '@react-spectrum/test-utils-internal';
-import {Image} from '../src';
+import {Image} from '../../src/image/Image';
 import React from 'react';
 
 describe('Image', () => {
diff --git a/packages/@react-spectrum/inlinealert/test/InlineAlert.test.js b/packages/@adobe/react-spectrum/test/inlinealert/InlineAlert.test.js
similarity index 94%
rename from packages/@react-spectrum/inlinealert/test/InlineAlert.test.js
rename to packages/@adobe/react-spectrum/test/inlinealert/InlineAlert.test.js
index 0bfdff04dab..a8a3ae9f638 100644
--- a/packages/@react-spectrum/inlinealert/test/InlineAlert.test.js
+++ b/packages/@adobe/react-spectrum/test/inlinealert/InlineAlert.test.js
@@ -10,8 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {Content, Header} from '@react-spectrum/view';
-import {InlineAlert} from '../';
+import {Content} from '../../src/view/Content';
+
+import {Header} from '../../src/view/Header';
+import {InlineAlert} from '../../src/inlinealert/InlineAlert';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/@react-spectrum/label/test/Field.test.js b/packages/@adobe/react-spectrum/test/label/Field.test.js
similarity index 96%
rename from packages/@react-spectrum/label/test/Field.test.js
rename to packages/@adobe/react-spectrum/test/label/Field.test.js
index b5d5a7ebef0..006246898d1 100644
--- a/packages/@react-spectrum/label/test/Field.test.js
+++ b/packages/@adobe/react-spectrum/test/label/Field.test.js
@@ -10,11 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {Content, ContextualHelp, Heading} from '@adobe/react-spectrum';
-import {Field} from '../';
+import {Content} from '../../src/view/Content';
+
+import {ContextualHelp} from '../../src/contextualhelp/ContextualHelp';
+import {Field} from '../../src/label/Field';
+import {Heading} from '../../src/text/Heading';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {useField} from '@react-aria/label';
+import {useField} from 'react-aria/useField';
 import userEvent from '@testing-library/user-event';
 
 let defaultProps = {
diff --git a/packages/@react-spectrum/labeledvalue/test/LabeledValue.test.js b/packages/@adobe/react-spectrum/test/labeledvalue/LabeledValue.test.js
similarity index 99%
rename from packages/@react-spectrum/labeledvalue/test/LabeledValue.test.js
rename to packages/@adobe/react-spectrum/test/labeledvalue/LabeledValue.test.js
index 4a5d5061cb9..ae715a694cd 100644
--- a/packages/@react-spectrum/labeledvalue/test/LabeledValue.test.js
+++ b/packages/@adobe/react-spectrum/test/labeledvalue/LabeledValue.test.js
@@ -11,7 +11,7 @@
  */
 
 import {CalendarDate, CalendarDateTime, Time, ZonedDateTime} from '@internationalized/date';
-import {LabeledValue} from '../src';
+import {LabeledValue} from '../../src/labeledvalue/LabeledValue';
 import React from 'react';
 import {render, within} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/@react-spectrum/layout/test/Flex.ssr.test.js b/packages/@adobe/react-spectrum/test/layout/Flex.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/layout/test/Flex.ssr.test.js
rename to packages/@adobe/react-spectrum/test/layout/Flex.ssr.test.js
diff --git a/packages/@react-spectrum/layout/test/Grid.ssr.test.js b/packages/@adobe/react-spectrum/test/layout/Grid.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/layout/test/Grid.ssr.test.js
rename to packages/@adobe/react-spectrum/test/layout/Grid.ssr.test.js
diff --git a/packages/@react-spectrum/layout/test/Grid.test.js b/packages/@adobe/react-spectrum/test/layout/Grid.test.js
similarity index 95%
rename from packages/@react-spectrum/layout/test/Grid.test.js
rename to packages/@adobe/react-spectrum/test/layout/Grid.test.js
index 2537ec2f65d..385a4fcbdb9 100644
--- a/packages/@react-spectrum/layout/test/Grid.test.js
+++ b/packages/@adobe/react-spectrum/test/layout/Grid.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import Grid from '../';
+import {Grid} from '../../src/layout/Grid';
 import React from 'react';
 
 // TODO: testing :)
diff --git a/packages/@react-spectrum/link/test/Link.ssr.test.js b/packages/@adobe/react-spectrum/test/link/Link.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/link/test/Link.ssr.test.js
rename to packages/@adobe/react-spectrum/test/link/Link.ssr.test.js
diff --git a/packages/@react-spectrum/link/test/Link.test.js b/packages/@adobe/react-spectrum/test/link/Link.test.js
similarity index 94%
rename from packages/@react-spectrum/link/test/Link.test.js
rename to packages/@adobe/react-spectrum/test/link/Link.test.js
index 0a8c4e08213..abdfdf98647 100644
--- a/packages/@react-spectrum/link/test/Link.test.js
+++ b/packages/@adobe/react-spectrum/test/link/Link.test.js
@@ -11,11 +11,12 @@
  */
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Link} from '../';
-import {Provider} from '@react-spectrum/provider';
+import {Link} from '../../src/link/Link';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
-import {Tooltip, TooltipTrigger} from '@react-spectrum/tooltip';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {Tooltip} from '../../src/tooltip/Tooltip';
+import {TooltipTrigger} from '../../src/tooltip/TooltipTrigger';
 import userEvent from '@testing-library/user-event';
 
 describe('Link', function () {
diff --git a/packages/@react-spectrum/list/test/ListView.ssr.test.js b/packages/@adobe/react-spectrum/test/list/ListView.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/list/test/ListView.ssr.test.js
rename to packages/@adobe/react-spectrum/test/list/ListView.ssr.test.js
diff --git a/packages/@react-spectrum/list/test/ListView.test.js b/packages/@adobe/react-spectrum/test/list/ListView.test.js
similarity index 98%
rename from packages/@react-spectrum/list/test/ListView.test.js
rename to packages/@adobe/react-spectrum/test/list/ListView.test.js
index 27735a9a7b9..014f2c3b7e0 100644
--- a/packages/@react-spectrum/list/test/ListView.test.js
+++ b/packages/@adobe/react-spectrum/test/list/ListView.test.js
@@ -11,19 +11,20 @@
  */
 
 
-jest.mock('@react-aria/live-announcer');
-jest.mock('@react-aria/utils/src/scrollIntoView');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
+jest.mock('react-aria/src/utils/scrollIntoView');
 import {act, fireEvent, installPointerEvent, mockClickDefault, pointerMap, render as renderComponent, triggerTouch, within} from '@react-spectrum/test-utils-internal';
-import {ActionButton} from '@react-spectrum/button';
-import {announce} from '@react-aria/live-announcer';
-import {FocusExample} from '../stories/ListViewActions.stories';
-import {Item, ListView} from '../src';
-import {Provider} from '@react-spectrum/provider';
+import {ActionButton} from '../../src/button/ActionButton';
+import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
+import {FocusExample} from '../../stories/list/ListViewActions.stories';
+import {Item} from 'react-stately/Item';
+import {ListView} from '../../src/list/ListView';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {renderEmptyState} from '../stories/ListView.stories';
-import {scrollIntoView} from '@react-aria/utils';
-import {Text} from '@react-spectrum/text';
-import {theme} from '@react-spectrum/theme-default';
+import {renderEmptyState} from '../../stories/list/ListView.stories';
+import {scrollIntoView} from 'react-aria/private/utils/scrollIntoView';
+import {Text} from '../../src/text/Text';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/list/test/ListViewDnd.test.js b/packages/@adobe/react-spectrum/test/list/ListViewDnd.test.js
similarity index 99%
rename from packages/@react-spectrum/list/test/ListViewDnd.test.js
rename to packages/@adobe/react-spectrum/test/list/ListViewDnd.test.js
index 04ad1c5b2c9..2e224e52224 100644
--- a/packages/@react-spectrum/list/test/ListViewDnd.test.js
+++ b/packages/@adobe/react-spectrum/test/list/ListViewDnd.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
 import {
   act,
   fireEvent,
@@ -20,21 +20,22 @@ import {
   waitFor,
   within
 } from '@react-spectrum/test-utils-internal';
-import {CUSTOM_DRAG_TYPE} from '@react-aria/dnd/src/constants';
-import {DataTransfer, DataTransferItem, DragEvent, FileSystemDirectoryEntry, FileSystemFileEntry} from '@react-aria/dnd/test/mocks';
-import {DIRECTORY_DRAG_TYPE} from '@react-aria/dnd';
-import {DragBetweenListsComplex} from '../stories/ListViewDnDUtilExamples';
-import {DragBetweenListsExample, DragBetweenListsRootOnlyExample, DragExample, DragIntoItemExample, ReorderExample} from '../stories/ListViewDnDExamples';
-import {Droppable} from '@react-aria/dnd/test/examples';
-import {Flex} from '@react-spectrum/layout';
-import {globalDndState} from '@react-aria/dnd/src/utils';
-import {Item, ListView} from '../';
-import {Provider} from '@react-spectrum/provider';
+import {CUSTOM_DRAG_TYPE} from 'react-aria/src/dnd/constants';
+import {DataTransfer, DataTransferItem, DragEvent, FileSystemDirectoryEntry, FileSystemFileEntry} from 'react-aria/test/dnd/mocks';
+import {DIRECTORY_DRAG_TYPE} from 'react-aria/private/dnd/utils';
+import {DragBetweenListsComplex} from '../../stories/list/ListViewDnDUtilExamples';
+import {DragBetweenListsExample, DragBetweenListsRootOnlyExample, DragExample, DragIntoItemExample, ReorderExample} from '../../stories/list/ListViewDnDExamples';
+import {Droppable} from 'react-aria/test/dnd/examples';
+import {Flex} from '../../src/layout/Flex';
+import {globalDndState} from 'react-aria/src/dnd/utils';
+import {Item} from 'react-stately/Item';
+import {ListView} from '../../src/list/ListView';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {Text} from '@react-spectrum/text';
-import {theme} from '@react-spectrum/theme-default';
-import {useDragAndDrop} from '@react-spectrum/dnd';
-import {useListData} from '@react-stately/data';
+import {Text} from '../../src/text/Text';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {useDragAndDrop} from '../../src/dnd/useDragAndDrop';
+import {useListData} from 'react-stately/useListData';
 import userEvent from '@testing-library/user-event';
 
 let isReact18 = parseInt(React.version, 10) === 18;
diff --git a/packages/@react-spectrum/listbox/test/ListBox.ssr.test.js b/packages/@adobe/react-spectrum/test/listbox/ListBox.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/listbox/test/ListBox.ssr.test.js
rename to packages/@adobe/react-spectrum/test/listbox/ListBox.ssr.test.js
diff --git a/packages/@react-spectrum/listbox/test/ListBox.test.js b/packages/@adobe/react-spectrum/test/listbox/ListBox.test.js
similarity index 99%
rename from packages/@react-spectrum/listbox/test/ListBox.test.js
rename to packages/@adobe/react-spectrum/test/listbox/ListBox.test.js
index 92b9c0d03d4..acb086b4e04 100644
--- a/packages/@react-spectrum/listbox/test/ListBox.test.js
+++ b/packages/@adobe/react-spectrum/test/listbox/ListBox.test.js
@@ -12,13 +12,15 @@
 
 import {act, fireEvent, mockClickDefault, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
 import Bell from '@spectrum-icons/workflow/Bell';
-import {FocusExample} from '../stories/ListBox.stories';
-import {Item, ListBox, Section} from '../';
-import {Provider} from '@react-spectrum/provider';
+import {FocusExample} from '../../stories/listbox/ListBox.stories';
+import {Item} from 'react-stately/Item';
+import {ListBox} from '../../src/listbox/ListBox';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {Text} from '@react-spectrum/text';
-import {theme} from '@react-spectrum/theme-default';
-import {useAsyncList} from '@react-stately/data';
+import {Section} from 'react-stately/Section';
+import {Text} from '../../src/text/Text';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {useAsyncList} from 'react-stately/useAsyncList';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/menu/test/ActionMenu.test.js b/packages/@adobe/react-spectrum/test/menu/ActionMenu.test.js
similarity index 95%
rename from packages/@react-spectrum/menu/test/ActionMenu.test.js
rename to packages/@adobe/react-spectrum/test/menu/ActionMenu.test.js
index 9a955392f1e..12e3748bbec 100644
--- a/packages/@react-spectrum/menu/test/ActionMenu.test.js
+++ b/packages/@adobe/react-spectrum/test/menu/ActionMenu.test.js
@@ -11,11 +11,13 @@
  */
 
 import {act, fireEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {ActionMenu, Item} from '../';
-import {Provider} from '@react-spectrum/provider';
+import {ActionMenu} from '../../src/menu/ActionMenu';
+import {Item} from 'react-stately/Item';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
-import {Tooltip, TooltipTrigger} from '@react-spectrum/tooltip';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {Tooltip} from '../../src/tooltip/Tooltip';
+import {TooltipTrigger} from '../../src/tooltip/TooltipTrigger';
 import userEvent from '@testing-library/user-event';
 
 let CLOSE_TIME = 350;
diff --git a/packages/@react-spectrum/menu/test/Menu.ssr.test.js b/packages/@adobe/react-spectrum/test/menu/Menu.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/menu/test/Menu.ssr.test.js
rename to packages/@adobe/react-spectrum/test/menu/Menu.ssr.test.js
diff --git a/packages/@react-spectrum/menu/test/Menu.test.js b/packages/@adobe/react-spectrum/test/menu/Menu.test.js
similarity index 98%
rename from packages/@react-spectrum/menu/test/Menu.test.js
rename to packages/@adobe/react-spectrum/test/menu/Menu.test.js
index 51764cc6ea3..faceac07056 100644
--- a/packages/@react-spectrum/menu/test/Menu.test.js
+++ b/packages/@adobe/react-spectrum/test/menu/Menu.test.js
@@ -12,14 +12,19 @@
 
 import {act, fireEvent, mockClickDefault, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
 import Bell from '@spectrum-icons/workflow/Bell';
-import {Button} from '@react-spectrum/button';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
-import {Item, Menu, MenuTrigger, Section} from '../';
-import {Keyboard, Text} from '@react-spectrum/text';
-import {MenuContext} from '../src/context';
-import {Provider} from '@react-spectrum/provider';
+import {Button} from '../../src/button/Button';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
+import {Item} from 'react-stately/Item';
+import {Keyboard} from '../../src/text/Keyboard';
+import {Menu} from '../../src/menu/Menu';
+import {MenuContext} from '../../src/menu/context';
+import {MenuTrigger} from '../../src/menu/MenuTrigger';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {Section} from 'react-stately/Section';
+import {Text} from '../../src/text/Text';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 let menuId = 'menu-id';
diff --git a/packages/@react-spectrum/menu/test/MenuTrigger.ssr.test.js b/packages/@adobe/react-spectrum/test/menu/MenuTrigger.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/menu/test/MenuTrigger.ssr.test.js
rename to packages/@adobe/react-spectrum/test/menu/MenuTrigger.ssr.test.js
diff --git a/packages/@react-spectrum/menu/test/MenuTrigger.test.js b/packages/@adobe/react-spectrum/test/menu/MenuTrigger.test.js
similarity index 97%
rename from packages/@react-spectrum/menu/test/MenuTrigger.test.js
rename to packages/@adobe/react-spectrum/test/menu/MenuTrigger.test.js
index 80f6d9c0de7..8d60edc93f2 100644
--- a/packages/@react-spectrum/menu/test/MenuTrigger.test.js
+++ b/packages/@adobe/react-spectrum/test/menu/MenuTrigger.test.js
@@ -12,10 +12,11 @@
 
 import {act, fireEvent, render, screen, within} from '@testing-library/react';
 import {action} from 'storybook/actions';
-import {ActionButton, Button} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
 import {AriaMenuTests} from 'react-aria-components/test/AriaMenu.test-util';
-import {Content, Footer} from '@react-spectrum/view';
-import {ContextualHelpTrigger, Item, Menu, MenuTrigger, Section, SubmenuTrigger} from '../';
+import {Button} from '../../src/button/Button';
+import {Content} from '../../src/view/Content';
+import {ContextualHelpTrigger} from '../../src/menu/ContextualHelpTrigger';
 import {
   DEFAULT_LONG_PRESS_TIME,
   installPointerEvent,
@@ -23,13 +24,20 @@ import {
   simulateDesktop,
   triggerLongPress
 } from '@react-spectrum/test-utils-internal';
-import {Dialog} from '@react-spectrum/dialog';
-import {Heading, Text} from '@react-spectrum/text';
-import {Link} from '@react-spectrum/link';
-import {Provider} from '@react-spectrum/provider';
+import {Dialog} from '../../src/dialog/Dialog';
+import {Footer} from '../../src/view/Footer';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
+import {Link} from '../../src/link/Link';
+import {Menu} from '../../src/menu/Menu';
+import {MenuTrigger} from '../../src/menu/MenuTrigger';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
-import {UNSAFE_PortalProvider} from '@react-aria/overlays';
+import {Section} from 'react-stately/Section';
+import {SubmenuTrigger} from '../../src/menu/SubmenuTrigger';
+import {Text} from '../../src/text/Text';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {UNSAFE_PortalProvider} from 'react-aria/PortalProvider';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/menu/test/SubMenuTrigger.test.tsx b/packages/@adobe/react-spectrum/test/menu/SubMenuTrigger.test.tsx
similarity index 99%
rename from packages/@react-spectrum/menu/test/SubMenuTrigger.test.tsx
rename to packages/@adobe/react-spectrum/test/menu/SubMenuTrigger.test.tsx
index 0fa0a94378b..7c7bcd108f7 100644
--- a/packages/@react-spectrum/menu/test/SubMenuTrigger.test.tsx
+++ b/packages/@adobe/react-spectrum/test/menu/SubMenuTrigger.test.tsx
@@ -11,11 +11,11 @@
  */
 
 import {act, fireEvent, installPointerEvent, pointerMap, render as renderComponent, triggerTouch, within} from '@react-spectrum/test-utils-internal';
-import {ComplexRender as Complex, SubmenuDynamicRender as SubmenuDynamic, SubmenuStaticRender as SubmenuStatic, TabBehaviorRender as TabBehaviorStory} from '../stories/Submenu.stories';
-import {Provider} from '@react-spectrum/provider';
+import {ComplexRender as Complex, SubmenuDynamicRender as SubmenuDynamic, SubmenuStaticRender as SubmenuStatic, TabBehaviorRender as TabBehaviorStory} from '../../stories/menu/Submenu.stories';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
 import type {Scale} from '@react-types/provider';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 let render = (children, scale = 'medium' as Scale, locale = 'en-US') => {
diff --git a/packages/@react-spectrum/meter/test/Meter.ssr.test.js b/packages/@adobe/react-spectrum/test/meter/Meter.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/meter/test/Meter.ssr.test.js
rename to packages/@adobe/react-spectrum/test/meter/Meter.ssr.test.js
diff --git a/packages/@react-spectrum/meter/test/Meter.test.js b/packages/@adobe/react-spectrum/test/meter/Meter.test.js
similarity index 98%
rename from packages/@react-spectrum/meter/test/Meter.test.js
rename to packages/@adobe/react-spectrum/test/meter/Meter.test.js
index fb27c246cf0..6795e0f5c18 100644
--- a/packages/@react-spectrum/meter/test/Meter.test.js
+++ b/packages/@adobe/react-spectrum/test/meter/Meter.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Meter} from '../';
+import {Meter} from '../../src/meter/Meter';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/@react-spectrum/numberfield/test/NumberField.ssr.test.js b/packages/@adobe/react-spectrum/test/numberfield/NumberField.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/numberfield/test/NumberField.ssr.test.js
rename to packages/@adobe/react-spectrum/test/numberfield/NumberField.ssr.test.js
diff --git a/packages/@react-spectrum/numberfield/test/NumberField.test.js b/packages/@adobe/react-spectrum/test/numberfield/NumberField.test.js
similarity index 99%
rename from packages/@react-spectrum/numberfield/test/NumberField.test.js
rename to packages/@adobe/react-spectrum/test/numberfield/NumberField.test.js
index 923c44ffc34..8ab22bed260 100644
--- a/packages/@react-spectrum/numberfield/test/NumberField.test.js
+++ b/packages/@adobe/react-spectrum/test/numberfield/NumberField.test.js
@@ -10,17 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
 import {act, fireEvent, pointerMap, render, screen, within} from '@react-spectrum/test-utils-internal';
-import {announce} from '@react-aria/live-announcer';
-import {Button} from '@react-spectrum/button';
-import {chain} from '@react-aria/utils';
-import {Form} from '@react-spectrum/form';
-import messages from '@react-aria/numberfield/intl/*.json';
-import {NumberField} from '../';
-import {Provider} from '@react-spectrum/provider';
+import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
+import {Button} from '../../src/button/Button';
+import {chain} from 'react-aria/private/utils/chain';
+import {Form} from '../../src/form/Form';
+import messages from 'react-aria/intl/numberfield/*.json';
+import {NumberField} from '../../src/numberfield/NumberField';
+import {Provider} from '../../src/provider/Provider';
 import React, {useState} from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 // for some reason hu-HU isn't supported in jsdom/node
diff --git a/packages/@react-spectrum/overlays/test/Modal.test.js b/packages/@adobe/react-spectrum/test/overlays/Modal.test.js
similarity index 93%
rename from packages/@react-spectrum/overlays/test/Modal.test.js
rename to packages/@adobe/react-spectrum/test/overlays/Modal.test.js
index fabd82907b6..36ae7289593 100644
--- a/packages/@react-spectrum/overlays/test/Modal.test.js
+++ b/packages/@adobe/react-spectrum/test/overlays/Modal.test.js
@@ -11,11 +11,11 @@
  */
 
 import {fireEvent, render, waitFor} from '@react-spectrum/test-utils-internal';
-import {Modal} from '../';
-import {Provider} from '@react-spectrum/provider';
+import {Modal} from '../../src/overlays/Modal';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
-import {useOverlayTriggerState} from '@react-stately/overlays';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {useOverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 
 function TestModal(props) {
   let state = useOverlayTriggerState(props);
diff --git a/packages/@react-spectrum/overlays/test/Overlay.test.js b/packages/@adobe/react-spectrum/test/overlays/Overlay.test.js
similarity index 91%
rename from packages/@react-spectrum/overlays/test/Overlay.test.js
rename to packages/@adobe/react-spectrum/test/overlays/Overlay.test.js
index a7d1f77479c..6902ece4400 100644
--- a/packages/@react-spectrum/overlays/test/Overlay.test.js
+++ b/packages/@adobe/react-spectrum/test/overlays/Overlay.test.js
@@ -10,11 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {Overlay} from '../';
-import {Provider} from '@react-spectrum/provider';
+import {Overlay} from '../../src/overlays/Overlay';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 
 function _ExampleOverlay(props, ref) {
   return <span data-testid="contents" ref={ref}>Overlay</span>;
diff --git a/packages/@react-spectrum/overlays/test/Popover.test.js b/packages/@adobe/react-spectrum/test/overlays/Popover.test.js
similarity index 96%
rename from packages/@react-spectrum/overlays/test/Popover.test.js
rename to packages/@adobe/react-spectrum/test/overlays/Popover.test.js
index 595635f8c0a..e6f7e817adf 100644
--- a/packages/@react-spectrum/overlays/test/Popover.test.js
+++ b/packages/@adobe/react-spectrum/test/overlays/Popover.test.js
@@ -11,12 +11,12 @@
  */
 
 import {act, fireEvent, pointerMap, render, waitFor} from '@react-spectrum/test-utils-internal';
-import {Dialog} from '@react-spectrum/dialog';
-import {Popover} from '../';
-import {Provider} from '@react-spectrum/provider';
+import {Dialog} from '../../src/dialog/Dialog';
+import {Popover} from '../../src/overlays/Popover';
+import {Provider} from '../../src/provider/Provider';
 import React, {useRef} from 'react';
-import {theme} from '@react-spectrum/theme-default';
-import {useOverlayTriggerState} from '@react-stately/overlays';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {useOverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 import userEvent from '@testing-library/user-event';
 
 function PopoverWithDialog({children}) {
diff --git a/packages/@react-spectrum/overlays/test/Tray.test.js b/packages/@adobe/react-spectrum/test/overlays/Tray.test.js
similarity index 93%
rename from packages/@react-spectrum/overlays/test/Tray.test.js
rename to packages/@adobe/react-spectrum/test/overlays/Tray.test.js
index 8ebccb2a347..b9f91634e16 100644
--- a/packages/@react-spectrum/overlays/test/Tray.test.js
+++ b/packages/@adobe/react-spectrum/test/overlays/Tray.test.js
@@ -11,12 +11,12 @@
  */
 
 import {act, fireEvent, render, waitFor} from '@react-spectrum/test-utils-internal';
-import {Dialog} from '@react-spectrum/dialog';
-import {Provider} from '@react-spectrum/provider';
+import {Dialog} from '../../src/dialog/Dialog';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
-import {Tray} from '../';
-import {useOverlayTriggerState} from '@react-stately/overlays';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {Tray} from '../../src/overlays/Tray';
+import {useOverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 
 function TestTray(props) {
   let state = useOverlayTriggerState(props);
diff --git a/packages/@react-spectrum/picker/test/Picker.ssr.test.js b/packages/@adobe/react-spectrum/test/picker/Picker.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/picker/test/Picker.ssr.test.js
rename to packages/@adobe/react-spectrum/test/picker/Picker.ssr.test.js
diff --git a/packages/@react-spectrum/picker/test/Picker.test.js b/packages/@adobe/react-spectrum/test/picker/Picker.test.js
similarity index 99%
rename from packages/@react-spectrum/picker/test/Picker.test.js
rename to packages/@adobe/react-spectrum/test/picker/Picker.test.js
index 99cedf78a05..16ff41e2960 100644
--- a/packages/@react-spectrum/picker/test/Picker.test.js
+++ b/packages/@adobe/react-spectrum/test/picker/Picker.test.js
@@ -10,23 +10,25 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/utils/src/scrollIntoView');
+jest.mock('react-aria/src/utils/scrollIntoView');
 import {act, fireEvent, mockClickDefault, pointerMap, render, simulateDesktop, within} from '@react-spectrum/test-utils-internal';
 import AlignCenter from '@spectrum-icons/workflow/AlignCenter';
 import AlignLeft from '@spectrum-icons/workflow/AlignLeft';
 import AlignRight from '@spectrum-icons/workflow/AlignRight';
-import {Button} from '@react-spectrum/button';
+import {Button} from '../../src/button/Button';
 import Copy from '@spectrum-icons/workflow/Copy';
 import Cut from '@spectrum-icons/workflow/Cut';
-import {Form} from '@react-spectrum/form';
-import {Item, Picker, Section} from '../src';
+import {Form} from '../../src/form/Form';
+import {Item} from 'react-stately/Item';
 import Paste from '@spectrum-icons/workflow/Paste';
-import {Provider} from '@react-spectrum/provider';
+import {Picker} from '../../src/picker/Picker';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {scrollIntoView} from '@react-aria/utils';
+import {scrollIntoView} from 'react-aria/private/utils/scrollIntoView';
+import {Section} from 'react-stately/Section';
 import {states} from './data';
-import {Text} from '@react-spectrum/text';
-import {theme} from '@react-spectrum/theme-default';
+import {Text} from '../../src/text/Text';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/picker/test/TempUtilTest.test.js b/packages/@adobe/react-spectrum/test/picker/TempUtilTest.test.js
similarity index 94%
rename from packages/@react-spectrum/picker/test/TempUtilTest.test.js
rename to packages/@adobe/react-spectrum/test/picker/TempUtilTest.test.js
index 50609f77a48..efccdb90617 100644
--- a/packages/@react-spectrum/picker/test/TempUtilTest.test.js
+++ b/packages/@adobe/react-spectrum/test/picker/TempUtilTest.test.js
@@ -11,11 +11,17 @@
  */
 
 import {act, pointerMap, render, screen, simulateDesktop, simulateMobile, waitFor, waitForElementToBeRemoved, within} from '@react-spectrum/test-utils-internal';
-import {Button, Label, ListBox, ListBoxItem, Popover, Select, SelectValue, Text} from 'react-aria-components';
-import {Item, Picker} from '../src';
-import {Provider} from '@react-spectrum/provider';
+import {Button} from 'react-aria-components/Button';
+import {Item} from 'react-stately/Item';
+import {Label} from 'react-aria-components/Label';
+import {ListBox, ListBoxItem} from 'react-aria-components/ListBox';
+import {Picker} from '../../src/picker/Picker';
+import {Popover} from 'react-aria-components/Popover';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {Select, SelectValue} from 'react-aria-components/Select';
+import {Text} from 'react-aria-components/Text';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/picker/test/data.js b/packages/@adobe/react-spectrum/test/picker/data.js
similarity index 100%
rename from packages/@react-spectrum/picker/test/data.js
rename to packages/@adobe/react-spectrum/test/picker/data.js
diff --git a/packages/@react-spectrum/progress/test/ProgressBar.ssr.test.js b/packages/@adobe/react-spectrum/test/progress/ProgressBar.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/progress/test/ProgressBar.ssr.test.js
rename to packages/@adobe/react-spectrum/test/progress/ProgressBar.ssr.test.js
diff --git a/packages/@react-spectrum/progress/test/ProgressBar.test.js b/packages/@adobe/react-spectrum/test/progress/ProgressBar.test.js
similarity index 98%
rename from packages/@react-spectrum/progress/test/ProgressBar.test.js
rename to packages/@adobe/react-spectrum/test/progress/ProgressBar.test.js
index c99f5045e57..3016a3d5b79 100644
--- a/packages/@react-spectrum/progress/test/ProgressBar.test.js
+++ b/packages/@adobe/react-spectrum/test/progress/ProgressBar.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ProgressBar} from '../';
+import {ProgressBar} from '../../src/progress/ProgressBar';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/@react-spectrum/progress/test/ProgressCircle.ssr.test.js b/packages/@adobe/react-spectrum/test/progress/ProgressCircle.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/progress/test/ProgressCircle.ssr.test.js
rename to packages/@adobe/react-spectrum/test/progress/ProgressCircle.ssr.test.js
diff --git a/packages/@react-spectrum/progress/test/ProgressCircle.test.js b/packages/@adobe/react-spectrum/test/progress/ProgressCircle.test.js
similarity index 99%
rename from packages/@react-spectrum/progress/test/ProgressCircle.test.js
rename to packages/@adobe/react-spectrum/test/progress/ProgressCircle.test.js
index 2b982bca893..3ca06467a5f 100644
--- a/packages/@react-spectrum/progress/test/ProgressCircle.test.js
+++ b/packages/@adobe/react-spectrum/test/progress/ProgressCircle.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ProgressCircle} from '../';
+import {ProgressCircle} from '../../src/progress/ProgressCircle';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/@react-spectrum/provider/test/Provider.ssr.test.js b/packages/@adobe/react-spectrum/test/provider/Provider.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/provider/test/Provider.ssr.test.js
rename to packages/@adobe/react-spectrum/test/provider/Provider.ssr.test.js
diff --git a/packages/@react-spectrum/provider/test/Provider.test.tsx b/packages/@adobe/react-spectrum/test/provider/Provider.test.tsx
similarity index 96%
rename from packages/@react-spectrum/provider/test/Provider.test.tsx
rename to packages/@adobe/react-spectrum/test/provider/Provider.test.tsx
index ca5fee8ef3f..4ce5b965902 100644
--- a/packages/@react-spectrum/provider/test/Provider.test.tsx
+++ b/packages/@adobe/react-spectrum/test/provider/Provider.test.tsx
@@ -11,16 +11,17 @@
  */
 
 import {act, fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {ActionButton, Button} from '@react-spectrum/button';
-import {Checkbox} from '@react-spectrum/checkbox';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Button} from '../../src/button/Button';
+import {Checkbox} from '../../src/checkbox/Checkbox';
 import MatchMediaMock from 'jest-matchmedia-mock';
 
-import {Provider} from '../';
+import {Provider} from '../../src/provider/Provider';
 import React, {useRef} from 'react';
-import {Switch} from '@react-spectrum/switch';
-import {TextField} from '@react-spectrum/textfield';
-import {useBreakpoint} from '@react-spectrum/utils';
-import {useLayoutEffect} from '@react-aria/utils';
+import {Switch} from '../../src/switch/Switch';
+import {TextField} from '../../src/textfield/TextField';
+import {useBreakpoint} from '../../src/utils/BreakpointProvider';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
 import userEvent from '@testing-library/user-event';
 
 let theme = {
diff --git a/packages/@react-spectrum/provider/test/mediaQueries.test.ts b/packages/@adobe/react-spectrum/test/provider/mediaQueries.test.ts
similarity index 96%
rename from packages/@react-spectrum/provider/test/mediaQueries.test.ts
rename to packages/@adobe/react-spectrum/test/provider/mediaQueries.test.ts
index 38629192b40..d9f2e877d58 100644
--- a/packages/@react-spectrum/provider/test/mediaQueries.test.ts
+++ b/packages/@adobe/react-spectrum/test/provider/mediaQueries.test.ts
@@ -13,7 +13,7 @@
 // needs to be imported first
 import MatchMediaMock from 'jest-matchmedia-mock';
 import {renderHook} from '@react-spectrum/test-utils-internal';
-import {useColorScheme} from '../src/mediaQueries';
+import {useColorScheme} from '../../src/provider/mediaQueries';
 
 let theme = {
   global: {},
diff --git a/packages/@react-spectrum/radio/test/Radio.ssr.test.js b/packages/@adobe/react-spectrum/test/radio/Radio.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/radio/test/Radio.ssr.test.js
rename to packages/@adobe/react-spectrum/test/radio/Radio.ssr.test.js
diff --git a/packages/@react-spectrum/radio/test/Radio.test.js b/packages/@adobe/react-spectrum/test/radio/Radio.test.js
similarity index 99%
rename from packages/@react-spectrum/radio/test/Radio.test.js
rename to packages/@adobe/react-spectrum/test/radio/Radio.test.js
index 429a55130ee..56923ed40b4 100644
--- a/packages/@react-spectrum/radio/test/Radio.test.js
+++ b/packages/@adobe/react-spectrum/test/radio/Radio.test.js
@@ -11,12 +11,13 @@
  */
 
 import {act, pointerMap, render, User} from '@react-spectrum/test-utils-internal';
-import {Button} from '@react-spectrum/button';
-import {Form} from '@react-spectrum/form';
-import {Provider} from '@react-spectrum/provider';
-import {Radio, RadioGroup} from '../';
+import {Button} from '../../src/button/Button';
+import {Form} from '../../src/form/Form';
+import {Provider} from '../../src/provider/Provider';
+import {Radio} from '../../src/radio/Radio';
+import {RadioGroup} from '../../src/radio/RadioGroup';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 function renderRadioGroup(ComponentGroup, Component, groupProps, radioProps) {
diff --git a/packages/@react-spectrum/searchfield/test/SearchField.ssr.test.js b/packages/@adobe/react-spectrum/test/searchfield/SearchField.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/searchfield/test/SearchField.ssr.test.js
rename to packages/@adobe/react-spectrum/test/searchfield/SearchField.ssr.test.js
diff --git a/packages/@react-spectrum/searchfield/test/SearchField.test.js b/packages/@adobe/react-spectrum/test/searchfield/SearchField.test.js
similarity index 99%
rename from packages/@react-spectrum/searchfield/test/SearchField.test.js
rename to packages/@adobe/react-spectrum/test/searchfield/SearchField.test.js
index 9314b27bd4e..9a1cdd37b8e 100644
--- a/packages/@react-spectrum/searchfield/test/SearchField.test.js
+++ b/packages/@adobe/react-spectrum/test/searchfield/SearchField.test.js
@@ -13,7 +13,7 @@
 import {act, fireEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
 import Checkmark from '@spectrum-icons/workflow/Checkmark';
 import React from 'react';
-import {SearchField} from '../';
+import {SearchField} from '../../src/searchfield/SearchField';
 import userEvent from '@testing-library/user-event';
 
 let testId = 'test-id';
diff --git a/packages/@react-spectrum/slider/test/RangeSlider.test.tsx b/packages/@adobe/react-spectrum/test/slider/RangeSlider.test.tsx
similarity index 99%
rename from packages/@react-spectrum/slider/test/RangeSlider.test.tsx
rename to packages/@adobe/react-spectrum/test/slider/RangeSlider.test.tsx
index 29f9906a7ad..34ff896a869 100644
--- a/packages/@react-spectrum/slider/test/RangeSlider.test.tsx
+++ b/packages/@adobe/react-spectrum/test/slider/RangeSlider.test.tsx
@@ -12,10 +12,10 @@
 
 import {fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
 import {press, testKeypresses} from './utils';
-import {Provider} from '@adobe/react-spectrum';
-import {RangeSlider} from '../';
+import {Provider} from '../../src/provider/Provider';
+import {RangeSlider} from '../../src/slider/RangeSlider';
 import React, {useCallback, useState} from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 
diff --git a/packages/@react-spectrum/slider/test/Slider.test.tsx b/packages/@adobe/react-spectrum/test/slider/Slider.test.tsx
similarity index 99%
rename from packages/@react-spectrum/slider/test/Slider.test.tsx
rename to packages/@adobe/react-spectrum/test/slider/Slider.test.tsx
index e52bb94e791..1e47661e936 100644
--- a/packages/@react-spectrum/slider/test/Slider.test.tsx
+++ b/packages/@adobe/react-spectrum/test/slider/Slider.test.tsx
@@ -12,10 +12,10 @@
 
 import {act, fireEvent, installMouseEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
 import {press, testKeypresses} from './utils';
-import {Provider} from '@adobe/react-spectrum';
+import {Provider} from '../../src/provider/Provider';
 import React, {useCallback, useState} from 'react';
-import {Slider} from '../';
-import {theme} from '@react-spectrum/theme-default';
+import {Slider} from '../../src/slider/Slider';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 describe('Slider', function () {
diff --git a/packages/@react-spectrum/slider/test/utils.ts b/packages/@adobe/react-spectrum/test/slider/utils.ts
similarity index 100%
rename from packages/@react-spectrum/slider/test/utils.ts
rename to packages/@adobe/react-spectrum/test/slider/utils.ts
diff --git a/packages/@react-spectrum/statuslight/test/StatusLight.ssr.test.js b/packages/@adobe/react-spectrum/test/statuslight/StatusLight.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/statuslight/test/StatusLight.ssr.test.js
rename to packages/@adobe/react-spectrum/test/statuslight/StatusLight.ssr.test.js
diff --git a/packages/@react-spectrum/statuslight/test/StatusLight.test.js b/packages/@adobe/react-spectrum/test/statuslight/StatusLight.test.js
similarity index 98%
rename from packages/@react-spectrum/statuslight/test/StatusLight.test.js
rename to packages/@adobe/react-spectrum/test/statuslight/StatusLight.test.js
index 27158afe158..2d11a3a43d8 100644
--- a/packages/@react-spectrum/statuslight/test/StatusLight.test.js
+++ b/packages/@adobe/react-spectrum/test/statuslight/StatusLight.test.js
@@ -12,7 +12,7 @@
 
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
-import {StatusLight} from '../';
+import {StatusLight} from '../../src/statuslight/StatusLight';
 
 
 describe('StatusLight', function () {
diff --git a/packages/@react-spectrum/steplist/test/StepList.test.tsx b/packages/@adobe/react-spectrum/test/steplist/StepList.test.tsx
similarity index 98%
rename from packages/@react-spectrum/steplist/test/StepList.test.tsx
rename to packages/@adobe/react-spectrum/test/steplist/StepList.test.tsx
index 29ec602ee77..c32ab7aabb7 100644
--- a/packages/@react-spectrum/steplist/test/StepList.test.tsx
+++ b/packages/@adobe/react-spectrum/test/steplist/StepList.test.tsx
@@ -12,12 +12,12 @@
 
 import {act} from '@testing-library/react';
 import {DOMRefValue} from '@react-types/shared';
-import {Item} from '@react-stately/collections';
+import {Item} from 'react-stately/Item';
 import {pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {StepList} from '../';
-import {theme} from '@react-spectrum/theme-default';
+import {StepList} from '../../src/steplist/StepList';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 const items = [
diff --git a/packages/@react-spectrum/switch/test/Switch.ssr.test.js b/packages/@adobe/react-spectrum/test/switch/Switch.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/switch/test/Switch.ssr.test.js
rename to packages/@adobe/react-spectrum/test/switch/Switch.ssr.test.js
diff --git a/packages/@react-spectrum/switch/test/Switch.test.js b/packages/@adobe/react-spectrum/test/switch/Switch.test.js
similarity index 99%
rename from packages/@react-spectrum/switch/test/Switch.test.js
rename to packages/@adobe/react-spectrum/test/switch/Switch.test.js
index 0fc1a328ded..c76fed13b02 100644
--- a/packages/@react-spectrum/switch/test/Switch.test.js
+++ b/packages/@adobe/react-spectrum/test/switch/Switch.test.js
@@ -12,7 +12,7 @@
 
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {Switch} from '../';
+import {Switch} from '../../src/switch/Switch';
 import userEvent from '@testing-library/user-event';
 
 describe('Switch', function () {
diff --git a/packages/@react-spectrum/table/test/Table.ssr.test.js b/packages/@adobe/react-spectrum/test/table/Table.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/table/test/Table.ssr.test.js
rename to packages/@adobe/react-spectrum/test/table/Table.ssr.test.js
diff --git a/packages/@react-spectrum/table/test/Table.test.js b/packages/@adobe/react-spectrum/test/table/Table.test.js
similarity index 100%
rename from packages/@react-spectrum/table/test/Table.test.js
rename to packages/@adobe/react-spectrum/test/table/Table.test.js
diff --git a/packages/@react-spectrum/table/test/TableDnd.test.js b/packages/@adobe/react-spectrum/test/table/TableDnd.test.js
similarity index 99%
rename from packages/@react-spectrum/table/test/TableDnd.test.js
rename to packages/@adobe/react-spectrum/test/table/TableDnd.test.js
index 6e14b1ead8f..e868141a9b3 100644
--- a/packages/@react-spectrum/table/test/TableDnd.test.js
+++ b/packages/@adobe/react-spectrum/test/table/TableDnd.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
 import {
   act,
   fireEvent, installPointerEvent,
@@ -19,20 +19,20 @@ import {
   waitFor,
   within
 } from '@react-spectrum/test-utils-internal';
-import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../';
-import {CUSTOM_DRAG_TYPE} from '@react-aria/dnd/src/constants';
-import {DataTransfer, DataTransferItem, DragEvent, FileSystemDirectoryEntry, FileSystemFileEntry} from '@react-aria/dnd/test/mocks';
-import {DIRECTORY_DRAG_TYPE} from '@react-aria/dnd';
-import {DragBetweenTablesComplex} from '../stories/TableDnDUtilExamples';
-import {DragBetweenTablesExample, DragBetweenTablesRootOnlyExample, DragExample, DragOntoRowExample, DragWithoutRowHeaderExample, ReorderExample} from '../stories/TableDnDExamples';
-import {Droppable} from '@react-aria/dnd/test/examples';
-import {Flex} from '@react-spectrum/layout';
-import {globalDndState} from '@react-aria/dnd/src/utils';
-import {Provider} from '@react-spectrum/provider';
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../src/table/TableView';
+import {CUSTOM_DRAG_TYPE} from 'react-aria/src/dnd/constants';
+import {DataTransfer, DataTransferItem, DragEvent, FileSystemDirectoryEntry, FileSystemFileEntry} from 'react-aria/test/dnd/mocks';
+import {DIRECTORY_DRAG_TYPE} from 'react-aria/private/dnd/utils';
+import {DragBetweenTablesComplex} from '../../stories/table/TableDnDUtilExamples';
+import {DragBetweenTablesExample, DragBetweenTablesRootOnlyExample, DragExample, DragOntoRowExample, DragWithoutRowHeaderExample, ReorderExample} from '../../stories/table/TableDnDExamples';
+import {Droppable} from 'react-aria/test/dnd/examples';
+import {Flex} from '../../src/layout/Flex';
+import {globalDndState} from 'react-aria/src/dnd/utils';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
-import {useDragAndDrop} from '@react-spectrum/dnd';
-import {useListData} from '@react-stately/data';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {useDragAndDrop} from '../../src/dnd/useDragAndDrop';
+import {useListData} from 'react-stately/useListData';
 import userEvent from '@testing-library/user-event';
 
 // getComputedStyle is very slow in our version of jsdom.
diff --git a/packages/@react-spectrum/table/test/TableNestedRows.test.js b/packages/@adobe/react-spectrum/test/table/TableNestedRows.test.js
similarity index 88%
rename from packages/@react-spectrum/table/test/TableNestedRows.test.js
rename to packages/@adobe/react-spectrum/test/table/TableNestedRows.test.js
index a839f58a003..f9dadffec1d 100644
--- a/packages/@react-spectrum/table/test/TableNestedRows.test.js
+++ b/packages/@adobe/react-spectrum/test/table/TableNestedRows.test.js
@@ -10,15 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
-jest.mock('@react-aria/utils/src/scrollIntoView');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
+jest.mock('react-aria/src/utils/scrollIntoView');
 import {act, render as renderComponent} from '@react-spectrum/test-utils-internal';
-import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../';
-import {enableTableNestedRows} from '@react-stately/flags';
-import {Provider} from '@react-spectrum/provider';
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../src/table/TableView';
+import {enableTableNestedRows} from 'react-stately/private/flags/flags';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
 import {tableTests} from './TableTests';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 
 describe('TableView with expandable rows flag on', function () {
   beforeAll(() => {
diff --git a/packages/@react-spectrum/table/test/TableSizing.test.tsx b/packages/@adobe/react-spectrum/test/table/TableSizing.test.tsx
similarity index 99%
rename from packages/@react-spectrum/table/test/TableSizing.test.tsx
rename to packages/@adobe/react-spectrum/test/table/TableSizing.test.tsx
index c5e5b57ac6a..197b3c184c6 100644
--- a/packages/@react-spectrum/table/test/TableSizing.test.tsx
+++ b/packages/@adobe/react-spectrum/test/table/TableSizing.test.tsx
@@ -10,24 +10,24 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
 import {act, render as renderComponent, within} from '@testing-library/react';
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
 import Add from '@spectrum-icons/workflow/Add';
-import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../';
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../src/table/TableView';
 import {ColumnSize} from '@react-types/table';
-import {ControllingResize} from '../stories/ControllingResize';
+import {ControllingResize} from '../../stories/table/ControllingResize';
 import {fireEvent, installPointerEvent, pointerMap, simulateDesktop, triggerTouch} from '@react-spectrum/test-utils-internal';
-import {HidingColumns} from '../stories/HidingColumns';
+import {HidingColumns} from '../../stories/table/HidingColumns';
 import {Key} from '@react-types/shared';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../../src/provider/Provider';
 import React, {useRef} from 'react';
 // @ts-ignore
-import {resizingTests} from '@react-aria/table/test/tableResizingTests.tsx';
+import {resizingTests} from 'react-aria/test/table/tableResizingTests.tsx';
 import {Scale} from '@react-types/provider';
-import {setInteractionModality} from '@react-aria/interactions';
-import {theme} from '@react-spectrum/theme-default';
-import {UNSAFE_PortalProvider} from '@react-aria/overlays';
+import {setInteractionModality} from 'react-aria/private/interactions/useFocusVisible';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {UNSAFE_PortalProvider} from 'react-aria/PortalProvider';
 import userEvent from '@testing-library/user-event';
 
 let columns = [
diff --git a/packages/@react-spectrum/table/test/TableTests.js b/packages/@adobe/react-spectrum/test/table/TableTests.js
similarity index 99%
rename from packages/@react-spectrum/table/test/TableTests.js
rename to packages/@adobe/react-spectrum/test/table/TableTests.js
index c2f21cc6fd5..fa7a83f8879 100644
--- a/packages/@react-spectrum/table/test/TableTests.js
+++ b/packages/@adobe/react-spectrum/test/table/TableTests.js
@@ -10,30 +10,33 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
-jest.mock('@react-aria/utils/src/scrollIntoView');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
+jest.mock('react-aria/src/utils/scrollIntoView');
 import {act, fireEvent, installPointerEvent, mockClickDefault, pointerMap, render as renderComponent, User, within} from '@react-spectrum/test-utils-internal';
-import {ActionButton, Button} from '@react-spectrum/button';
+import {ActionButton} from '../../src/button/ActionButton';
 import Add from '@spectrum-icons/workflow/Add';
-import {announce} from '@react-aria/live-announcer';
-import {ButtonGroup} from '@react-spectrum/buttongroup';
-import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../';
+import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
+import {Button} from '../../src/button/Button';
+import {ButtonGroup} from '../../src/buttongroup/ButtonGroup';
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../src/table/TableView';
 import {composeStories} from '@storybook/react';
-import {Content} from '@react-spectrum/view';
-import {CRUDExample} from '../stories/CRUDExample';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
-import {Divider} from '@react-spectrum/divider';
-import {getFocusableTreeWalker} from '@react-aria/focus';
-import {Heading} from '@react-spectrum/text';
-import {Item, Picker} from '@react-spectrum/picker';
-import {Link} from '@react-spectrum/link';
-import {Provider} from '@react-spectrum/provider';
+import {Content} from '../../src/view/Content';
+import {CRUDExample} from '../../stories/table/CRUDExample';
+import {Dialog} from '../../src/dialog/Dialog';
+import {DialogTrigger} from '../../src/dialog/DialogTrigger';
+import {Divider} from '../../src/divider/Divider';
+import {getFocusableTreeWalker} from 'react-aria/private/focus/FocusScope';
+import {Heading} from '../../src/text/Heading';
+import {Item} from 'react-stately/Item';
+import {Link} from '../../src/link/Link';
+import {Picker} from '../../src/picker/Picker';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {scrollIntoView} from '@react-aria/utils';
-import * as stories from '../stories/Table.stories';
-import {Switch} from '@react-spectrum/switch';
-import {TextField} from '@react-spectrum/textfield';
-import {theme} from '@react-spectrum/theme-default';
+import {scrollIntoView} from 'react-aria/private/utils/scrollIntoView';
+import * as stories from '../../stories/table/Table.stories';
+import {Switch} from '../../src/switch/Switch';
+import {TextField} from '../../src/textfield/TextField';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 let {
diff --git a/packages/@react-spectrum/table/test/TestTableUtils.test.tsx b/packages/@adobe/react-spectrum/test/table/TestTableUtils.test.tsx
similarity index 98%
rename from packages/@react-spectrum/table/test/TestTableUtils.test.tsx
rename to packages/@adobe/react-spectrum/test/table/TestTableUtils.test.tsx
index 02d71e35132..c6049361f5e 100644
--- a/packages/@react-spectrum/table/test/TestTableUtils.test.tsx
+++ b/packages/@adobe/react-spectrum/test/table/TestTableUtils.test.tsx
@@ -11,11 +11,11 @@
  */
 
 import {act, render, screen} from '@react-spectrum/test-utils-internal';
-import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../';
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../src/table/TableView';
 import {installPointerEvent, User} from '@react-aria/test-utils';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '../../src/provider/Provider';
 import React, {useState} from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 
 let manyItems = [] as any[];
 for (let i = 1; i <= 10; i++) {
diff --git a/packages/@react-spectrum/table/test/TreeGridTable.test.tsx b/packages/@adobe/react-spectrum/test/table/TreeGridTable.test.tsx
similarity index 99%
rename from packages/@react-spectrum/table/test/TreeGridTable.test.tsx
rename to packages/@adobe/react-spectrum/test/table/TreeGridTable.test.tsx
index 7b5eb4b1914..0b781a43dd9 100644
--- a/packages/@react-spectrum/table/test/TreeGridTable.test.tsx
+++ b/packages/@adobe/react-spectrum/test/table/TreeGridTable.test.tsx
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
-jest.mock('@react-aria/utils/src/scrollIntoView');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
+jest.mock('react-aria/src/utils/scrollIntoView');
 import {
   act,
   fireEvent,
@@ -20,7 +20,7 @@ import {
   render as renderComponent,
   within
 } from '@react-spectrum/test-utils-internal';
-import {announce} from '@react-aria/live-announcer';
+import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
 import {
   DynamicExpandableRowsStoryRender as DynamicExpandableTable,
   EmptyTreeGridStoryRender as EmptyStateTable,
@@ -28,13 +28,13 @@ import {
   ManyExpandableRowsStoryRender as ManyRowsExpandableTable,
   StaticExpandableRowsRender as StaticExpandableTable,
   UserSetRowHeaderRender as UserSetRowHeaderTable
-} from '../stories/TreeGridTable.stories';
-import {enableTableNestedRows} from '@react-stately/flags';
-import {Provider} from '@react-spectrum/provider';
+} from '../../stories/table/TreeGridTable.stories';
+import {enableTableNestedRows} from 'react-stately/private/flags/flags';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
 import {Scale} from '@react-types/provider';
-import {scrollIntoView} from '@react-aria/utils';
-import {theme} from '@react-spectrum/theme-default';
+import {scrollIntoView} from 'react-aria/private/utils/scrollIntoView';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 let onSelectionChange = jest.fn();
diff --git a/packages/@react-spectrum/tabs/test/Tabs.test.js b/packages/@adobe/react-spectrum/test/tabs/Tabs.test.js
similarity index 99%
rename from packages/@react-spectrum/tabs/test/Tabs.test.js
rename to packages/@adobe/react-spectrum/test/tabs/Tabs.test.js
index 46f1a0fa8e1..fa5a9a177f7 100644
--- a/packages/@react-spectrum/tabs/test/Tabs.test.js
+++ b/packages/@adobe/react-spectrum/test/tabs/Tabs.test.js
@@ -11,11 +11,12 @@
  */
 
 import {act, createEvent, fireEvent, mockImplementation, pointerMap, render, waitFor, within} from '@react-spectrum/test-utils-internal';
-import {Item, TabList, TabPanels, Tabs} from '../src';
-import {Links as LinksExample} from '../stories/Tabs.stories';
-import {Provider} from '@react-spectrum/provider';
+import {Item} from 'react-stately/Item';
+import {Links as LinksExample} from '../../stories/tabs/Tabs.stories';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {TabList, TabPanels, Tabs} from '../../src/tabs/Tabs';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/tag/test/TagGroup.ssr.test.js b/packages/@adobe/react-spectrum/test/tag/TagGroup.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/tag/test/TagGroup.ssr.test.js
rename to packages/@adobe/react-spectrum/test/tag/TagGroup.ssr.test.js
diff --git a/packages/@react-spectrum/tag/test/TagGroup.test.js b/packages/@adobe/react-spectrum/test/tag/TagGroup.test.js
similarity index 98%
rename from packages/@react-spectrum/tag/test/TagGroup.test.js
rename to packages/@adobe/react-spectrum/test/tag/TagGroup.test.js
index 567cd711cd8..9e1a1ce8a85 100644
--- a/packages/@react-spectrum/tag/test/TagGroup.test.js
+++ b/packages/@adobe/react-spectrum/test/tag/TagGroup.test.js
@@ -11,14 +11,14 @@
  */
 
 import {act, fireEvent, mockClickDefault, mockImplementation, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Button} from '@react-spectrum/button';
-import {chain} from '@react-aria/utils';
-import {Item} from '@react-stately/collections';
-import {Link} from '@react-spectrum/link';
-import {Provider} from '@react-spectrum/provider';
+import {Button} from '../../src/button/Button';
+import {chain} from 'react-aria/private/utils/chain';
+import {Item} from 'react-stately/Item';
+import {Link} from '../../src/link/Link';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {TagGroup} from '../src';
-import {theme} from '@react-spectrum/theme-default';
+import {TagGroup} from '../../src/tag/TagGroup';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 
diff --git a/packages/@react-spectrum/text/test/Heading.ssr.test.js b/packages/@adobe/react-spectrum/test/text/Heading.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/text/test/Heading.ssr.test.js
rename to packages/@adobe/react-spectrum/test/text/Heading.ssr.test.js
diff --git a/packages/@react-spectrum/text/test/Keyboard.ssr.test.js b/packages/@adobe/react-spectrum/test/text/Keyboard.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/text/test/Keyboard.ssr.test.js
rename to packages/@adobe/react-spectrum/test/text/Keyboard.ssr.test.js
diff --git a/packages/@react-spectrum/text/test/Text.ssr.test.js b/packages/@adobe/react-spectrum/test/text/Text.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/text/test/Text.ssr.test.js
rename to packages/@adobe/react-spectrum/test/text/Text.ssr.test.js
diff --git a/packages/@react-spectrum/textfield/test/TextArea.ssr.test.js b/packages/@adobe/react-spectrum/test/textfield/TextArea.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/textfield/test/TextArea.ssr.test.js
rename to packages/@adobe/react-spectrum/test/textfield/TextArea.ssr.test.js
diff --git a/packages/@react-spectrum/textfield/test/TextArea.test.js b/packages/@adobe/react-spectrum/test/textfield/TextArea.test.js
similarity index 98%
rename from packages/@react-spectrum/textfield/test/TextArea.test.js
rename to packages/@adobe/react-spectrum/test/textfield/TextArea.test.js
index 3c783e7b712..32022b2670a 100644
--- a/packages/@react-spectrum/textfield/test/TextArea.test.js
+++ b/packages/@adobe/react-spectrum/test/textfield/TextArea.test.js
@@ -12,7 +12,7 @@
 
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {TextArea} from '../';
+import {TextArea} from '../../src/textfield/TextArea';
 import userEvent from '@testing-library/user-event';
 
 let testId = 'test-id';
diff --git a/packages/@react-spectrum/textfield/test/TextField.ssr.test.js b/packages/@adobe/react-spectrum/test/textfield/TextField.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/textfield/test/TextField.ssr.test.js
rename to packages/@adobe/react-spectrum/test/textfield/TextField.ssr.test.js
diff --git a/packages/@react-spectrum/textfield/test/TextField.test.js b/packages/@adobe/react-spectrum/test/textfield/TextField.test.js
similarity index 98%
rename from packages/@react-spectrum/textfield/test/TextField.test.js
rename to packages/@adobe/react-spectrum/test/textfield/TextField.test.js
index d623f9802c8..6627057e753 100644
--- a/packages/@react-spectrum/textfield/test/TextField.test.js
+++ b/packages/@adobe/react-spectrum/test/textfield/TextField.test.js
@@ -11,14 +11,15 @@
  */
 
 import {act, fireEvent, pointerMap, render, waitFor} from '@react-spectrum/test-utils-internal';
-import {Button} from '@react-spectrum/button';
+import {Button} from '../../src/button/Button';
 import Checkmark from '@spectrum-icons/workflow/Checkmark';
-import {Form} from '@react-spectrum/form';
-import {Provider} from '@react-spectrum/provider';
+import {Form} from '../../src/form/Form';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {SearchField} from '@react-spectrum/searchfield';
-import {TextArea, TextField} from '../';
-import {theme} from '@react-spectrum/theme-default';
+import {SearchField} from '../../src/searchfield/SearchField';
+import {TextArea} from '../../src/textfield/TextArea';
+import {TextField} from '../../src/textfield/TextField';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 let testId = 'test-id';
diff --git a/packages/@react-spectrum/toast/test/ToastContainer.ssr.test.js b/packages/@adobe/react-spectrum/test/toast/ToastContainer.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/toast/test/ToastContainer.ssr.test.js
rename to packages/@adobe/react-spectrum/test/toast/ToastContainer.ssr.test.js
diff --git a/packages/@react-spectrum/toast/test/ToastContainer.test.js b/packages/@adobe/react-spectrum/test/toast/ToastContainer.test.js
similarity index 98%
rename from packages/@react-spectrum/toast/test/ToastContainer.test.js
rename to packages/@adobe/react-spectrum/test/toast/ToastContainer.test.js
index 1a637b18690..6b90f1dec10 100644
--- a/packages/@react-spectrum/toast/test/ToastContainer.test.js
+++ b/packages/@adobe/react-spectrum/test/toast/ToastContainer.test.js
@@ -11,10 +11,10 @@
  */
 
 import {act, fireEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Button} from '@react-spectrum/button';
-import {clearToastQueue, ToastContainer, ToastQueue} from '../src/ToastContainer';
-import {defaultTheme} from '@adobe/react-spectrum';
-import {Provider} from '@react-spectrum/provider';
+import {Button} from '../../src/button/Button';
+import {clearToastQueue, ToastContainer, ToastQueue} from '../../src/toast/ToastContainer';
+import {defaultTheme} from '../../src/theme-default/defaultTheme';
+import {Provider} from '../../src/provider/Provider';
 import React, {useState} from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/tooltip/test/Tooltip.test.js b/packages/@adobe/react-spectrum/test/tooltip/Tooltip.test.js
similarity index 97%
rename from packages/@react-spectrum/tooltip/test/Tooltip.test.js
rename to packages/@adobe/react-spectrum/test/tooltip/Tooltip.test.js
index a85d16ce8e5..58004bd04c2 100644
--- a/packages/@react-spectrum/tooltip/test/Tooltip.test.js
+++ b/packages/@adobe/react-spectrum/test/tooltip/Tooltip.test.js
@@ -12,7 +12,7 @@
 
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
-import {Tooltip} from '../';
+import {Tooltip} from '../../src/tooltip/Tooltip';
 
 describe('Tooltip', function () {
   it('supports children', () => {
diff --git a/packages/@react-spectrum/tooltip/test/TooltipTrigger.test.js b/packages/@adobe/react-spectrum/test/tooltip/TooltipTrigger.test.js
similarity index 99%
rename from packages/@react-spectrum/tooltip/test/TooltipTrigger.test.js
rename to packages/@adobe/react-spectrum/test/tooltip/TooltipTrigger.test.js
index 9a6576f521a..5f569bdd67d 100644
--- a/packages/@react-spectrum/tooltip/test/TooltipTrigger.test.js
+++ b/packages/@adobe/react-spectrum/test/tooltip/TooltipTrigger.test.js
@@ -11,12 +11,13 @@
  */
 
 import {act, fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {ActionButton} from '@react-spectrum/button';
-import {Provider} from '@react-spectrum/provider';
+import {ActionButton} from '../../src/button/ActionButton';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
-import {Tooltip, TooltipTrigger} from '../';
-import {UNSAFE_PortalProvider} from '@react-aria/overlays';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {Tooltip} from '../../src/tooltip/Tooltip';
+import {TooltipTrigger} from '../../src/tooltip/TooltipTrigger';
+import {UNSAFE_PortalProvider} from 'react-aria/PortalProvider';
 import userEvent from '@testing-library/user-event';
 
 // Sync with useTooltipTriggerState.ts
diff --git a/packages/@react-spectrum/tree/test/TreeView.ssr.test.tsx b/packages/@adobe/react-spectrum/test/tree/TreeView.ssr.test.tsx
similarity index 100%
rename from packages/@react-spectrum/tree/test/TreeView.ssr.test.tsx
rename to packages/@adobe/react-spectrum/test/tree/TreeView.ssr.test.tsx
diff --git a/packages/@react-spectrum/tree/test/TreeView.test.tsx b/packages/@adobe/react-spectrum/test/tree/TreeView.test.tsx
similarity index 99%
rename from packages/@react-spectrum/tree/test/TreeView.test.tsx
rename to packages/@adobe/react-spectrum/test/tree/TreeView.test.tsx
index f87c26f13a3..a5b607f1ecf 100644
--- a/packages/@react-spectrum/tree/test/TreeView.test.tsx
+++ b/packages/@adobe/react-spectrum/test/tree/TreeView.test.tsx
@@ -11,19 +11,21 @@
  */
 
 import {act, fireEvent, mockClickDefault, pointerMap, render as renderComponent, within} from '@react-spectrum/test-utils-internal';
-import {ActionGroup, Item} from '@react-spectrum/actiongroup';
-import {Collection} from 'react-aria-components';
-import {Content} from '@react-spectrum/view';
+import {ActionGroup} from '../../src/actiongroup/ActionGroup';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {Content} from '../../src/view/Content';
 import Delete from '@spectrum-icons/workflow/Delete';
 import Edit from '@spectrum-icons/workflow/Edit';
 import Folder from '@spectrum-icons/workflow/Folder';
-import {Heading, Text} from '@react-spectrum/text';
-import {IllustratedMessage} from '@react-spectrum/illustratedmessage';
+import {Heading} from '../../src/text/Heading';
+import {IllustratedMessage} from '../../src/illustratedmessage/IllustratedMessage';
 import {installPointerEvent, User} from '@react-aria/test-utils';
-import {Provider} from '@react-spectrum/provider';
+import {Item} from 'react-stately/Item';
+import {Provider} from '../../src/provider/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
-import {TreeView, TreeViewItem, TreeViewItemContent} from '../';
+import {Text} from '../../src/text/Text';
+import {defaultTheme as theme} from '../../src/theme-default/defaultTheme';
+import {TreeView, TreeViewItem, TreeViewItemContent} from '../../src/tree/TreeView';
 import userEvent from '@testing-library/user-event';
 
 let onSelectionChange = jest.fn();
diff --git a/packages/@react-spectrum/utils/test/Slots.test.js b/packages/@adobe/react-spectrum/test/utils/Slots.test.js
similarity index 97%
rename from packages/@react-spectrum/utils/test/Slots.test.js
rename to packages/@adobe/react-spectrum/test/utils/Slots.test.js
index 8e178918bfd..b5a891a01b8 100644
--- a/packages/@react-spectrum/utils/test/Slots.test.js
+++ b/packages/@adobe/react-spectrum/test/utils/Slots.test.js
@@ -10,12 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {ClearSlots, SlotProvider, useSlotProps} from '../';
+import {ClearSlots, SlotProvider, useSlotProps} from '../../src/utils/Slots';
+
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React, {StrictMode, useEffect, useRef} from 'react';
-import {useId, useSlotId} from '@react-aria/utils';
-import {usePress} from '@react-aria/interactions';
+import {useId} from 'react-aria/useId';
+import {usePress} from 'react-aria/usePress';
 import userEvent from '@testing-library/user-event';
+import {useSlotId} from 'react-aria/private/utils/useId';
 
 describe('Slots', function () {
   let results = {};
diff --git a/packages/@react-spectrum/utils/test/styleProps.test.js b/packages/@adobe/react-spectrum/test/utils/styleProps.test.js
similarity index 99%
rename from packages/@react-spectrum/utils/test/styleProps.test.js
rename to packages/@adobe/react-spectrum/test/utils/styleProps.test.js
index ed7b7fcc21d..860972402d9 100644
--- a/packages/@react-spectrum/utils/test/styleProps.test.js
+++ b/packages/@adobe/react-spectrum/test/utils/styleProps.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {convertStyleProps, dimensionValue, viewStyleProps} from '../';
+import {convertStyleProps, dimensionValue, viewStyleProps} from '../../src/utils/styleProps';
 
 
 describe('styleProps', function () {
diff --git a/packages/@react-spectrum/view/test/Content.ssr.test.js b/packages/@adobe/react-spectrum/test/view/Content.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/view/test/Content.ssr.test.js
rename to packages/@adobe/react-spectrum/test/view/Content.ssr.test.js
diff --git a/packages/@react-spectrum/view/test/Footer.ssr.test.js b/packages/@adobe/react-spectrum/test/view/Footer.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/view/test/Footer.ssr.test.js
rename to packages/@adobe/react-spectrum/test/view/Footer.ssr.test.js
diff --git a/packages/@react-spectrum/view/test/Header.ssr.test.js b/packages/@adobe/react-spectrum/test/view/Header.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/view/test/Header.ssr.test.js
rename to packages/@adobe/react-spectrum/test/view/Header.ssr.test.js
diff --git a/packages/@react-spectrum/view/test/View.ssr.test.js b/packages/@adobe/react-spectrum/test/view/View.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/view/test/View.ssr.test.js
rename to packages/@adobe/react-spectrum/test/view/View.ssr.test.js
diff --git a/packages/@react-spectrum/view/test/View.test.js b/packages/@adobe/react-spectrum/test/view/View.test.js
similarity index 95%
rename from packages/@react-spectrum/view/test/View.test.js
rename to packages/@adobe/react-spectrum/test/view/View.test.js
index 09d311435a3..389d44e7de7 100644
--- a/packages/@react-spectrum/view/test/View.test.js
+++ b/packages/@adobe/react-spectrum/test/view/View.test.js
@@ -12,7 +12,7 @@
 
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
-import {View} from '../';
+import {View} from '../../src/view/View';
 
 describe('View', function () {
   it('renders', function () {
diff --git a/packages/@react-spectrum/well/test/Well.ssr.test.js b/packages/@adobe/react-spectrum/test/well/Well.ssr.test.js
similarity index 100%
rename from packages/@react-spectrum/well/test/Well.ssr.test.js
rename to packages/@adobe/react-spectrum/test/well/Well.ssr.test.js
diff --git a/packages/@react-spectrum/well/test/Well.test.js b/packages/@adobe/react-spectrum/test/well/Well.test.js
similarity index 98%
rename from packages/@react-spectrum/well/test/Well.test.js
rename to packages/@adobe/react-spectrum/test/well/Well.test.js
index 9e6b11a3301..2f1b132106b 100644
--- a/packages/@react-spectrum/well/test/Well.test.js
+++ b/packages/@adobe/react-spectrum/test/well/Well.test.js
@@ -12,7 +12,7 @@
 
 import React, {useEffect, useRef} from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
-import {Well} from '../';
+import {Well} from '../../src/well/Well';
 
 let refExists = (ComponentToCheck, children, props) => {
   let ref;
diff --git a/packages/@internationalized/date/package.json b/packages/@internationalized/date/package.json
index b60a6c99a4a..debd00c8ddb 100644
--- a/packages/@internationalized/date/package.json
+++ b/packages/@internationalized/date/package.json
@@ -7,14 +7,11 @@
   "module": "dist/module.js",
   "exports": {
     "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
+    "types": "./dist/types/src/index.d.ts",
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
-  "types": "dist/types.d.ts",
+  "types": "./dist/types/src/index.d.ts",
   "source": "src/index.ts",
   "files": [
     "dist",
@@ -30,5 +27,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@internationalized/message/package.json b/packages/@internationalized/message/package.json
index dfde239776d..8fac4f07dfb 100644
--- a/packages/@internationalized/message/package.json
+++ b/packages/@internationalized/message/package.json
@@ -7,14 +7,11 @@
   "module": "dist/module.js",
   "exports": {
     "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
+    "types": "./dist/types/src/index.d.ts",
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
-  "types": "dist/types.d.ts",
+  "types": "./dist/types/src/index.d.ts",
   "source": "src/index.ts",
   "files": [
     "dist",
@@ -31,5 +28,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@internationalized/number/package.json b/packages/@internationalized/number/package.json
index ec981de4d2d..1b1584d6e6c 100644
--- a/packages/@internationalized/number/package.json
+++ b/packages/@internationalized/number/package.json
@@ -7,14 +7,11 @@
   "module": "dist/module.js",
   "exports": {
     "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
+    "types": "./dist/types/src/index.d.ts",
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
-  "types": "dist/types.d.ts",
+  "types": "./dist/types/src/index.d.ts",
   "source": "src/index.ts",
   "files": [
     "dist",
@@ -30,5 +27,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@internationalized/number/test/NumberParser.test.js b/packages/@internationalized/number/test/NumberParser.test.js
index c3599da5b97..24e6d35da71 100644
--- a/packages/@internationalized/number/test/NumberParser.test.js
+++ b/packages/@internationalized/number/test/NumberParser.test.js
@@ -11,7 +11,7 @@
  */
 
 import fc from 'fast-check';
-import messages from '@react-aria/numberfield/intl/*.json';
+import messages from 'react-aria/intl/numberfield/*.json';
 import {NumberParser} from '../src/NumberParser';
 
 // for some reason hu-HU isn't supported in jsdom/node
diff --git a/packages/@internationalized/string/package.json b/packages/@internationalized/string/package.json
index b17475042a6..31ce1f60c0b 100644
--- a/packages/@internationalized/string/package.json
+++ b/packages/@internationalized/string/package.json
@@ -7,14 +7,11 @@
   "module": "dist/module.js",
   "exports": {
     "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
+    "types": "./dist/types/src/index.d.ts",
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
-  "types": "dist/types.d.ts",
+  "types": "./dist/types/src/index.d.ts",
   "source": "src/index.ts",
   "files": [
     "dist",
@@ -30,5 +27,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/actiongroup/package.json b/packages/@react-aria/actiongroup/package.json
index b098ebd1b08..087ff95bfb7 100644
--- a/packages/@react-aria/actiongroup/package.json
+++ b/packages/@react-aria/actiongroup/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,14 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/list": "^3.13.4",
     "@react-types/actiongroup": "^3.4.23",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -41,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/actiongroup/src/index.ts b/packages/@react-aria/actiongroup/src/index.ts
index 5a0f49a27e8..533c4a1bd26 100644
--- a/packages/@react-aria/actiongroup/src/index.ts
+++ b/packages/@react-aria/actiongroup/src/index.ts
@@ -9,8 +9,9 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export type {ActionGroupAria} from './useActionGroup';
-export {useActionGroup} from './useActionGroup';
-export {useActionGroupItem} from './useActionGroupItem';
-export type {AriaActionGroupProps} from '@react-types/actiongroup';
-export type {ActionGroupItemAria, AriaActionGroupItemProps} from './useActionGroupItem';
+export {useActionGroup} from 'react-aria/private/actiongroup/useActionGroup';
+
+export {useActionGroupItem} from 'react-aria/private/actiongroup/useActionGroupItem';
+export type {ActionGroupAria} from 'react-aria/private/actiongroup/useActionGroup';
+export type {ActionGroupItemAria, AriaActionGroupItemProps} from 'react-aria/private/actiongroup/useActionGroupItem';
+export type {} from '@react-types/actiongroup';
diff --git a/packages/@react-aria/aria-modal-polyfill/package.json b/packages/@react-aria/aria-modal-polyfill/package.json
index d22a3756ac2..5565865c417 100644
--- a/packages/@react-aria/aria-modal-polyfill/package.json
+++ b/packages/@react-aria/aria-modal-polyfill/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -27,12 +30,17 @@
   },
   "dependencies": {
     "@swc/helpers": "^0.5.0",
-    "aria-hidden": "^1.2.3"
+    "aria-hidden": "^1.2.3",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/aria-modal-polyfill/src/index.ts b/packages/@react-aria/aria-modal-polyfill/src/index.ts
index 377a84749ba..0fb56dfa186 100644
--- a/packages/@react-aria/aria-modal-polyfill/src/index.ts
+++ b/packages/@react-aria/aria-modal-polyfill/src/index.ts
@@ -10,4 +10,4 @@
  * governing permissions and limitations under the License.
  */
 
-export {watchModals} from './ariaModalPolyfill';
+export {watchModals} from 'react-aria/private/aria-modal-polyfill/ariaModalPolyfill';
diff --git a/packages/@react-aria/autocomplete/index.ts b/packages/@react-aria/autocomplete/index.ts
deleted file mode 100644
index b1a5da03bc4..00000000000
--- a/packages/@react-aria/autocomplete/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2021 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/autocomplete/package.json b/packages/@react-aria/autocomplete/package.json
index b01b1784780..89024cc46f5 100644
--- a/packages/@react-aria/autocomplete/package.json
+++ b/packages/@react-aria/autocomplete/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,20 +29,12 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/combobox": "^3.15.0",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/listbox": "^3.15.3",
-    "@react-aria/searchfield": "^3.8.12",
-    "@react-aria/textfield": "^3.18.5",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/autocomplete": "3.0.0-beta.4",
-    "@react-stately/combobox": "^3.13.0",
     "@react-types/autocomplete": "3.0.0-alpha.38",
     "@react-types/button": "^3.15.1",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -47,5 +42,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/autocomplete/src/index.ts b/packages/@react-aria/autocomplete/src/index.ts
index 30bac8eecac..04d76afdcd7 100644
--- a/packages/@react-aria/autocomplete/src/index.ts
+++ b/packages/@react-aria/autocomplete/src/index.ts
@@ -9,9 +9,9 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useSearchAutocomplete} from './useSearchAutocomplete';
-export {useAutocomplete} from './useAutocomplete';
+export {useSearchAutocomplete} from 'react-aria/private/autocomplete/useSearchAutocomplete';
 
-export type {AriaSearchAutocompleteOptions, SearchAutocompleteAria} from './useSearchAutocomplete';
-export type {AriaSearchAutocompleteProps} from '@react-types/autocomplete';
-export type {AriaAutocompleteProps, AriaAutocompleteOptions, AutocompleteAria, CollectionOptions, InputProps} from './useAutocomplete';
+export {useAutocomplete} from 'react-aria/private/autocomplete/useAutocomplete';
+export type {AriaSearchAutocompleteOptions, SearchAutocompleteAria} from 'react-aria/private/autocomplete/useSearchAutocomplete';
+export type {AriaAutocompleteProps, AriaAutocompleteOptions, AutocompleteAria, CollectionOptions, InputProps} from 'react-aria/private/autocomplete/useAutocomplete';
+export type {} from '@react-types/autocomplete';
diff --git a/packages/@react-aria/breadcrumbs/package.json b/packages/@react-aria/breadcrumbs/package.json
index 1ec292e1915..bef0695cf54 100644
--- a/packages/@react-aria/breadcrumbs/package.json
+++ b/packages/@react-aria/breadcrumbs/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,12 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/link": "^3.8.9",
-    "@react-aria/utils": "^3.33.1",
     "@react-types/breadcrumbs": "^3.7.19",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -39,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/breadcrumbs/src/index.ts b/packages/@react-aria/breadcrumbs/src/index.ts
index 5e8220708ca..a2f67221fa2 100644
--- a/packages/@react-aria/breadcrumbs/src/index.ts
+++ b/packages/@react-aria/breadcrumbs/src/index.ts
@@ -9,8 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useBreadcrumbItem} from './useBreadcrumbItem';
-export {useBreadcrumbs} from './useBreadcrumbs';
+export {useBreadcrumbItem, useBreadcrumbs} from 'react-aria/useBreadcrumbs';
+
+export type {BreadcrumbItemAria, BreadcrumbsAria} from 'react-aria/useBreadcrumbs';
 export type {AriaBreadcrumbItemProps, AriaBreadcrumbsProps} from '@react-types/breadcrumbs';
-export type {BreadcrumbItemAria} from './useBreadcrumbItem';
-export type {BreadcrumbsAria} from './useBreadcrumbs';
diff --git a/packages/@react-aria/button/index.ts b/packages/@react-aria/button/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/button/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/button/package.json b/packages/@react-aria/button/package.json
index 738ca063073..ce411fea086 100644
--- a/packages/@react-aria/button/package.json
+++ b/packages/@react-aria/button/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,13 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/toolbar": "3.0.0-beta.24",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/toggle": "^3.9.5",
     "@react-types/button": "^3.15.1",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -40,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/button/src/index.ts b/packages/@react-aria/button/src/index.ts
index 0c9845ea155..3cdad7f00fe 100644
--- a/packages/@react-aria/button/src/index.ts
+++ b/packages/@react-aria/button/src/index.ts
@@ -9,10 +9,11 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useButton} from './useButton';
-export {useToggleButton} from './useToggleButton';
-export {useToggleButtonGroup, useToggleButtonGroupItem} from './useToggleButtonGroup';
-export type {AriaButtonOptions, ButtonAria} from './useButton';
+export {useButton} from 'react-aria/useButton';
+
+export {useToggleButton} from 'react-aria/useToggleButton';
+export {useToggleButtonGroup, useToggleButtonGroupItem} from 'react-aria/useToggleButtonGroup';
+export type {AriaButtonOptions, ButtonAria} from 'react-aria/useButton';
+export type {AriaToggleButtonOptions, ToggleButtonAria} from 'react-aria/useToggleButton';
+export type {AriaToggleButtonGroupProps, ToggleButtonGroupAria, AriaToggleButtonGroupItemProps, AriaToggleButtonGroupItemOptions} from 'react-aria/useToggleButtonGroup';
 export type {AriaButtonProps, AriaToggleButtonProps} from '@react-types/button';
-export type {AriaToggleButtonOptions, ToggleButtonAria} from './useToggleButton';
-export type {AriaToggleButtonGroupProps, ToggleButtonGroupAria, AriaToggleButtonGroupItemProps, AriaToggleButtonGroupItemOptions} from './useToggleButtonGroup';
diff --git a/packages/@react-aria/calendar/index.ts b/packages/@react-aria/calendar/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/calendar/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/calendar/package.json b/packages/@react-aria/calendar/package.json
index dda1b4e2d1d..5a823d60e58 100644
--- a/packages/@react-aria/calendar/package.json
+++ b/packages/@react-aria/calendar/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -27,15 +30,12 @@
   },
   "dependencies": {
     "@internationalized/date": "^3.12.0",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/live-announcer": "^3.4.4",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/calendar": "^3.9.3",
     "@react-types/button": "^3.15.1",
     "@react-types/calendar": "^3.8.3",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -43,5 +43,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/calendar/src/index.ts b/packages/@react-aria/calendar/src/index.ts
index 1676e603a42..160319242e2 100644
--- a/packages/@react-aria/calendar/src/index.ts
+++ b/packages/@react-aria/calendar/src/index.ts
@@ -10,12 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-export {useCalendar} from './useCalendar';
-export {useRangeCalendar} from './useRangeCalendar';
-export {useCalendarGrid} from './useCalendarGrid';
-export {useCalendarCell} from './useCalendarCell';
+export {useCalendar, useCalendarGrid, useCalendarCell} from 'react-aria/useCalendar';
+
+export {useRangeCalendar} from 'react-aria/useRangeCalendar';
+export type {CalendarAria} from 'react-aria/private/calendar/useCalendarBase';
+export type {AriaCalendarGridProps, CalendarGridAria, AriaCalendarCellProps, CalendarCellAria} from 'react-aria/useCalendar';
 
 export type {AriaCalendarProps, AriaRangeCalendarProps, CalendarProps, DateValue, RangeCalendarProps} from '@react-types/calendar';
-export type {CalendarAria} from './useCalendarBase';
-export type {AriaCalendarGridProps, CalendarGridAria} from './useCalendarGrid';
-export type {AriaCalendarCellProps, CalendarCellAria} from './useCalendarCell';
diff --git a/packages/@react-aria/checkbox/index.ts b/packages/@react-aria/checkbox/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/checkbox/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/checkbox/package.json b/packages/@react-aria/checkbox/package.json
index 872b6db9d16..d0b8d513c4d 100644
--- a/packages/@react-aria/checkbox/package.json
+++ b/packages/@react-aria/checkbox/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,17 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/form": "^3.1.5",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/label": "^3.7.25",
-    "@react-aria/toggle": "^3.12.5",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/checkbox": "^3.7.5",
-    "@react-stately/form": "^3.2.4",
-    "@react-stately/toggle": "^3.9.5",
     "@react-types/checkbox": "^3.10.4",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -44,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/checkbox/src/index.ts b/packages/@react-aria/checkbox/src/index.ts
index 536cafb0826..75bf070143a 100644
--- a/packages/@react-aria/checkbox/src/index.ts
+++ b/packages/@react-aria/checkbox/src/index.ts
@@ -9,9 +9,9 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export type {CheckboxAria} from './useCheckbox';
-export {useCheckbox} from './useCheckbox';
-export {useCheckboxGroup} from './useCheckboxGroup';
-export {useCheckboxGroupItem} from './useCheckboxGroupItem';
+export {useCheckbox} from 'react-aria/useCheckbox';
+
+export {useCheckboxGroup, useCheckboxGroupItem} from 'react-aria/useCheckboxGroup';
+export type {CheckboxAria} from 'react-aria/useCheckbox';
+export type {CheckboxGroupAria} from 'react-aria/useCheckboxGroup';
 export type {AriaCheckboxGroupItemProps, AriaCheckboxGroupProps, AriaCheckboxProps} from '@react-types/checkbox';
-export type {CheckboxGroupAria} from './useCheckboxGroup';
diff --git a/packages/@react-aria/collections/package.json b/packages/@react-aria/collections/package.json
index 893a3584021..2eb4ff69800 100644
--- a/packages/@react-aria/collections/package.json
+++ b/packages/@react-aria/collections/package.json
@@ -7,13 +7,16 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "source": "src/index.ts",
   "files": [
@@ -26,12 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/ssr": "^3.9.10",
-    "@react-aria/utils": "^3.33.1",
     "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "use-sync-external-store": "^1.6.0"
+    "use-sync-external-store": "^1.6.0",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -39,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/collections/src/index.ts b/packages/@react-aria/collections/src/index.ts
index 060f214ce0c..47acc6da0c7 100644
--- a/packages/@react-aria/collections/src/index.ts
+++ b/packages/@react-aria/collections/src/index.ts
@@ -10,10 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-export {CollectionBuilder, Collection, createLeafComponent, createBranchComponent} from './CollectionBuilder';
-export {createHideableComponent, useIsHidden} from './Hidden';
-export {useCachedChildren} from './useCachedChildren';
-export {BaseCollection, CollectionNode, ItemNode, SectionNode, FilterableNode, LoaderNode, HeaderNode} from './BaseCollection';
+export {CollectionBuilder, Collection, createLeafComponent, createBranchComponent} from 'react-aria/private/collections/CollectionBuilder';
 
-export type {CollectionBuilderProps, CollectionProps} from './CollectionBuilder';
-export type {CachedChildrenOptions} from './useCachedChildren';
+export {createHideableComponent, useIsHidden} from 'react-aria/private/collections/Hidden';
+export {useCachedChildren} from 'react-aria/private/collections/useCachedChildren';
+export {BaseCollection, CollectionNode, ItemNode, SectionNode, FilterableNode, LoaderNode, HeaderNode} from 'react-aria/private/collections/BaseCollection';
+export type {CollectionBuilderProps, CollectionProps} from 'react-aria/private/collections/CollectionBuilder';
+export type {CachedChildrenOptions} from 'react-aria/private/collections/useCachedChildren';
diff --git a/packages/@react-aria/color/index.ts b/packages/@react-aria/color/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/color/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/color/package.json b/packages/@react-aria/color/package.json
index 3eb158e582f..13ea49e709b 100644
--- a/packages/@react-aria/color/package.json
+++ b/packages/@react-aria/color/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,19 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/numberfield": "^3.12.5",
-    "@react-aria/slider": "^3.8.5",
-    "@react-aria/spinbutton": "^3.7.2",
-    "@react-aria/textfield": "^3.18.5",
-    "@react-aria/utils": "^3.33.1",
-    "@react-aria/visually-hidden": "^3.8.31",
-    "@react-stately/color": "^3.9.5",
-    "@react-stately/form": "^3.2.4",
     "@react-types/color": "^3.1.4",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -46,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/color/src/index.ts b/packages/@react-aria/color/src/index.ts
index 8f65cf51bcb..3bf32910e6b 100644
--- a/packages/@react-aria/color/src/index.ts
+++ b/packages/@react-aria/color/src/index.ts
@@ -9,16 +9,15 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useColorArea} from './useColorArea';
-export {useColorSlider} from './useColorSlider';
-export {useColorWheel} from './useColorWheel';
-export {useColorField} from './useColorField';
-export {useColorSwatch} from './useColorSwatch';
-export {useColorChannelField} from './useColorChannelField';
-export type {AriaColorAreaOptions, ColorAreaAria} from './useColorArea';
-export type {AriaColorSliderOptions, ColorSliderAria} from './useColorSlider';
-export type {AriaColorWheelOptions, ColorWheelAria} from './useColorWheel';
+export {useColorArea} from 'react-aria/useColorArea';
+
+export {useColorSlider} from 'react-aria/useColorSlider';
+export {useColorWheel} from 'react-aria/useColorWheel';
+export {useColorField, useColorChannelField} from 'react-aria/useColorField';
+export {useColorSwatch} from 'react-aria/useColorSwatch';
+export type {AriaColorAreaOptions, ColorAreaAria} from 'react-aria/useColorArea';
+export type {AriaColorSliderOptions, ColorSliderAria} from 'react-aria/useColorSlider';
+export type {AriaColorWheelOptions, ColorWheelAria} from 'react-aria/useColorWheel';
+export type {ColorFieldAria, AriaColorChannelFieldProps, ColorChannelFieldAria} from 'react-aria/useColorField';
+export type {AriaColorSwatchProps, ColorSwatchAria} from 'react-aria/useColorSwatch';
 export type {AriaColorAreaProps, AriaColorFieldProps, AriaColorSliderProps} from '@react-types/color';
-export type {ColorFieldAria} from './useColorField';
-export type {AriaColorSwatchProps, ColorSwatchAria} from './useColorSwatch';
-export type {AriaColorChannelFieldProps, ColorChannelFieldAria} from './useColorChannelField';
diff --git a/packages/@react-aria/combobox/package.json b/packages/@react-aria/combobox/package.json
index d65910f05e4..9e536b82ad6 100644
--- a/packages/@react-aria/combobox/package.json
+++ b/packages/@react-aria/combobox/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,23 +29,12 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/listbox": "^3.15.3",
-    "@react-aria/live-announcer": "^3.4.4",
-    "@react-aria/menu": "^3.21.0",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/selection": "^3.27.2",
-    "@react-aria/textfield": "^3.18.5",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/combobox": "^3.13.0",
-    "@react-stately/form": "^3.2.4",
     "@react-types/button": "^3.15.1",
     "@react-types/combobox": "^3.14.0",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -50,5 +42,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/combobox/src/index.ts b/packages/@react-aria/combobox/src/index.ts
index 8e24d45b144..c6a5fb098ca 100644
--- a/packages/@react-aria/combobox/src/index.ts
+++ b/packages/@react-aria/combobox/src/index.ts
@@ -9,6 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useComboBox} from './useComboBox';
-export type {AriaComboBoxOptions, ComboBoxAria} from './useComboBox';
+export {useComboBox} from 'react-aria/useComboBox';
+
+export type {AriaComboBoxOptions, ComboBoxAria} from 'react-aria/useComboBox';
 export type {AriaComboBoxProps} from '@react-types/combobox';
diff --git a/packages/@react-aria/datepicker/index.ts b/packages/@react-aria/datepicker/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/datepicker/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/datepicker/package.json b/packages/@react-aria/datepicker/package.json
index c30a62cb4f0..3d308940013 100644
--- a/packages/@react-aria/datepicker/package.json
+++ b/packages/@react-aria/datepicker/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -29,21 +32,14 @@
     "@internationalized/date": "^3.12.0",
     "@internationalized/number": "^3.6.5",
     "@internationalized/string": "^3.2.7",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/form": "^3.1.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/label": "^3.7.25",
-    "@react-aria/spinbutton": "^3.7.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/datepicker": "^3.16.1",
-    "@react-stately/form": "^3.2.4",
     "@react-types/button": "^3.15.1",
     "@react-types/calendar": "^3.8.3",
     "@react-types/datepicker": "^3.13.5",
     "@react-types/dialog": "^3.5.24",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -51,5 +47,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/datepicker/src/index.ts b/packages/@react-aria/datepicker/src/index.ts
index 3d4c6ba44c6..5b2f48a329d 100644
--- a/packages/@react-aria/datepicker/src/index.ts
+++ b/packages/@react-aria/datepicker/src/index.ts
@@ -10,15 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-export {useDatePicker} from './useDatePicker';
-export {useDateSegment} from './useDateSegment';
-export {useDateField, useTimeField} from './useDateField';
-export {useDateRangePicker} from './useDateRangePicker';
-export {useDisplayNames} from './useDisplayNames';
+export {useDatePicker} from 'react-aria/useDatePicker';
+
+export {useDateSegment, useDateField, useTimeField} from 'react-aria/useDateField';
+export {useDateRangePicker} from 'react-aria/useDateRangePicker';
+export {useDisplayNames} from 'react-aria/private/datepicker/useDisplayNames';
+export type {AriaDateFieldOptions, DateFieldAria, AriaTimeFieldOptions, DateSegmentAria} from 'react-aria/useDateField';
+export type {DatePickerAria} from 'react-aria/useDatePicker';
+export type {DateRangePickerAria} from 'react-aria/useDateRangePicker';
 
 export type {AriaDateFieldProps, AriaDatePickerProps, AriaDateRangePickerProps, DateRange, DateValue, TimeValue} from '@react-types/datepicker';
-export type {AriaDateFieldOptions, DateFieldAria, AriaTimeFieldOptions} from './useDateField';
-export type {DatePickerAria} from './useDatePicker';
-export type {DateRangePickerAria} from './useDateRangePicker';
-export type {DateSegmentAria} from './useDateSegment';
 export type {AriaTimeFieldProps} from '@react-types/datepicker';
diff --git a/packages/@react-aria/dialog/index.ts b/packages/@react-aria/dialog/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/dialog/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/dialog/package.json b/packages/@react-aria/dialog/package.json
index e0865b44b45..81b7f20409a 100644
--- a/packages/@react-aria/dialog/package.json
+++ b/packages/@react-aria/dialog/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -30,14 +33,15 @@
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "dependencies": {
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/utils": "^3.33.1",
     "@react-types/dialog": "^3.5.24",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/dialog/src/index.ts b/packages/@react-aria/dialog/src/index.ts
index 814368f58fc..a70539686ae 100644
--- a/packages/@react-aria/dialog/src/index.ts
+++ b/packages/@react-aria/dialog/src/index.ts
@@ -9,6 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useDialog} from './useDialog';
+export {useDialog} from 'react-aria/useDialog';
+
+export type {DialogAria} from 'react-aria/useDialog';
 export type {AriaDialogProps} from '@react-types/dialog';
-export type {DialogAria} from './useDialog';
diff --git a/packages/@react-aria/disclosure/index.ts b/packages/@react-aria/disclosure/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/disclosure/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/disclosure/package.json b/packages/@react-aria/disclosure/package.json
index 781b0912c92..2294a79385e 100644
--- a/packages/@react-aria/disclosure/package.json
+++ b/packages/@react-aria/disclosure/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,11 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/ssr": "^3.9.10",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/disclosure": "^3.0.11",
     "@react-types/button": "^3.15.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -38,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/disclosure/src/index.ts b/packages/@react-aria/disclosure/src/index.ts
index 2357cfcbcfb..91bd09b5abc 100644
--- a/packages/@react-aria/disclosure/src/index.ts
+++ b/packages/@react-aria/disclosure/src/index.ts
@@ -9,5 +9,6 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useDisclosure} from './useDisclosure';
-export type {DisclosureAria, AriaDisclosureProps} from './useDisclosure';
+export {useDisclosure} from 'react-aria/useDisclosure';
+
+export type {DisclosureAria, AriaDisclosureProps} from 'react-aria/useDisclosure';
diff --git a/packages/@react-aria/dnd/index.ts b/packages/@react-aria/dnd/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/dnd/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/dnd/package.json b/packages/@react-aria/dnd/package.json
index 7e4e5292520..681aa8e49fb 100644
--- a/packages/@react-aria/dnd/package.json
+++ b/packages/@react-aria/dnd/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -27,16 +30,11 @@
   },
   "dependencies": {
     "@internationalized/string": "^3.2.7",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/live-announcer": "^3.4.4",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/dnd": "^3.7.4",
     "@react-types/button": "^3.15.1",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -44,5 +42,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/dnd/src/index.ts b/packages/@react-aria/dnd/src/index.ts
index 76e0f8a6735..13f20bd441e 100644
--- a/packages/@react-aria/dnd/src/index.ts
+++ b/packages/@react-aria/dnd/src/index.ts
@@ -10,59 +10,20 @@
  * governing permissions and limitations under the License.
  */
 
-export type {DroppableCollectionOptions, DroppableCollectionResult} from './useDroppableCollection';
-export type {DroppableItemOptions, DroppableItemResult} from './useDroppableItem';
-export type {DropIndicatorProps, DropIndicatorAria} from './useDropIndicator';
-export type {DraggableItemProps, DraggableItemResult} from './useDraggableItem';
-export type {DraggableCollectionOptions} from './useDraggableCollection';
-export type {DragPreviewProps} from './DragPreview';
-export type {DragOptions, DragResult} from './useDrag';
-export type {DropOptions, DropResult} from './useDrop';
-export type {ClipboardProps, ClipboardResult} from './useClipboard';
-export type {
-  DirectoryDropItem,
-  DragEndEvent,
-  DraggableCollectionEndEvent,
-  DraggableCollectionMoveEvent,
-  DraggableCollectionStartEvent,
-  DragItem,
-  DragMoveEvent,
-  DragPreviewRenderer,
-  DragStartEvent,
-  DragTypes,
-  DropEnterEvent,
-  DropEvent,
-  DropExitEvent,
-  DropItem,
-  DropMoveEvent,
-  DropOperation,
-  DroppableCollectionDropEvent,
-  DroppableCollectionEnterEvent,
-  DroppableCollectionExitEvent,
-  DroppableCollectionInsertDropEvent,
-  DroppableCollectionMoveEvent,
-  DroppableCollectionOnItemDropEvent,
-  DroppableCollectionReorderEvent,
-  DroppableCollectionRootDropEvent,
-  DropPosition,
-  DropTarget,
-  DropTargetDelegate,
-  FileDropItem,
-  ItemDropTarget,
-  RootDropTarget,
-  TextDropItem
-} from '@react-types/shared';
+export {DIRECTORY_DRAG_TYPE, isDirectoryDropItem, isFileDropItem, isTextDropItem} from 'react-aria/private/dnd/utils';
 
-export {DIRECTORY_DRAG_TYPE} from './utils';
-export {useDrag} from './useDrag';
-export {useDrop} from './useDrop';
-export {useDroppableCollection} from './useDroppableCollection';
-export {useDroppableItem} from './useDroppableItem';
-export {useDropIndicator} from './useDropIndicator';
-export {useDraggableItem} from './useDraggableItem';
-export {useDraggableCollection} from './useDraggableCollection';
-export {useClipboard} from './useClipboard';
-export {DragPreview} from './DragPreview';
-export {ListDropTargetDelegate} from './ListDropTargetDelegate';
-export {isVirtualDragging} from './DragManager';
-export {isDirectoryDropItem, isFileDropItem, isTextDropItem} from './utils';
+export {useDrag} from 'react-aria/useDrag';
+export {useDrop} from 'react-aria/useDrop';
+export {useDroppableCollection, useDroppableItem, useDropIndicator} from 'react-aria/useDroppableCollection';
+export {useDraggableItem, useDraggableCollection} from 'react-aria/useDraggableCollection';
+export {useClipboard} from 'react-aria/useClipboard';
+export {DragPreview} from 'react-aria/DragPreview';
+export {ListDropTargetDelegate} from 'react-aria/ListDropTargetDelegate';
+export {isVirtualDragging} from 'react-aria/private/dnd/DragManager';
+export type {DroppableCollectionOptions, DroppableCollectionResult, DroppableItemOptions, DroppableItemResult, DropIndicatorProps, DropIndicatorAria} from 'react-aria/useDroppableCollection';
+export type {DraggableItemProps, DraggableItemResult, DraggableCollectionOptions} from 'react-aria/useDraggableCollection';
+export type {DragPreviewProps} from 'react-aria/DragPreview';
+export type {DragOptions, DragResult} from 'react-aria/useDrag';
+export type {DropOptions, DropResult} from 'react-aria/useDrop';
+export type {ClipboardProps, ClipboardResult} from 'react-aria/useClipboard';
+export type {DirectoryDropItem, DragEndEvent, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DragTypes, DropEnterEvent, DropEvent, DropExitEvent, DropItem, DropMoveEvent, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, DropTargetDelegate, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
diff --git a/packages/@react-aria/focus/index.ts b/packages/@react-aria/focus/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/focus/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/focus/package.json b/packages/@react-aria/focus/package.json
index ab02780285d..92013cff638 100644
--- a/packages/@react-aria/focus/package.json
+++ b/packages/@react-aria/focus/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,11 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
     "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "clsx": "^2.0.0"
+    "clsx": "^2.0.0",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -38,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/focus/src/index.ts b/packages/@react-aria/focus/src/index.ts
index 2d4aa6ffd6f..5f1feaaed62 100644
--- a/packages/@react-aria/focus/src/index.ts
+++ b/packages/@react-aria/focus/src/index.ts
@@ -10,16 +10,19 @@
  * governing permissions and limitations under the License.
  */
 
-export {FocusScope, useFocusManager, getFocusableTreeWalker, createFocusManager, isElementInChildOfActiveScope} from './FocusScope';
-export {FocusRing} from './FocusRing';
-export {useFocusRing} from './useFocusRing';
-export {useHasTabbableChild} from './useHasTabbableChild';
-export {moveVirtualFocus, dispatchVirtualBlur, dispatchVirtualFocus, getVirtuallyFocusedElement} from './virtualFocus';
-// For backward compatibility.
-export {isFocusable} from '@react-aria/utils';
-export {FocusableProvider, Focusable, useFocusable, focusSafely} from '@react-aria/interactions';
+export {FocusScope, useFocusManager} from 'react-aria/FocusScope';
 
-export type {FocusScopeProps, FocusManager, FocusManagerOptions} from './FocusScope';
-export type {FocusRingProps} from './FocusRing';
-export type {FocusableAria, FocusableOptions, FocusableProviderProps} from '@react-aria/interactions';
-export type {AriaFocusRingProps, FocusRingAria} from './useFocusRing';
+export {getFocusableTreeWalker, createFocusManager, isElementInChildOfActiveScope} from 'react-aria/private/focus/FocusScope';
+export {FocusRing} from 'react-aria/FocusRing';
+export {useFocusRing} from 'react-aria/useFocusRing';
+export {useHasTabbableChild} from 'react-aria/private/focus/useHasTabbableChild';
+export {moveVirtualFocus, dispatchVirtualBlur, dispatchVirtualFocus, getVirtuallyFocusedElement} from 'react-aria/private/focus/virtualFocus';
+export type {FocusScopeProps, FocusManager, FocusManagerOptions} from 'react-aria/FocusScope';
+export type {FocusRingProps} from 'react-aria/FocusRing';
+export type {AriaFocusRingProps, FocusRingAria} from 'react-aria/useFocusRing';
+export {} from 'react-aria/private/utils/isFocusable';
+
+export {Focusable, useFocusable} from 'react-aria/private/interactions/useFocusable';
+export {} from 'react-aria/private/interactions/focusSafely';
+
+export type {FocusableAria, FocusableOptions} from 'react-aria/private/interactions/useFocusable';
diff --git a/packages/@react-aria/form/package.json b/packages/@react-aria/form/package.json
index 96a351277c6..3ad75ede9d7 100644
--- a/packages/@react-aria/form/package.json
+++ b/packages/@react-aria/form/package.json
@@ -7,13 +7,16 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "source": "src/index.ts",
   "files": [
@@ -26,11 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/form": "^3.2.4",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -38,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/form/src/index.ts b/packages/@react-aria/form/src/index.ts
index 138d89c20a1..4a14a8c60df 100644
--- a/packages/@react-aria/form/src/index.ts
+++ b/packages/@react-aria/form/src/index.ts
@@ -10,4 +10,4 @@
  * governing permissions and limitations under the License.
  */
 
-export {useFormValidation} from './useFormValidation';
+export {useFormValidation} from 'react-aria/private/form/useFormValidation';
diff --git a/packages/@react-aria/grid/package.json b/packages/@react-aria/grid/package.json
index 38698f9990c..9c587f4b7e6 100644
--- a/packages/@react-aria/grid/package.json
+++ b/packages/@react-aria/grid/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,19 +29,12 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/live-announcer": "^3.4.4",
-    "@react-aria/selection": "^3.27.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/grid": "^3.11.9",
-    "@react-stately/selection": "^3.20.9",
     "@react-types/checkbox": "^3.10.4",
     "@react-types/grid": "^3.3.8",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -46,5 +42,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/grid/src/index.ts b/packages/@react-aria/grid/src/index.ts
index 58feb7bbdd6..bf0c51edfc8 100644
--- a/packages/@react-aria/grid/src/index.ts
+++ b/packages/@react-aria/grid/src/index.ts
@@ -10,20 +10,20 @@
  * governing permissions and limitations under the License.
  */
 
-export {GridKeyboardDelegate} from './GridKeyboardDelegate';
-export {useGrid} from './useGrid';
-export {useGridRowGroup} from './useGridRowGroup';
-export {useGridRow} from './useGridRow';
-export {useGridCell} from './useGridCell';
-export {useGridSelectionCheckbox} from './useGridSelectionCheckbox';
-export {useHighlightSelectionDescription} from './useHighlightSelectionDescription';
-export {useGridSelectionAnnouncement} from './useGridSelectionAnnouncement';
+export {GridKeyboardDelegate} from 'react-aria/private/grid/GridKeyboardDelegate';
 
-export type {GridProps, GridAria} from './useGrid';
-export type {GridCellAria, GridCellProps} from './useGridCell';
-export type {GridRowGroupAria} from './useGridRowGroup';
-export type {GridRowProps, GridRowAria} from './useGridRow';
-export type {GridKeyboardDelegateOptions} from './GridKeyboardDelegate';
-export type {AriaGridSelectionCheckboxProps, GridSelectionCheckboxAria} from './useGridSelectionCheckbox';
-export type {HighlightSelectionDescriptionProps} from './useHighlightSelectionDescription';
-export type {GridSelectionAnnouncementProps} from './useGridSelectionAnnouncement';
+export {useGrid} from 'react-aria/private/grid/useGrid';
+export {useGridRowGroup} from 'react-aria/private/grid/useGridRowGroup';
+export {useGridRow} from 'react-aria/private/grid/useGridRow';
+export {useGridCell} from 'react-aria/private/grid/useGridCell';
+export {useGridSelectionCheckbox} from 'react-aria/private/grid/useGridSelectionCheckbox';
+export {useHighlightSelectionDescription} from 'react-aria/private/grid/useHighlightSelectionDescription';
+export {useGridSelectionAnnouncement} from 'react-aria/private/grid/useGridSelectionAnnouncement';
+export type {GridProps, GridAria} from 'react-aria/private/grid/useGrid';
+export type {GridCellAria, GridCellProps} from 'react-aria/private/grid/useGridCell';
+export type {GridRowGroupAria} from 'react-aria/private/grid/useGridRowGroup';
+export type {GridRowProps, GridRowAria} from 'react-aria/private/grid/useGridRow';
+export type {GridKeyboardDelegateOptions} from 'react-aria/private/grid/GridKeyboardDelegate';
+export type {AriaGridSelectionCheckboxProps, GridSelectionCheckboxAria} from 'react-aria/private/grid/useGridSelectionCheckbox';
+export type {HighlightSelectionDescriptionProps} from 'react-aria/private/grid/useHighlightSelectionDescription';
+export type {GridSelectionAnnouncementProps} from 'react-aria/private/grid/useGridSelectionAnnouncement';
diff --git a/packages/@react-aria/gridlist/package.json b/packages/@react-aria/gridlist/package.json
index 568a65e0742..a140493c7b0 100644
--- a/packages/@react-aria/gridlist/package.json
+++ b/packages/@react-aria/gridlist/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,16 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/grid": "^3.14.8",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/selection": "^3.27.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/list": "^3.13.4",
-    "@react-stately/tree": "^3.9.6",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -43,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/gridlist/src/index.ts b/packages/@react-aria/gridlist/src/index.ts
index b41d1bbfa32..c970e9caa5b 100644
--- a/packages/@react-aria/gridlist/src/index.ts
+++ b/packages/@react-aria/gridlist/src/index.ts
@@ -10,12 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-export {useGridList} from './useGridList';
-export {useGridListItem} from './useGridListItem';
-export {useGridListSelectionCheckbox} from './useGridListSelectionCheckbox';
-export {useGridListSection} from './useGridListSection';
+export {useGridList, useGridListItem, useGridListSelectionCheckbox, useGridListSection} from 'react-aria/useGridList';
 
-export type {AriaGridListOptions, AriaGridListProps, GridListAria, GridListProps} from './useGridList';
-export type {AriaGridListItemOptions, GridListItemAria} from './useGridListItem';
-export type {AriaGridListSectionProps, GridListSectionAria} from './useGridListSection';
-export type {AriaGridSelectionCheckboxProps, GridSelectionCheckboxAria} from '@react-aria/grid';
+export type {AriaGridListOptions, AriaGridListProps, GridListAria, GridListProps, AriaGridListItemOptions, GridListItemAria, AriaGridListSectionProps, GridListSectionAria} from 'react-aria/useGridList';
+export type {AriaGridSelectionCheckboxProps, GridSelectionCheckboxAria} from 'react-aria/private/grid/useGridSelectionCheckbox';
diff --git a/packages/@react-aria/i18n/index.ts b/packages/@react-aria/i18n/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/i18n/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/i18n/package.json b/packages/@react-aria/i18n/package.json
index 1d44d35b4cf..66e8a1c3bcd 100644
--- a/packages/@react-aria/i18n/package.json
+++ b/packages/@react-aria/i18n/package.json
@@ -19,27 +19,15 @@
       "source": "./src/server.tsx",
       "import": "./server/index.mjs",
       "require": "./server/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "server-module": "server/index.mjs",
   "server-main": "server/index.js",
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
   "targets": {
-    "main": {},
-    "module": {},
-    "server-module": {
-      "source": "src/server.tsx",
-      "outputFormat": "esmodule",
-      "isLibrary": true,
-      "includeNodeModules": false
-    },
-    "server-main": {
-      "source": "src/server.tsx",
-      "outputFormat": "commonjs",
-      "isLibrary": true,
-      "includeNodeModules": false
-    }
+    "types": false
   },
   "files": [
     "dist",
@@ -56,10 +44,9 @@
     "@internationalized/message": "^3.1.8",
     "@internationalized/number": "^3.6.5",
     "@internationalized/string": "^3.2.7",
-    "@react-aria/ssr": "^3.9.10",
-    "@react-aria/utils": "^3.33.1",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/i18n/src/index.ts b/packages/@react-aria/i18n/src/index.ts
index faf3e8a0c98..df0c786dbb0 100644
--- a/packages/@react-aria/i18n/src/index.ts
+++ b/packages/@react-aria/i18n/src/index.ts
@@ -10,20 +10,21 @@
  * governing permissions and limitations under the License.
  */
 
-export {I18nProvider, useLocale} from './I18nProvider';
-export {useMessageFormatter} from './useMessageFormatter';
-export {useLocalizedStringFormatter, useLocalizedStringDictionary} from './useLocalizedStringFormatter';
-export {useListFormatter} from './useListFormatter';
-export {useDateFormatter} from './useDateFormatter';
-export {useNumberFormatter} from './useNumberFormatter';
-export {useCollator} from './useCollator';
-export {useFilter} from './useFilter';
-export {isRTL} from './utils';
+export {I18nProvider, useLocale} from 'react-aria/I18nProvider';
 
-export type {FormatMessage} from './useMessageFormatter';
+export {useMessageFormatter} from 'react-aria/private/i18n/useMessageFormatter';
+export {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+export {useLocalizedStringDictionary} from 'react-aria/private/i18n/useLocalizedStringFormatter';
+export {useListFormatter} from 'react-aria/useListFormatter';
+export {useDateFormatter} from 'react-aria/useDateFormatter';
+export {useNumberFormatter} from 'react-aria/useNumberFormatter';
+export {useCollator} from 'react-aria/useCollator';
+export {useFilter} from 'react-aria/useFilter';
+export {isRTL} from 'react-aria/private/i18n/utils';
+export type {FormatMessage} from 'react-aria/private/i18n/useMessageFormatter';
+export type {I18nProviderProps, Locale} from 'react-aria/I18nProvider';
+export type {DateFormatterOptions} from 'react-aria/useDateFormatter';
+export type {Filter} from 'react-aria/useFilter';
 export type {LocalizedStringFormatter} from '@internationalized/string';
-export type {I18nProviderProps, Locale} from './I18nProvider';
 export type {LocalizedStrings} from '@internationalized/message';
-export type {DateFormatterOptions} from './useDateFormatter';
 export type {DateFormatter} from '@internationalized/date';
-export type {Filter} from './useFilter';
diff --git a/packages/@react-aria/interactions/index.ts b/packages/@react-aria/interactions/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/interactions/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/interactions/package.json b/packages/@react-aria/interactions/package.json
index 9ecfb631288..48391ae7b2c 100644
--- a/packages/@react-aria/interactions/package.json
+++ b/packages/@react-aria/interactions/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,11 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/ssr": "^3.9.10",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/flags": "^3.1.2",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -38,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/interactions/src/index.ts b/packages/@react-aria/interactions/src/index.ts
index 421358ab7af..b2ee77083db 100644
--- a/packages/@react-aria/interactions/src/index.ts
+++ b/packages/@react-aria/interactions/src/index.ts
@@ -10,39 +10,32 @@
  * governing permissions and limitations under the License.
  */
 
-export {Pressable} from './Pressable';
-export {PressResponder, ClearPressResponder} from './PressResponder';
-export {useFocus} from './useFocus';
-export {
-  isFocusVisible,
-  getInteractionModality,
-  setInteractionModality,
-  getPointerType,
-  addWindowFocusTracking,
-  useInteractionModality,
-  useFocusVisible,
-  useFocusVisibleListener
-} from './useFocusVisible';
-export {useFocusWithin} from './useFocusWithin';
-export {useHover} from './useHover';
-export {useInteractOutside} from './useInteractOutside';
-export {useKeyboard} from './useKeyboard';
-export {useMove} from './useMove';
-export {usePress} from './usePress';
-export {useScrollWheel} from './useScrollWheel';
-export {useLongPress} from './useLongPress';
-export {useFocusable, FocusableProvider, Focusable, FocusableContext} from './useFocusable';
-export {focusSafely} from './focusSafely';
+export {Pressable} from 'react-aria/private/interactions/Pressable';
 
-export type {FocusProps, FocusResult} from './useFocus';
-export type {FocusVisibleHandler, FocusVisibleProps, FocusVisibleResult, Modality} from './useFocusVisible';
-export type {FocusWithinProps, FocusWithinResult} from './useFocusWithin';
-export type {HoverProps, HoverResult} from './useHover';
-export type {InteractOutsideProps} from './useInteractOutside';
-export type {KeyboardProps, KeyboardResult} from './useKeyboard';
-export type {PressProps, PressHookProps, PressResult} from './usePress';
+export {PressResponder, ClearPressResponder} from 'react-aria/private/interactions/PressResponder';
+export {useFocus} from 'react-aria/useFocus';
+export {isFocusVisible, getInteractionModality, setInteractionModality, getPointerType, addWindowFocusTracking, useInteractionModality, useFocusVisibleListener} from 'react-aria/private/interactions/useFocusVisible';
+export {useFocusVisible} from 'react-aria/useFocusVisible';
+export {useFocusWithin} from 'react-aria/useFocusWithin';
+export {useHover} from 'react-aria/useHover';
+export {useInteractOutside} from 'react-aria/private/interactions/useInteractOutside';
+export {useKeyboard} from 'react-aria/useKeyboard';
+export {useMove} from 'react-aria/useMove';
+export {usePress} from 'react-aria/usePress';
+export {useScrollWheel} from 'react-aria/private/interactions/useScrollWheel';
+export {useLongPress} from 'react-aria/useLongPress';
+export {useFocusable, FocusableProvider, Focusable, FocusableContext} from 'react-aria/private/interactions/useFocusable';
+export {focusSafely} from 'react-aria/private/interactions/focusSafely';
+export type {FocusProps, FocusResult} from 'react-aria/useFocus';
+export type {FocusVisibleHandler, Modality} from 'react-aria/private/interactions/useFocusVisible';
+export type {FocusVisibleProps, FocusVisibleResult} from 'react-aria/useFocusVisible';
+export type {FocusWithinProps, FocusWithinResult} from 'react-aria/useFocusWithin';
+export type {HoverProps, HoverResult} from 'react-aria/useHover';
+export type {InteractOutsideProps} from 'react-aria/private/interactions/useInteractOutside';
+export type {KeyboardProps, KeyboardResult} from 'react-aria/useKeyboard';
+export type {PressProps, PressHookProps, PressResult} from 'react-aria/usePress';
+export type {MoveResult} from 'react-aria/useMove';
+export type {LongPressProps, LongPressResult} from 'react-aria/useLongPress';
+export type {ScrollWheelProps} from 'react-aria/private/interactions/useScrollWheel';
+export type {FocusableAria, FocusableOptions, FocusableProviderProps} from 'react-aria/private/interactions/useFocusable';
 export type {PressEvent, PressEvents, LongPressEvent, MoveStartEvent, MoveMoveEvent, MoveEndEvent, MoveEvent, MoveEvents, HoverEvent, HoverEvents, FocusEvents, KeyboardEvents} from '@react-types/shared';
-export type {MoveResult} from './useMove';
-export type {LongPressProps, LongPressResult} from './useLongPress';
-export type {ScrollWheelProps} from './useScrollWheel';
-export type {FocusableAria, FocusableOptions, FocusableProviderProps} from './useFocusable';
diff --git a/packages/@react-aria/label/index.ts b/packages/@react-aria/label/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/label/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/label/package.json b/packages/@react-aria/label/package.json
index 2dbe82f85f8..b28af5d8e83 100644
--- a/packages/@react-aria/label/package.json
+++ b/packages/@react-aria/label/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,9 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -36,5 +39,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/label/src/index.ts b/packages/@react-aria/label/src/index.ts
index 3670dd2584b..79cd1858f85 100644
--- a/packages/@react-aria/label/src/index.ts
+++ b/packages/@react-aria/label/src/index.ts
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export type {AriaFieldProps, FieldAria} from './useField';
-export type {LabelAriaProps, LabelAria} from './useLabel';
+export {useField} from 'react-aria/useField';
 
-export {useField} from './useField';
-export {useLabel} from './useLabel';
+export {useLabel} from 'react-aria/useLabel';
+export type {AriaFieldProps, FieldAria} from 'react-aria/useField';
+export type {LabelAriaProps, LabelAria} from 'react-aria/useLabel';
diff --git a/packages/@react-aria/landmark/package.json b/packages/@react-aria/landmark/package.json
index fd9bf8238ee..2466abdb4aa 100644
--- a/packages/@react-aria/landmark/package.json
+++ b/packages/@react-aria/landmark/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,10 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
     "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "use-sync-external-store": "^1.6.0"
+    "use-sync-external-store": "^1.6.0",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -37,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/landmark/src/index.ts b/packages/@react-aria/landmark/src/index.ts
index fe1b74043e6..0932ee9550f 100644
--- a/packages/@react-aria/landmark/src/index.ts
+++ b/packages/@react-aria/landmark/src/index.ts
@@ -10,5 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export type {AriaLandmarkRole, AriaLandmarkProps, LandmarkAria, LandmarkController, LandmarkControllerOptions} from './useLandmark';
-export {useLandmark, UNSTABLE_createLandmarkController} from './useLandmark';
+export {useLandmark} from 'react-aria/useLandmark';
+
+export {UNSTABLE_createLandmarkController} from 'react-aria/private/landmark/useLandmark';
+export type {AriaLandmarkRole, AriaLandmarkProps, LandmarkAria, LandmarkController} from 'react-aria/useLandmark';
+export type {LandmarkControllerOptions} from 'react-aria/private/landmark/useLandmark';
diff --git a/packages/@react-aria/link/index.ts b/packages/@react-aria/link/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/link/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/link/package.json b/packages/@react-aria/link/package.json
index b4bea21cdc5..849e48388a9 100644
--- a/packages/@react-aria/link/package.json
+++ b/packages/@react-aria/link/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,11 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
     "@react-types/link": "^3.6.7",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -38,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/link/src/index.ts b/packages/@react-aria/link/src/index.ts
index e1f5714dc07..ec2450d90de 100644
--- a/packages/@react-aria/link/src/index.ts
+++ b/packages/@react-aria/link/src/index.ts
@@ -9,5 +9,6 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export type {AriaLinkOptions, LinkAria} from './useLink';
-export {useLink} from './useLink';
+export {useLink} from 'react-aria/useLink';
+
+export type {AriaLinkOptions, LinkAria} from 'react-aria/useLink';
diff --git a/packages/@react-aria/listbox/index.ts b/packages/@react-aria/listbox/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-aria/listbox/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/listbox/package.json b/packages/@react-aria/listbox/package.json
index 121d62bcc43..5568bef4b04 100644
--- a/packages/@react-aria/listbox/package.json
+++ b/packages/@react-aria/listbox/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,15 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/label": "^3.7.25",
-    "@react-aria/selection": "^3.27.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/list": "^3.13.4",
     "@react-types/listbox": "^3.7.6",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -42,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/listbox/src/index.ts b/packages/@react-aria/listbox/src/index.ts
index af34544993e..89869bbea59 100644
--- a/packages/@react-aria/listbox/src/index.ts
+++ b/packages/@react-aria/listbox/src/index.ts
@@ -10,12 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-export {useListBox} from './useListBox';
-export {useOption} from './useOption';
-export {useListBoxSection} from './useListBoxSection';
-export {listData, getItemId} from './utils';
+export {useListBox, useOption, useListBoxSection} from 'react-aria/useListBox';
+
+export {listData, getItemId} from 'react-aria/private/listbox/utils';
+export type {AriaListBoxOptions, ListBoxAria, AriaOptionProps, OptionAria, AriaListBoxSectionProps, ListBoxSectionAria} from 'react-aria/useListBox';
 
 export type {AriaListBoxProps} from '@react-types/listbox';
-export type {AriaListBoxOptions, ListBoxAria} from './useListBox';
-export type {AriaOptionProps, OptionAria} from './useOption';
-export type {AriaListBoxSectionProps, ListBoxSectionAria} from './useListBoxSection';
diff --git a/packages/@react-aria/live-announcer/index.ts b/packages/@react-aria/live-announcer/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/live-announcer/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/live-announcer/package.json b/packages/@react-aria/live-announcer/package.json
index 9b60a87a009..d685e325387 100644
--- a/packages/@react-aria/live-announcer/package.json
+++ b/packages/@react-aria/live-announcer/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,9 +29,17 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
+  },
+  "peerDependencies": {
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   }
 }
diff --git a/packages/@react-aria/live-announcer/src/index.ts b/packages/@react-aria/live-announcer/src/index.ts
index 51dbb8c5a46..c83226421b5 100644
--- a/packages/@react-aria/live-announcer/src/index.ts
+++ b/packages/@react-aria/live-announcer/src/index.ts
@@ -9,4 +9,4 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {announce, clearAnnouncer, destroyAnnouncer} from './LiveAnnouncer';
+export {announce, clearAnnouncer, destroyAnnouncer} from 'react-aria/private/live-announcer/LiveAnnouncer';
diff --git a/packages/@react-aria/menu/index.ts b/packages/@react-aria/menu/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/menu/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/menu/package.json b/packages/@react-aria/menu/package.json
index c08d69caca3..f72f2aa5ba6 100644
--- a/packages/@react-aria/menu/package.json
+++ b/packages/@react-aria/menu/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,20 +29,12 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/selection": "^3.27.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/menu": "^3.9.11",
-    "@react-stately/selection": "^3.20.9",
-    "@react-stately/tree": "^3.9.6",
     "@react-types/button": "^3.15.1",
     "@react-types/menu": "^3.10.7",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -47,5 +42,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/menu/src/index.ts b/packages/@react-aria/menu/src/index.ts
index 7aa44be2fce..75d67999641 100644
--- a/packages/@react-aria/menu/src/index.ts
+++ b/packages/@react-aria/menu/src/index.ts
@@ -10,15 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export {useMenuTrigger} from './useMenuTrigger';
-export {useMenu} from './useMenu';
-export {useMenuItem} from './useMenuItem';
-export {useMenuSection} from './useMenuSection';
-export {useSubmenuTrigger} from './useSubmenuTrigger';
+export {useMenuTrigger, useMenu, useMenuItem, useMenuSection, useSubmenuTrigger} from 'react-aria/useMenu';
+
+export type {AriaMenuTriggerProps, MenuTriggerAria, AriaMenuOptions, MenuAria, AriaMenuItemProps, MenuItemAria, AriaMenuSectionProps, MenuSectionAria, AriaSubmenuTriggerProps, SubmenuTriggerAria} from 'react-aria/useMenu';
 
 export type {AriaMenuProps} from '@react-types/menu';
-export type {AriaMenuTriggerProps, MenuTriggerAria} from './useMenuTrigger';
-export type {AriaMenuOptions, MenuAria} from './useMenu';
-export type {AriaMenuItemProps, MenuItemAria} from './useMenuItem';
-export type {AriaMenuSectionProps, MenuSectionAria} from './useMenuSection';
-export type {AriaSubmenuTriggerProps, SubmenuTriggerAria} from './useSubmenuTrigger';
diff --git a/packages/@react-aria/meter/index.ts b/packages/@react-aria/meter/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/meter/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/meter/package.json b/packages/@react-aria/meter/package.json
index 33878256aef..9006fb30930 100644
--- a/packages/@react-aria/meter/package.json
+++ b/packages/@react-aria/meter/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,10 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/progress": "^3.4.30",
     "@react-types/meter": "^3.4.15",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -37,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/meter/src/index.ts b/packages/@react-aria/meter/src/index.ts
index 81807e3bc32..9f279695694 100644
--- a/packages/@react-aria/meter/src/index.ts
+++ b/packages/@react-aria/meter/src/index.ts
@@ -9,6 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useMeter} from './useMeter';
+export {useMeter} from 'react-aria/useMeter';
+
+export type {MeterAria} from 'react-aria/useMeter';
 export type {AriaMeterProps} from '@react-types/meter';
-export type {MeterAria} from './useMeter';
diff --git a/packages/@react-aria/numberfield/index.ts b/packages/@react-aria/numberfield/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/numberfield/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/numberfield/package.json b/packages/@react-aria/numberfield/package.json
index 916c1342721..dc99999b6f3 100644
--- a/packages/@react-aria/numberfield/package.json
+++ b/packages/@react-aria/numberfield/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,18 +29,12 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/live-announcer": "^3.4.4",
-    "@react-aria/spinbutton": "^3.7.2",
-    "@react-aria/textfield": "^3.18.5",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/form": "^3.2.4",
-    "@react-stately/numberfield": "^3.11.0",
     "@react-types/button": "^3.15.1",
     "@react-types/numberfield": "^3.8.18",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -45,5 +42,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/numberfield/src/index.ts b/packages/@react-aria/numberfield/src/index.ts
index 08c0ea848a8..2da950733ad 100644
--- a/packages/@react-aria/numberfield/src/index.ts
+++ b/packages/@react-aria/numberfield/src/index.ts
@@ -9,6 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useNumberField} from './useNumberField';
+export {useNumberField} from 'react-aria/useNumberField';
+
+export type {NumberFieldAria} from 'react-aria/useNumberField';
 export type {AriaNumberFieldProps} from '@react-types/numberfield';
-export type {NumberFieldAria} from './useNumberField';
diff --git a/packages/@react-aria/overlays/index.ts b/packages/@react-aria/overlays/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/overlays/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/overlays/package.json b/packages/@react-aria/overlays/package.json
index fbcbde2b766..622af346e2d 100644
--- a/packages/@react-aria/overlays/package.json
+++ b/packages/@react-aria/overlays/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,18 +29,12 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/ssr": "^3.9.10",
-    "@react-aria/utils": "^3.33.1",
-    "@react-aria/visually-hidden": "^3.8.31",
-    "@react-stately/flags": "^3.1.2",
-    "@react-stately/overlays": "^3.6.23",
     "@react-types/button": "^3.15.1",
     "@react-types/overlays": "^3.9.4",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -45,5 +42,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/overlays/src/index.ts b/packages/@react-aria/overlays/src/index.ts
index cf37e048e7d..4c17114b51a 100644
--- a/packages/@react-aria/overlays/src/index.ts
+++ b/packages/@react-aria/overlays/src/index.ts
@@ -9,25 +9,24 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useOverlayPosition} from './useOverlayPosition';
-export {useOverlay} from './useOverlay';
-export {useOverlayTrigger} from './useOverlayTrigger';
-export {usePreventScroll} from './usePreventScroll';
-export {ModalProvider, useModalProvider, OverlayProvider, OverlayContainer, useModal} from './useModal';
-export {DismissButton} from './DismissButton';
-export {ariaHideOutside} from './ariaHideOutside';
-export {usePopover} from './usePopover';
-export {useModalOverlay} from './useModalOverlay';
-export {Overlay, useOverlayFocusContain} from './Overlay';
-export {UNSAFE_PortalProvider, useUNSAFE_PortalContext} from './PortalProvider';
+export {useOverlayPosition} from 'react-aria/private/overlays/useOverlayPosition';
 
-export type {AriaPositionProps, PositionAria} from './useOverlayPosition';
-export type {AriaOverlayProps, OverlayAria} from './useOverlay';
-export type {OverlayTriggerAria, OverlayTriggerProps} from './useOverlayTrigger';
-export type {AriaModalOptions, ModalAria, ModalProviderAria, ModalProviderProps, OverlayContainerProps} from './useModal';
-export type {DismissButtonProps} from './DismissButton';
-export type {AriaPopoverProps, PopoverAria} from './usePopover';
-export type {AriaModalOverlayProps, ModalOverlayAria} from './useModalOverlay';
-export type {OverlayProps} from './Overlay';
+export {useOverlay} from 'react-aria/private/overlays/useOverlay';
+export {useOverlayTrigger} from 'react-aria/useOverlayTrigger';
+export {usePreventScroll} from 'react-aria/private/overlays/usePreventScroll';
+export {ModalProvider, useModalProvider, OverlayProvider, OverlayContainer, useModal} from 'react-aria/private/overlays/useModal';
+export {DismissButton, Overlay} from 'react-aria/Overlay';
+export {ariaHideOutside} from 'react-aria/private/overlays/ariaHideOutside';
+export {usePopover} from 'react-aria/usePopover';
+export {useModalOverlay} from 'react-aria/useModalOverlay';
+export {useOverlayFocusContain} from 'react-aria/private/overlays/Overlay';
+export {UNSAFE_PortalProvider, useUNSAFE_PortalContext} from 'react-aria/PortalProvider';
+export type {AriaPositionProps, PositionAria} from 'react-aria/private/overlays/useOverlayPosition';
+export type {AriaOverlayProps, OverlayAria} from 'react-aria/private/overlays/useOverlay';
+export type {OverlayTriggerAria, OverlayTriggerProps} from 'react-aria/useOverlayTrigger';
+export type {AriaModalOptions, ModalAria, ModalProviderAria, ModalProviderProps, OverlayContainerProps} from 'react-aria/private/overlays/useModal';
+export type {DismissButtonProps, OverlayProps} from 'react-aria/Overlay';
+export type {AriaPopoverProps, PopoverAria} from 'react-aria/usePopover';
+export type {AriaModalOverlayProps, ModalOverlayAria} from 'react-aria/useModalOverlay';
+export type {PortalProviderProps, PortalProviderContextValue} from 'react-aria/PortalProvider';
 export type {Placement, PlacementAxis, PositionProps} from '@react-types/overlays';
-export type {PortalProviderProps, PortalProviderContextValue} from './PortalProvider';
diff --git a/packages/@react-aria/progress/index.ts b/packages/@react-aria/progress/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/progress/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/progress/package.json b/packages/@react-aria/progress/package.json
index 6e2fde52ad0..f21e54524d4 100644
--- a/packages/@react-aria/progress/package.json
+++ b/packages/@react-aria/progress/package.json
@@ -6,13 +6,16 @@
   "main": "dist/index.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/index.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/index.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,12 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/label": "^3.7.25",
-    "@react-aria/utils": "^3.33.1",
     "@react-types/progress": "^3.5.18",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -39,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/progress/src/index.ts b/packages/@react-aria/progress/src/index.ts
index ac384c94212..aa7c328308f 100644
--- a/packages/@react-aria/progress/src/index.ts
+++ b/packages/@react-aria/progress/src/index.ts
@@ -9,6 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useProgressBar} from './useProgressBar';
+export {useProgressBar} from 'react-aria/useProgressBar';
+
+export type {ProgressBarAria} from 'react-aria/useProgressBar';
 export type {AriaProgressBarProps} from '@react-types/progress';
-export type {ProgressBarAria} from './useProgressBar';
diff --git a/packages/@react-aria/radio/index.ts b/packages/@react-aria/radio/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/radio/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/radio/package.json b/packages/@react-aria/radio/package.json
index 97b389aa89c..5ed2dc802c9 100644
--- a/packages/@react-aria/radio/package.json
+++ b/packages/@react-aria/radio/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,16 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/form": "^3.1.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/label": "^3.7.25",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/radio": "^3.11.5",
     "@react-types/radio": "^3.9.4",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -43,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/radio/src/index.ts b/packages/@react-aria/radio/src/index.ts
index 1b82ecdef0f..80ed49cbbd3 100644
--- a/packages/@react-aria/radio/src/index.ts
+++ b/packages/@react-aria/radio/src/index.ts
@@ -9,9 +9,8 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useRadio} from './useRadio';
-export {useRadioGroup} from './useRadioGroup';
+export {useRadio, useRadioGroup} from 'react-aria/useRadioGroup';
+
+export type {RadioAria, RadioGroupAria} from 'react-aria/useRadioGroup';
 export type {AriaRadioGroupProps, AriaRadioProps} from '@react-types/radio';
 export type {Orientation} from '@react-types/shared';
-export type {RadioAria} from './useRadio';
-export type {RadioGroupAria} from './useRadioGroup';
diff --git a/packages/@react-aria/searchfield/index.ts b/packages/@react-aria/searchfield/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/searchfield/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/searchfield/package.json b/packages/@react-aria/searchfield/package.json
index e4c2ff2ce17..2890aae6285 100644
--- a/packages/@react-aria/searchfield/package.json
+++ b/packages/@react-aria/searchfield/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,14 +29,12 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/textfield": "^3.18.5",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/searchfield": "^3.5.19",
     "@react-types/button": "^3.15.1",
     "@react-types/searchfield": "^3.6.8",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -41,5 +42,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/searchfield/src/index.ts b/packages/@react-aria/searchfield/src/index.ts
index dd49a5e49b5..ef031a98500 100644
--- a/packages/@react-aria/searchfield/src/index.ts
+++ b/packages/@react-aria/searchfield/src/index.ts
@@ -9,6 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useSearchField} from './useSearchField';
+export {useSearchField} from 'react-aria/useSearchField';
+
+export type {SearchFieldAria} from 'react-aria/useSearchField';
 export type {AriaSearchFieldProps} from '@react-types/searchfield';
-export type {SearchFieldAria} from './useSearchField';
diff --git a/packages/@react-aria/select/index.ts b/packages/@react-aria/select/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-aria/select/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/select/package.json b/packages/@react-aria/select/package.json
index ac64411179b..fa43af3cf07 100644
--- a/packages/@react-aria/select/package.json
+++ b/packages/@react-aria/select/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,20 +29,12 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/form": "^3.1.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/label": "^3.7.25",
-    "@react-aria/listbox": "^3.15.3",
-    "@react-aria/menu": "^3.21.0",
-    "@react-aria/selection": "^3.27.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-aria/visually-hidden": "^3.8.31",
-    "@react-stately/select": "^3.9.2",
     "@react-types/button": "^3.15.1",
     "@react-types/select": "^3.12.2",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -47,5 +42,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/select/src/index.ts b/packages/@react-aria/select/src/index.ts
index a13dccd4b04..477c20ea24e 100644
--- a/packages/@react-aria/select/src/index.ts
+++ b/packages/@react-aria/select/src/index.ts
@@ -9,8 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useSelect} from './useSelect';
-export {useHiddenSelect, HiddenSelect} from './HiddenSelect';
-export type {AriaSelectOptions, SelectAria} from './useSelect';
-export type {AriaHiddenSelectProps, AriaHiddenSelectOptions, HiddenSelectProps, HiddenSelectAria} from './HiddenSelect';
+export {useSelect, useHiddenSelect, HiddenSelect} from 'react-aria/useSelect';
+
+export type {AriaSelectOptions, SelectAria, AriaHiddenSelectProps, AriaHiddenSelectOptions, HiddenSelectProps, HiddenSelectAria} from 'react-aria/useSelect';
 export type {AriaSelectProps} from '@react-types/select';
diff --git a/packages/@react-aria/selection/index.ts b/packages/@react-aria/selection/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/selection/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/selection/package.json b/packages/@react-aria/selection/package.json
index 539029372e8..682fd5bb812 100644
--- a/packages/@react-aria/selection/package.json
+++ b/packages/@react-aria/selection/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,13 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/selection": "^3.20.9",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -40,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/selection/src/index.ts b/packages/@react-aria/selection/src/index.ts
index 189275687bd..7d0330905a8 100644
--- a/packages/@react-aria/selection/src/index.ts
+++ b/packages/@react-aria/selection/src/index.ts
@@ -10,14 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-export {useSelectableCollection} from './useSelectableCollection';
-export {useSelectableItem} from './useSelectableItem';
-export {useSelectableList} from './useSelectableList';
-export {ListKeyboardDelegate} from './ListKeyboardDelegate';
-export {DOMLayoutDelegate} from './DOMLayoutDelegate';
-export {useTypeSelect} from './useTypeSelect';
+export {useSelectableCollection} from 'react-aria/private/selection/useSelectableCollection';
 
-export type {AriaSelectableCollectionOptions, SelectableCollectionAria} from './useSelectableCollection';
-export type {AriaSelectableListOptions, SelectableListAria} from './useSelectableList';
-export type {SelectableItemOptions, SelectableItemStates, SelectableItemAria} from './useSelectableItem';
-export type {AriaTypeSelectOptions, TypeSelectAria} from './useTypeSelect';
+export {useSelectableItem} from 'react-aria/private/selection/useSelectableItem';
+export {useSelectableList} from 'react-aria/private/selection/useSelectableList';
+export {ListKeyboardDelegate} from 'react-aria/ListKeyboardDelegate';
+export {DOMLayoutDelegate} from 'react-aria/private/selection/DOMLayoutDelegate';
+export {useTypeSelect} from 'react-aria/private/selection/useTypeSelect';
+export type {AriaSelectableCollectionOptions, SelectableCollectionAria} from 'react-aria/private/selection/useSelectableCollection';
+export type {AriaSelectableListOptions, SelectableListAria} from 'react-aria/private/selection/useSelectableList';
+export type {SelectableItemOptions, SelectableItemStates, SelectableItemAria} from 'react-aria/private/selection/useSelectableItem';
+export type {AriaTypeSelectOptions, TypeSelectAria} from 'react-aria/private/selection/useTypeSelect';
diff --git a/packages/@react-aria/separator/index.ts b/packages/@react-aria/separator/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/separator/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/separator/package.json b/packages/@react-aria/separator/package.json
index 6104cef6dfb..0e3c3bd3b47 100644
--- a/packages/@react-aria/separator/package.json
+++ b/packages/@react-aria/separator/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,9 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -36,5 +39,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/separator/src/index.ts b/packages/@react-aria/separator/src/index.ts
index 97ad5024394..310ae255f03 100644
--- a/packages/@react-aria/separator/src/index.ts
+++ b/packages/@react-aria/separator/src/index.ts
@@ -9,5 +9,6 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export type {SeparatorProps, SeparatorAria} from './useSeparator';
-export {useSeparator} from './useSeparator';
+export {useSeparator} from 'react-aria/useSeparator';
+
+export type {SeparatorProps, SeparatorAria} from 'react-aria/useSeparator';
diff --git a/packages/@react-aria/slider/index.ts b/packages/@react-aria/slider/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/slider/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/slider/package.json b/packages/@react-aria/slider/package.json
index b1c2ad6c48d..15a53815739 100644
--- a/packages/@react-aria/slider/package.json
+++ b/packages/@react-aria/slider/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,14 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/label": "^3.7.25",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/slider": "^3.7.5",
     "@react-types/shared": "^3.33.1",
     "@react-types/slider": "^3.8.4",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -41,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/slider/src/index.ts b/packages/@react-aria/slider/src/index.ts
index b4d966cd3f4..02a5ae19c4b 100644
--- a/packages/@react-aria/slider/src/index.ts
+++ b/packages/@react-aria/slider/src/index.ts
@@ -9,10 +9,9 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useSlider} from './useSlider';
-export {useSliderThumb} from './useSliderThumb';
+export {useSlider, useSliderThumb} from 'react-aria/useSlider';
+
+export type {SliderAria, AriaSliderThumbOptions, SliderThumbAria} from 'react-aria/useSlider';
 export type {AriaSliderProps} from '@react-types/slider';
-export type {SliderAria} from './useSlider';
-export type {AriaSliderThumbOptions, SliderThumbAria} from './useSliderThumb';
 export type {AriaSliderThumbProps} from '@react-types/slider';
 export type {Orientation} from '@react-types/shared';
diff --git a/packages/@react-aria/spinbutton/index.ts b/packages/@react-aria/spinbutton/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/spinbutton/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/spinbutton/package.json b/packages/@react-aria/spinbutton/package.json
index 68a7f30d9fa..6ea3bbfd62a 100644
--- a/packages/@react-aria/spinbutton/package.json
+++ b/packages/@react-aria/spinbutton/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,12 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/live-announcer": "^3.4.4",
-    "@react-aria/utils": "^3.33.1",
     "@react-types/button": "^3.15.1",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -39,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/spinbutton/src/index.ts b/packages/@react-aria/spinbutton/src/index.ts
index 892752621f6..920b46786e0 100644
--- a/packages/@react-aria/spinbutton/src/index.ts
+++ b/packages/@react-aria/spinbutton/src/index.ts
@@ -9,5 +9,6 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export type {SpinButtonProps, SpinbuttonAria} from './useSpinButton';
-export {useSpinButton} from './useSpinButton';
+export {useSpinButton} from 'react-aria/private/spinbutton/useSpinButton';
+
+export type {SpinButtonProps, SpinbuttonAria} from 'react-aria/private/spinbutton/useSpinButton';
diff --git a/packages/@react-aria/ssr/index.ts b/packages/@react-aria/ssr/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/ssr/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/ssr/package.json b/packages/@react-aria/ssr/package.json
index 6359445159c..f31ac57c687 100644
--- a/packages/@react-aria/ssr/package.json
+++ b/packages/@react-aria/ssr/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,10 +29,12 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
@@ -38,11 +43,6 @@
     "node": ">= 12"
   },
   "targets": {
-    "main": {
-      "context": "node"
-    },
-    "module": {
-      "context": "node"
-    }
+    "types": false
   }
 }
diff --git a/packages/@react-aria/ssr/src/index.ts b/packages/@react-aria/ssr/src/index.ts
index ee5c98be727..0c5bade7d0d 100644
--- a/packages/@react-aria/ssr/src/index.ts
+++ b/packages/@react-aria/ssr/src/index.ts
@@ -9,5 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {SSRProvider, useSSRSafeId, useIsSSR} from './SSRProvider';
-export type {SSRProviderProps} from './SSRProvider';
+export {SSRProvider, useIsSSR} from 'react-aria/SSRProvider';
+
+export {useSSRSafeId} from 'react-aria/private/ssr/SSRProvider';
+export type {SSRProviderProps} from 'react-aria/SSRProvider';
diff --git a/packages/@react-aria/steplist/index.ts b/packages/@react-aria/steplist/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/steplist/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/steplist/package.json b/packages/@react-aria/steplist/package.json
index e9063848fce..b82b97f8ceb 100644
--- a/packages/@react-aria/steplist/package.json
+++ b/packages/@react-aria/steplist/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,12 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/selection": "^3.27.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/steplist": "3.0.0-alpha.21",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -39,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/steplist/src/index.ts b/packages/@react-aria/steplist/src/index.ts
index bca22fe6e9e..2bca57109ed 100644
--- a/packages/@react-aria/steplist/src/index.ts
+++ b/packages/@react-aria/steplist/src/index.ts
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export {useStepList} from './useStepList';
-export {useStepListItem} from './useStepListItem';
+export {useStepList} from 'react-aria/private/steplist/useStepList';
 
-export type {AriaStepListProps, StepListAria} from './useStepList';
-export type {AriaStepListItemProps, StepListItemAria} from './useStepListItem';
+export {useStepListItem} from 'react-aria/private/steplist/useStepListItem';
+export type {AriaStepListProps, StepListAria} from 'react-aria/private/steplist/useStepList';
+export type {AriaStepListItemProps, StepListItemAria} from 'react-aria/private/steplist/useStepListItem';
diff --git a/packages/@react-aria/switch/index.ts b/packages/@react-aria/switch/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/switch/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/switch/package.json b/packages/@react-aria/switch/package.json
index 3fb2cfa85a6..2a7cb8b9050 100644
--- a/packages/@react-aria/switch/package.json
+++ b/packages/@react-aria/switch/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,11 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/toggle": "^3.12.5",
-    "@react-stately/toggle": "^3.9.5",
     "@react-types/shared": "^3.33.1",
     "@react-types/switch": "^3.5.17",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -38,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/switch/src/index.ts b/packages/@react-aria/switch/src/index.ts
index 9b83896dfc5..1446a0149b3 100644
--- a/packages/@react-aria/switch/src/index.ts
+++ b/packages/@react-aria/switch/src/index.ts
@@ -9,7 +9,8 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useSwitch} from './useSwitch';
+export {useSwitch} from 'react-aria/useSwitch';
+
+export type {SwitchAria} from 'react-aria/useSwitch';
 
 export type {AriaSwitchProps} from '@react-types/switch';
-export type {SwitchAria} from './useSwitch';
diff --git a/packages/@react-aria/table/index.ts b/packages/@react-aria/table/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-aria/table/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/table/package.json b/packages/@react-aria/table/package.json
index 9aa6a6b9377..0b361428ac6 100644
--- a/packages/@react-aria/table/package.json
+++ b/packages/@react-aria/table/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,22 +29,13 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/button": "^3.14.5",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/grid": "^3.14.8",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/live-announcer": "^3.4.4",
-    "@react-aria/utils": "^3.33.1",
-    "@react-aria/visually-hidden": "^3.8.31",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/flags": "^3.1.2",
-    "@react-stately/table": "^3.15.4",
     "@react-types/checkbox": "^3.10.4",
     "@react-types/grid": "^3.3.8",
     "@react-types/shared": "^3.33.1",
     "@react-types/table": "^3.13.6",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -49,5 +43,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/table/src/index.ts b/packages/@react-aria/table/src/index.ts
index 6317607551e..be6edefc5da 100644
--- a/packages/@react-aria/table/src/index.ts
+++ b/packages/@react-aria/table/src/index.ts
@@ -10,20 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export {useTable} from './useTable';
-export {useTableColumnHeader} from './useTableColumnHeader';
-export {useTableRow} from './useTableRow';
-export {useTableHeaderRow} from './useTableHeaderRow';
-export {useTableCell} from './useTableCell';
-export {useTableSelectionCheckbox, useTableSelectAllCheckbox} from './useTableSelectionCheckbox';
-export {useTableColumnResize} from './useTableColumnResize';
+export {useTable, useTableColumnHeader, useTableRow, useTableHeaderRow, useTableCell, useTableSelectionCheckbox, useTableSelectAllCheckbox, useTableColumnResize, useTableRowGroup} from 'react-aria/useTable';
 
-export {useTableRowGroup} from './useTableRowGroup';
-
-export type {AriaTableProps} from './useTable';
-export type {GridAria, GridRowAria, GridRowProps} from '@react-aria/grid';
-export type {AriaTableColumnHeaderProps, TableColumnHeaderAria} from './useTableColumnHeader';
-export type {AriaTableCellProps, TableCellAria} from './useTableCell';
-export type {TableHeaderRowAria} from './useTableHeaderRow';
-export type {AriaTableSelectionCheckboxProps, TableSelectionCheckboxAria, TableSelectAllCheckboxAria} from './useTableSelectionCheckbox';
-export type {AriaTableColumnResizeProps, TableColumnResizeAria} from './useTableColumnResize';
+export type {AriaTableProps, AriaTableColumnHeaderProps, TableColumnHeaderAria, AriaTableCellProps, TableCellAria, TableHeaderRowAria, AriaTableSelectionCheckboxProps, TableSelectionCheckboxAria, TableSelectAllCheckboxAria, AriaTableColumnResizeProps, TableColumnResizeAria} from 'react-aria/useTable';
+export type {GridAria} from 'react-aria/private/grid/useGrid';
+export type {GridRowAria, GridRowProps} from 'react-aria/private/grid/useGridRow';
diff --git a/packages/@react-aria/tabs/index.ts b/packages/@react-aria/tabs/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/tabs/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/tabs/package.json b/packages/@react-aria/tabs/package.json
index 0e9b896bcd6..76604270ec6 100644
--- a/packages/@react-aria/tabs/package.json
+++ b/packages/@react-aria/tabs/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,14 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/selection": "^3.27.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/tabs": "^3.8.9",
     "@react-types/shared": "^3.33.1",
     "@react-types/tabs": "^3.3.22",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -41,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/tabs/src/index.ts b/packages/@react-aria/tabs/src/index.ts
index e36be83acab..51c4b5cfb8b 100644
--- a/packages/@react-aria/tabs/src/index.ts
+++ b/packages/@react-aria/tabs/src/index.ts
@@ -9,11 +9,8 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useTab} from './useTab';
-export {useTabPanel} from './useTabPanel';
-export {useTabList} from './useTabList';
+export {useTab, useTabPanel, useTabList} from 'react-aria/useTabList';
+
+export type {TabAria, TabPanelAria, AriaTabListOptions, TabListAria} from 'react-aria/useTabList';
 export type {AriaTabListProps, AriaTabPanelProps, AriaTabProps} from '@react-types/tabs';
 export type {Orientation} from '@react-types/shared';
-export type {TabAria} from './useTab';
-export type {TabPanelAria} from './useTabPanel';
-export type {AriaTabListOptions, TabListAria} from './useTabList';
diff --git a/packages/@react-aria/tag/index.ts b/packages/@react-aria/tag/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/tag/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/tag/package.json b/packages/@react-aria/tag/package.json
index 73d20234a0c..391c32a4fc4 100644
--- a/packages/@react-aria/tag/package.json
+++ b/packages/@react-aria/tag/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,16 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/gridlist": "^3.14.4",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/label": "^3.7.25",
-    "@react-aria/selection": "^3.27.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/list": "^3.13.4",
     "@react-types/button": "^3.15.1",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -43,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/tag/src/index.ts b/packages/@react-aria/tag/src/index.ts
index ba6b79fa279..4560307ecc5 100644
--- a/packages/@react-aria/tag/src/index.ts
+++ b/packages/@react-aria/tag/src/index.ts
@@ -10,8 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-export {useTag} from './useTag';
-export {useTagGroup} from './useTagGroup';
+export {useTag, useTagGroup} from 'react-aria/useTagGroup';
 
-export type {TagGroupAria, AriaTagGroupProps, AriaTagGroupOptions} from './useTagGroup';
-export type {AriaTagProps, TagAria} from './useTag';
+export type {TagGroupAria, AriaTagGroupProps, AriaTagGroupOptions, AriaTagProps, TagAria} from 'react-aria/useTagGroup';
diff --git a/packages/@react-aria/test-utils/package.json b/packages/@react-aria/test-utils/package.json
index c69f6b4b80a..2b79e0b7bfe 100644
--- a/packages/@react-aria/test-utils/package.json
+++ b/packages/@react-aria/test-utils/package.json
@@ -7,14 +7,11 @@
   "module": "dist/module.js",
   "exports": {
     "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
+    "types": "./dist/types/src/index.d.ts",
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
-  "types": "dist/types.d.ts",
+  "types": "./dist/types/src/index.d.ts",
   "source": "src/index.ts",
   "files": [
     "dist",
@@ -37,5 +34,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/textfield/index.ts b/packages/@react-aria/textfield/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/textfield/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/textfield/package.json b/packages/@react-aria/textfield/package.json
index 519d3f768a6..7d16ae16a92 100644
--- a/packages/@react-aria/textfield/package.json
+++ b/packages/@react-aria/textfield/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,15 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/form": "^3.1.5",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/label": "^3.7.25",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/form": "^3.2.4",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/shared": "^3.33.1",
     "@react-types/textfield": "^3.12.8",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -42,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/textfield/src/index.ts b/packages/@react-aria/textfield/src/index.ts
index 17f0fc3ef7b..913401fc9d6 100644
--- a/packages/@react-aria/textfield/src/index.ts
+++ b/packages/@react-aria/textfield/src/index.ts
@@ -9,8 +9,8 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export type {TextFieldAria} from './useTextField';
-export {useTextField} from './useTextField';
-export {useFormattedTextField} from './useFormattedTextField';
-export type {AriaTextFieldOptions} from './useTextField';
+export {useTextField} from 'react-aria/useTextField';
+
+export {useFormattedTextField} from 'react-aria/private/textfield/useFormattedTextField';
+export type {TextFieldAria, AriaTextFieldOptions} from 'react-aria/useTextField';
 export type {AriaTextFieldProps} from '@react-types/textfield';
diff --git a/packages/@react-aria/toast/index.ts b/packages/@react-aria/toast/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/toast/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/toast/package.json b/packages/@react-aria/toast/package.json
index 15804612224..15755d460fa 100644
--- a/packages/@react-aria/toast/package.json
+++ b/packages/@react-aria/toast/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,14 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/landmark": "^3.0.10",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/toast": "^3.1.3",
     "@react-types/button": "^3.15.1",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -41,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/toast/src/index.ts b/packages/@react-aria/toast/src/index.ts
index e12f6adf336..b823de15068 100644
--- a/packages/@react-aria/toast/src/index.ts
+++ b/packages/@react-aria/toast/src/index.ts
@@ -9,8 +9,6 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useToast} from './useToast';
-export {useToastRegion} from './useToastRegion';
+export {useToast, useToastRegion} from 'react-aria/useToast';
 
-export type {AriaToastRegionProps, ToastRegionAria} from './useToastRegion';
-export type {AriaToastProps, ToastAria} from './useToast';
+export type {AriaToastRegionProps, ToastRegionAria, AriaToastProps, ToastAria} from 'react-aria/useToast';
diff --git a/packages/@react-aria/toggle/index.ts b/packages/@react-aria/toggle/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/toggle/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/toggle/package.json b/packages/@react-aria/toggle/package.json
index 3a43ce588a1..7c3c166893e 100644
--- a/packages/@react-aria/toggle/package.json
+++ b/packages/@react-aria/toggle/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,12 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/toggle": "^3.9.5",
     "@react-types/checkbox": "^3.10.4",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -39,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/toggle/src/index.ts b/packages/@react-aria/toggle/src/index.ts
index df0eb656be9..2ddc6e54299 100644
--- a/packages/@react-aria/toggle/src/index.ts
+++ b/packages/@react-aria/toggle/src/index.ts
@@ -10,6 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-export {useToggle} from './useToggle';
-export type {AriaToggleProps} from '@react-types/checkbox';
-export type {ToggleAria} from './useToggle';
+export {useToggle} from 'react-aria/private/toggle/useToggle';
+
+export type {ToggleAria} from 'react-aria/private/toggle/useToggle';
+export type {} from '@react-types/checkbox';
diff --git a/packages/@react-aria/toolbar/package.json b/packages/@react-aria/toolbar/package.json
index 1904410b595..d3cde862b83 100644
--- a/packages/@react-aria/toolbar/package.json
+++ b/packages/@react-aria/toolbar/package.json
@@ -7,13 +7,16 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "source": "src/index.ts",
   "files": [
@@ -26,11 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/utils": "^3.33.1",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -38,5 +39,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/toolbar/src/index.ts b/packages/@react-aria/toolbar/src/index.ts
index f44c7261f07..b5dadb2771b 100644
--- a/packages/@react-aria/toolbar/src/index.ts
+++ b/packages/@react-aria/toolbar/src/index.ts
@@ -10,5 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-export {useToolbar} from './useToolbar';
-export type {AriaToolbarProps, ToolbarAria} from './useToolbar';
+export {useToolbar} from 'react-aria/private/toolbar/useToolbar';
+
+export type {AriaToolbarProps, ToolbarAria} from 'react-aria/private/toolbar/useToolbar';
diff --git a/packages/@react-aria/tooltip/index.ts b/packages/@react-aria/tooltip/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/tooltip/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/tooltip/package.json b/packages/@react-aria/tooltip/package.json
index cf21fec6218..83490f8f199 100644
--- a/packages/@react-aria/tooltip/package.json
+++ b/packages/@react-aria/tooltip/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,12 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/tooltip": "^3.5.11",
     "@react-types/shared": "^3.33.1",
     "@react-types/tooltip": "^3.5.2",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -39,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/tooltip/src/index.ts b/packages/@react-aria/tooltip/src/index.ts
index 4c7f8648b21..bc63be1c5c5 100644
--- a/packages/@react-aria/tooltip/src/index.ts
+++ b/packages/@react-aria/tooltip/src/index.ts
@@ -9,8 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useTooltip} from './useTooltip';
-export {useTooltipTrigger} from './useTooltipTrigger';
+export {useTooltip, useTooltipTrigger} from 'react-aria/useTooltipTrigger';
+
+export type {TooltipAria, TooltipTriggerAria} from 'react-aria/useTooltipTrigger';
 export type {AriaTooltipProps, TooltipTriggerProps} from '@react-types/tooltip';
-export type {TooltipAria} from './useTooltip';
-export type {TooltipTriggerAria} from './useTooltipTrigger';
diff --git a/packages/@react-aria/tree/index.ts b/packages/@react-aria/tree/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/tree/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/tree/package.json b/packages/@react-aria/tree/package.json
index f4d30b9f77d..5f39412a5c9 100644
--- a/packages/@react-aria/tree/package.json
+++ b/packages/@react-aria/tree/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,14 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/gridlist": "^3.14.4",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/selection": "^3.27.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/tree": "^3.9.6",
     "@react-types/button": "^3.15.1",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -41,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/tree/src/index.ts b/packages/@react-aria/tree/src/index.ts
index 469042985a2..a331b47e6df 100644
--- a/packages/@react-aria/tree/src/index.ts
+++ b/packages/@react-aria/tree/src/index.ts
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export {useTree} from './useTree';
-export {useTreeItem} from './useTreeItem';
+export {useTree} from 'react-aria/private/tree/useTree';
 
-export type {AriaTreeOptions, AriaTreeProps, TreeAria, TreeProps} from './useTree';
-export type {AriaTreeItemOptions, TreeItemAria} from './useTreeItem';
+export {useTreeItem} from 'react-aria/private/tree/useTreeItem';
+export type {AriaTreeOptions, AriaTreeProps, TreeAria, TreeProps} from 'react-aria/private/tree/useTree';
+export type {AriaTreeItemOptions, TreeItemAria} from 'react-aria/private/tree/useTreeItem';
diff --git a/packages/@react-aria/utils/index.ts b/packages/@react-aria/utils/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/utils/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/utils/package.json b/packages/@react-aria/utils/package.json
index 9dd71c9ac61..ee7040d180f 100644
--- a/packages/@react-aria/utils/package.json
+++ b/packages/@react-aria/utils/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,12 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/ssr": "^3.9.10",
-    "@react-stately/flags": "^3.1.2",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "clsx": "^2.0.0"
+    "clsx": "^2.0.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -39,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/utils/src/index.ts b/packages/@react-aria/utils/src/index.ts
index 549ff02a2ec..081d1c72d25 100644
--- a/packages/@react-aria/utils/src/index.ts
+++ b/packages/@react-aria/utils/src/index.ts
@@ -9,48 +9,49 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {CLEAR_FOCUS_EVENT, FOCUS_EVENT} from './constants';
-export {isMac, isIPhone, isIPad, isIOS, isAppleDevice, isWebKit, isChrome, isAndroid, isFirefox} from './platform';
-export {openLink, getSyntheticLinkProps, useSyntheticLinkProps, RouterProvider, shouldClientNavigate, useRouter, useLinkProps, handleLinkClick} from './openLink';
-export {useId, mergeIds, useSlotId} from './useId';
-export {chain} from './chain';
-export {createShadowTreeWalker, ShadowTreeWalker} from './shadowdom/ShadowTreeWalker';
-export {getActiveElement, getEventTarget, nodeContains, isFocusWithin} from './shadowdom/DOMFunctions';
-export {getOwnerDocument, getOwnerWindow, isShadowRoot} from './domHelpers';
-export {mergeProps} from './mergeProps';
-export {mergeRefs} from './mergeRefs';
-export {filterDOMProps} from './filterDOMProps';
-export {focusWithoutScrolling} from './focusWithoutScrolling';
-export {getOffset} from './getOffset';
-export {runAfterTransition} from './runAfterTransition';
-export {useDrag1D} from './useDrag1D';
-export {useGlobalListeners} from './useGlobalListeners';
-export {useLabels} from './useLabels';
-export {useObjectRef} from './useObjectRef';
-export {useUpdateEffect} from './useUpdateEffect';
-export {useUpdateLayoutEffect} from './useUpdateLayoutEffect';
-export {useLayoutEffect} from './useLayoutEffect';
-export {useResizeObserver} from './useResizeObserver';
-export {useSyncRef} from './useSyncRef';
-export {getScrollParent} from './getScrollParent';
-export {getScrollParents} from './getScrollParents';
-export {isScrollable} from './isScrollable';
-export {useViewportSize} from './useViewportSize';
-export {useDescription} from './useDescription';
-export {useEvent} from './useEvent';
-export {useValueEffect} from './useValueEffect';
-export {scrollIntoView, scrollIntoViewport} from './scrollIntoView';
-export {clamp, snapValueToStep} from '@react-stately/utils';
-export {isVirtualClick, isVirtualPointerEvent} from './isVirtualEvent';
-export {useEffectEvent} from './useEffectEvent';
-export {useDeepMemo} from './useDeepMemo';
-export {useFormReset} from './useFormReset';
-export {useLoadMore} from './useLoadMore';
-export {useLoadMoreSentinel, useLoadMoreSentinel as UNSTABLE_useLoadMoreSentinel} from './useLoadMoreSentinel';
-export {inertValue} from './inertValue';
-export {isCtrlKeyPressed, willOpenKeyboard} from './keyboard';
-export {useEnterAnimation, useExitAnimation} from './animation';
-export {isFocusable, isTabbable} from './isFocusable';
-export {getNonce} from './getNonce';
+export {CLEAR_FOCUS_EVENT, FOCUS_EVENT} from 'react-aria/private/utils/constants';
 
-export type {LoadMoreSentinelProps} from './useLoadMoreSentinel';
+export {isMac, isIPhone, isIPad, isIOS, isAppleDevice, isWebKit, isChrome, isAndroid, isFirefox} from 'react-aria/private/utils/platform';
+export {openLink, getSyntheticLinkProps, useSyntheticLinkProps, RouterProvider, shouldClientNavigate, useRouter, useLinkProps, handleLinkClick} from 'react-aria/private/utils/openLink';
+export {useId} from 'react-aria/useId';
+export {mergeIds, useSlotId} from 'react-aria/private/utils/useId';
+export {chain} from 'react-aria/private/utils/chain';
+export {createShadowTreeWalker, ShadowTreeWalker} from 'react-aria/private/utils/shadowdom/ShadowTreeWalker';
+export {getActiveElement, getEventTarget, nodeContains, isFocusWithin} from 'react-aria/private/utils/shadowdom/DOMFunctions';
+export {getOwnerDocument, getOwnerWindow, isShadowRoot} from 'react-aria/private/utils/domHelpers';
+export {mergeProps} from 'react-aria/mergeProps';
+export {mergeRefs} from 'react-aria/private/utils/mergeRefs';
+export {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+export {focusWithoutScrolling} from 'react-aria/private/utils/focusWithoutScrolling';
+export {getOffset} from 'react-aria/private/utils/getOffset';
+export {runAfterTransition} from 'react-aria/private/utils/runAfterTransition';
+export {useDrag1D} from 'react-aria/private/utils/useDrag1D';
+export {useGlobalListeners} from 'react-aria/private/utils/useGlobalListeners';
+export {useLabels} from 'react-aria/private/utils/useLabels';
+export {useObjectRef} from 'react-aria/useObjectRef';
+export {useUpdateEffect} from 'react-aria/private/utils/useUpdateEffect';
+export {useUpdateLayoutEffect} from 'react-aria/private/utils/useUpdateLayoutEffect';
+export {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+export {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
+export {useSyncRef} from 'react-aria/private/utils/useSyncRef';
+export {getScrollParent} from 'react-aria/private/utils/getScrollParent';
+export {getScrollParents} from 'react-aria/private/utils/getScrollParents';
+export {isScrollable} from 'react-aria/private/utils/isScrollable';
+export {useViewportSize} from 'react-aria/private/utils/useViewportSize';
+export {useDescription} from 'react-aria/private/utils/useDescription';
+export {useEvent} from 'react-aria/private/utils/useEvent';
+export {useValueEffect} from 'react-aria/private/utils/useValueEffect';
+export {scrollIntoView, scrollIntoViewport} from 'react-aria/private/utils/scrollIntoView';
+export {isVirtualClick, isVirtualPointerEvent} from 'react-aria/private/utils/isVirtualEvent';
+export {useEffectEvent} from 'react-aria/private/utils/useEffectEvent';
+export {useDeepMemo} from 'react-aria/private/utils/useDeepMemo';
+export {useFormReset} from 'react-aria/private/utils/useFormReset';
+export {useLoadMore} from 'react-aria/private/utils/useLoadMore';
+export {useLoadMoreSentinel, useLoadMoreSentinel as UNSTABLE_useLoadMoreSentinel} from 'react-aria/private/utils/useLoadMoreSentinel';
+export {inertValue} from 'react-aria/private/utils/inertValue';
+export {isCtrlKeyPressed, willOpenKeyboard} from 'react-aria/private/utils/keyboard';
+export {useEnterAnimation, useExitAnimation} from 'react-aria/private/utils/animation';
+export {isFocusable, isTabbable} from 'react-aria/private/utils/isFocusable';
+export {getNonce} from 'react-aria/private/utils/getNonce';
+export type {LoadMoreSentinelProps} from 'react-aria/private/utils/useLoadMoreSentinel';
+export {} from 'react-stately/private/utils/number';
diff --git a/packages/@react-aria/virtualizer/index.ts b/packages/@react-aria/virtualizer/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/virtualizer/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/virtualizer/package.json b/packages/@react-aria/virtualizer/package.json
index 93f28c9f4ac..f7a83117cd6 100644
--- a/packages/@react-aria/virtualizer/package.json
+++ b/packages/@react-aria/virtualizer/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,12 +29,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-stately/virtualizer": "^4.4.6",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -39,5 +40,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/virtualizer/src/index.ts b/packages/@react-aria/virtualizer/src/index.ts
index efeb2a766ac..e54a86313fd 100644
--- a/packages/@react-aria/virtualizer/src/index.ts
+++ b/packages/@react-aria/virtualizer/src/index.ts
@@ -10,10 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-export type {RTLOffsetType} from './utils';
-export type {VirtualizerItemOptions} from './useVirtualizerItem';
-export {Virtualizer} from './Virtualizer';
-export {useVirtualizerItem} from './useVirtualizerItem';
-export {VirtualizerItem, layoutInfoToStyle} from './VirtualizerItem';
-export {ScrollView, useScrollView} from './ScrollView';
-export {getRTLOffsetType, getScrollLeft, setScrollLeft} from './utils';
+export {Virtualizer} from 'react-aria/private/virtualizer/Virtualizer';
+
+export {useVirtualizerItem} from 'react-aria/private/virtualizer/useVirtualizerItem';
+export {VirtualizerItem, layoutInfoToStyle} from 'react-aria/private/virtualizer/VirtualizerItem';
+export {ScrollView, useScrollView} from 'react-aria/private/virtualizer/ScrollView';
+export {getRTLOffsetType, getScrollLeft, setScrollLeft} from 'react-aria/private/virtualizer/utils';
+export type {RTLOffsetType} from 'react-aria/private/virtualizer/utils';
+export type {VirtualizerItemOptions} from 'react-aria/private/virtualizer/useVirtualizerItem';
diff --git a/packages/@react-aria/visually-hidden/index.ts b/packages/@react-aria/visually-hidden/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-aria/visually-hidden/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/visually-hidden/package.json b/packages/@react-aria/visually-hidden/package.json
index a4028884581..ac9eaf61126 100644
--- a/packages/@react-aria/visually-hidden/package.json
+++ b/packages/@react-aria/visually-hidden/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -28,10 +31,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -39,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-aria/visually-hidden/src/index.ts b/packages/@react-aria/visually-hidden/src/index.ts
index aa756ba6acc..e1b6d97dc53 100644
--- a/packages/@react-aria/visually-hidden/src/index.ts
+++ b/packages/@react-aria/visually-hidden/src/index.ts
@@ -9,5 +9,6 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useVisuallyHidden, VisuallyHidden} from './VisuallyHidden';
-export type {VisuallyHiddenAria, VisuallyHiddenProps} from './VisuallyHidden';
+export {useVisuallyHidden, VisuallyHidden} from 'react-aria/VisuallyHidden';
+
+export type {VisuallyHiddenAria, VisuallyHiddenProps} from 'react-aria/VisuallyHidden';
diff --git a/packages/@react-spectrum/accordion/index.ts b/packages/@react-spectrum/accordion/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/accordion/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/accordion/package.json b/packages/@react-spectrum/accordion/package.json
index c5241b7e8c3..deb810d0644 100644
--- a/packages/@react-spectrum/accordion/package.json
+++ b/packages/@react-spectrum/accordion/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,34 +27,24 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
     "@swc/helpers": "^0.5.0",
-    "react-aria-components": "^1.16.0"
+    "react-aria-components": "^1.16.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/accordion/src/index.ts b/packages/@react-spectrum/accordion/src/index.ts
index 95c4ba7cba1..467644ec84b 100644
--- a/packages/@react-spectrum/accordion/src/index.ts
+++ b/packages/@react-spectrum/accordion/src/index.ts
@@ -10,5 +10,6 @@
  * governing permissions and limitations under the License.
  */
 /// <reference types="css-module-types" />
-export {Disclosure, Accordion, DisclosureTitle, DisclosurePanel} from './Accordion';
-export type {SpectrumAccordionProps, SpectrumDisclosureProps, SpectrumDisclosurePanelProps, SpectrumDisclosureTitleProps} from './Accordion';
+export {Disclosure, Accordion, DisclosureTitle, DisclosurePanel} from '@adobe/react-spectrum/Accordion';
+
+export type {SpectrumAccordionProps, SpectrumDisclosureProps, SpectrumDisclosurePanelProps, SpectrumDisclosureTitleProps} from '@adobe/react-spectrum/Accordion';
diff --git a/packages/@react-spectrum/actionbar/index.ts b/packages/@react-spectrum/actionbar/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/actionbar/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/actionbar/package.json b/packages/@react-spectrum/actionbar/package.json
index 73065daadd9..c9c30a950e6 100644
--- a/packages/@react-spectrum/actionbar/package.json
+++ b/packages/@react-spectrum/actionbar/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,43 +27,25 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/live-announcer": "^3.4.4",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/actiongroup": "^3.11.7",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/overlays": "^5.9.3",
-    "@react-spectrum/text": "^3.5.25",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/collections": "^3.12.10",
     "@react-types/actionbar": "^3.1.21",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/actionbar/src/index.ts b/packages/@react-spectrum/actionbar/src/index.ts
index b07d20e23c2..2a3002363cc 100644
--- a/packages/@react-spectrum/actionbar/src/index.ts
+++ b/packages/@react-spectrum/actionbar/src/index.ts
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 /// <reference types="css-module-types" />
-export {ActionBar} from './ActionBar';
-export {ActionBarContainer} from './ActionBarContainer';
-export {Item} from '@react-stately/collections';
+export {ActionBar, ActionBarContainer} from '@adobe/react-spectrum/ActionBar';
+
+export {Item} from 'react-stately/Item';
 export type {SpectrumActionBarContainerProps} from '@react-types/actionbar';
 export type {SpectrumActionBarProps} from '@react-types/actionbar';
diff --git a/packages/@react-spectrum/actiongroup/index.ts b/packages/@react-spectrum/actiongroup/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-spectrum/actiongroup/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/actiongroup/package.json b/packages/@react-spectrum/actiongroup/package.json
index 7fcc3547a84..d2207e2fdde 100644
--- a/packages/@react-spectrum/actiongroup/package.json
+++ b/packages/@react-spectrum/actiongroup/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,45 +27,26 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/actiongroup": "^3.7.24",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/menu": "^3.22.11",
-    "@react-spectrum/text": "^3.5.25",
-    "@react-spectrum/tooltip": "^3.8.2",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/list": "^3.13.4",
     "@react-types/actiongroup": "^3.4.23",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
     "@spectrum-icons/workflow": "^4.2.28",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.2.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/actiongroup/src/index.ts b/packages/@react-spectrum/actiongroup/src/index.ts
index a72ca7baf34..40afce20f72 100644
--- a/packages/@react-spectrum/actiongroup/src/index.ts
+++ b/packages/@react-spectrum/actiongroup/src/index.ts
@@ -10,6 +10,7 @@
  * governing permissions and limitations under the License.
  */
 /// <reference types="css-module-types" />
-export {ActionGroup} from './ActionGroup';
-export {Item} from '@react-stately/collections';
+export {ActionGroup} from '@adobe/react-spectrum/ActionGroup';
+
+export {Item} from 'react-stately/Item';
 export type {SpectrumActionGroupProps} from '@react-types/actiongroup';
diff --git a/packages/@react-spectrum/autocomplete/package.json b/packages/@react-spectrum/autocomplete/package.json
index cb266f112da..d2b9c6bc7b9 100644
--- a/packages/@react-spectrum/autocomplete/package.json
+++ b/packages/@react-spectrum/autocomplete/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,53 +27,26 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/autocomplete": "3.0.0-rc.6",
-    "@react-aria/button": "^3.14.5",
-    "@react-aria/dialog": "^3.5.34",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/form": "^3.1.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/label": "^3.7.25",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/form": "^3.7.22",
-    "@react-spectrum/label": "^3.16.22",
-    "@react-spectrum/listbox": "^3.15.11",
-    "@react-spectrum/overlays": "^5.9.3",
-    "@react-spectrum/progress": "^3.7.23",
-    "@react-spectrum/textfield": "^3.14.5",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/combobox": "^3.13.0",
     "@react-types/autocomplete": "3.0.0-alpha.38",
     "@react-types/button": "^3.15.1",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/autocomplete/src/index.ts b/packages/@react-spectrum/autocomplete/src/index.ts
index 113271364ab..60076129896 100644
--- a/packages/@react-spectrum/autocomplete/src/index.ts
+++ b/packages/@react-spectrum/autocomplete/src/index.ts
@@ -10,6 +10,8 @@
  * governing permissions and limitations under the License.
  */
 /// <reference types="css-module-types" />
-export {SearchAutocomplete} from './SearchAutocomplete';
-export {Item, Section} from '@react-stately/collections';
-export type {SpectrumSearchAutocompleteProps} from '@react-types/autocomplete';
+export {SearchAutocomplete} from '@adobe/react-spectrum/private/autocomplete/SearchAutocomplete';
+
+export {Item} from 'react-stately/Item';
+export {Section} from 'react-stately/Section';
+export type {} from '@react-types/autocomplete';
diff --git a/packages/@react-spectrum/avatar/package.json b/packages/@react-spectrum/avatar/package.json
index 7a962d086ec..3fd9e453e30 100644
--- a/packages/@react-spectrum/avatar/package.json
+++ b/packages/@react-spectrum/avatar/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,33 +27,23 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/avatar": "^3.0.21",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.2.1",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/avatar/src/index.ts b/packages/@react-spectrum/avatar/src/index.ts
index c340ea0ebc7..c6ed89f907d 100644
--- a/packages/@react-spectrum/avatar/src/index.ts
+++ b/packages/@react-spectrum/avatar/src/index.ts
@@ -10,5 +10,6 @@
  * governing permissions and limitations under the License.
  */
 /// <reference types="css-module-types" />
-export {Avatar} from './Avatar';
+export {Avatar} from '@adobe/react-spectrum/Avatar';
+
 export type {SpectrumAvatarProps} from '@react-types/avatar';
diff --git a/packages/@react-spectrum/badge/package.json b/packages/@react-spectrum/badge/package.json
index e0b463a05cb..5fe560a3e57 100644
--- a/packages/@react-spectrum/badge/package.json
+++ b/packages/@react-spectrum/badge/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,34 +27,23 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/text": "^3.5.25",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/badge": "^3.1.23",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/badge/src/index.ts b/packages/@react-spectrum/badge/src/index.ts
index 5e5a05029eb..c63b5727e7a 100644
--- a/packages/@react-spectrum/badge/src/index.ts
+++ b/packages/@react-spectrum/badge/src/index.ts
@@ -12,5 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export {Badge} from './Badge';
+export {Badge} from '@adobe/react-spectrum/Badge';
+
 export type {SpectrumBadgeProps} from '@react-types/badge';
diff --git a/packages/@react-spectrum/breadcrumbs/index.ts b/packages/@react-spectrum/breadcrumbs/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/breadcrumbs/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/breadcrumbs/package.json b/packages/@react-spectrum/breadcrumbs/package.json
index 55fcb61ebaf..4605ef1d2c4 100644
--- a/packages/@react-spectrum/breadcrumbs/package.json
+++ b/packages/@react-spectrum/breadcrumbs/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,41 +27,25 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/breadcrumbs": "^3.5.32",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/menu": "^3.22.11",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/collections": "^3.12.10",
     "@react-types/breadcrumbs": "^3.7.19",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/breadcrumbs/src/index.ts b/packages/@react-spectrum/breadcrumbs/src/index.ts
index 650e47cee7d..97152c1365f 100644
--- a/packages/@react-spectrum/breadcrumbs/src/index.ts
+++ b/packages/@react-spectrum/breadcrumbs/src/index.ts
@@ -10,6 +10,7 @@
  * governing permissions and limitations under the License.
  */
 /// <reference types="css-module-types" />
-export {Breadcrumbs} from './Breadcrumbs';
-export {Item} from '@react-stately/collections';
+export {Breadcrumbs} from '@adobe/react-spectrum/Breadcrumbs';
+
+export {Item} from 'react-stately/Item';
 export type {SpectrumBreadcrumbsProps} from '@react-types/breadcrumbs';
diff --git a/packages/@react-spectrum/button/index.ts b/packages/@react-spectrum/button/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/button/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/button/package.json b/packages/@react-spectrum/button/package.json
index ff775bf89e2..0f9fc694f80 100644
--- a/packages/@react-spectrum/button/package.json
+++ b/packages/@react-spectrum/button/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,35 +27,20 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/button": "^3.14.5",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/progress": "^3.7.23",
-    "@react-spectrum/text": "^3.5.25",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/toggle": "^3.9.5",
     "@react-types/button": "^3.15.1",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
@@ -60,7 +48,6 @@
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/button/src/index.ts b/packages/@react-spectrum/button/src/index.ts
index 00ffe0148e3..747b1f460a0 100644
--- a/packages/@react-spectrum/button/src/index.ts
+++ b/packages/@react-spectrum/button/src/index.ts
@@ -10,10 +10,11 @@
  * governing permissions and limitations under the License.
  */
 /// <reference types="css-module-types" />
-export {Button} from './Button';
-export {ActionButton} from './ActionButton';
-export {FieldButton} from './FieldButton';
-export {LogicButton} from './LogicButton';
-export {ClearButton} from './ClearButton';
-export {ToggleButton} from './ToggleButton';
+export {Button} from '@adobe/react-spectrum/Button';
+
+export {ActionButton} from '@adobe/react-spectrum/ActionButton';
+export {FieldButton} from '@adobe/react-spectrum/private/button/FieldButton';
+export {LogicButton} from '@adobe/react-spectrum/LogicButton';
+export {ClearButton} from '@adobe/react-spectrum/private/button/ClearButton';
+export {ToggleButton} from '@adobe/react-spectrum/ToggleButton';
 export type {SpectrumActionButtonProps, SpectrumButtonProps, SpectrumLogicButtonProps, SpectrumToggleButtonProps} from '@react-types/button';
diff --git a/packages/@react-spectrum/buttongroup/index.ts b/packages/@react-spectrum/buttongroup/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/buttongroup/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/buttongroup/package.json b/packages/@react-spectrum/buttongroup/package.json
index ef6c8ec1930..f59a7e6e76c 100644
--- a/packages/@react-spectrum/buttongroup/package.json
+++ b/packages/@react-spectrum/buttongroup/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,34 +27,24 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/buttongroup": "^3.3.23",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
     "@spectrum-icons/workflow": "^4.0.0"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/buttongroup/src/index.ts b/packages/@react-spectrum/buttongroup/src/index.ts
index 1d1d63d8b0a..b40f623f927 100644
--- a/packages/@react-spectrum/buttongroup/src/index.ts
+++ b/packages/@react-spectrum/buttongroup/src/index.ts
@@ -10,5 +10,6 @@
  * governing permissions and limitations under the License.
  */
 /// <reference types="css-module-types" />
-export {ButtonGroup} from './ButtonGroup';
+export {ButtonGroup} from '@adobe/react-spectrum/ButtonGroup';
+
 export type {SpectrumButtonGroupProps} from '@react-types/buttongroup';
diff --git a/packages/@react-spectrum/calendar/index.ts b/packages/@react-spectrum/calendar/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/calendar/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/calendar/package.json b/packages/@react-spectrum/calendar/package.json
index 6d3af0f29ab..5cfdc7cdd77 100644
--- a/packages/@react-spectrum/calendar/package.json
+++ b/packages/@react-spectrum/calendar/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,16 +27,7 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
@@ -41,28 +35,20 @@
   },
   "dependencies": {
     "@internationalized/date": "^3.12.0",
-    "@react-aria/calendar": "^3.9.5",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-aria/visually-hidden": "^3.8.31",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/label": "^3.16.22",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/calendar": "^3.9.3",
     "@react-types/button": "^3.15.1",
     "@react-types/calendar": "^3.8.3",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
     "@react-spectrum/test-utils-internal": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/calendar/src/index.ts b/packages/@react-spectrum/calendar/src/index.ts
index 34b2be5dc25..88de2f4fbe2 100644
--- a/packages/@react-spectrum/calendar/src/index.ts
+++ b/packages/@react-spectrum/calendar/src/index.ts
@@ -12,6 +12,7 @@
 
 /// <reference types="css-module-types" />
 
-export {Calendar} from './Calendar';
-export {RangeCalendar} from './RangeCalendar';
+export {Calendar} from '@adobe/react-spectrum/Calendar';
+
+export {RangeCalendar} from '@adobe/react-spectrum/RangeCalendar';
 export type {SpectrumCalendarProps, SpectrumRangeCalendarProps} from '@react-types/calendar';
diff --git a/packages/@react-spectrum/card/index.ts b/packages/@react-spectrum/card/index.ts
deleted file mode 100644
index b1a5da03bc4..00000000000
--- a/packages/@react-spectrum/card/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2021 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/card/package.json b/packages/@react-spectrum/card/package.json
index ac07c99bfc8..3cfd8ad4fb3 100644
--- a/packages/@react-spectrum/card/package.json
+++ b/packages/@react-spectrum/card/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,45 +27,25 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/grid": "^3.14.8",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-aria/virtualizer": "^4.1.13",
-    "@react-spectrum/checkbox": "^3.10.7",
-    "@react-spectrum/progress": "^3.7.23",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/grid": "^3.11.9",
-    "@react-stately/list": "^3.13.4",
-    "@react-stately/virtualizer": "^4.4.6",
     "@react-types/card": "3.0.0-alpha.43",
     "@react-types/provider": "^3.8.15",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/card/src/index.ts b/packages/@react-spectrum/card/src/index.ts
index 3b993a1f4f1..c725f289ef2 100644
--- a/packages/@react-spectrum/card/src/index.ts
+++ b/packages/@react-spectrum/card/src/index.ts
@@ -12,13 +12,13 @@
 
 /// <reference types="css-module-types" />
 
-export type {GalleryLayoutOptions} from './GalleryLayout';
-export type {GridLayoutOptions} from './GridLayout';
-export type {WaterfallLayoutOptions} from './WaterfallLayout';
+export {CardView} from '@adobe/react-spectrum/private/card/CardView';
 
-export {CardView} from './CardView';
-export {GalleryLayout} from './GalleryLayout';
-export {GridLayout} from './GridLayout';
-export {WaterfallLayout} from './WaterfallLayout';
-export {Card} from './Card';
-export type {SpectrumCardViewProps} from '@react-types/card';
+export {GalleryLayout} from '@adobe/react-spectrum/private/card/GalleryLayout';
+export {GridLayout} from '@adobe/react-spectrum/private/card/GridLayout';
+export {WaterfallLayout} from '@adobe/react-spectrum/private/card/WaterfallLayout';
+export {Card} from '@adobe/react-spectrum/private/card/Card';
+export type {GalleryLayoutOptions} from '@adobe/react-spectrum/private/card/GalleryLayout';
+export type {GridLayoutOptions} from '@adobe/react-spectrum/private/card/GridLayout';
+export type {WaterfallLayoutOptions} from '@adobe/react-spectrum/private/card/WaterfallLayout';
+export type {} from '@react-types/card';
diff --git a/packages/@react-spectrum/checkbox/index.ts b/packages/@react-spectrum/checkbox/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/checkbox/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/checkbox/package.json b/packages/@react-spectrum/checkbox/package.json
index 68e8e4eb26e..6fc38e9cd90 100644
--- a/packages/@react-spectrum/checkbox/package.json
+++ b/packages/@react-spectrum/checkbox/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,42 +27,27 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/checkbox": "^3.16.5",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-spectrum/form": "^3.7.22",
-    "@react-spectrum/label": "^3.16.22",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/checkbox": "^3.7.5",
-    "@react-stately/toggle": "^3.9.5",
     "@react-types/checkbox": "^3.10.4",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
     "@swc/helpers": "^0.5.0",
-    "react-aria-components": "^1.16.0"
+    "react-aria-components": "^1.16.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/checkbox/src/index.ts b/packages/@react-spectrum/checkbox/src/index.ts
index c46a38dd276..70a2161b008 100644
--- a/packages/@react-spectrum/checkbox/src/index.ts
+++ b/packages/@react-spectrum/checkbox/src/index.ts
@@ -10,6 +10,7 @@
  * governing permissions and limitations under the License.
  */
 /// <reference types="css-module-types" />
-export {Checkbox} from './Checkbox';
-export {CheckboxGroup} from './CheckboxGroup';
+export {Checkbox} from '@adobe/react-spectrum/Checkbox';
+
+export {CheckboxGroup} from '@adobe/react-spectrum/CheckboxGroup';
 export type {SpectrumCheckboxProps, SpectrumCheckboxGroupProps} from '@react-types/checkbox';
diff --git a/packages/@react-spectrum/color/index.ts b/packages/@react-spectrum/color/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/color/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/color/package.json b/packages/@react-spectrum/color/package.json
index 30ea7ab10d8..6b54974ebd9 100644
--- a/packages/@react-spectrum/color/package.json
+++ b/packages/@react-spectrum/color/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,48 +27,27 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/color": "^3.1.5",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/dialog": "^3.9.7",
-    "@react-spectrum/form": "^3.7.22",
-    "@react-spectrum/label": "^3.16.22",
-    "@react-spectrum/overlays": "^5.9.3",
-    "@react-spectrum/picker": "^3.16.7",
-    "@react-spectrum/textfield": "^3.14.5",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-spectrum/view": "^3.6.26",
-    "@react-stately/color": "^3.9.5",
     "@react-types/color": "^3.1.4",
     "@react-types/shared": "^3.33.1",
     "@react-types/textfield": "^3.12.8",
     "@swc/helpers": "^0.5.0",
-    "react-aria-components": "^1.16.0"
+    "react-aria-components": "^1.16.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
     "@react-spectrum/style-macro-s1": "3.0.0-alpha.5"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/color/src/index.ts b/packages/@react-spectrum/color/src/index.ts
index 96172309a7a..84641a99efa 100644
--- a/packages/@react-spectrum/color/src/index.ts
+++ b/packages/@react-spectrum/color/src/index.ts
@@ -11,18 +11,17 @@
  */
 
 /// <reference types="css-module-types" />
-export {ColorArea} from './ColorArea';
-export {ColorWheel} from './ColorWheel';
-export {ColorSlider} from './ColorSlider';
-export {ColorField} from './ColorField';
-export {ColorSwatch} from './ColorSwatch';
-export {ColorPicker} from './ColorPicker';
-export {ColorEditor} from './ColorEditor';
-export {ColorSwatchPicker} from './ColorSwatchPicker';
-export {parseColor, getColorChannels} from '@react-stately/color';
+export {ColorArea} from '@adobe/react-spectrum/ColorArea';
+
+export {ColorWheel} from '@adobe/react-spectrum/ColorWheel';
+export {ColorSlider} from '@adobe/react-spectrum/ColorSlider';
+export {ColorField} from '@adobe/react-spectrum/ColorField';
+export {ColorSwatch} from '@adobe/react-spectrum/ColorSwatch';
+export {ColorPicker, ColorEditor} from '@adobe/react-spectrum/ColorPicker';
+export {ColorSwatchPicker} from '@adobe/react-spectrum/ColorSwatchPicker';
+export type {SpectrumColorSwatchProps} from '@adobe/react-spectrum/ColorSwatch';
+export type {SpectrumColorPickerProps, SpectrumColorEditorProps} from '@adobe/react-spectrum/ColorPicker';
+export type {SpectrumColorSwatchPickerProps} from '@adobe/react-spectrum/ColorSwatchPicker';
+export {parseColor, getColorChannels} from 'react-stately/Color';
 export type {SpectrumColorAreaProps, SpectrumColorFieldProps, SpectrumColorSliderProps, SpectrumColorWheelProps} from '@react-types/color';
-export type {SpectrumColorSwatchProps} from './ColorSwatch';
-export type {SpectrumColorPickerProps} from './ColorPicker';
-export type {SpectrumColorEditorProps} from './ColorEditor';
-export type {SpectrumColorSwatchPickerProps} from './ColorSwatchPicker';
 export type {Color, ColorSpace, ColorFormat} from '@react-types/color';
diff --git a/packages/@react-spectrum/combobox/index.ts b/packages/@react-spectrum/combobox/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-spectrum/combobox/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/combobox/package.json b/packages/@react-spectrum/combobox/package.json
index 5fbfc36c6fa..272eba5e9d7 100644
--- a/packages/@react-spectrum/combobox/package.json
+++ b/packages/@react-spectrum/combobox/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,53 +27,26 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/button": "^3.14.5",
-    "@react-aria/combobox": "^3.15.0",
-    "@react-aria/dialog": "^3.5.34",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/form": "^3.1.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/label": "^3.7.25",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/form": "^3.7.22",
-    "@react-spectrum/label": "^3.16.22",
-    "@react-spectrum/listbox": "^3.15.11",
-    "@react-spectrum/overlays": "^5.9.3",
-    "@react-spectrum/progress": "^3.7.23",
-    "@react-spectrum/textfield": "^3.14.5",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/combobox": "^3.13.0",
     "@react-types/button": "^3.15.1",
     "@react-types/combobox": "^3.14.0",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/combobox/src/index.ts b/packages/@react-spectrum/combobox/src/index.ts
index 4499d3795c0..18b770ff047 100644
--- a/packages/@react-spectrum/combobox/src/index.ts
+++ b/packages/@react-spectrum/combobox/src/index.ts
@@ -12,6 +12,8 @@
 
 /// <reference types="css-module-types" />
 
-export {ComboBox} from './ComboBox';
-export {Item, Section} from '@react-stately/collections';
+export {ComboBox} from '@adobe/react-spectrum/ComboBox';
+
+export {Item} from 'react-stately/Item';
+export {Section} from 'react-stately/Section';
 export type {SpectrumComboBoxProps} from '@react-types/combobox';
diff --git a/packages/@react-spectrum/contextualhelp/index.ts b/packages/@react-spectrum/contextualhelp/index.ts
deleted file mode 100644
index b1a5da03bc4..00000000000
--- a/packages/@react-spectrum/contextualhelp/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2021 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/contextualhelp/package.json b/packages/@react-spectrum/contextualhelp/package.json
index 326bbf30ab5..e0a765f16d3 100644
--- a/packages/@react-spectrum/contextualhelp/package.json
+++ b/packages/@react-spectrum/contextualhelp/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,31 +27,19 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/dialog": "^3.9.7",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/contextualhelp": "^3.2.24",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/workflow": "^4.2.28",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
@@ -56,7 +47,6 @@
     "@react-spectrum/view": "^3.1.3"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/contextualhelp/src/index.ts b/packages/@react-spectrum/contextualhelp/src/index.ts
index f7137ca1cbb..5e3cbc08b85 100644
--- a/packages/@react-spectrum/contextualhelp/src/index.ts
+++ b/packages/@react-spectrum/contextualhelp/src/index.ts
@@ -10,5 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-export {ContextualHelp} from './ContextualHelp';
+export {ContextualHelp} from '@adobe/react-spectrum/ContextualHelp';
+
 export type {SpectrumContextualHelpProps} from '@react-types/contextualhelp';
diff --git a/packages/@react-spectrum/datepicker/index.ts b/packages/@react-spectrum/datepicker/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/datepicker/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/datepicker/package.json b/packages/@react-spectrum/datepicker/package.json
index bddd888efd5..8795b791afe 100644
--- a/packages/@react-spectrum/datepicker/package.json
+++ b/packages/@react-spectrum/datepicker/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,16 +27,7 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
@@ -41,32 +35,20 @@
   },
   "dependencies": {
     "@internationalized/date": "^3.12.0",
-    "@react-aria/datepicker": "^3.16.1",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/calendar": "^3.7.11",
-    "@react-spectrum/dialog": "^3.9.7",
-    "@react-spectrum/form": "^3.7.22",
-    "@react-spectrum/label": "^3.16.22",
-    "@react-spectrum/layout": "^3.6.22",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-spectrum/view": "^3.6.26",
-    "@react-stately/datepicker": "^3.16.1",
     "@react-types/datepicker": "^3.13.5",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
     "@spectrum-icons/workflow": "^4.2.28",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
     "@react-spectrum/test-utils-internal": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/datepicker/src/index.ts b/packages/@react-spectrum/datepicker/src/index.ts
index 612874b37cb..3c002daac25 100644
--- a/packages/@react-spectrum/datepicker/src/index.ts
+++ b/packages/@react-spectrum/datepicker/src/index.ts
@@ -12,8 +12,9 @@
 
 /// <reference types="css-module-types" />
 
-export {DatePicker} from './DatePicker';
-export {DateRangePicker} from './DateRangePicker';
-export {TimeField} from './TimeField';
-export {DateField} from './DateField';
+export {DatePicker} from '@adobe/react-spectrum/DatePicker';
+
+export {DateRangePicker} from '@adobe/react-spectrum/DateRangePicker';
+export {TimeField} from '@adobe/react-spectrum/TimeField';
+export {DateField} from '@adobe/react-spectrum/DateField';
 export type {SpectrumDateFieldProps, SpectrumDatePickerProps, SpectrumDateRangePickerProps, SpectrumTimeFieldProps} from '@react-types/datepicker';
diff --git a/packages/@react-spectrum/dialog/index.ts b/packages/@react-spectrum/dialog/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/dialog/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/dialog/package.json b/packages/@react-spectrum/dialog/package.json
index 102494cae13..0f501be4549 100644
--- a/packages/@react-spectrum/dialog/package.json
+++ b/packages/@react-spectrum/dialog/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,48 +27,27 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/dialog": "^3.5.34",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/buttongroup": "^3.6.29",
-    "@react-spectrum/divider": "^3.5.30",
-    "@react-spectrum/layout": "^3.6.22",
-    "@react-spectrum/overlays": "^5.9.3",
-    "@react-spectrum/text": "^3.5.25",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-spectrum/view": "^3.6.26",
-    "@react-stately/overlays": "^3.6.23",
     "@react-types/button": "^3.15.1",
     "@react-types/dialog": "^3.5.24",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
     "@react-spectrum/test-utils-internal": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/dialog/src/index.ts b/packages/@react-spectrum/dialog/src/index.ts
index 0030f4f0397..18e84553f69 100644
--- a/packages/@react-spectrum/dialog/src/index.ts
+++ b/packages/@react-spectrum/dialog/src/index.ts
@@ -12,11 +12,11 @@
 
 /// <reference types="css-module-types" />
 
-export {AlertDialog} from './AlertDialog';
-export {Dialog} from './Dialog';
-export {DialogTrigger} from './DialogTrigger';
-export {DialogContainer} from './DialogContainer';
-export {useDialogContainer} from './useDialogContainer';
+export {AlertDialog} from '@adobe/react-spectrum/AlertDialog';
+
+export {Dialog} from '@adobe/react-spectrum/Dialog';
+export {DialogTrigger} from '@adobe/react-spectrum/DialogTrigger';
+export {DialogContainer, useDialogContainer} from '@adobe/react-spectrum/DialogContainer';
+export type {DialogContainerValue} from '@adobe/react-spectrum/DialogContainer';
 
 export type {SpectrumAlertDialogProps, SpectrumDialogProps, SpectrumDialogContainerProps, SpectrumDialogTriggerProps} from '@react-types/dialog';
-export type {DialogContainerValue} from './useDialogContainer';
diff --git a/packages/@react-spectrum/divider/index.ts b/packages/@react-spectrum/divider/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/divider/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/divider/package.json b/packages/@react-spectrum/divider/package.json
index 68e459a4885..91a53dcfa24 100644
--- a/packages/@react-spectrum/divider/package.json
+++ b/packages/@react-spectrum/divider/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,27 +27,18 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/separator": "^3.4.16",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/divider": "^3.3.23",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/divider/src/index.ts b/packages/@react-spectrum/divider/src/index.ts
index a2b71ac7460..77075c7a946 100644
--- a/packages/@react-spectrum/divider/src/index.ts
+++ b/packages/@react-spectrum/divider/src/index.ts
@@ -12,5 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export {Divider} from './Divider';
+export {Divider} from '@adobe/react-spectrum/Divider';
+
 export type {SpectrumDividerProps} from '@react-types/divider';
diff --git a/packages/@react-spectrum/dnd/package.json b/packages/@react-spectrum/dnd/package.json
index 6e57c796a55..57324640468 100644
--- a/packages/@react-spectrum/dnd/package.json
+++ b/packages/@react-spectrum/dnd/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,32 +27,23 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/dnd": "^3.11.6",
-    "@react-stately/dnd": "^3.7.4",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "react-stately": "^3.45.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/dnd/src/index.ts b/packages/@react-spectrum/dnd/src/index.ts
index d455231f04d..b669bc39b28 100644
--- a/packages/@react-spectrum/dnd/src/index.ts
+++ b/packages/@react-spectrum/dnd/src/index.ts
@@ -12,31 +12,9 @@
 
 /// <reference types="css-module-types" />
 
-export type {DragAndDropOptions, DragAndDropHooks} from './useDragAndDrop';
-export {useDragAndDrop} from './useDragAndDrop';
-export {DIRECTORY_DRAG_TYPE} from '@react-aria/dnd';
+export {useDragAndDrop} from '@adobe/react-spectrum/useDragAndDrop';
 
-export type {
-  DirectoryDropItem,
-  DraggableCollectionEndEvent,
-  DraggableCollectionMoveEvent,
-  DraggableCollectionStartEvent,
-  DragPreviewRenderer,
-  DragTypes,
-  DropItem,
-  DropOperation,
-  DroppableCollectionDropEvent,
-  DroppableCollectionEnterEvent,
-  DroppableCollectionExitEvent,
-  DroppableCollectionInsertDropEvent,
-  DroppableCollectionMoveEvent,
-  DroppableCollectionOnItemDropEvent,
-  DroppableCollectionReorderEvent,
-  DroppableCollectionRootDropEvent,
-  DropPosition,
-  DropTarget,
-  FileDropItem,
-  ItemDropTarget,
-  RootDropTarget,
-  TextDropItem
-} from '@react-types/shared';
+export type {DragAndDropOptions, DragAndDropHooks} from '@adobe/react-spectrum/useDragAndDrop';
+export {DIRECTORY_DRAG_TYPE} from 'react-aria/private/dnd/utils';
+
+export type {DirectoryDropItem, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
diff --git a/packages/@react-spectrum/dropzone/index.ts b/packages/@react-spectrum/dropzone/index.ts
deleted file mode 100644
index 0a9a164cdd8..00000000000
--- a/packages/@react-spectrum/dropzone/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright 2023 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-export * from './src';
diff --git a/packages/@react-spectrum/dropzone/package.json b/packages/@react-spectrum/dropzone/package.json
index 796cb32bc6d..acecd7e064a 100644
--- a/packages/@react-spectrum/dropzone/package.json
+++ b/packages/@react-spectrum/dropzone/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,28 +27,18 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria-components": "^1.16.0"
+    "react-aria-components": "^1.16.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
@@ -53,7 +46,6 @@
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/dropzone/src/index.ts b/packages/@react-spectrum/dropzone/src/index.ts
index 2c464765331..c6b32788402 100644
--- a/packages/@react-spectrum/dropzone/src/index.ts
+++ b/packages/@react-spectrum/dropzone/src/index.ts
@@ -12,5 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export {DropZone} from './DropZone';
-export type {SpectrumDropZoneProps} from './DropZone';
+export {DropZone} from '@adobe/react-spectrum/DropZone';
+
+export type {SpectrumDropZoneProps} from '@adobe/react-spectrum/DropZone';
diff --git a/packages/@react-spectrum/filetrigger/index.ts b/packages/@react-spectrum/filetrigger/index.ts
deleted file mode 100644
index 15c3cdeecbb..00000000000
--- a/packages/@react-spectrum/filetrigger/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright 2024 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-export * from './src';
diff --git a/packages/@react-spectrum/filetrigger/package.json b/packages/@react-spectrum/filetrigger/package.json
index 3f1bbbd8950..6ad0495fc1e 100644
--- a/packages/@react-spectrum/filetrigger/package.json
+++ b/packages/@react-spectrum/filetrigger/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,16 +27,7 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
@@ -41,10 +35,10 @@
   },
   "dependencies": {
     "@swc/helpers": "^0.5.0",
-    "react-aria-components": "^1.16.0"
+    "react-aria-components": "^1.16.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/filetrigger/src/index.ts b/packages/@react-spectrum/filetrigger/src/index.ts
index c1fc774f8c4..ac6599cf522 100644
--- a/packages/@react-spectrum/filetrigger/src/index.ts
+++ b/packages/@react-spectrum/filetrigger/src/index.ts
@@ -12,5 +12,5 @@
 
 /// <reference types="css-module-types" />
 
-export {FileTrigger} from 'react-aria-components';
-export type {FileTriggerProps} from 'react-aria-components';
+export {FileTrigger} from 'react-aria-components/FileTrigger';
+export type {FileTriggerProps} from 'react-aria-components/FileTrigger';
diff --git a/packages/@react-spectrum/form/index.ts b/packages/@react-spectrum/form/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/form/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/form/package.json b/packages/@react-spectrum/form/package.json
index 13e7e959f3d..91bb369ba4f 100644
--- a/packages/@react-spectrum/form/package.json
+++ b/packages/@react-spectrum/form/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,34 +27,24 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/form": "^3.2.4",
     "@react-types/form": "^3.7.18",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/form/src/index.ts b/packages/@react-spectrum/form/src/index.ts
index 9920465f5d4..c6585633a15 100644
--- a/packages/@react-spectrum/form/src/index.ts
+++ b/packages/@react-spectrum/form/src/index.ts
@@ -12,5 +12,7 @@
 
 /// <reference types="css-module-types" />
 
-export {useFormProps, Form} from './Form';
+export {useFormProps} from '@adobe/react-spectrum/private/form/Form';
+
+export {Form} from '@adobe/react-spectrum/Form';
 export type {SpectrumFormProps} from '@react-types/form';
diff --git a/packages/@react-spectrum/icon/index.ts b/packages/@react-spectrum/icon/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/icon/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/icon/package.json b/packages/@react-spectrum/icon/package.json
index e1fe6422f54..e4126590d2f 100644
--- a/packages/@react-spectrum/icon/package.json
+++ b/packages/@react-spectrum/icon/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,32 +27,22 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/icon/src/index.ts b/packages/@react-spectrum/icon/src/index.ts
index 96053ab3ee5..fc84d887ec7 100644
--- a/packages/@react-spectrum/icon/src/index.ts
+++ b/packages/@react-spectrum/icon/src/index.ts
@@ -12,10 +12,11 @@
 
 /// <reference types="css-module-types" />
 
-export {Icon} from './Icon';
-export {UIIcon} from './UIIcon';
-export {Illustration} from './Illustration';
+export {Icon} from '@adobe/react-spectrum/Icon';
 
-export type {IconProps, IconPropsWithoutChildren} from './Icon';
-export type {IllustrationProps, IllustrationPropsWithoutChildren} from './Illustration';
-export type {UIIconProps, UIIconPropsWithoutChildren} from './UIIcon';
+export {UIIcon} from '@adobe/react-spectrum/private/icon/UIIcon';
+export {Illustration} from '@adobe/react-spectrum/private/icon/Illustration';
+export type {IconProps} from '@adobe/react-spectrum/Icon';
+export type {IconPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Icon';
+export type {IllustrationProps, IllustrationPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/Illustration';
+export type {UIIconProps, UIIconPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/UIIcon';
diff --git a/packages/@react-spectrum/illustratedmessage/index.ts b/packages/@react-spectrum/illustratedmessage/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/illustratedmessage/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/illustratedmessage/package.json b/packages/@react-spectrum/illustratedmessage/package.json
index f923da7fd45..e5ccd7662cf 100644
--- a/packages/@react-spectrum/illustratedmessage/package.json
+++ b/packages/@react-spectrum/illustratedmessage/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,34 +27,23 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/layout": "^3.6.22",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/illustratedmessage": "^3.3.23",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/illustratedmessage/src/index.ts b/packages/@react-spectrum/illustratedmessage/src/index.ts
index 70b14730819..c809c118a0c 100644
--- a/packages/@react-spectrum/illustratedmessage/src/index.ts
+++ b/packages/@react-spectrum/illustratedmessage/src/index.ts
@@ -12,5 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export {IllustratedMessage} from './IllustratedMessage';
+export {IllustratedMessage} from '@adobe/react-spectrum/IllustratedMessage';
+
 export type {SpectrumIllustratedMessageProps} from '@react-types/illustratedmessage';
diff --git a/packages/@react-spectrum/image/index.ts b/packages/@react-spectrum/image/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/image/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/image/package.json b/packages/@react-spectrum/image/package.json
index 367704600c2..7f09aa1d001 100644
--- a/packages/@react-spectrum/image/package.json
+++ b/packages/@react-spectrum/image/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,33 +27,23 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/image": "^3.5.4",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/image/src/index.ts b/packages/@react-spectrum/image/src/index.ts
index c675668a42c..2c3ecf8572a 100644
--- a/packages/@react-spectrum/image/src/index.ts
+++ b/packages/@react-spectrum/image/src/index.ts
@@ -12,5 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export {Image} from './Image';
+export {Image} from '@adobe/react-spectrum/Image';
+
 export type {SpectrumImageProps} from '@react-types/image';
diff --git a/packages/@react-spectrum/inlinealert/index.ts b/packages/@react-spectrum/inlinealert/index.ts
deleted file mode 100644
index 7e5b036e91f..00000000000
--- a/packages/@react-spectrum/inlinealert/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2023 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/inlinealert/package.json b/packages/@react-spectrum/inlinealert/package.json
index f10984ba5cc..2ebeea29791 100644
--- a/packages/@react-spectrum/inlinealert/package.json
+++ b/packages/@react-spectrum/inlinealert/package.json
@@ -7,13 +7,16 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "source": "src/index.ts",
   "files": [
@@ -24,36 +27,23 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/layout": "^3.6.22",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/inlinealert/src/index.ts b/packages/@react-spectrum/inlinealert/src/index.ts
index f5a2fc81374..56914b80fef 100644
--- a/packages/@react-spectrum/inlinealert/src/index.ts
+++ b/packages/@react-spectrum/inlinealert/src/index.ts
@@ -12,5 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export {InlineAlert} from './InlineAlert';
-export type {SpectrumInlineAlertProps} from './InlineAlert';
+export {InlineAlert} from '@adobe/react-spectrum/InlineAlert';
+
+export type {SpectrumInlineAlertProps} from '@adobe/react-spectrum/InlineAlert';
diff --git a/packages/@react-spectrum/label/index.ts b/packages/@react-spectrum/label/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/label/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/label/package.json b/packages/@react-spectrum/label/package.json
index fabb2d839dc..56eb6d3b1a9 100644
--- a/packages/@react-spectrum/label/package.json
+++ b/packages/@react-spectrum/label/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,37 +27,24 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/form": "^3.7.22",
-    "@react-spectrum/layout": "^3.6.22",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/label": "^3.9.17",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/label/src/index.ts b/packages/@react-spectrum/label/src/index.ts
index b8a3d89cd2e..c20c1eb86a6 100644
--- a/packages/@react-spectrum/label/src/index.ts
+++ b/packages/@react-spectrum/label/src/index.ts
@@ -12,6 +12,7 @@
 
 /// <reference types="css-module-types" />
 
-export {Field} from './Field';
-export {Label} from './Label';
-export {HelpText} from './HelpText';
+export {Field} from '@adobe/react-spectrum/private/label/Field';
+
+export {Label} from '@adobe/react-spectrum/private/label/Label';
+export {HelpText} from '@adobe/react-spectrum/private/label/HelpText';
diff --git a/packages/@react-spectrum/labeledvalue/index.ts b/packages/@react-spectrum/labeledvalue/index.ts
deleted file mode 100644
index 4e9931530d8..00000000000
--- a/packages/@react-spectrum/labeledvalue/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2022 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/labeledvalue/package.json b/packages/@react-spectrum/labeledvalue/package.json
index ba7d99a9cc3..d2befc8f25d 100644
--- a/packages/@react-spectrum/labeledvalue/package.json
+++ b/packages/@react-spectrum/labeledvalue/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,16 +27,7 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
@@ -41,18 +35,15 @@
   },
   "dependencies": {
     "@internationalized/date": "^3.12.0",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/label": "^3.16.22",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/labeledvalue/src/index.ts b/packages/@react-spectrum/labeledvalue/src/index.ts
index 1efa8989bcb..7a8b4aae8bb 100644
--- a/packages/@react-spectrum/labeledvalue/src/index.ts
+++ b/packages/@react-spectrum/labeledvalue/src/index.ts
@@ -12,5 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export type {SpectrumLabeledValueProps} from './LabeledValue';
-export {LabeledValue} from './LabeledValue';
+export {LabeledValue} from '@adobe/react-spectrum/LabeledValue';
+
+export type {SpectrumLabeledValueProps} from '@adobe/react-spectrum/LabeledValue';
diff --git a/packages/@react-spectrum/layout/index.ts b/packages/@react-spectrum/layout/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/layout/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/layout/package.json b/packages/@react-spectrum/layout/package.json
index f0087fdcc54..3ac3e5e9056 100644
--- a/packages/@react-spectrum/layout/package.json
+++ b/packages/@react-spectrum/layout/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,33 +27,23 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/layout": "^3.3.29",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/layout/src/index.ts b/packages/@react-spectrum/layout/src/index.ts
index 712fedf5a1b..f6ce395ce57 100644
--- a/packages/@react-spectrum/layout/src/index.ts
+++ b/packages/@react-spectrum/layout/src/index.ts
@@ -12,7 +12,8 @@
 
 /// <reference types="css-module-types" />
 
-export {repeat, minmax, fitContent, Grid} from './Grid';
-export {Flex} from './Flex';
+export {repeat, minmax, fitContent, Grid} from '@adobe/react-spectrum/Grid';
+
+export {Flex} from '@adobe/react-spectrum/Flex';
 export type {DimensionValue} from '@react-types/shared';
 export type {FlexProps, GridProps} from '@react-types/layout';
diff --git a/packages/@react-spectrum/link/index.ts b/packages/@react-spectrum/link/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/link/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/link/package.json b/packages/@react-spectrum/link/package.json
index fa2b3b4fd4f..9255e22ad8a 100644
--- a/packages/@react-spectrum/link/package.json
+++ b/packages/@react-spectrum/link/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,36 +27,23 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/link": "^3.8.9",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/link": "^3.6.7",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/link/src/index.ts b/packages/@react-spectrum/link/src/index.ts
index 4193c3f6ad2..7f16fe9cba6 100644
--- a/packages/@react-spectrum/link/src/index.ts
+++ b/packages/@react-spectrum/link/src/index.ts
@@ -12,5 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export {Link} from './Link';
+export {Link} from '@adobe/react-spectrum/Link';
+
 export type {SpectrumLinkProps} from '@react-types/link';
diff --git a/packages/@react-spectrum/list/index.ts b/packages/@react-spectrum/list/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/list/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/list/package.json b/packages/@react-spectrum/list/package.json
index 36a49d06874..4b24e1b2e41 100644
--- a/packages/@react-spectrum/list/package.json
+++ b/packages/@react-spectrum/list/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,46 +27,21 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/button": "^3.14.5",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/gridlist": "^3.14.4",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/selection": "^3.27.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-aria/virtualizer": "^4.1.13",
-    "@react-aria/visually-hidden": "^3.8.31",
-    "@react-spectrum/checkbox": "^3.10.7",
-    "@react-spectrum/dnd": "^3.6.5",
-    "@react-spectrum/layout": "^3.6.22",
-    "@react-spectrum/progress": "^3.7.23",
-    "@react-spectrum/text": "^3.5.25",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/layout": "^4.6.0",
-    "@react-stately/list": "^3.13.4",
-    "@react-stately/virtualizer": "^4.4.6",
     "@react-types/grid": "^3.3.8",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
     "@swc/helpers": "^0.5.0",
-    "react-transition-group": "^4.4.5"
+    "react-transition-group": "^4.4.5",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
@@ -72,7 +50,6 @@
     "@react-stately/dnd": "^3.0.0"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.2.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/list/src/index.ts b/packages/@react-spectrum/list/src/index.ts
index 0b3c13f524f..6b9baebe528 100644
--- a/packages/@react-spectrum/list/src/index.ts
+++ b/packages/@react-spectrum/list/src/index.ts
@@ -10,6 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-export {ListView} from './ListView';
-export {Item} from '@react-stately/collections';
-export type {SpectrumListViewProps} from './ListView';
+export {ListView} from '@adobe/react-spectrum/ListView';
+
+export type {SpectrumListViewProps} from '@adobe/react-spectrum/ListView';
+export {Item} from 'react-stately/Item';
diff --git a/packages/@react-spectrum/listbox/index.ts b/packages/@react-spectrum/listbox/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-spectrum/listbox/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/listbox/package.json b/packages/@react-spectrum/listbox/package.json
index e88e7d377f7..9bc0fbac113 100644
--- a/packages/@react-spectrum/listbox/package.json
+++ b/packages/@react-spectrum/listbox/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,46 +27,25 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/listbox": "^3.15.3",
-    "@react-aria/utils": "^3.33.1",
-    "@react-aria/virtualizer": "^4.1.13",
-    "@react-spectrum/layout": "^3.6.22",
-    "@react-spectrum/progress": "^3.7.23",
-    "@react-spectrum/text": "^3.5.25",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/layout": "^4.6.0",
-    "@react-stately/list": "^3.13.4",
-    "@react-stately/virtualizer": "^4.4.6",
     "@react-types/listbox": "^3.7.6",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.2.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/listbox/src/index.ts b/packages/@react-spectrum/listbox/src/index.ts
index cde0e6831d2..32d8c9e3a6b 100644
--- a/packages/@react-spectrum/listbox/src/index.ts
+++ b/packages/@react-spectrum/listbox/src/index.ts
@@ -12,7 +12,9 @@
 
 /// <reference types="css-module-types" />
 
-export {ListBox} from './ListBox';
-export {useListBoxLayout, ListBoxBase} from './ListBoxBase';
-export {Item, Section} from '@react-stately/collections';
+export {ListBox} from '@adobe/react-spectrum/ListBox';
+
+export {useListBoxLayout, ListBoxBase} from '@adobe/react-spectrum/private/listbox/ListBoxBase';
+export {Item} from 'react-stately/Item';
+export {Section} from 'react-stately/Section';
 export type {SpectrumListBoxProps} from '@react-types/listbox';
diff --git a/packages/@react-spectrum/menu/index.ts b/packages/@react-spectrum/menu/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/menu/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/menu/package.json b/packages/@react-spectrum/menu/package.json
index 60dee5bec7f..262148cb16a 100644
--- a/packages/@react-spectrum/menu/package.json
+++ b/packages/@react-spectrum/menu/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,50 +27,27 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/menu": "^3.21.0",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/separator": "^3.4.16",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/layout": "^3.6.22",
-    "@react-spectrum/overlays": "^5.9.3",
-    "@react-spectrum/text": "^3.5.25",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/menu": "^3.9.11",
-    "@react-stately/overlays": "^3.6.23",
-    "@react-stately/tree": "^3.9.6",
     "@react-types/menu": "^3.10.7",
     "@react-types/overlays": "^3.9.4",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
     "@spectrum-icons/workflow": "^4.2.28",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/menu/src/index.ts b/packages/@react-spectrum/menu/src/index.ts
index baea74b9b16..e181ea1f822 100644
--- a/packages/@react-spectrum/menu/src/index.ts
+++ b/packages/@react-spectrum/menu/src/index.ts
@@ -12,12 +12,11 @@
 
 /// <reference types="css-module-types" />
 
-export {MenuTrigger} from './MenuTrigger';
-export {SubmenuTrigger} from './SubmenuTrigger';
-export {Menu} from './Menu';
-export {ActionMenu} from './ActionMenu';
-export {ContextualHelpTrigger} from './ContextualHelpTrigger';
-export {Item, Section} from '@react-stately/collections';
+export {MenuTrigger} from '@adobe/react-spectrum/MenuTrigger';
+
+export {SubmenuTrigger, Menu, ContextualHelpTrigger} from '@adobe/react-spectrum/Menu';
+export {ActionMenu} from '@adobe/react-spectrum/ActionMenu';
+export type {SpectrumMenuDialogTriggerProps, SpectrumSubmenuTriggerProps} from '@adobe/react-spectrum/Menu';
+export {Item} from 'react-stately/Item';
+export {Section} from 'react-stately/Section';
 export type {SpectrumActionMenuProps, SpectrumMenuProps, SpectrumMenuTriggerProps} from '@react-types/menu';
-export type {SpectrumMenuDialogTriggerProps} from './ContextualHelpTrigger';
-export type {SpectrumSubmenuTriggerProps} from './SubmenuTrigger';
diff --git a/packages/@react-spectrum/meter/index.ts b/packages/@react-spectrum/meter/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/meter/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/meter/package.json b/packages/@react-spectrum/meter/package.json
index 6c5b29a20be..b8a0ec1b7d2 100644
--- a/packages/@react-spectrum/meter/package.json
+++ b/packages/@react-spectrum/meter/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,34 +27,23 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/meter": "^3.4.30",
-    "@react-spectrum/progress": "^3.7.23",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/meter": "^3.4.15",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/meter/src/index.ts b/packages/@react-spectrum/meter/src/index.ts
index ad64b8dcb56..482780ab8cc 100644
--- a/packages/@react-spectrum/meter/src/index.ts
+++ b/packages/@react-spectrum/meter/src/index.ts
@@ -12,5 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export {Meter} from './Meter';
+export {Meter} from '@adobe/react-spectrum/Meter';
+
 export type {SpectrumMeterProps} from '@react-types/meter';
diff --git a/packages/@react-spectrum/numberfield/index.ts b/packages/@react-spectrum/numberfield/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/numberfield/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/numberfield/package.json b/packages/@react-spectrum/numberfield/package.json
index 32bdff5a078..5ba497a472d 100644
--- a/packages/@react-spectrum/numberfield/package.json
+++ b/packages/@react-spectrum/numberfield/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,46 +27,28 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/button": "^3.14.5",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/numberfield": "^3.12.5",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/form": "^3.7.22",
-    "@react-spectrum/label": "^3.16.22",
-    "@react-spectrum/textfield": "^3.14.5",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/numberfield": "^3.11.0",
     "@react-types/button": "^3.15.1",
     "@react-types/numberfield": "^3.8.18",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
     "@spectrum-icons/workflow": "^4.2.28",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
     "@react-spectrum/test-utils-internal": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/numberfield/src/index.ts b/packages/@react-spectrum/numberfield/src/index.ts
index e93474e331f..e513fcface1 100644
--- a/packages/@react-spectrum/numberfield/src/index.ts
+++ b/packages/@react-spectrum/numberfield/src/index.ts
@@ -12,5 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export {NumberField} from './NumberField';
+export {NumberField} from '@adobe/react-spectrum/NumberField';
+
 export type {SpectrumNumberFieldProps} from '@react-types/numberfield';
diff --git a/packages/@react-spectrum/overlays/index.ts b/packages/@react-spectrum/overlays/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/overlays/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/overlays/package.json b/packages/@react-spectrum/overlays/package.json
index 8e58fa4662c..018393bd520 100644
--- a/packages/@react-spectrum/overlays/package.json
+++ b/packages/@react-spectrum/overlays/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,37 +27,25 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/overlays": "^3.6.23",
     "@react-types/overlays": "^3.9.4",
     "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-transition-group": "^4.4.5"
+    "react-transition-group": "^4.4.5",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/overlays/src/index.ts b/packages/@react-spectrum/overlays/src/index.ts
index d48ba9c86d3..7ac20756c04 100644
--- a/packages/@react-spectrum/overlays/src/index.ts
+++ b/packages/@react-spectrum/overlays/src/index.ts
@@ -12,8 +12,9 @@
 
 /// <reference types="css-module-types" />
 
-export {Overlay} from './Overlay';
-export {Popover} from './Popover';
-export {Modal} from './Modal';
-export {Tray} from './Tray';
-export {OpenTransition} from './OpenTransition';
+export {Overlay} from '@adobe/react-spectrum/private/overlays/Overlay';
+
+export {Popover} from '@adobe/react-spectrum/private/overlays/Popover';
+export {Modal} from '@adobe/react-spectrum/private/overlays/Modal';
+export {Tray} from '@adobe/react-spectrum/private/overlays/Tray';
+export {OpenTransition} from '@adobe/react-spectrum/private/overlays/OpenTransition';
diff --git a/packages/@react-spectrum/picker/index.ts b/packages/@react-spectrum/picker/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-spectrum/picker/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/picker/package.json b/packages/@react-spectrum/picker/package.json
index 46295958b2f..76e82b1eadb 100644
--- a/packages/@react-spectrum/picker/package.json
+++ b/packages/@react-spectrum/picker/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,46 +27,25 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/select": "^3.17.3",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/form": "^3.7.22",
-    "@react-spectrum/label": "^3.16.22",
-    "@react-spectrum/listbox": "^3.15.11",
-    "@react-spectrum/overlays": "^5.9.3",
-    "@react-spectrum/progress": "^3.7.23",
-    "@react-spectrum/text": "^3.5.25",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/select": "^3.9.2",
     "@react-types/select": "^3.12.2",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.1.4",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/picker/src/index.ts b/packages/@react-spectrum/picker/src/index.ts
index 428ace31e20..51be3876d5d 100644
--- a/packages/@react-spectrum/picker/src/index.ts
+++ b/packages/@react-spectrum/picker/src/index.ts
@@ -12,6 +12,8 @@
 
 /// <reference types="css-module-types" />
 
-export {Picker} from './Picker';
-export {Item, Section} from '@react-stately/collections';
+export {Picker} from '@adobe/react-spectrum/Picker';
+
+export {Item} from 'react-stately/Item';
+export {Section} from 'react-stately/Section';
 export type {SpectrumPickerProps} from '@react-types/select';
diff --git a/packages/@react-spectrum/progress/index.ts b/packages/@react-spectrum/progress/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/progress/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/progress/package.json b/packages/@react-spectrum/progress/package.json
index 6512e5a8008..dff5cea8b28 100644
--- a/packages/@react-spectrum/progress/package.json
+++ b/packages/@react-spectrum/progress/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,34 +27,23 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/progress": "^3.4.30",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/progress": "^3.5.18",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/progress/src/index.ts b/packages/@react-spectrum/progress/src/index.ts
index 89fee1088cf..4b79adf597c 100644
--- a/packages/@react-spectrum/progress/src/index.ts
+++ b/packages/@react-spectrum/progress/src/index.ts
@@ -12,7 +12,8 @@
 
 /// <reference types="css-module-types" />
 
-export {ProgressBar} from './ProgressBar';
-export {ProgressCircle} from './ProgressCircle';
-export {ProgressBarBase} from './ProgressBarBase';
+export {ProgressBar} from '@adobe/react-spectrum/ProgressBar';
+
+export {ProgressCircle} from '@adobe/react-spectrum/ProgressCircle';
+export {ProgressBarBase} from '@adobe/react-spectrum/private/progress/ProgressBarBase';
 export type {SpectrumProgressBarProps, SpectrumProgressCircleProps} from '@react-types/progress';
diff --git a/packages/@react-spectrum/provider/index.ts b/packages/@react-spectrum/provider/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/provider/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/provider/package.json b/packages/@react-spectrum/provider/package.json
index 02ee595086e..c9012bd57ef 100644
--- a/packages/@react-spectrum/provider/package.json
+++ b/packages/@react-spectrum/provider/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,30 +27,19 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/provider": "^3.8.15",
     "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "clsx": "^2.0.0"
+    "clsx": "^2.0.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/provider/src/index.ts b/packages/@react-spectrum/provider/src/index.ts
index 31a2ed296bc..7d76a9fa276 100644
--- a/packages/@react-spectrum/provider/src/index.ts
+++ b/packages/@react-spectrum/provider/src/index.ts
@@ -12,6 +12,8 @@
 
 /// <reference types="css-module-types" />
 
-export {Provider, useProvider, useProviderProps} from './Provider';
+export {Provider, useProvider} from '@adobe/react-spectrum/Provider';
+
+export {useProviderProps} from '@adobe/react-spectrum/private/provider/Provider';
 export type {ProviderContext} from '@react-types/provider';
 export type {ProviderProps} from '@react-types/provider';
diff --git a/packages/@react-spectrum/radio/index.ts b/packages/@react-spectrum/radio/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/radio/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/radio/package.json b/packages/@react-spectrum/radio/package.json
index 888f94a4d68..5415406aee5 100644
--- a/packages/@react-spectrum/radio/package.json
+++ b/packages/@react-spectrum/radio/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,38 +27,24 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/radio": "^3.12.5",
-    "@react-spectrum/form": "^3.7.22",
-    "@react-spectrum/label": "^3.16.22",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/radio": "^3.11.5",
     "@react-types/radio": "^3.9.4",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/radio/src/index.ts b/packages/@react-spectrum/radio/src/index.ts
index 338417acef6..85e107f28a9 100644
--- a/packages/@react-spectrum/radio/src/index.ts
+++ b/packages/@react-spectrum/radio/src/index.ts
@@ -12,7 +12,7 @@
 
 /// <reference types="css-module-types" />
 
-export {Radio} from './Radio';
-export {RadioGroup} from './RadioGroup';
+export {Radio, RadioGroup} from '@adobe/react-spectrum/RadioGroup';
+
 export type {SpectrumRadioProps} from '@react-types/radio';
 export type {SpectrumRadioGroupProps} from '@react-types/radio';
diff --git a/packages/@react-spectrum/s2/chromatic/Accordion.stories.tsx b/packages/@react-spectrum/s2/chromatic/Accordion.stories.tsx
index cc3f85a6447..1adadda01b8 100644
--- a/packages/@react-spectrum/s2/chromatic/Accordion.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Accordion.stories.tsx
@@ -10,11 +10,20 @@
  * governing permissions and limitations under the License.
  */
 
-import {Accordion, AccordionItem, AccordionItemHeader, AccordionItemPanel, AccordionItemTitle, ActionButton, TextField} from '../src';
+import {
+  Accordion,
+  AccordionItem,
+  AccordionItemHeader,
+  AccordionItemPanel,
+  AccordionItemTitle
+} from '../src/Accordion';
+
+import {ActionButton} from '../src/ActionButton';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import React from 'react';
 import {style} from '../style/spectrum-theme' with { type: 'macro' };
+import {TextField} from '../src/TextField';
 
 const meta: Meta<typeof Accordion> = {
   component: Accordion,
diff --git a/packages/@react-spectrum/s2/chromatic/ActionButton.stories.tsx b/packages/@react-spectrum/s2/chromatic/ActionButton.stories.tsx
index da80c53f128..8bd32a7d895 100644
--- a/packages/@react-spectrum/s2/chromatic/ActionButton.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ActionButton.stories.tsx
@@ -10,17 +10,21 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, ActionButtonProps, Avatar, NotificationBadge, Text} from '../src';
+import {ActionButton, ActionButtonProps} from '../src/ActionButton';
+
+import {Avatar} from '../src/Avatar';
 import BellIcon from '../s2wf-icons/S2_Icon_Bell_20_N.svg';
 import CommentIcon from '../s2wf-icons/S2_Icon_Comment_20_N.svg';
 import {Fonts, NotificationBadges, UnsafeClassName} from '../stories/ActionButton.stories';
 import {generatePowerset} from '@react-spectrum/story-utils';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
+import {NotificationBadge} from '../src/NotificationBadge';
 import {ReactElement} from 'react';
 import {shortName} from './utils';
 import {StaticColorProvider} from '../stories/utils';
 import {style} from '../style' with { type: 'macro' };
+import {Text} from '../src/Content';
 
 const meta: Meta<typeof ActionButton> = {
   component: ActionButton,
diff --git a/packages/@react-spectrum/s2/chromatic/ActionButtonGroup.stories.tsx b/packages/@react-spectrum/s2/chromatic/ActionButtonGroup.stories.tsx
index c02a2173af2..21031c52167 100644
--- a/packages/@react-spectrum/s2/chromatic/ActionButtonGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ActionButtonGroup.stories.tsx
@@ -10,13 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, ActionButtonGroup, Text} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {ActionButtonGroup} from '../src/ActionButtonGroup';
 import {categorizeArgTypes, getActionArgs, StaticColorDecorator} from '../stories/utils';
 import Copy from '../s2wf-icons/S2_Icon_Copy_20_N.svg';
 import Cut from '../s2wf-icons/S2_Icon_Cut_20_N.svg';
 import type {Meta, StoryObj} from '@storybook/react';
 import Paste from '../s2wf-icons/S2_Icon_Paste_20_N.svg';
 import {style} from '../style' with { type: 'macro' };
+import {Text} from '../src/Content';
 
 const events = ['onPress', 'onPressChange', 'onPressEnd', 'onPressStart', 'onPressUp', 'onChange'];
 
diff --git a/packages/@react-spectrum/s2/chromatic/ActionMenu.stories.tsx b/packages/@react-spectrum/s2/chromatic/ActionMenu.stories.tsx
index 1181d3b9500..2fdadfa4728 100644
--- a/packages/@react-spectrum/s2/chromatic/ActionMenu.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ActionMenu.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionMenu} from '../src';
+import {ActionMenu} from '../src/ActionMenu';
 import {DynamicExample, Example} from '../stories/ActionMenu.stories';
 import type {Meta, StoryObj} from '@storybook/react';
 import {userEvent, within} from 'storybook/test';
diff --git a/packages/@react-spectrum/s2/chromatic/ActionMenuRTL.stories.tsx b/packages/@react-spectrum/s2/chromatic/ActionMenuRTL.stories.tsx
index 7995ea290d7..bd535a20d9e 100644
--- a/packages/@react-spectrum/s2/chromatic/ActionMenuRTL.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ActionMenuRTL.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionMenu} from '../src';
+import {ActionMenu} from '../src/ActionMenu';
 
 import type {Meta} from '@storybook/react';
 
diff --git a/packages/@react-spectrum/s2/chromatic/AlertDialog.stories.tsx b/packages/@react-spectrum/s2/chromatic/AlertDialog.stories.tsx
index 109b9447c29..5415b05d375 100644
--- a/packages/@react-spectrum/s2/chromatic/AlertDialog.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/AlertDialog.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {AlertDialog} from '../src';
+import {AlertDialog} from '../src/AlertDialog';
 import {Example as Base} from '../stories/AlertDialog.stories';
 import type {Meta, StoryObj} from '@storybook/react';
 import {userEvent, within} from 'storybook/test';
diff --git a/packages/@react-spectrum/s2/chromatic/AlertDialogRTL.stories.tsx b/packages/@react-spectrum/s2/chromatic/AlertDialogRTL.stories.tsx
index 89cbc7ea9a9..153fbaa42d7 100644
--- a/packages/@react-spectrum/s2/chromatic/AlertDialogRTL.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/AlertDialogRTL.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {AlertDialog} from '../src';
+import {AlertDialog} from '../src/AlertDialog';
 
 import type {Meta} from '@storybook/react';
 
diff --git a/packages/@react-spectrum/s2/chromatic/Avatar.stories.tsx b/packages/@react-spectrum/s2/chromatic/Avatar.stories.tsx
index 2935e68c6af..4a969e210de 100644
--- a/packages/@react-spectrum/s2/chromatic/Avatar.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Avatar.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Avatar} from '../src';
+import {Avatar} from '../src/Avatar';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style' with { type: 'macro' };
 
diff --git a/packages/@react-spectrum/s2/chromatic/AvatarGroup.stories.tsx b/packages/@react-spectrum/s2/chromatic/AvatarGroup.stories.tsx
index 2753eb5bdf2..5ce9efec307 100644
--- a/packages/@react-spectrum/s2/chromatic/AvatarGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/AvatarGroup.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {AvatarGroup} from '../src';
+import {AvatarGroup} from '../src/AvatarGroup';
 import {Example, WithLabel, WithProviderBackground} from '../stories/AvatarGroup.stories';
 import type {Meta} from '@storybook/react';
 
diff --git a/packages/@react-spectrum/s2/chromatic/Badge.stories.tsx b/packages/@react-spectrum/s2/chromatic/Badge.stories.tsx
index 3f6374b9fe3..a11db15beaf 100644
--- a/packages/@react-spectrum/s2/chromatic/Badge.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Badge.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Badge, BadgeProps} from '../src';
+import {Badge, BadgeProps} from '../src/Badge';
 import {Example} from '../stories/Badge.stories';
 import {generatePowerset} from '@react-spectrum/story-utils';
 import type {Meta, StoryObj} from '@storybook/react';
diff --git a/packages/@react-spectrum/s2/chromatic/Breadcrumbs.stories.tsx b/packages/@react-spectrum/s2/chromatic/Breadcrumbs.stories.tsx
index 3de20fcba76..37ef335f6d4 100644
--- a/packages/@react-spectrum/s2/chromatic/Breadcrumbs.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Breadcrumbs.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Breadcrumb, Breadcrumbs} from '../src';
+import {Breadcrumb, Breadcrumbs} from '../src/Breadcrumbs';
 import {generatePowerset} from '@react-spectrum/story-utils';
 import {type IMany, Many} from '../stories/Breadcrumbs.stories';
 import type {Meta, StoryObj} from '@storybook/react';
diff --git a/packages/@react-spectrum/s2/chromatic/BreadcrumbsRTL.stories.tsx b/packages/@react-spectrum/s2/chromatic/BreadcrumbsRTL.stories.tsx
index ec3dfa23182..fe3604492fe 100644
--- a/packages/@react-spectrum/s2/chromatic/BreadcrumbsRTL.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/BreadcrumbsRTL.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Breadcrumbs} from '../src';
+import {Breadcrumbs} from '../src/Breadcrumbs';
 
 import type {Meta} from '@storybook/react';
 
diff --git a/packages/@react-spectrum/s2/chromatic/Button.stories.tsx b/packages/@react-spectrum/s2/chromatic/Button.stories.tsx
index 0149063d3fb..0369992d484 100644
--- a/packages/@react-spectrum/s2/chromatic/Button.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Button.stories.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, ButtonProps, Text} from '../src';
+import {Button, ButtonProps} from '../src/Button';
+
 import {generatePowerset} from '@react-spectrum/story-utils';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
@@ -18,6 +19,7 @@ import {ReactNode} from 'react';
 import {shortName} from './utils';
 import {StaticColorProvider} from '../stories/utils';
 import {style} from '../style' with { type: 'macro' };
+import {Text} from '../src/Content';
 import {Example as WithWrapping} from '../stories/Button.stories';
 
 const meta: Meta<typeof Button> = {
diff --git a/packages/@react-spectrum/s2/chromatic/ButtonGroup.stories.tsx b/packages/@react-spectrum/s2/chromatic/ButtonGroup.stories.tsx
index 6a56ed96d03..49a2b622b14 100644
--- a/packages/@react-spectrum/s2/chromatic/ButtonGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ButtonGroup.stories.tsx
@@ -10,13 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, ButtonGroup, ButtonGroupProps, Text} from '../src';
+import {Button} from '../src/Button';
+
+import {ButtonGroup, ButtonGroupProps} from '../src/ButtonGroup';
 import {generatePowerset} from '@react-spectrum/story-utils';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import {ReactNode} from 'react';
 import {shortName} from './utils';
 import {style} from '../style' with { type: 'macro' };
+import {Text} from '../src/Content';
 
 const meta: Meta<typeof ButtonGroup> = {
   component: ButtonGroup,
diff --git a/packages/@react-spectrum/s2/chromatic/Calendar.stories.tsx b/packages/@react-spectrum/s2/chromatic/Calendar.stories.tsx
index 8f3b5cf4385..687a7e56e53 100644
--- a/packages/@react-spectrum/s2/chromatic/Calendar.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Calendar.stories.tsx
@@ -10,10 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {Calendar} from '../src';
+import {Calendar} from '../src/Calendar';
 import {CalendarDate} from '@internationalized/date';
 import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
-import {DateValue} from 'react-aria';
+import {DateValue} from '@react-types/datepicker';
 import type {Meta, StoryObj} from '@storybook/react';
 import {screen, userEvent, within} from 'storybook/test';
 
diff --git a/packages/@react-spectrum/s2/chromatic/Card.stories.tsx b/packages/@react-spectrum/s2/chromatic/Card.stories.tsx
index 2c5d21d7fdb..af9faf67b45 100644
--- a/packages/@react-spectrum/s2/chromatic/Card.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Card.stories.tsx
@@ -10,12 +10,32 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionMenu, AssetCard, Avatar, Badge, Button, Card, CardPreview, CardProps, CollectionCardPreview, Content, Divider, Footer, Image, MenuItem, Meter, ProductCard, StatusLight, Text, UserCard} from '../src';
+import {ActionMenu} from '../src/ActionMenu';
+
+import {
+  AssetCard,
+  Card,
+  CardPreview,
+  CardProps,
+  CollectionCardPreview,
+  ProductCard,
+  UserCard
+} from '../src/Card';
+
+import {Avatar} from '../src/Avatar';
+import {Badge} from '../src/Badge';
+import {Button} from '../src/Button';
+import {Content, Footer, Text} from '../src/Content';
+import {Divider} from '../src/Divider';
 import Folder from '../s2wf-icons/S2_Icon_Folder_20_N.svg';
 import FolderGradient from '../spectrum-illustrations/gradient/generic2/FolderClose';
+import {Image} from '../src/Image';
+import {MenuItem} from '../src/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
+import {Meter} from '../src/Meter';
 import Project from '../s2wf-icons/S2_Icon_Project_20_N.svg';
 import Select from '../s2wf-icons/S2_Icon_Select_20_N.svg';
+import {StatusLight} from '../src/StatusLight';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
 
 const meta: Meta<CardProps> = {
diff --git a/packages/@react-spectrum/s2/chromatic/CardView.stories.tsx b/packages/@react-spectrum/s2/chromatic/CardView.stories.tsx
index 7efe5339fc1..8349e6cb2d9 100644
--- a/packages/@react-spectrum/s2/chromatic/CardView.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/CardView.stories.tsx
@@ -10,10 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {CardView, Content, Heading, IllustratedMessage, SkeletonCollection} from '../src';
+import {CardView} from '../src/CardView';
+
+import {Content, Heading} from '../src/Content';
 import EmptyIcon from '../spectrum-illustrations/gradient/generic1/Image';
+import {IllustratedMessage} from '../src/IllustratedMessage';
 import type {Meta, StoryObj} from '@storybook/react';
 import {PhotoCard} from '../stories/CardView.stories';
+import {SkeletonCollection} from '../src/SkeletonCollection';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
 
 const meta: Meta<typeof CardView> = {
diff --git a/packages/@react-spectrum/s2/chromatic/Checkbox.stories.tsx b/packages/@react-spectrum/s2/chromatic/Checkbox.stories.tsx
index 635532a5c73..23c3338aad3 100644
--- a/packages/@react-spectrum/s2/chromatic/Checkbox.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Checkbox.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Checkbox, CheckboxProps} from '../src';
+import {Checkbox, CheckboxProps} from '../src/Checkbox';
 import {generateComboChunks, shortName} from './utils';
 import {LongLabel} from '../stories/Checkbox.stories';
 import type {Meta, StoryObj} from '@storybook/react';
diff --git a/packages/@react-spectrum/s2/chromatic/CheckboxGroup.stories.tsx b/packages/@react-spectrum/s2/chromatic/CheckboxGroup.stories.tsx
index bce455cdb1c..f5d9f3ee192 100644
--- a/packages/@react-spectrum/s2/chromatic/CheckboxGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/CheckboxGroup.stories.tsx
@@ -10,7 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {Checkbox, CheckboxGroup, CheckboxGroupProps, Content, ContextualHelp, Heading} from '../src';
+import {Checkbox} from '../src/Checkbox';
+
+import {CheckboxGroup, CheckboxGroupProps} from '../src/CheckboxGroup';
+import {Content, Heading} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
 import {generateComboChunks, shortName} from './utils';
 import type {Meta, StoryObj} from '@storybook/react';
 import {ReactNode} from 'react';
diff --git a/packages/@react-spectrum/s2/chromatic/ColorArea.stories.tsx b/packages/@react-spectrum/s2/chromatic/ColorArea.stories.tsx
index 5a0b207ff58..8c9f0370bf9 100644
--- a/packages/@react-spectrum/s2/chromatic/ColorArea.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ColorArea.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorArea} from '../src';
+import {ColorArea} from '../src/ColorArea';
 import type {Meta, StoryObj} from '@storybook/react';
 
 const meta: Meta<typeof ColorArea> = {
diff --git a/packages/@react-spectrum/s2/chromatic/ColorField.stories.tsx b/packages/@react-spectrum/s2/chromatic/ColorField.stories.tsx
index 03f9dec2837..400a940edd2 100644
--- a/packages/@react-spectrum/s2/chromatic/ColorField.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ColorField.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorField, ColorFieldProps} from '../src';
+import {ColorField, ColorFieldProps} from '../src/ColorField';
 import {generateComboChunks, shortName} from './utils';
 import type {Meta, StoryObj} from '@storybook/react';
 import {ReactElement} from 'react';
diff --git a/packages/@react-spectrum/s2/chromatic/ColorSlider.stories.tsx b/packages/@react-spectrum/s2/chromatic/ColorSlider.stories.tsx
index 32c4afb80cc..00b0c89cf5b 100644
--- a/packages/@react-spectrum/s2/chromatic/ColorSlider.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ColorSlider.stories.tsx
@@ -10,7 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorSlider, ColorSliderProps, Content, ContextualHelp, Heading} from '../src';
+import {ColorSlider, ColorSliderProps} from '../src/ColorSlider';
+
+import {Content, Heading} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
 import {generatePowerset} from '@react-spectrum/story-utils';
 import type {Meta, StoryObj} from '@storybook/react';
 import {ReactElement} from 'react';
diff --git a/packages/@react-spectrum/s2/chromatic/Combobox.stories.tsx b/packages/@react-spectrum/s2/chromatic/Combobox.stories.tsx
index 441d49272f3..b56a2b712ea 100644
--- a/packages/@react-spectrum/s2/chromatic/Combobox.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Combobox.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {AsyncComboBoxStory, AsyncComboBoxStoryType, ContextualHelpExample, CustomWidth, Dynamic, EmptyCombobox, Example, Sections, WithAvatars, WithIcons} from '../stories/ComboBox.stories';
-import {ComboBox} from '../src';
+import {ComboBox} from '../src/ComboBox';
 import {expect} from '@storybook/jest';
 import type {Meta, StoryObj} from '@storybook/react';
 import {userEvent, waitFor, within} from 'storybook/test';
diff --git a/packages/@react-spectrum/s2/chromatic/ComboboxRTL.stories.tsx b/packages/@react-spectrum/s2/chromatic/ComboboxRTL.stories.tsx
index 8d7198fb9fe..5c6f9f15b08 100644
--- a/packages/@react-spectrum/s2/chromatic/ComboboxRTL.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ComboboxRTL.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ComboBox} from '../src';
+import {ComboBox} from '../src/ComboBox';
 
 import type {Meta} from '@storybook/react';
 
diff --git a/packages/@react-spectrum/s2/chromatic/ContextualHelp.stories.tsx b/packages/@react-spectrum/s2/chromatic/ContextualHelp.stories.tsx
index 6938da52655..cc484f95a47 100644
--- a/packages/@react-spectrum/s2/chromatic/ContextualHelp.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ContextualHelp.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ContextualHelp} from '../src';
+import {ContextualHelp} from '../src/ContextualHelp';
 import {Example} from '../stories/ContextualHelp.stories';
 import type {Meta, StoryObj} from '@storybook/react';
 import {userEvent, within} from 'storybook/test';
diff --git a/packages/@react-spectrum/s2/chromatic/ContextualHelpRTL.stories.tsx b/packages/@react-spectrum/s2/chromatic/ContextualHelpRTL.stories.tsx
index ffdde6aed01..af82bce40ac 100644
--- a/packages/@react-spectrum/s2/chromatic/ContextualHelpRTL.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ContextualHelpRTL.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ContextualHelp} from '../src';
+import {ContextualHelp} from '../src/ContextualHelp';
 
 import type {Meta} from '@storybook/react';
 
diff --git a/packages/@react-spectrum/s2/chromatic/DateField.stories.tsx b/packages/@react-spectrum/s2/chromatic/DateField.stories.tsx
index 384658bc569..64edd5e9d93 100644
--- a/packages/@react-spectrum/s2/chromatic/DateField.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/DateField.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {CalendarDate} from '@internationalized/date';
-import {DateField} from '../';
+import {DateField} from '../src/DateField';
 import type {Meta, StoryObj} from '@storybook/react';
 import {userEvent} from 'storybook/test';
 
diff --git a/packages/@react-spectrum/s2/chromatic/DatePicker.stories.tsx b/packages/@react-spectrum/s2/chromatic/DatePicker.stories.tsx
index 8afb01f9ee0..b492ca8e2b6 100644
--- a/packages/@react-spectrum/s2/chromatic/DatePicker.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/DatePicker.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {CalendarDate, CalendarDateTime} from '@internationalized/date';
-import {DatePicker} from '../';
+import {DatePicker} from '../src/DatePicker';
 import type {Meta, StoryObj} from '@storybook/react';
 import {userEvent} from 'storybook/test';
 
diff --git a/packages/@react-spectrum/s2/chromatic/DateRangePicker.stories.tsx b/packages/@react-spectrum/s2/chromatic/DateRangePicker.stories.tsx
index f8c2ace2d67..8406d1fd382 100644
--- a/packages/@react-spectrum/s2/chromatic/DateRangePicker.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/DateRangePicker.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {CalendarDate, CalendarDateTime} from '@internationalized/date';
-import {DateRangePicker} from '../';
+import {DateRangePicker} from '../src/DateRangePicker';
 import type {Meta, StoryObj} from '@storybook/react';
 import {userEvent} from 'storybook/test';
 
diff --git a/packages/@react-spectrum/s2/chromatic/Dialog.stories.tsx b/packages/@react-spectrum/s2/chromatic/Dialog.stories.tsx
index 1b11dc5f7b5..9afef93dc4b 100644
--- a/packages/@react-spectrum/s2/chromatic/Dialog.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Dialog.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Dialog} from '../src';
+import {Dialog} from '../src/Dialog';
 import {DialogContainerExample, DialogTriggerExample, Example, ExampleStoryType} from '../stories/Dialog.stories';
 import type {Meta, StoryObj} from '@storybook/react';
 import {userEvent, within} from 'storybook/test';
diff --git a/packages/@react-spectrum/s2/chromatic/DialogRTL.stories.tsx b/packages/@react-spectrum/s2/chromatic/DialogRTL.stories.tsx
index 4df1bdfa081..21e39226ccb 100644
--- a/packages/@react-spectrum/s2/chromatic/DialogRTL.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/DialogRTL.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Dialog} from '../src';
+import {Dialog} from '../src/Dialog';
 import type {Meta} from '@storybook/react';
 
 const meta: Meta<typeof Dialog> = {
diff --git a/packages/@react-spectrum/s2/chromatic/Disclosure.stories.tsx b/packages/@react-spectrum/s2/chromatic/Disclosure.stories.tsx
index 78314159313..09a5e91a8be 100644
--- a/packages/@react-spectrum/s2/chromatic/Disclosure.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Disclosure.stories.tsx
@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, Disclosure, DisclosureHeader, DisclosurePanel, DisclosureTitle} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {Disclosure, DisclosureHeader, DisclosurePanel, DisclosureTitle} from '../src/Disclosure';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import React from 'react';
diff --git a/packages/@react-spectrum/s2/chromatic/Divider.stories.tsx b/packages/@react-spectrum/s2/chromatic/Divider.stories.tsx
index dc00f938f54..38a95842aac 100644
--- a/packages/@react-spectrum/s2/chromatic/Divider.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Divider.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {baseColor, style} from '../style/spectrum-theme' with {type: 'macro'};
-import {Divider} from '../src';
+import {Divider} from '../src/Divider';
 
 import type {Meta, StoryObj} from '@storybook/react';
 import {StaticColorDecorator} from '../stories/utils';
diff --git a/packages/@react-spectrum/s2/chromatic/DropZone.stories.tsx b/packages/@react-spectrum/s2/chromatic/DropZone.stories.tsx
index d9df5f5c865..e1063d2a43c 100644
--- a/packages/@react-spectrum/s2/chromatic/DropZone.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/DropZone.stories.tsx
@@ -10,14 +10,24 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, ButtonGroup, Content, DropZone, DropZoneProps, FileTrigger, Heading, IllustratedMessage} from '../src';
+import {Button} from '../src/Button';
+
+import {ButtonGroup} from '../src/ButtonGroup';
 import Cloud from '../spectrum-illustrations/linear/Cloud';
 import CloudUpload from '../spectrum-illustrations/gradient/generic1/CloudUpload';
+import {Content, Heading} from '../src/Content';
 import DropToUpload from '../spectrum-illustrations/linear/DropToUpload';
-import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from 'react-aria';
+import {DropZone, DropZoneProps} from '../src/DropZone';
+import {FileTrigger} from 'react-aria-components/FileTrigger';
+import {FocusRing} from 'react-aria/FocusRing';
+import {IllustratedMessage} from '../src/IllustratedMessage';
+import {mergeProps} from 'react-aria/mergeProps';
 import type {Meta, StoryObj} from '@storybook/react';
 import React, {ReactElement, useState} from 'react';
 import {style} from '../style/spectrum-theme' with { type: 'macro' };
+import {useButton} from 'react-aria/useButton';
+import {useClipboard} from 'react-aria/useClipboard';
+import {useDrag} from 'react-aria/useDrag';
 
 const meta: Meta<typeof DropZone> = {
   component: DropZone,
diff --git a/packages/@react-spectrum/s2/chromatic/Fonts.stories.tsx b/packages/@react-spectrum/s2/chromatic/Fonts.stories.tsx
index 0c5c8941f44..640f02b4a38 100644
--- a/packages/@react-spectrum/s2/chromatic/Fonts.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Fonts.stories.tsx
@@ -12,7 +12,7 @@
 
 import type {Meta} from '@storybook/react';
 import {style} from '../style' with {type: 'macro'};
-import {useLocale} from 'react-aria';
+import {useLocale} from 'react-aria/I18nProvider';
 
 const meta: Meta<any> = {
   title: 'S2 Chromatic/Fonts'
diff --git a/packages/@react-spectrum/s2/chromatic/Forms.stories.tsx b/packages/@react-spectrum/s2/chromatic/Forms.stories.tsx
index 5da7087d322..eea1205c653 100644
--- a/packages/@react-spectrum/s2/chromatic/Forms.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Forms.stories.tsx
@@ -10,43 +10,35 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  ActionButton,
-  Button,
-  Checkbox,
-  CheckboxGroup,
-  ColorField,
-  ColorSlider,
-  ComboBox,
-  ComboBoxItem,
-  Content,
-  ContextualHelp,
-  Divider,
-  Form,
-  FormProps,
-  Heading,
-  Meter,
-  NumberField,
-  Picker,
-  PickerItem,
-  ProgressBar,
-  Radio,
-  RadioGroup,
-  RangeSlider,
-  SearchField,
-  Slider,
-  Switch,
-  Tag,
-  TagGroup,
-  TextArea,
-  TextField,
-  ToggleButton
-} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {Button} from '../src/Button';
+import {Checkbox} from '../src/Checkbox';
+import {CheckboxGroup} from '../src/CheckboxGroup';
+import {ColorField} from '../src/ColorField';
+import {ColorSlider} from '../src/ColorSlider';
+import {ComboBox, ComboBoxItem} from '../src/ComboBox';
+import {Content, Heading} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
+import {Divider} from '../src/Divider';
+import {Form, FormProps} from '../src/Form';
 import type {Meta, StoryObj} from '@storybook/react';
+import {Meter} from '../src/Meter';
+import {NumberField} from '../src/NumberField';
+import {Picker, PickerItem} from '../src/Picker';
+import {ProgressBar} from '../src/ProgressBar';
+import {Radio, RadioGroup} from '../src/RadioGroup';
+import {RangeSlider} from '../src/RangeSlider';
 import {ReactElement, useState} from 'react';
+import {SearchField} from '../src/SearchField';
+import {Slider} from '../src/Slider';
 import SortDown from '../s2wf-icons/S2_Icon_SortDown_20_N.svg';
 import SortUp from '../s2wf-icons/S2_Icon_SortUp_20_N.svg';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
+import {Switch} from '../src/Switch';
+import {Tag, TagGroup} from '../src/TagGroup';
+import {TextArea, TextField} from '../src/TextField';
+import {ToggleButton} from '../src/ToggleButton';
 
 const meta: Meta<typeof Form> = {
   component: Form,
diff --git a/packages/@react-spectrum/s2/chromatic/IllustratedMessage.stories.tsx b/packages/@react-spectrum/s2/chromatic/IllustratedMessage.stories.tsx
index 45fd706c0db..1b45021c641 100644
--- a/packages/@react-spectrum/s2/chromatic/IllustratedMessage.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/IllustratedMessage.stories.tsx
@@ -10,9 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, ButtonGroup, Content, Heading, IllustratedMessage} from '../src';
+import {Button} from '../src/Button';
+
+import {ButtonGroup} from '../src/ButtonGroup';
 import Cloud from '../spectrum-illustrations/linear/Cloud';
+import {Content, Heading} from '../src/Content';
 import Folder from '../spectrum-illustrations/gradient/generic2/FolderOpen';
+import {IllustratedMessage} from '../src/IllustratedMessage';
 import type {Meta, StoryObj} from '@storybook/react';
 
 const meta: Meta<typeof IllustratedMessage> = {
diff --git a/packages/@react-spectrum/s2/chromatic/InlineAlert.stories.tsx b/packages/@react-spectrum/s2/chromatic/InlineAlert.stories.tsx
index eddd514b440..60f6f5932a3 100644
--- a/packages/@react-spectrum/s2/chromatic/InlineAlert.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/InlineAlert.stories.tsx
@@ -10,7 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Content, Heading, InlineAlert, InlineAlertProps} from '../src';
+import {Button} from '../src/Button';
+
+import {Content, Heading} from '../src/Content';
+import {InlineAlert, InlineAlertProps} from '../src/InlineAlert';
 import type {Meta, StoryObj} from '@storybook/react';
 import {ReactElement, useState} from 'react';
 
diff --git a/packages/@react-spectrum/s2/chromatic/Link.tsx b/packages/@react-spectrum/s2/chromatic/Link.tsx
index e309a2cc80d..9be12b5daea 100644
--- a/packages/@react-spectrum/s2/chromatic/Link.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Link.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Link} from '../src';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 import {StaticColorDecorator} from '../stories/utils';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
diff --git a/packages/@react-spectrum/s2/chromatic/LinkButton.stories.tsx b/packages/@react-spectrum/s2/chromatic/LinkButton.stories.tsx
index be13b5d8e00..894aa6a0ed8 100644
--- a/packages/@react-spectrum/s2/chromatic/LinkButton.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/LinkButton.stories.tsx
@@ -10,11 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {LinkButton, Text} from '../src';
+import {LinkButton} from '../src/Button';
+
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import {StaticColorDecorator} from '../stories/utils';
 import {style} from '../style/spectrum-theme' with { type: 'macro' };
+import {Text} from '../src/Content';
 
 const meta: Meta<typeof LinkButton> = {
   component: LinkButton,
diff --git a/packages/@react-spectrum/s2/chromatic/ListView.stories.tsx b/packages/@react-spectrum/s2/chromatic/ListView.stories.tsx
index b59ee06e31d..de0d453601f 100644
--- a/packages/@react-spectrum/s2/chromatic/ListView.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ListView.stories.tsx
@@ -10,13 +10,21 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, ActionButtonGroup, ActionMenu, Content, Heading, IllustratedMessage, Image, ListView, ListViewItem, MenuItem, Text} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {ActionButtonGroup} from '../src/ActionButtonGroup';
+import {ActionMenu} from '../src/ActionMenu';
 import {checkers} from './check';
+import {Content, Heading, Text} from '../src/Content';
 import Delete from '../s2wf-icons/S2_Icon_Delete_20_N.svg';
 import Edit from '../s2wf-icons/S2_Icon_Edit_20_N.svg';
 import File from '../s2wf-icons/S2_Icon_File_20_N.svg';
 import Folder from '../s2wf-icons/S2_Icon_Folder_20_N.svg';
 import FolderOpen from '../spectrum-illustrations/linear/FolderOpen';
+import {IllustratedMessage} from '../src/IllustratedMessage';
+import {Image} from '../src/Image';
+import {ListView, ListViewItem} from '../src/ListView';
+import {MenuItem} from '../src/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
 
diff --git a/packages/@react-spectrum/s2/chromatic/Menu.stories.tsx b/packages/@react-spectrum/s2/chromatic/Menu.stories.tsx
index 80a5e1ca1bd..d67e155bfc9 100644
--- a/packages/@react-spectrum/s2/chromatic/Menu.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Menu.stories.tsx
@@ -12,7 +12,7 @@
 
 import {BlendModes, DynamicExample, Example, KeyboardShortcuts, PublishAndExport, UnavailableMenuItem} from '../stories/Menu.stories';
 import {expect} from '@storybook/jest';
-import {Menu} from '../src';
+import {Menu} from '../src/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
 import {userEvent, within} from 'storybook/test';
 
diff --git a/packages/@react-spectrum/s2/chromatic/MenuRTL.stories.tsx b/packages/@react-spectrum/s2/chromatic/MenuRTL.stories.tsx
index 5d2e7f4db3a..51e1c70a8a8 100644
--- a/packages/@react-spectrum/s2/chromatic/MenuRTL.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/MenuRTL.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Menu} from '../src';
+import {Menu} from '../src/Menu';
 
 import type {Meta} from '@storybook/react';
 
diff --git a/packages/@react-spectrum/s2/chromatic/NumberField.stories.tsx b/packages/@react-spectrum/s2/chromatic/NumberField.stories.tsx
index 3ab7a4a13a9..6bcea65bba4 100644
--- a/packages/@react-spectrum/s2/chromatic/NumberField.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/NumberField.stories.tsx
@@ -10,17 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  Content,
-  ContextualHelp,
-  Footer,
-  Heading,
-  Link,
-  NumberField,
-  Text
-} from '../src';
+import {Content, Footer, Heading, Text} from '../src/Content';
+
+import {ContextualHelp} from '../src/ContextualHelp';
 import {generatePowerset} from '@react-spectrum/story-utils';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
+import {NumberField} from '../src/NumberField';
 import {NumberFieldProps} from '../src/NumberField';
 import {ReactElement} from 'react';
 import {shortName} from './utils';
diff --git a/packages/@react-spectrum/s2/chromatic/Picker.stories.tsx b/packages/@react-spectrum/s2/chromatic/Picker.stories.tsx
index 8fc3676894b..b2b80b95844 100644
--- a/packages/@react-spectrum/s2/chromatic/Picker.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Picker.stories.tsx
@@ -13,7 +13,7 @@
 import {AsyncPickerStory, AsyncPickerStoryType, ContextualHelpExample, CustomWidth, Dynamic, Example, Sections, WithAvatars, WithIcons} from '../stories/Picker.stories';
 import {expect} from '@storybook/jest';
 import type {Meta, StoryObj} from '@storybook/react';
-import {Picker, PickerItem} from '../src';
+import {Picker, PickerItem} from '../src/Picker';
 import {userEvent, waitFor, within} from 'storybook/test';
 
 const meta: Meta<typeof Picker<any>> = {
diff --git a/packages/@react-spectrum/s2/chromatic/PickerRTL.stories.tsx b/packages/@react-spectrum/s2/chromatic/PickerRTL.stories.tsx
index daa7151d66c..9f2735ab607 100644
--- a/packages/@react-spectrum/s2/chromatic/PickerRTL.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/PickerRTL.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import type {Meta} from '@storybook/react';
-import {Picker} from '../src';
+import {Picker} from '../src/Picker';
 
 const meta: Meta<typeof Picker<any>> = {
   component: Picker,
diff --git a/packages/@react-spectrum/s2/chromatic/Popover.stories.tsx b/packages/@react-spectrum/s2/chromatic/Popover.stories.tsx
index 50b12f9fa35..8b9aa4877e5 100644
--- a/packages/@react-spectrum/s2/chromatic/Popover.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Popover.stories.tsx
@@ -12,7 +12,7 @@
 
 import {AccountMenu, AutocompletePopover, CustomTrigger, HelpCenter, MenuTrigger} from '../stories/Popover.stories';
 import type {Meta, StoryObj} from '@storybook/react';
-import {Popover} from '../src';
+import {Popover} from '../src/Popover';
 import {userEvent} from 'storybook/test';
 
 const meta: Meta<typeof Popover> = {
diff --git a/packages/@react-spectrum/s2/chromatic/ProgressBar.stories.tsx b/packages/@react-spectrum/s2/chromatic/ProgressBar.stories.tsx
index ec37bf349c5..b6eddf0b881 100644
--- a/packages/@react-spectrum/s2/chromatic/ProgressBar.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ProgressBar.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import type {Meta, StoryObj} from '@storybook/react';
-import {ProgressBar} from '../src';
+import {ProgressBar} from '../src/ProgressBar';
 import {StaticColorDecorator} from '../stories/utils';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
 
diff --git a/packages/@react-spectrum/s2/chromatic/ProgressCircle.stories.tsx b/packages/@react-spectrum/s2/chromatic/ProgressCircle.stories.tsx
index ec12e641f8a..a627cf1cef2 100644
--- a/packages/@react-spectrum/s2/chromatic/ProgressCircle.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ProgressCircle.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import type {Meta, StoryObj} from '@storybook/react';
-import {ProgressCircle} from '../src';
+import {ProgressCircle} from '../src/ProgressCircle';
 import {StaticColorDecorator} from '../stories/utils';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
 
diff --git a/packages/@react-spectrum/s2/chromatic/RadioGroup.stories.tsx b/packages/@react-spectrum/s2/chromatic/RadioGroup.stories.tsx
index 9ed3a439146..650b8615e5f 100644
--- a/packages/@react-spectrum/s2/chromatic/RadioGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/RadioGroup.stories.tsx
@@ -10,17 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  Content,
-  ContextualHelp,
-  Footer,
-  Heading,
-  Link,
-  Radio,
-  RadioGroup,
-  Text
-} from '../src';
+import {Content, Footer, Heading, Text} from '../src/Content';
+
+import {ContextualHelp} from '../src/ContextualHelp';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
+import {Radio, RadioGroup} from '../src/RadioGroup';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
 
 const meta: Meta<typeof RadioGroup> = {
diff --git a/packages/@react-spectrum/s2/chromatic/RangeCalendar.stories.tsx b/packages/@react-spectrum/s2/chromatic/RangeCalendar.stories.tsx
index 41c9ac72e82..6b2d023311f 100644
--- a/packages/@react-spectrum/s2/chromatic/RangeCalendar.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/RangeCalendar.stories.tsx
@@ -12,9 +12,9 @@
 
 import {CalendarDate} from '@internationalized/date';
 import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
-import {DateValue} from 'react-aria';
+import {DateValue} from '@react-types/datepicker';
 import type {Meta, StoryObj} from '@storybook/react';
-import {RangeCalendar} from '../src';
+import {RangeCalendar} from '../src/RangeCalendar';
 import {userEvent} from 'storybook/test';
 
 const meta: Meta<typeof RangeCalendar> = {
diff --git a/packages/@react-spectrum/s2/chromatic/RangeSlider.stories.tsx b/packages/@react-spectrum/s2/chromatic/RangeSlider.stories.tsx
index 2c8d5064af7..627def378da 100644
--- a/packages/@react-spectrum/s2/chromatic/RangeSlider.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/RangeSlider.stories.tsx
@@ -14,7 +14,7 @@ import {Content, Footer, Heading, Text} from '../src/Content';
 import {ContextualHelp} from '../src/ContextualHelp';
 import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
-import {RangeSlider} from '../src';
+import {RangeSlider} from '../src/RangeSlider';
 
 const meta: Meta<typeof RangeSlider> = {
   component: RangeSlider,
diff --git a/packages/@react-spectrum/s2/chromatic/SearchField.stories.tsx b/packages/@react-spectrum/s2/chromatic/SearchField.stories.tsx
index 159a2c37151..81831bfd8de 100644
--- a/packages/@react-spectrum/s2/chromatic/SearchField.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/SearchField.stories.tsx
@@ -10,16 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  Content,
-  ContextualHelp,
-  Footer,
-  Heading,
-  Link,
-  SearchField,
-  Text
-} from '../src';
+import {Content, Footer, Heading, Text} from '../src/Content';
+
+import {ContextualHelp} from '../src/ContextualHelp';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
+import {SearchField} from '../src/SearchField';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
 
 const meta: Meta<typeof SearchField> = {
diff --git a/packages/@react-spectrum/s2/chromatic/SegmentedControl.stories.tsx b/packages/@react-spectrum/s2/chromatic/SegmentedControl.stories.tsx
index d6b7b830209..1e90d1ac6e2 100644
--- a/packages/@react-spectrum/s2/chromatic/SegmentedControl.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/SegmentedControl.stories.tsx
@@ -17,8 +17,9 @@ import ListBulleted from '../s2wf-icons/S2_Icon_ListBulleted_20_N.svg';
 import ListMultiSelect from '../s2wf-icons/S2_Icon_ListMultiSelect_20_N.svg';
 import ListNumbered from '../s2wf-icons/S2_Icon_ListNumbered_20_N.svg';
 import type {Meta, StoryObj} from '@storybook/react';
-import {SegmentedControl, SegmentedControlItem, Text} from '../src';
+import {SegmentedControl, SegmentedControlItem} from '../src/SegmentedControl';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
+import {Text} from '../src/Content';
 
 const meta: Meta<typeof SegmentedControl> = {
   component: SegmentedControl,
diff --git a/packages/@react-spectrum/s2/chromatic/SelectBoxGroup.stories.tsx b/packages/@react-spectrum/s2/chromatic/SelectBoxGroup.stories.tsx
index 1ba4323a881..09be09ea522 100644
--- a/packages/@react-spectrum/s2/chromatic/SelectBoxGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/SelectBoxGroup.stories.tsx
@@ -13,8 +13,9 @@
 import type {Meta, StoryObj} from '@storybook/react';
 import PaperAirplane from '../spectrum-illustrations/linear/Paperairplane';
 import React from 'react';
-import {SelectBox, SelectBoxGroup, Text} from '../src';
+import {SelectBox, SelectBoxGroup} from '../src/SelectBoxGroup';
 import Server from '../spectrum-illustrations/linear/Server';
+import {Text} from '../src/Content';
 
 const meta: Meta<typeof SelectBoxGroup> = {
   component: SelectBoxGroup,
diff --git a/packages/@react-spectrum/s2/chromatic/StatusLight.stories.tsx b/packages/@react-spectrum/s2/chromatic/StatusLight.stories.tsx
index 0609196c455..f8abebacc4c 100644
--- a/packages/@react-spectrum/s2/chromatic/StatusLight.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/StatusLight.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import type {Meta, StoryObj} from '@storybook/react';
-import {StatusLight} from '../src';
+import {StatusLight} from '../src/StatusLight';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
 
 const meta: Meta<typeof StatusLight> = {
diff --git a/packages/@react-spectrum/s2/chromatic/Switch.stories.tsx b/packages/@react-spectrum/s2/chromatic/Switch.stories.tsx
index 21d87025cc4..8ce801faa58 100644
--- a/packages/@react-spectrum/s2/chromatic/Switch.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Switch.stories.tsx
@@ -12,7 +12,7 @@
 
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
-import {Switch} from '../src';
+import {Switch} from '../src/Switch';
 
 const meta: Meta<typeof Switch> = {
   component: Switch,
diff --git a/packages/@react-spectrum/s2/chromatic/TableView.stories.tsx b/packages/@react-spectrum/s2/chromatic/TableView.stories.tsx
index fe35d1dd7de..23057e6083b 100644
--- a/packages/@react-spectrum/s2/chromatic/TableView.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/TableView.stories.tsx
@@ -11,13 +11,16 @@
  */
 
 import {action} from 'storybook/actions';
-import {Cell, Column, Content, Heading, IllustratedMessage, Link, Row, TableBody, TableHeader, TableView, TableViewProps} from '../src';
+import {Cell, Column, Row, TableBody, TableHeader, TableView, TableViewProps} from '../src/TableView';
+import {Content, Heading} from '../src/Content';
 import FolderOpen from '../spectrum-illustrations/linear/FolderOpen';
+import {IllustratedMessage} from '../src/IllustratedMessage';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 import {ReactElement, useState} from 'react';
-import {SortDescriptor} from 'react-aria-components';
+import {SortDescriptor} from '@react-types/shared';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
-import {useAsyncList} from '@react-stately/data';
+import {useAsyncList} from 'react-stately/useAsyncList';
 
 const meta: Meta<typeof TableView> = {
   component: TableView,
diff --git a/packages/@react-spectrum/s2/chromatic/Tabs.stories.tsx b/packages/@react-spectrum/s2/chromatic/Tabs.stories.tsx
index 04f90789662..ae27ad04dc3 100644
--- a/packages/@react-spectrum/s2/chromatic/Tabs.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Tabs.stories.tsx
@@ -11,12 +11,14 @@
  */
 
 import Bell from '../s2wf-icons/S2_Icon_Bell_20_N.svg';
-import {Button, Tab, TabList, TabPanel, Tabs} from '../src';
-import {Collection, Text} from '@react-spectrum/s2';
+import {Button} from '../src/Button';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
 import Edit from '../s2wf-icons/S2_Icon_Edit_20_N.svg';
 import Heart from '../s2wf-icons/S2_Icon_Heart_20_N.svg';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style/spectrum-theme' with { type: 'macro' };
+import {Tab, TabList, TabPanel, Tabs} from '../src/Tabs';
+import {Text} from '../src/Content';
 import {userEvent} from 'storybook/test';
 import {useState} from 'react';
 
diff --git a/packages/@react-spectrum/s2/chromatic/TagGroup.stories.tsx b/packages/@react-spectrum/s2/chromatic/TagGroup.stories.tsx
index 349334d0e28..482b331dfa7 100644
--- a/packages/@react-spectrum/s2/chromatic/TagGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/TagGroup.stories.tsx
@@ -11,21 +11,15 @@
  */
 
 import {action} from 'storybook/actions';
-import {
-  Avatar,
-  Content,
-  ContextualHelp,
-  Footer,
-  Heading,
-  Image,
-  Link,
-  Tag,
-  TagGroup,
-  Text
-} from '../src';
+import {Avatar} from '../src/Avatar';
+import {Content, Footer, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
+import {Image} from '../src/Image';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
+import {Tag, TagGroup} from '../src/TagGroup';
 
 const meta: Meta<typeof TagGroup<any>> = {
   component: TagGroup,
diff --git a/packages/@react-spectrum/s2/chromatic/TextField.stories.tsx b/packages/@react-spectrum/s2/chromatic/TextField.stories.tsx
index a355c43ddc9..6b36960b013 100644
--- a/packages/@react-spectrum/s2/chromatic/TextField.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/TextField.stories.tsx
@@ -10,12 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Form, TextArea, TextField} from '../src';
+import {Button} from '../src/Button';
+
 import {Content, Footer, Heading, Text} from '../src/Content';
 import {ContextualHelp} from '../src/ContextualHelp';
+import {Form} from '../src/Form';
 import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
+import {TextArea, TextField} from '../src/TextField';
 
 const meta: Meta<typeof TextField> = {
   component: TextField,
diff --git a/packages/@react-spectrum/s2/chromatic/TimeField.stories.tsx b/packages/@react-spectrum/s2/chromatic/TimeField.stories.tsx
index 4fa00563143..65771161454 100644
--- a/packages/@react-spectrum/s2/chromatic/TimeField.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/TimeField.stories.tsx
@@ -12,7 +12,7 @@
 
 import type {Meta, StoryObj} from '@storybook/react';
 import {Time} from '@internationalized/date';
-import {TimeField} from '../';
+import {TimeField} from '../src/TimeField';
 import {userEvent} from 'storybook/test';
 
 const meta: Meta<typeof TimeField> = {
diff --git a/packages/@react-spectrum/s2/chromatic/Toast.stories.tsx b/packages/@react-spectrum/s2/chromatic/Toast.stories.tsx
index 5d89bbc6189..4dc10809deb 100644
--- a/packages/@react-spectrum/s2/chromatic/Toast.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Toast.stories.tsx
@@ -13,8 +13,8 @@
 import type {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 import {SpectrumToast, SpectrumToastValue} from '../src/Toast';
-import {UNSTABLE_ToastStateContext} from 'react-aria-components';
-import {useToastState} from 'react-stately';
+import {UNSTABLE_ToastStateContext} from 'react-aria-components/Toast';
+import {useToastState} from 'react-stately/useToastState';
 
 function FakeToast(props: SpectrumToastValue) {
   return (
diff --git a/packages/@react-spectrum/s2/chromatic/ToggleButton.stories.tsx b/packages/@react-spectrum/s2/chromatic/ToggleButton.stories.tsx
index fe3535931d2..bdca3623a2f 100644
--- a/packages/@react-spectrum/s2/chromatic/ToggleButton.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ToggleButton.stories.tsx
@@ -17,7 +17,8 @@ import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import {ReactElement} from 'react';
 import {shortName} from './utils';
 import {style} from '../style' with { type: 'macro' };
-import {Text, ToggleButton, ToggleButtonProps} from '../src';
+import {Text} from '../src/Content';
+import {ToggleButton, ToggleButtonProps} from '../src/ToggleButton';
 
 const events = ['onPress', 'onPressChange', 'onPressEnd', 'onPressStart', 'onPressUp', 'onChange'];
 
diff --git a/packages/@react-spectrum/s2/chromatic/ToggleButtonGroup.stories.tsx b/packages/@react-spectrum/s2/chromatic/ToggleButtonGroup.stories.tsx
index 16c4724dcd6..bb68808ce34 100644
--- a/packages/@react-spectrum/s2/chromatic/ToggleButtonGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/ToggleButtonGroup.stories.tsx
@@ -15,7 +15,9 @@ import {categorizeArgTypes, getActionArgs, StaticColorDecorator} from '../storie
 import Italic from '../s2wf-icons/S2_Icon_TextItalic_20_N.svg';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style' with { type: 'macro' };
-import {Text, ToggleButton, ToggleButtonGroup} from '../src';
+import {Text} from '../src/Content';
+import {ToggleButton} from '../src/ToggleButton';
+import {ToggleButtonGroup} from '../src/ToggleButtonGroup';
 import Underline from '../s2wf-icons/S2_Icon_TextUnderline_20_N.svg';
 
 const events = ['onPress', 'onPressChange', 'onPressEnd', 'onPressStart', 'onPressUp', 'onChange'];
diff --git a/packages/@react-spectrum/s2/chromatic/Tooltip.stories.tsx b/packages/@react-spectrum/s2/chromatic/Tooltip.stories.tsx
index bb93ad90fbe..6082adecf5a 100644
--- a/packages/@react-spectrum/s2/chromatic/Tooltip.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/Tooltip.stories.tsx
@@ -12,7 +12,7 @@
 
 import {Example, LongLabel} from '../stories/Tooltip.stories';
 import type {Meta, StoryObj} from '@storybook/react';
-import {Tooltip} from '../src';
+import {Tooltip} from '../src/Tooltip';
 import {userEvent, within} from 'storybook/test';
 
 const meta: Meta<typeof Tooltip> = {
diff --git a/packages/@react-spectrum/s2/chromatic/TooltipRTL.stories.tsx b/packages/@react-spectrum/s2/chromatic/TooltipRTL.stories.tsx
index 8e77b8394f8..1c1ef527825 100644
--- a/packages/@react-spectrum/s2/chromatic/TooltipRTL.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/TooltipRTL.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import type {Meta} from '@storybook/react';
-import {Tooltip} from '../src';
+import {Tooltip} from '../src/Tooltip';
 
 const meta: Meta<typeof Tooltip> = {
   component: Tooltip,
diff --git a/packages/@react-spectrum/s2/chromatic/TreeView.stories.tsx b/packages/@react-spectrum/s2/chromatic/TreeView.stories.tsx
index b718f1702c0..ba93363e933 100644
--- a/packages/@react-spectrum/s2/chromatic/TreeView.stories.tsx
+++ b/packages/@react-spectrum/s2/chromatic/TreeView.stories.tsx
@@ -10,14 +10,29 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionMenu, Collection, Content, Heading, IllustratedMessage, Link, MenuItem, Text, TreeView, TreeViewItem, TreeViewItemContent, TreeViewItemProps, TreeViewProps} from '../src';
+import {ActionMenu} from '../src/ActionMenu';
+
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {Content, Heading, Text} from '../src/Content';
 import Delete from '../s2wf-icons/S2_Icon_Delete_20_N.svg';
 import Edit from '../s2wf-icons/S2_Icon_Edit_20_N.svg';
 import FileTxt from '../s2wf-icons/S2_Icon_FileText_20_N.svg';
+
 import Folder from '../s2wf-icons/S2_Icon_Folder_20_N.svg';
+
 import FolderOpen from '../spectrum-illustrations/linear/FolderOpen';
+import {IllustratedMessage} from '../src/IllustratedMessage';
+import {Link} from '../src/Link';
+import {MenuItem} from '../src/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
 import {ReactElement} from 'react';
+import {
+  TreeView,
+  TreeViewItem,
+  TreeViewItemContent,
+  TreeViewItemProps,
+  TreeViewProps
+} from '../src/TreeView';
 
 const meta: Meta<typeof TreeView> = {
   component: TreeView,
diff --git a/packages/@react-spectrum/s2/exports/Accordion.ts b/packages/@react-spectrum/s2/exports/Accordion.ts
new file mode 100644
index 00000000000..befdefec5fc
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Accordion.ts
@@ -0,0 +1,3 @@
+export {Accordion, AccordionContext, AccordionItem, AccordionItemHeader, AccordionItemTitle, AccordionItemPanel} from '../src/Accordion';
+
+export type {AccordionProps, AccordionItemProps, AccordionItemHeaderProps, AccordionItemTitleProps, AccordionItemPanelProps, AccordionItemState, AccordionItemRenderProps} from '../src/Accordion';
diff --git a/packages/@react-spectrum/s2/exports/ActionBar.ts b/packages/@react-spectrum/s2/exports/ActionBar.ts
new file mode 100644
index 00000000000..2397bc14890
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ActionBar.ts
@@ -0,0 +1,2 @@
+export {ActionBar, ActionBarContext} from '../src/ActionBar';
+export type {ActionBarProps} from '../src/ActionBar';
diff --git a/packages/@react-spectrum/s2/exports/ActionButton.ts b/packages/@react-spectrum/s2/exports/ActionButton.ts
new file mode 100644
index 00000000000..e95388d46cf
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ActionButton.ts
@@ -0,0 +1,2 @@
+export {ActionButton, ActionButtonContext} from '../src/ActionButton';
+export type {ActionButtonProps} from '../src/ActionButton';
diff --git a/packages/@react-spectrum/s2/exports/ActionButtonGroup.ts b/packages/@react-spectrum/s2/exports/ActionButtonGroup.ts
new file mode 100644
index 00000000000..a98d2a7d92d
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ActionButtonGroup.ts
@@ -0,0 +1,2 @@
+export {ActionButtonGroup, ActionButtonGroupContext} from '../src/ActionButtonGroup';
+export type {ActionButtonGroupProps} from '../src/ActionButtonGroup';
diff --git a/packages/@react-spectrum/s2/exports/ActionMenu.ts b/packages/@react-spectrum/s2/exports/ActionMenu.ts
new file mode 100644
index 00000000000..f16512aa175
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ActionMenu.ts
@@ -0,0 +1,2 @@
+export {ActionMenu, ActionMenuContext} from '../src/ActionMenu';
+export type {ActionMenuProps} from '../src/ActionMenu';
diff --git a/packages/@react-spectrum/s2/exports/AlertDialog.ts b/packages/@react-spectrum/s2/exports/AlertDialog.ts
new file mode 100644
index 00000000000..914706b5def
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/AlertDialog.ts
@@ -0,0 +1,2 @@
+export {AlertDialog} from '../src/AlertDialog';
+export type {AlertDialogProps} from '../src/AlertDialog';
diff --git a/packages/@react-spectrum/s2/exports/Avatar.ts b/packages/@react-spectrum/s2/exports/Avatar.ts
new file mode 100644
index 00000000000..e430ce240f0
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Avatar.ts
@@ -0,0 +1,2 @@
+export {Avatar, AvatarContext} from '../src/Avatar';
+export type {AvatarProps} from '../src/Avatar';
diff --git a/packages/@react-spectrum/s2/exports/AvatarGroup.ts b/packages/@react-spectrum/s2/exports/AvatarGroup.ts
new file mode 100644
index 00000000000..835d47c98b6
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/AvatarGroup.ts
@@ -0,0 +1,2 @@
+export {AvatarGroup, AvatarGroupContext} from '../src/AvatarGroup';
+export type {AvatarGroupProps} from '../src/AvatarGroup';
diff --git a/packages/@react-spectrum/s2/exports/Badge.ts b/packages/@react-spectrum/s2/exports/Badge.ts
new file mode 100644
index 00000000000..7298807b43e
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Badge.ts
@@ -0,0 +1,2 @@
+export {Badge, BadgeContext} from '../src/Badge';
+export type {BadgeProps} from '../src/Badge';
diff --git a/packages/@react-spectrum/s2/exports/Breadcrumbs.ts b/packages/@react-spectrum/s2/exports/Breadcrumbs.ts
new file mode 100644
index 00000000000..d40579fea54
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Breadcrumbs.ts
@@ -0,0 +1,2 @@
+export {Breadcrumbs, Breadcrumb, BreadcrumbsContext} from '../src/Breadcrumbs';
+export type {BreadcrumbsProps, BreadcrumbProps} from '../src/Breadcrumbs';
diff --git a/packages/@react-spectrum/s2/exports/Button.ts b/packages/@react-spectrum/s2/exports/Button.ts
new file mode 100644
index 00000000000..b505cffe47d
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Button.ts
@@ -0,0 +1,2 @@
+export {Button, LinkButton, ButtonContext, LinkButtonContext} from '../src/Button';
+export type {ButtonProps, LinkButtonProps} from '../src/Button';
diff --git a/packages/@react-spectrum/s2/exports/ButtonGroup.ts b/packages/@react-spectrum/s2/exports/ButtonGroup.ts
new file mode 100644
index 00000000000..8513c99c3aa
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ButtonGroup.ts
@@ -0,0 +1,2 @@
+export {ButtonGroup, ButtonGroupContext} from '../src/ButtonGroup';
+export type {ButtonGroupProps} from '../src/ButtonGroup';
diff --git a/packages/@react-spectrum/s2/exports/Calendar.ts b/packages/@react-spectrum/s2/exports/Calendar.ts
new file mode 100644
index 00000000000..34f37ac5f0e
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Calendar.ts
@@ -0,0 +1,2 @@
+export {Calendar, CalendarContext} from '../src/Calendar';
+export type {CalendarProps} from '../src/Calendar';
diff --git a/packages/@react-spectrum/s2/exports/Card.ts b/packages/@react-spectrum/s2/exports/Card.ts
new file mode 100644
index 00000000000..bd59a827d10
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Card.ts
@@ -0,0 +1,2 @@
+export {Card, CardPreview, CollectionCardPreview, AssetCard, UserCard, ProductCard, CardContext} from '../src/Card';
+export type {CardProps, CardPreviewProps, AssetCardProps, ProductCardProps, UserCardProps} from '../src/Card';
diff --git a/packages/@react-spectrum/s2/exports/CardView.ts b/packages/@react-spectrum/s2/exports/CardView.ts
new file mode 100644
index 00000000000..5fa33405736
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/CardView.ts
@@ -0,0 +1,2 @@
+export {CardView, CardViewContext} from '../src/CardView';
+export type {CardViewProps} from '../src/CardView';
diff --git a/packages/@react-spectrum/s2/exports/Checkbox.ts b/packages/@react-spectrum/s2/exports/Checkbox.ts
new file mode 100644
index 00000000000..90d2c00a112
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Checkbox.ts
@@ -0,0 +1,2 @@
+export {Checkbox, CheckboxContext} from '../src/Checkbox';
+export type {CheckboxProps} from '../src/Checkbox';
diff --git a/packages/@react-spectrum/s2/exports/CheckboxGroup.ts b/packages/@react-spectrum/s2/exports/CheckboxGroup.ts
new file mode 100644
index 00000000000..25714e834ef
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/CheckboxGroup.ts
@@ -0,0 +1,2 @@
+export {CheckboxGroup, CheckboxGroupContext} from '../src/CheckboxGroup';
+export type {CheckboxGroupProps} from '../src/CheckboxGroup';
diff --git a/packages/@react-spectrum/s2/exports/CloseButton.ts b/packages/@react-spectrum/s2/exports/CloseButton.ts
new file mode 100644
index 00000000000..b5ddf8610bc
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/CloseButton.ts
@@ -0,0 +1,2 @@
+export {CloseButton} from '../src/CloseButton';
+export type {CloseButtonProps} from '../src/CloseButton';
diff --git a/packages/@react-spectrum/s2/exports/ColorArea.ts b/packages/@react-spectrum/s2/exports/ColorArea.ts
new file mode 100644
index 00000000000..e38d584f0aa
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ColorArea.ts
@@ -0,0 +1,2 @@
+export {ColorArea, ColorAreaContext} from '../src/ColorArea';
+export type {ColorAreaProps} from '../src/ColorArea';
diff --git a/packages/@react-spectrum/s2/exports/ColorField.ts b/packages/@react-spectrum/s2/exports/ColorField.ts
new file mode 100644
index 00000000000..02d46a8975e
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ColorField.ts
@@ -0,0 +1,2 @@
+export {ColorField, ColorFieldContext} from '../src/ColorField';
+export type {ColorFieldProps} from '../src/ColorField';
diff --git a/packages/@react-spectrum/s2/exports/ColorSlider.ts b/packages/@react-spectrum/s2/exports/ColorSlider.ts
new file mode 100644
index 00000000000..0d040778d76
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ColorSlider.ts
@@ -0,0 +1,2 @@
+export {ColorSlider, ColorSliderContext} from '../src/ColorSlider';
+export type {ColorSliderProps} from '../src/ColorSlider';
diff --git a/packages/@react-spectrum/s2/exports/ColorSwatch.ts b/packages/@react-spectrum/s2/exports/ColorSwatch.ts
new file mode 100644
index 00000000000..6d3290f5c64
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ColorSwatch.ts
@@ -0,0 +1,2 @@
+export {ColorSwatch, ColorSwatchContext} from '../src/ColorSwatch';
+export type {ColorSwatchProps} from '../src/ColorSwatch';
diff --git a/packages/@react-spectrum/s2/exports/ColorSwatchPicker.ts b/packages/@react-spectrum/s2/exports/ColorSwatchPicker.ts
new file mode 100644
index 00000000000..5ce718c3500
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ColorSwatchPicker.ts
@@ -0,0 +1,2 @@
+export {ColorSwatchPicker, ColorSwatchPickerContext} from '../src/ColorSwatchPicker';
+export type {ColorSwatchPickerProps} from '../src/ColorSwatchPicker';
diff --git a/packages/@react-spectrum/s2/exports/ColorWheel.ts b/packages/@react-spectrum/s2/exports/ColorWheel.ts
new file mode 100644
index 00000000000..8fd32ce9b96
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ColorWheel.ts
@@ -0,0 +1,2 @@
+export {ColorWheel, ColorWheelContext} from '../src/ColorWheel';
+export type {ColorWheelProps} from '../src/ColorWheel';
diff --git a/packages/@react-spectrum/s2/exports/ComboBox.ts b/packages/@react-spectrum/s2/exports/ComboBox.ts
new file mode 100644
index 00000000000..cb5437b07bc
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ComboBox.ts
@@ -0,0 +1,2 @@
+export {ComboBox, ComboBoxItem, ComboBoxSection, ComboBoxContext} from '../src/ComboBox';
+export type {ComboBoxProps, ComboBoxItemProps, ComboBoxSectionProps} from '../src/ComboBox';
diff --git a/packages/@react-spectrum/s2/exports/Content.ts b/packages/@react-spectrum/s2/exports/Content.ts
new file mode 100644
index 00000000000..7a2d3fc9311
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Content.ts
@@ -0,0 +1 @@
+export {Heading, HeadingContext, Header, HeaderContext, Content, ContentContext, Footer, FooterContext, Text, TextContext, Keyboard, KeyboardContext} from '../src/Content';
diff --git a/packages/@react-spectrum/s2/exports/ContextualHelp.ts b/packages/@react-spectrum/s2/exports/ContextualHelp.ts
new file mode 100644
index 00000000000..64f1db7b5dd
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ContextualHelp.ts
@@ -0,0 +1,2 @@
+export {ContextualHelp, ContextualHelpContext, ContextualHelpPopover} from '../src/ContextualHelp';
+export type {ContextualHelpProps, ContextualHelpStyleProps, ContextualHelpPopoverProps} from '../src/ContextualHelp';
diff --git a/packages/@react-spectrum/s2/exports/CustomDialog.ts b/packages/@react-spectrum/s2/exports/CustomDialog.ts
new file mode 100644
index 00000000000..90aad9001b4
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/CustomDialog.ts
@@ -0,0 +1,2 @@
+export {CustomDialog} from '../src/CustomDialog';
+export type {CustomDialogProps} from '../src/CustomDialog';
diff --git a/packages/@react-spectrum/s2/exports/DateField.ts b/packages/@react-spectrum/s2/exports/DateField.ts
new file mode 100644
index 00000000000..b21bb1102a5
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/DateField.ts
@@ -0,0 +1,2 @@
+export {DateField, DateFieldContext} from '../src/DateField';
+export type {DateFieldProps} from '../src/DateField';
diff --git a/packages/@react-spectrum/s2/exports/DatePicker.ts b/packages/@react-spectrum/s2/exports/DatePicker.ts
new file mode 100644
index 00000000000..588cb5c18e0
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/DatePicker.ts
@@ -0,0 +1,2 @@
+export {DatePicker, DatePickerContext} from '../src/DatePicker';
+export type {DatePickerProps} from '../src/DatePicker';
diff --git a/packages/@react-spectrum/s2/exports/DateRangePicker.ts b/packages/@react-spectrum/s2/exports/DateRangePicker.ts
new file mode 100644
index 00000000000..3f8278ecef2
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/DateRangePicker.ts
@@ -0,0 +1,2 @@
+export {DateRangePicker, DateRangePickerContext} from '../src/DateRangePicker';
+export type {DateRangePickerProps} from '../src/DateRangePicker';
diff --git a/packages/@react-spectrum/s2/exports/Dialog.ts b/packages/@react-spectrum/s2/exports/Dialog.ts
new file mode 100644
index 00000000000..9f7497af1b1
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Dialog.ts
@@ -0,0 +1,2 @@
+export {Dialog} from '../src/Dialog';
+export type {DialogProps} from '../src/Dialog';
diff --git a/packages/@react-spectrum/s2/exports/DialogContainer.ts b/packages/@react-spectrum/s2/exports/DialogContainer.ts
new file mode 100644
index 00000000000..112b1c8cc6c
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/DialogContainer.ts
@@ -0,0 +1,2 @@
+export {DialogContainer, useDialogContainer} from '../src/DialogContainer';
+export type {DialogContainerProps, DialogContainerValue} from '../src/DialogContainer';
diff --git a/packages/@react-spectrum/s2/exports/DialogTrigger.ts b/packages/@react-spectrum/s2/exports/DialogTrigger.ts
new file mode 100644
index 00000000000..c4211c6f998
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/DialogTrigger.ts
@@ -0,0 +1,2 @@
+export {DialogTrigger} from '../src/DialogTrigger';
+export type {DialogTriggerProps} from '../src/DialogTrigger';
diff --git a/packages/@react-spectrum/s2/exports/Disclosure.ts b/packages/@react-spectrum/s2/exports/Disclosure.ts
new file mode 100644
index 00000000000..1c14e5b3e38
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Disclosure.ts
@@ -0,0 +1,2 @@
+export {DisclosureHeader, Disclosure, DisclosurePanel, DisclosureContext, DisclosureTitle} from '../src/Disclosure';
+export type {DisclosureProps, DisclosurePanelProps} from '../src/Disclosure';
diff --git a/packages/@react-spectrum/s2/exports/Divider.ts b/packages/@react-spectrum/s2/exports/Divider.ts
new file mode 100644
index 00000000000..39881022f40
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Divider.ts
@@ -0,0 +1,2 @@
+export {Divider, DividerContext} from '../src/Divider';
+export type {DividerProps} from '../src/Divider';
diff --git a/packages/@react-spectrum/s2/exports/DropZone.ts b/packages/@react-spectrum/s2/exports/DropZone.ts
new file mode 100644
index 00000000000..35355ef944e
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/DropZone.ts
@@ -0,0 +1,2 @@
+export {DropZone, DropZoneContext} from '../src/DropZone';
+export type {DropZoneProps} from '../src/DropZone';
diff --git a/packages/@react-spectrum/s2/exports/Form.ts b/packages/@react-spectrum/s2/exports/Form.ts
new file mode 100644
index 00000000000..a4b81251244
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Form.ts
@@ -0,0 +1,2 @@
+export {Form} from '../src/Form';
+export type {FormProps} from '../src/Form';
diff --git a/packages/@react-spectrum/s2/exports/FullscreenDialog.ts b/packages/@react-spectrum/s2/exports/FullscreenDialog.ts
new file mode 100644
index 00000000000..6c3dca8b2f7
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/FullscreenDialog.ts
@@ -0,0 +1,2 @@
+export {FullscreenDialog} from '../src/FullscreenDialog';
+export type {FullscreenDialogProps} from '../src/FullscreenDialog';
diff --git a/packages/@react-spectrum/s2/exports/Icon.ts b/packages/@react-spectrum/s2/exports/Icon.ts
new file mode 100644
index 00000000000..31d43178624
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Icon.ts
@@ -0,0 +1,2 @@
+export {createIcon, createIllustration, IconContext, IllustrationContext} from '../src/Icon';
+export type {IconProps, IconContextValue, IllustrationProps, IllustrationContextValue} from '../src/Icon';
diff --git a/packages/@react-spectrum/s2/exports/IllustratedMessage.ts b/packages/@react-spectrum/s2/exports/IllustratedMessage.ts
new file mode 100644
index 00000000000..e5a98530130
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/IllustratedMessage.ts
@@ -0,0 +1 @@
+export {IllustratedMessage, IllustratedMessageContext} from '../src/IllustratedMessage';
diff --git a/packages/@react-spectrum/s2/exports/Image.ts b/packages/@react-spectrum/s2/exports/Image.ts
new file mode 100644
index 00000000000..f9f638210ea
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Image.ts
@@ -0,0 +1,2 @@
+export {Image, ImageContext} from '../src/Image';
+export type {ImageProps} from '../src/Image';
diff --git a/packages/@react-spectrum/s2/exports/ImageCoordinator.ts b/packages/@react-spectrum/s2/exports/ImageCoordinator.ts
new file mode 100644
index 00000000000..31dd43c5c46
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ImageCoordinator.ts
@@ -0,0 +1,2 @@
+export {ImageCoordinator} from '../src/ImageCoordinator';
+export type {ImageCoordinatorProps} from '../src/ImageCoordinator';
diff --git a/packages/@react-spectrum/s2/exports/InlineAlert.ts b/packages/@react-spectrum/s2/exports/InlineAlert.ts
new file mode 100644
index 00000000000..82c99739eff
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/InlineAlert.ts
@@ -0,0 +1,2 @@
+export {InlineAlert, InlineAlertContext} from '../src/InlineAlert';
+export type {InlineAlertProps} from '../src/InlineAlert';
diff --git a/packages/@react-spectrum/s2/exports/Link.ts b/packages/@react-spectrum/s2/exports/Link.ts
new file mode 100644
index 00000000000..ecbae2ccb33
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Link.ts
@@ -0,0 +1,2 @@
+export {Link, LinkContext} from '../src/Link';
+export type {LinkProps} from '../src/Link';
diff --git a/packages/@react-spectrum/s2/exports/ListView.ts b/packages/@react-spectrum/s2/exports/ListView.ts
new file mode 100644
index 00000000000..3145ed5d797
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ListView.ts
@@ -0,0 +1,2 @@
+export {ListView, ListViewContext, ListViewItem} from '../src/ListView';
+export type {ListViewProps, ListViewItemProps} from '../src/ListView';
diff --git a/packages/@react-spectrum/s2/exports/Menu.ts b/packages/@react-spectrum/s2/exports/Menu.ts
new file mode 100644
index 00000000000..e7d69c0d8ae
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Menu.ts
@@ -0,0 +1,2 @@
+export {MenuItem, MenuTrigger, Menu, MenuSection, SubmenuTrigger, UnavailableMenuItemTrigger, MenuContext} from '../src/Menu';
+export type {MenuTriggerProps, MenuProps, MenuItemProps, MenuSectionProps, SubmenuTriggerProps, UnavailableMenuItemTriggerProps} from '../src/Menu';
diff --git a/packages/@react-spectrum/s2/exports/Meter.ts b/packages/@react-spectrum/s2/exports/Meter.ts
new file mode 100644
index 00000000000..772238a7c6a
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Meter.ts
@@ -0,0 +1,2 @@
+export {Meter, MeterContext} from '../src/Meter';
+export type {MeterProps} from '../src/Meter';
diff --git a/packages/@react-spectrum/s2/exports/NotificationBadge.ts b/packages/@react-spectrum/s2/exports/NotificationBadge.ts
new file mode 100644
index 00000000000..92e53b9c02e
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/NotificationBadge.ts
@@ -0,0 +1,2 @@
+export {NotificationBadge, NotificationBadgeContext} from '../src/NotificationBadge';
+export type {NotificationBadgeProps} from '../src/NotificationBadge';
diff --git a/packages/@react-spectrum/s2/exports/NumberField.ts b/packages/@react-spectrum/s2/exports/NumberField.ts
new file mode 100644
index 00000000000..7bef67e9265
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/NumberField.ts
@@ -0,0 +1 @@
+export {NumberField, NumberFieldContext} from '../src/NumberField';
diff --git a/packages/@react-spectrum/s2/exports/Picker.ts b/packages/@react-spectrum/s2/exports/Picker.ts
new file mode 100644
index 00000000000..b7f72ace4d1
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Picker.ts
@@ -0,0 +1,2 @@
+export {Picker, PickerItem, PickerSection, PickerContext} from '../src/Picker';
+export type {PickerProps, PickerItemProps, PickerSectionProps} from '../src/Picker';
diff --git a/packages/@react-spectrum/s2/exports/Popover.ts b/packages/@react-spectrum/s2/exports/Popover.ts
new file mode 100644
index 00000000000..7df90b737f5
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Popover.ts
@@ -0,0 +1,2 @@
+export {Popover} from '../src/Popover';
+export type {PopoverProps} from '../src/Popover';
diff --git a/packages/@react-spectrum/s2/exports/ProgressBar.ts b/packages/@react-spectrum/s2/exports/ProgressBar.ts
new file mode 100644
index 00000000000..5196d2cc95e
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ProgressBar.ts
@@ -0,0 +1,2 @@
+export {ProgressBar, ProgressBarContext} from '../src/ProgressBar';
+export type {ProgressBarProps} from '../src/ProgressBar';
diff --git a/packages/@react-spectrum/s2/exports/ProgressCircle.ts b/packages/@react-spectrum/s2/exports/ProgressCircle.ts
new file mode 100644
index 00000000000..da5500fb306
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ProgressCircle.ts
@@ -0,0 +1,2 @@
+export {ProgressCircle, ProgressCircleContext} from '../src/ProgressCircle';
+export type {ProgressCircleProps} from '../src/ProgressCircle';
diff --git a/packages/@react-spectrum/s2/exports/Provider.ts b/packages/@react-spectrum/s2/exports/Provider.ts
new file mode 100644
index 00000000000..7feeeb7bf3e
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Provider.ts
@@ -0,0 +1,2 @@
+export {Provider, ColorSchemeContext} from '../src/Provider';
+export type {ProviderProps} from '../src/Provider';
diff --git a/packages/@react-spectrum/s2/exports/RadioGroup.ts b/packages/@react-spectrum/s2/exports/RadioGroup.ts
new file mode 100644
index 00000000000..a737a5626ae
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/RadioGroup.ts
@@ -0,0 +1,2 @@
+export {RadioGroup, RadioGroupContext, Radio} from '../src/RadioGroup';
+export type {RadioGroupProps, RadioProps} from '../src/RadioGroup';
diff --git a/packages/@react-spectrum/s2/exports/RangeCalendar.ts b/packages/@react-spectrum/s2/exports/RangeCalendar.ts
new file mode 100644
index 00000000000..a4c0b08d155
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/RangeCalendar.ts
@@ -0,0 +1,2 @@
+export {RangeCalendar, RangeCalendarContext} from '../src/RangeCalendar';
+export type {RangeCalendarProps} from '../src/RangeCalendar';
diff --git a/packages/@react-spectrum/s2/exports/RangeSlider.ts b/packages/@react-spectrum/s2/exports/RangeSlider.ts
new file mode 100644
index 00000000000..837a83ba972
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/RangeSlider.ts
@@ -0,0 +1,2 @@
+export {RangeSlider, RangeSliderContext} from '../src/RangeSlider';
+export type {RangeSliderProps} from '../src/RangeSlider';
diff --git a/packages/@react-spectrum/s2/exports/SearchField.ts b/packages/@react-spectrum/s2/exports/SearchField.ts
new file mode 100644
index 00000000000..b24ca1203b2
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/SearchField.ts
@@ -0,0 +1,2 @@
+export {SearchField, SearchFieldContext} from '../src/SearchField';
+export type {SearchFieldProps} from '../src/SearchField';
diff --git a/packages/@react-spectrum/s2/exports/SegmentedControl.ts b/packages/@react-spectrum/s2/exports/SegmentedControl.ts
new file mode 100644
index 00000000000..2a4907174a3
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/SegmentedControl.ts
@@ -0,0 +1,2 @@
+export {SegmentedControl, SegmentedControlItem, SegmentedControlContext} from '../src/SegmentedControl';
+export type {SegmentedControlProps, SegmentedControlItemProps} from '../src/SegmentedControl';
diff --git a/packages/@react-spectrum/s2/exports/SelectBoxGroup.ts b/packages/@react-spectrum/s2/exports/SelectBoxGroup.ts
new file mode 100644
index 00000000000..e0a8a7e1327
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/SelectBoxGroup.ts
@@ -0,0 +1,2 @@
+export {SelectBox, SelectBoxGroup, SelectBoxGroupContext} from '../src/SelectBoxGroup';
+export type {SelectBoxProps, SelectBoxGroupProps} from '../src/SelectBoxGroup';
diff --git a/packages/@react-spectrum/s2/exports/Skeleton.ts b/packages/@react-spectrum/s2/exports/Skeleton.ts
new file mode 100644
index 00000000000..70789e790f8
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Skeleton.ts
@@ -0,0 +1,2 @@
+export {Skeleton, useIsSkeleton} from '../src/Skeleton';
+export type {SkeletonProps} from '../src/Skeleton';
diff --git a/packages/@react-spectrum/s2/exports/SkeletonCollection.ts b/packages/@react-spectrum/s2/exports/SkeletonCollection.ts
new file mode 100644
index 00000000000..8e56efe6e2b
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/SkeletonCollection.ts
@@ -0,0 +1,2 @@
+export {SkeletonCollection} from '../src/SkeletonCollection';
+export type {SkeletonCollectionProps} from '../src/SkeletonCollection';
diff --git a/packages/@react-spectrum/s2/exports/Slider.ts b/packages/@react-spectrum/s2/exports/Slider.ts
new file mode 100644
index 00000000000..13064bb7803
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Slider.ts
@@ -0,0 +1,2 @@
+export {Slider, SliderContext} from '../src/Slider';
+export type {SliderProps} from '../src/Slider';
diff --git a/packages/@react-spectrum/s2/exports/StatusLight.ts b/packages/@react-spectrum/s2/exports/StatusLight.ts
new file mode 100644
index 00000000000..4cf379480ef
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/StatusLight.ts
@@ -0,0 +1,2 @@
+export {StatusLight, StatusLightContext} from '../src/StatusLight';
+export type {StatusLightProps} from '../src/StatusLight';
diff --git a/packages/@react-spectrum/s2/exports/Switch.ts b/packages/@react-spectrum/s2/exports/Switch.ts
new file mode 100644
index 00000000000..be32f24c77e
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Switch.ts
@@ -0,0 +1,2 @@
+export {Switch, SwitchContext} from '../src/Switch';
+export type {SwitchProps} from '../src/Switch';
diff --git a/packages/@react-spectrum/s2/exports/TableView.ts b/packages/@react-spectrum/s2/exports/TableView.ts
new file mode 100644
index 00000000000..4765486d2d2
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/TableView.ts
@@ -0,0 +1,2 @@
+export {TableView, TableHeader, TableBody, Row, Cell, Column, TableContext, EditableCell} from '../src/TableView';
+export type {TableViewProps, TableHeaderProps, TableBodyProps, RowProps, CellProps, ColumnProps} from '../src/TableView';
diff --git a/packages/@react-spectrum/s2/exports/Tabs.ts b/packages/@react-spectrum/s2/exports/Tabs.ts
new file mode 100644
index 00000000000..73c75694716
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Tabs.ts
@@ -0,0 +1,2 @@
+export {Tabs, TabList, Tab, TabPanel, TabsContext} from '../src/Tabs';
+export type {TabsProps, TabProps, TabListProps, TabPanelProps} from '../src/Tabs';
diff --git a/packages/@react-spectrum/s2/exports/TagGroup.ts b/packages/@react-spectrum/s2/exports/TagGroup.ts
new file mode 100644
index 00000000000..ea7b0b4fc3c
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/TagGroup.ts
@@ -0,0 +1,2 @@
+export {TagGroup, Tag, TagGroupContext} from '../src/TagGroup';
+export type {TagGroupProps, TagProps} from '../src/TagGroup';
diff --git a/packages/@react-spectrum/s2/exports/TextField.ts b/packages/@react-spectrum/s2/exports/TextField.ts
new file mode 100644
index 00000000000..dfdff403249
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/TextField.ts
@@ -0,0 +1,2 @@
+export {TextArea, TextField, TextAreaContext, TextFieldContext} from '../src/TextField';
+export type {TextFieldProps, TextAreaProps} from '../src/TextField';
diff --git a/packages/@react-spectrum/s2/exports/TimeField.ts b/packages/@react-spectrum/s2/exports/TimeField.ts
new file mode 100644
index 00000000000..1ced2fe9923
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/TimeField.ts
@@ -0,0 +1,2 @@
+export {TimeField, TimeFieldContext} from '../src/TimeField';
+export type {TimeFieldProps} from '../src/TimeField';
diff --git a/packages/@react-spectrum/s2/exports/Toast.ts b/packages/@react-spectrum/s2/exports/Toast.ts
new file mode 100644
index 00000000000..a93b2a13bfd
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Toast.ts
@@ -0,0 +1,2 @@
+export {ToastContainer, ToastQueue} from '../src/Toast';
+export type {ToastOptions, ToastContainerProps} from '../src/Toast';
diff --git a/packages/@react-spectrum/s2/exports/ToggleButton.ts b/packages/@react-spectrum/s2/exports/ToggleButton.ts
new file mode 100644
index 00000000000..4aa1d10b3f4
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ToggleButton.ts
@@ -0,0 +1,2 @@
+export {ToggleButton, ToggleButtonContext} from '../src/ToggleButton';
+export type {ToggleButtonProps} from '../src/ToggleButton';
diff --git a/packages/@react-spectrum/s2/exports/ToggleButtonGroup.ts b/packages/@react-spectrum/s2/exports/ToggleButtonGroup.ts
new file mode 100644
index 00000000000..99ead5cf82f
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/ToggleButtonGroup.ts
@@ -0,0 +1,2 @@
+export {ToggleButtonGroup, ToggleButtonGroupContext} from '../src/ToggleButtonGroup';
+export type {ToggleButtonGroupProps} from '../src/ToggleButtonGroup';
diff --git a/packages/@react-spectrum/s2/exports/Tooltip.ts b/packages/@react-spectrum/s2/exports/Tooltip.ts
new file mode 100644
index 00000000000..fb3466b9b67
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/Tooltip.ts
@@ -0,0 +1,2 @@
+export {Tooltip, TooltipTrigger} from '../src/Tooltip';
+export type {TooltipProps} from '../src/Tooltip';
diff --git a/packages/@react-spectrum/s2/exports/TreeView.ts b/packages/@react-spectrum/s2/exports/TreeView.ts
new file mode 100644
index 00000000000..a2f6d831aa6
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/TreeView.ts
@@ -0,0 +1,3 @@
+export {TreeView, TreeViewItem, TreeViewItemContent, TreeViewLoadMoreItem} from '../src/TreeView';
+
+export type {TreeViewProps, TreeViewItemProps, TreeViewItemContentProps, TreeViewLoadMoreItemProps} from '../src/TreeView';
diff --git a/packages/@react-spectrum/s2/src/index.ts b/packages/@react-spectrum/s2/exports/index.ts
similarity index 90%
rename from packages/@react-spectrum/s2/src/index.ts
rename to packages/@react-spectrum/s2/exports/index.ts
index 4730ba32fb2..352072662ee 100644
--- a/packages/@react-spectrum/s2/src/index.ts
+++ b/packages/@react-spectrum/s2/exports/index.ts
@@ -10,8 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-'use client';
-
+'use client';;
 export {Accordion, AccordionContext, AccordionItem, AccordionItemHeader, AccordionItemTitle, AccordionItemPanel} from './Accordion';
 export {ActionBar, ActionBarContext} from './ActionBar';
 export {ActionButton, ActionButtonContext} from './ActionButton';
@@ -91,8 +90,14 @@ export {TreeView, TreeViewItem, TreeViewItemContent, TreeViewLoadMoreItem} from
 
 export {pressScale} from './pressScale';
 
-export {Autocomplete, Collection, FileTrigger, parseColor, useLocale} from 'react-aria-components';
-export {useListData, useTreeData, useAsyncList} from 'react-stately';
+export {Autocomplete} from 'react-aria-components/Autocomplete';
+export {Collection} from 'react-aria/private/collections/CollectionBuilder';
+export {FileTrigger} from 'react-aria-components/FileTrigger';
+export {parseColor} from 'react-stately/Color';
+export {useLocale} from 'react-aria/I18nProvider';
+export {useListData} from 'react-stately/useListData';
+export {useTreeData} from 'react-stately/useTreeData';
+export {useAsyncList} from 'react-stately/useAsyncList';
 
 export type {AccordionProps, AccordionItemProps, AccordionItemHeaderProps, AccordionItemTitleProps, AccordionItemPanelProps, AccordionItemState, AccordionItemRenderProps} from './Accordion';
 export type {ActionBarProps} from './ActionBar';
@@ -167,5 +172,11 @@ export type {ToggleButtonProps} from './ToggleButton';
 export type {ToggleButtonGroupProps} from './ToggleButtonGroup';
 export type {TooltipProps} from './Tooltip';
 export type {TreeViewProps, TreeViewItemProps, TreeViewItemContentProps, TreeViewLoadMoreItemProps} from './TreeView';
-export type {AutocompleteProps, FileTriggerProps, TooltipTriggerComponentProps as TooltipTriggerProps, SortDescriptor, Color, Key, Selection, RouterConfig} from 'react-aria-components';
-export type {ListData, TreeData, AsyncListData} from 'react-stately';
+export type {AutocompleteProps} from 'react-aria-components/Autocomplete';
+export type {FileTriggerProps} from 'react-aria-components/FileTrigger';
+export type {TooltipTriggerComponentProps as TooltipTriggerProps} from 'react-aria-components/Tooltip';
+export type {SortDescriptor, Key, Selection, RouterConfig} from '@react-types/shared';
+export type {Color} from '@react-types/color';
+export type {ListData} from 'react-stately/useListData';
+export type {TreeData} from 'react-stately/useTreeData';
+export type {AsyncListData} from 'react-stately/useAsyncList';
diff --git a/packages/@react-spectrum/s2/exports/pressScale.ts b/packages/@react-spectrum/s2/exports/pressScale.ts
new file mode 100644
index 00000000000..55752e272dd
--- /dev/null
+++ b/packages/@react-spectrum/s2/exports/pressScale.ts
@@ -0,0 +1 @@
+export {pressScale} from '../src/pressScale';
diff --git a/packages/@react-spectrum/s2/index.ts b/packages/@react-spectrum/s2/index.ts
deleted file mode 100644
index dc59658a5da..00000000000
--- a/packages/@react-spectrum/s2/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2024 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/s2/package.json b/packages/@react-spectrum/s2/package.json
index bcbebd73541..bedc684c9e4 100644
--- a/packages/@react-spectrum/s2/package.json
+++ b/packages/@react-spectrum/s2/package.json
@@ -7,24 +7,20 @@
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
-  "main": "dist/main.cjs",
-  "module": "dist/module.mjs",
-  "types": "dist/types.d.ts",
+  "main": "./dist/exports/index.cjs",
+  "module": "./dist/exports/index.mjs",
+  "types": "./dist/types/exports/index.ts",
   "page": "dist/page.cjs",
   "style-module": "style/dist/module.mjs",
   "style-main": "style/dist/main.cjs",
-  "style-types": "style/dist/types.d.ts",
-  "source": "src/index.ts",
+  "source": "exports/index.ts",
   "exports": {
     ".": {
-      "source": "./src/index.ts",
-      "types": [
-        "./dist/types.d.ts",
-        "./src/index.ts"
-      ],
+      "source": "./exports/index.ts",
+      "types": "./dist/types/exports/index.ts",
       "module": "./dist/module.mjs",
-      "import": "./dist/module.mjs",
-      "require": "./dist/main.cjs"
+      "import": "./dist/exports/index.mjs",
+      "require": "./dist/exports/index.cjs"
     },
     "./page.css": {
       "source": "./src/page.ts",
@@ -61,12 +57,20 @@
       "require": "./illustrations/*.cjs"
     },
     "./illustrations/linear/internal/*": null,
-    "./illustrations/gradient/*/internal/*": null
+    "./illustrations/gradient/*/internal/*": null,
+    "./package.json": "./package.json",
+    "./*": {
+      "source": "./exports/*.ts",
+      "types": "./dist/types/exports/*.d.ts",
+      "import": "./dist/exports/*.mjs",
+      "require": "./dist/exports/*.cjs"
+    },
+    "./private/*": null
   },
   "targets": {
-    "module": {},
-    "main": {},
-    "types": {},
+    "module": false,
+    "main": false,
+    "types": false,
     "page": {
       "source": "src/page.ts",
       "isLibrary": true
@@ -83,9 +87,6 @@
       "outputFormat": "commonjs",
       "context": "node"
     },
-    "style-types": {
-      "source": "style/index.ts"
-    },
     "icons-module": {
       "source": "s2wf-icons/*.svg",
       "distDir": "icons",
@@ -119,6 +120,20 @@
       "isLibrary": true,
       "outputFormat": "commonjs",
       "includeNodeModules": false
+    },
+    "exports-module": {
+      "source": "exports/*.ts",
+      "distDir": "dist",
+      "isLibrary": true,
+      "outputFormat": "esmodule",
+      "includeNodeModules": false
+    },
+    "exports-main": {
+      "source": "exports/*.ts",
+      "distDir": "dist",
+      "isLibrary": true,
+      "outputFormat": "commonjs",
+      "includeNodeModules": false
     }
   },
   "browserslist": "last 2 Chrome versions, last 2 Safari versions, last 2 Firefox versions, last 2 Edge versions",
@@ -149,19 +164,12 @@
     "jest": "^29.5.0"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "3.46.2",
     "@internationalized/date": "^3.12.0",
     "@internationalized/number": "^3.6.5",
     "@parcel/macros": "^2.16.3",
-    "@react-aria/calendar": "^3.9.5",
-    "@react-aria/collections": "^3.0.3",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/live-announcer": "^3.4.4",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/layout": "^4.6.0",
-    "@react-stately/utils": "^3.11.0",
+    "@react-types/color": "^3.1.4",
+    "@react-types/datepicker": "^3.13.5",
     "@react-types/dialog": "^3.5.24",
     "@react-types/grid": "^3.3.8",
     "@react-types/overlays": "^3.9.4",
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3D.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3D.tsx
index 5fdaa36606d..0fc5394449f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3D.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3D.tsx
@@ -15,7 +15,7 @@ import _3D_M from 'illustration:./S2_fill_3D_generic1_96.svg';
 import _3D_S from 'illustration:./S2_fill_3D_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function _3D(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3Dasset.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3Dasset.tsx
index a73fb748a30..cf6e8107e42 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3Dasset.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/3Dasset.tsx
@@ -15,7 +15,7 @@ import _3Dasset_M from 'illustration:./S2_fill_3Dasset_generic1_96.svg';
 import _3Dasset_S from 'illustration:./S2_fill_3Dasset_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function _3Dasset(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerate.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerate.tsx
index 3163842c44d..64e6f789691 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerate.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerate.tsx
@@ -15,7 +15,7 @@ import AIGenerate_M from 'illustration:./S2_fill_AIGenerate_generic1_96.svg';
 import AIGenerate_S from 'illustration:./S2_fill_AIGenerate_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function AIGenerate(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerateImage.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerateImage.tsx
index e6ef34728ee..e5d85f6cc6a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerateImage.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIGenerateImage.tsx
@@ -15,7 +15,7 @@ import AIGenerateImage_M from 'illustration:./S2_fill_AIGenerateImage_generic1_9
 import AIGenerateImage_S from 'illustration:./S2_fill_AIGenerateImage_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function AIGenerateImage(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIchat.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIchat.tsx
index 2b06894f375..81bd751367b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIchat.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AIchat.tsx
@@ -15,7 +15,7 @@ import AIchat_M from 'illustration:./S2_fill_AIchat_generic1_96.svg';
 import AIchat_S from 'illustration:./S2_fill_AIchat_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function AIchat(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Accessibility.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Accessibility.tsx
index 1c34f77b2e0..371b11531fa 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Accessibility.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Accessibility.tsx
@@ -15,7 +15,7 @@ import Accessibility_M from 'illustration:./S2_fill_accessibility_generic1_96.sv
 import Accessibility_S from 'illustration:./S2_fill_accessibility_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Accessibility(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Animation.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Animation.tsx
index 2a57d101105..5b67ee0009e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Animation.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Animation.tsx
@@ -15,7 +15,7 @@ import Animation_M from 'illustration:./S2_fill_animation_generic1_96.svg';
 import Animation_S from 'illustration:./S2_fill_animation_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Animation(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Apps.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Apps.tsx
index ae1ee37f222..3cf4ba36a41 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Apps.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Apps.tsx
@@ -15,7 +15,7 @@ import Apps_M from 'illustration:./S2_fill_apps_generic1_96.svg';
 import Apps_S from 'illustration:./S2_fill_apps_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Apps(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Artboard.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Artboard.tsx
index 244314661f4..3f6864b0d1a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Artboard.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Artboard.tsx
@@ -15,7 +15,7 @@ import Artboard_M from 'illustration:./S2_fill_artboard_generic1_96.svg';
 import Artboard_S from 'illustration:./S2_fill_artboard_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Artboard(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Assets.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Assets.tsx
index 22ffd9b19b9..ceafead4207 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Assets.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Assets.tsx
@@ -15,7 +15,7 @@ import Assets_M from 'illustration:./S2_fill_assets_generic1_96.svg';
 import Assets_S from 'illustration:./S2_fill_assets_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Assets(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AudioWave.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AudioWave.tsx
index eb82e5e673e..86330877fec 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AudioWave.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/AudioWave.tsx
@@ -15,7 +15,7 @@ import AudioWave_M from 'illustration:./S2_fill_audioWave_generic1_96.svg';
 import AudioWave_S from 'illustration:./S2_fill_audioWave_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function AudioWave(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BadgeVerified.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BadgeVerified.tsx
index b3006dd1029..93b70f2897f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BadgeVerified.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BadgeVerified.tsx
@@ -15,7 +15,7 @@ import BadgeVerified_M from 'illustration:./S2_fill_badgeVerified_generic1_96.sv
 import BadgeVerified_S from 'illustration:./S2_fill_badgeVerified_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function BadgeVerified(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bell.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bell.tsx
index 278e8a9d5f2..a52983dd207 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bell.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bell.tsx
@@ -15,7 +15,7 @@ import Bell_M from 'illustration:./S2_fill_bell_generic1_96.svg';
 import Bell_S from 'illustration:./S2_fill_bell_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Bell(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bolt.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bolt.tsx
index 256fa639220..2832b767219 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bolt.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Bolt.tsx
@@ -15,7 +15,7 @@ import Bolt_M from 'illustration:./S2_fill_bolt_generic1_96.svg';
 import Bolt_S from 'illustration:./S2_fill_bolt_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Bolt(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brand.tsx
index 1e15528b1fb..f2dbdf41c14 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brand.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brand.tsx
@@ -15,7 +15,7 @@ import Brand_M from 'illustration:./S2_fill_brand_generic1_96.svg';
 import Brand_S from 'illustration:./S2_fill_brand_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Brand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Briefcase.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Briefcase.tsx
index 43a2148d8d1..62048772b4d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Briefcase.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Briefcase.tsx
@@ -15,7 +15,7 @@ import Briefcase_M from 'illustration:./S2_fill_briefcase_generic1_96.svg';
 import Briefcase_S from 'illustration:./S2_fill_briefcase_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Briefcase(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BrightnessContrast.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BrightnessContrast.tsx
index f8661287744..017132c4c7d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BrightnessContrast.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BrightnessContrast.tsx
@@ -15,7 +15,7 @@ import BrightnessContrast_M from 'illustration:./S2_fill_brightnessContrast_gene
 import BrightnessContrast_S from 'illustration:./S2_fill_brightnessContrast_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function BrightnessContrast(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Browser.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Browser.tsx
index 70d4bbdd054..3b2d6f1b3ab 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Browser.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Browser.tsx
@@ -15,7 +15,7 @@ import Browser_M from 'illustration:./S2_fill_browser_generic1_96.svg';
 import Browser_S from 'illustration:./S2_fill_browser_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Browser(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brush.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brush.tsx
index 4a5ab873775..a1749a3af0e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brush.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Brush.tsx
@@ -15,7 +15,7 @@ import Brush_M from 'illustration:./S2_fill_brush_generic1_96.svg';
 import Brush_S from 'illustration:./S2_fill_brush_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Brush(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BuildTable.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BuildTable.tsx
index 96a67470f90..28d0f708678 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BuildTable.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/BuildTable.tsx
@@ -15,7 +15,7 @@ import BuildTable_M from 'illustration:./S2_fill_buildTable_generic1_96.svg';
 import BuildTable_S from 'illustration:./S2_fill_buildTable_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function BuildTable(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Buildings.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Buildings.tsx
index a1e15c68163..f8767525222 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Buildings.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Buildings.tsx
@@ -15,7 +15,7 @@ import Buildings_M from 'illustration:./S2_fill_buildings_generic1_96.svg';
 import Buildings_S from 'illustration:./S2_fill_buildings_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Buildings(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Calendar.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Calendar.tsx
index 3ab8992dd3e..74575ec9cdd 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Calendar.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Calendar.tsx
@@ -15,7 +15,7 @@ import Calendar_M from 'illustration:./S2_fill_calendar_generic1_96.svg';
 import Calendar_S from 'illustration:./S2_fill_calendar_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Calendar(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Camera.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Camera.tsx
index 17961a746f6..46ccee90f5d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Camera.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Camera.tsx
@@ -15,7 +15,7 @@ import Camera_M from 'illustration:./S2_fill_camera_generic1_96.svg';
 import Camera_S from 'illustration:./S2_fill_camera_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Camera(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CardTapPayment.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CardTapPayment.tsx
index af94acf0be4..be5da7ea7e3 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CardTapPayment.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CardTapPayment.tsx
@@ -15,7 +15,7 @@ import CardTapPayment_M from 'illustration:./S2_fill_cardTapPayment_generic1_96.
 import CardTapPayment_S from 'illustration:./S2_fill_cardTapPayment_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function CardTapPayment(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Channel.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Channel.tsx
index 9d8d04d1c31..c688138e75e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Channel.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Channel.tsx
@@ -15,7 +15,7 @@ import Channel_M from 'illustration:./S2_fill_channel_generic1_96.svg';
 import Channel_S from 'illustration:./S2_fill_channel_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Channel(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ChartAreaStack.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ChartAreaStack.tsx
index 55779990a9f..00ef75f37dd 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ChartAreaStack.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ChartAreaStack.tsx
@@ -15,7 +15,7 @@ import ChartAreaStack_M from 'illustration:./S2_fill_chartAreaStack_generic1_96.
 import ChartAreaStack_S from 'illustration:./S2_fill_chartAreaStack_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ChartAreaStack(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Chatbubble.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Chatbubble.tsx
index 8b3e3c9a24f..7e1d0d6039e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Chatbubble.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Chatbubble.tsx
@@ -15,7 +15,7 @@ import Chatbubble_M from 'illustration:./S2_fill_chatbubble_generic1_96.svg';
 import Chatbubble_S from 'illustration:./S2_fill_chatbubble_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Chatbubble(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Checkmark.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Checkmark.tsx
index b6a102803dc..33adc5ee279 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Checkmark.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Checkmark.tsx
@@ -15,7 +15,7 @@ import Checkmark_M from 'illustration:./S2_fill_checkmark_generic1_96.svg';
 import Checkmark_S from 'illustration:./S2_fill_checkmark_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Checkmark(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clipboard.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clipboard.tsx
index 31b26bfcf42..533bda454b1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clipboard.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clipboard.tsx
@@ -15,7 +15,7 @@ import Clipboard_M from 'illustration:./S2_fill_clipboard_generic1_96.svg';
 import Clipboard_S from 'illustration:./S2_fill_clipboard_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Clipboard(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clock.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clock.tsx
index c8ca94c9f52..b9529586fe5 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clock.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Clock.tsx
@@ -15,7 +15,7 @@ import Clock_M from 'illustration:./S2_fill_clock_generic1_96.svg';
 import Clock_S from 'illustration:./S2_fill_clock_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Clock(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cloud.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cloud.tsx
index 9312a6f7a78..e879d90f7ae 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cloud.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cloud.tsx
@@ -15,7 +15,7 @@ import Cloud_M from 'illustration:./S2_fill_cloud_generic1_96.svg';
 import Cloud_S from 'illustration:./S2_fill_cloud_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Cloud(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CloudUpload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CloudUpload.tsx
index 3c72ecc8ca3..296c7c45e63 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CloudUpload.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CloudUpload.tsx
@@ -15,7 +15,7 @@ import CloudUpload_M from 'illustration:./S2_fill_cloudUpload_generic1_96.svg';
 import CloudUpload_S from 'illustration:./S2_fill_cloudUpload_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function CloudUpload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CodeBrackets.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CodeBrackets.tsx
index 1c4f75ca123..489b3fe76a9 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CodeBrackets.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CodeBrackets.tsx
@@ -15,7 +15,7 @@ import CodeBrackets_M from 'illustration:./S2_fill_CodeBrackets_generic1_96.svg'
 import CodeBrackets_S from 'illustration:./S2_fill_CodeBrackets_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function CodeBrackets(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Color.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Color.tsx
index 7a429876a20..19de504a078 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Color.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Color.tsx
@@ -15,7 +15,7 @@ import Color_M from 'illustration:./S2_fill_color_generic1_96.svg';
 import Color_S from 'illustration:./S2_fill_color_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Color(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CommentText.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CommentText.tsx
index f31ae6b8fbd..678f1d68282 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CommentText.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/CommentText.tsx
@@ -15,7 +15,7 @@ import CommentText_M from 'illustration:./S2_fill_commentText_generic1_96.svg';
 import CommentText_S from 'illustration:./S2_fill_commentText_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function CommentText(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Confetti.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Confetti.tsx
index 22454d93cf3..facbe907559 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Confetti.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Confetti.tsx
@@ -15,7 +15,7 @@ import Confetti_M from 'illustration:./S2_fill_confetti_generic1_96.svg';
 import Confetti_S from 'illustration:./S2_fill_confetti_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Confetti(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Conversationbubbles.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Conversationbubbles.tsx
index 9d055875209..2d82e51eba6 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Conversationbubbles.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Conversationbubbles.tsx
@@ -15,7 +15,7 @@ import Conversationbubbles_M from 'illustration:./S2_fill_conversationbubbles_ge
 import Conversationbubbles_S from 'illustration:./S2_fill_conversationbubbles_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Conversationbubbles(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Crop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Crop.tsx
index 05e09ce0c34..6fea5022f53 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Crop.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Crop.tsx
@@ -15,7 +15,7 @@ import Crop_M from 'illustration:./S2_fill_crop_generic1_96.svg';
 import Crop_S from 'illustration:./S2_fill_crop_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Crop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cursor.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cursor.tsx
index ba879fd573e..3acec293d0d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cursor.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cursor.tsx
@@ -15,7 +15,7 @@ import Cursor_M from 'illustration:./S2_fill_cursor_generic1_96.svg';
 import Cursor_S from 'illustration:./S2_fill_cursor_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Cursor(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cut.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cut.tsx
index d115f178cc8..50641df3861 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cut.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Cut.tsx
@@ -15,7 +15,7 @@ import Cut_M from 'illustration:./S2_fill_cut_generic1_96.svg';
 import Cut_S from 'illustration:./S2_fill_cut_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Cut(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Data.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Data.tsx
index 9cdd94503e1..2657c1b5d00 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Data.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Data.tsx
@@ -15,7 +15,7 @@ import Data_M from 'illustration:./S2_fill_data_generic1_96.svg';
 import Data_S from 'illustration:./S2_fill_data_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Data(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DataAnalytics.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DataAnalytics.tsx
index 438f6d63aaf..091642d1581 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DataAnalytics.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DataAnalytics.tsx
@@ -15,7 +15,7 @@ import DataAnalytics_M from 'illustration:./S2_fill_dataAnalytics_generic1_96.sv
 import DataAnalytics_S from 'illustration:./S2_fill_dataAnalytics_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function DataAnalytics(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Desktop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Desktop.tsx
index 68cd8c9f301..b81091d3bfc 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Desktop.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Desktop.tsx
@@ -15,7 +15,7 @@ import Desktop_M from 'illustration:./S2_fill_desktop_generic1_96.svg';
 import Desktop_S from 'illustration:./S2_fill_desktop_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Desktop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Diamond.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Diamond.tsx
index bd3da255dc3..2e20bad845d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Diamond.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Diamond.tsx
@@ -15,7 +15,7 @@ import Diamond_M from 'illustration:./S2_fill_diamond_generic1_96.svg';
 import Diamond_S from 'illustration:./S2_fill_diamond_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Diamond(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Document.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Document.tsx
index 11fef6e56dd..6639472b872 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Document.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Document.tsx
@@ -15,7 +15,7 @@ import Document_M from 'illustration:./S2_fill_document_generic1_96.svg';
 import Document_S from 'illustration:./S2_fill_document_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Document(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Download.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Download.tsx
index 06d68171711..dace1a56da8 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Download.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Download.tsx
@@ -15,7 +15,7 @@ import Download_M from 'illustration:./S2_fill_download_generic1_96.svg';
 import Download_S from 'illustration:./S2_fill_download_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Download(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DropToUpload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DropToUpload.tsx
index 25a613e0aaf..3fb520f227b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DropToUpload.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/DropToUpload.tsx
@@ -15,7 +15,7 @@ import DropToUpload_M from 'illustration:./S2_fill_dropToUpload_generic1_96.svg'
 import DropToUpload_S from 'illustration:./S2_fill_dropToUpload_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function DropToUpload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Education.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Education.tsx
index 90ee5c0fe57..f33ca357eac 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Education.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Education.tsx
@@ -15,7 +15,7 @@ import Education_M from 'illustration:./S2_fill_education_generic1_96.svg';
 import Education_S from 'illustration:./S2_fill_education_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Education(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Effects.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Effects.tsx
index dab620e8a73..4a315f3bbeb 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Effects.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Effects.tsx
@@ -15,7 +15,7 @@ import Effects_M from 'illustration:./S2_fill_effects_generic1_96.svg';
 import Effects_S from 'illustration:./S2_fill_effects_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Effects(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Emoji.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Emoji.tsx
index e764c8302d7..527eb68ac6f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Emoji.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Emoji.tsx
@@ -15,7 +15,7 @@ import Emoji_M from 'illustration:./S2_fill_emoji_generic1_96.svg';
 import Emoji_S from 'illustration:./S2_fill_emoji_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Emoji(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/EmptyStateExport.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/EmptyStateExport.tsx
index 1491a4fce35..c751aee4fab 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/EmptyStateExport.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/EmptyStateExport.tsx
@@ -15,7 +15,7 @@ import EmptyStateExport_M from 'illustration:./S2_fill_EmptyStateExport_generic1
 import EmptyStateExport_S from 'illustration:./S2_fill_EmptyStateExport_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function EmptyStateExport(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Explosion.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Explosion.tsx
index b87c7b31b0e..4a3b4bd7f98 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Explosion.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Explosion.tsx
@@ -15,7 +15,7 @@ import Explosion_M from 'illustration:./S2_fill_explosion_generic1_96.svg';
 import Explosion_S from 'illustration:./S2_fill_explosion_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Explosion(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ExportTo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ExportTo.tsx
index ee45278412c..74ad1295986 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ExportTo.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ExportTo.tsx
@@ -15,7 +15,7 @@ import ExportTo_M from 'illustration:./S2_fill_exportTo_generic1_96.svg';
 import ExportTo_S from 'illustration:./S2_fill_exportTo_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ExportTo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Exposure.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Exposure.tsx
index b4148b112d5..f2f763a312c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Exposure.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Exposure.tsx
@@ -15,7 +15,7 @@ import Exposure_M from 'illustration:./S2_fill_exposure_generic1_96.svg';
 import Exposure_S from 'illustration:./S2_fill_exposure_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Exposure(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileImage.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileImage.tsx
index aaca1069d70..fc89600b6e3 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileImage.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileImage.tsx
@@ -15,7 +15,7 @@ import FileImage_M from 'illustration:./S2_fill_fileImage_generic1_96.svg';
 import FileImage_S from 'illustration:./S2_fill_fileImage_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileImage(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileShared.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileShared.tsx
index b541c0c1cfd..8c8ed641f53 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileShared.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileShared.tsx
@@ -15,7 +15,7 @@ import FileShared_M from 'illustration:./S2_fill_fileShared_generic1_96.svg';
 import FileShared_S from 'illustration:./S2_fill_fileShared_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileShared(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileText.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileText.tsx
index 16f2c0218b0..2509b6c75fa 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileText.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileText.tsx
@@ -15,7 +15,7 @@ import FileText_M from 'illustration:./S2_fill_fileText_generic1_96.svg';
 import FileText_S from 'illustration:./S2_fill_fileText_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileText(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileVideo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileVideo.tsx
index e498140d619..07137d42118 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileVideo.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileVideo.tsx
@@ -15,7 +15,7 @@ import FileVideo_M from 'illustration:./S2_fill_fileVideo_generic1_96.svg';
 import FileVideo_S from 'illustration:./S2_fill_fileVideo_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileVideo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileZip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileZip.tsx
index 7e4370b215f..131b6e067aa 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileZip.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FileZip.tsx
@@ -15,7 +15,7 @@ import FileZip_M from 'illustration:./S2_fill_fileZip_generic1_96.svg';
 import FileZip_S from 'illustration:./S2_fill_fileZip_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileZip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filmstrip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filmstrip.tsx
index 2b5660abe41..7b08002e35c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filmstrip.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filmstrip.tsx
@@ -15,7 +15,7 @@ import Filmstrip_M from 'illustration:./S2_fill_filmstrip_generic1_96.svg';
 import Filmstrip_S from 'illustration:./S2_fill_filmstrip_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Filmstrip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filter.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filter.tsx
index a90c998e17b..b5ee37f6160 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filter.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filter.tsx
@@ -15,7 +15,7 @@ import Filter_M from 'illustration:./S2_fill_filter_generic1_96.svg';
 import Filter_S from 'illustration:./S2_fill_filter_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Filter(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filters.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filters.tsx
index 21e074a009f..44450ca149f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filters.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Filters.tsx
@@ -15,7 +15,7 @@ import Filters_M from 'illustration:./S2_fill_filters_generic1_96.svg';
 import Filters_S from 'illustration:./S2_fill_filters_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Filters(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Fireworks.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Fireworks.tsx
index 46304b46e8e..a5d2f259e9f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Fireworks.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Fireworks.tsx
@@ -15,7 +15,7 @@ import Fireworks_M from 'illustration:./S2_fill_fireworks_generic1_96.svg';
 import Fireworks_S from 'illustration:./S2_fill_fireworks_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Fireworks(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Flag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Flag.tsx
index 7b1edff8f67..4104dc50883 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Flag.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Flag.tsx
@@ -15,7 +15,7 @@ import Flag_M from 'illustration:./S2_fill_flag_generic1_96.svg';
 import Flag_S from 'illustration:./S2_fill_flag_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Flag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCheckmark.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCheckmark.tsx
index 1fe1dde69a1..b3df935fb50 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCheckmark.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCheckmark.tsx
@@ -15,7 +15,7 @@ import FlagCheckmark_M from 'illustration:./S2_fill_flagCheckmark_generic1_96.sv
 import FlagCheckmark_S from 'illustration:./S2_fill_flagCheckmark_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FlagCheckmark(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCross.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCross.tsx
index 002a8c0d547..a70f2ae1bd6 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCross.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FlagCross.tsx
@@ -15,7 +15,7 @@ import FlagCross_M from 'illustration:./S2_fill_flagCross_generic1_96.svg';
 import FlagCross_S from 'illustration:./S2_fill_flagCross_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FlagCross(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderClose.tsx
index a13f9ebde4e..596f0ff1086 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderClose.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderClose.tsx
@@ -15,7 +15,7 @@ import FolderClose_M from 'illustration:./S2_fill_folderClose_generic1_96.svg';
 import FolderClose_S from 'illustration:./S2_fill_folderClose_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FolderClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderOpen.tsx
index 09d4fc886cd..1bd36d13a7c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderOpen.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderOpen.tsx
@@ -15,7 +15,7 @@ import FolderOpen_M from 'illustration:./S2_fill_folderOpen_generic1_96.svg';
 import FolderOpen_S from 'illustration:./S2_fill_folderOpen_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FolderOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderShared.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderShared.tsx
index d38303653e5..1accce1f217 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderShared.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/FolderShared.tsx
@@ -15,7 +15,7 @@ import FolderShared_M from 'illustration:./S2_fill_folderShared_generic1_96.svg'
 import FolderShared_S from 'illustration:./S2_fill_folderShared_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FolderShared(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GearSetting.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GearSetting.tsx
index e0516faae1f..2a98cbe9575 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GearSetting.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GearSetting.tsx
@@ -15,7 +15,7 @@ import GearSetting_M from 'illustration:./S2_fill_gearSetting_generic1_96.svg';
 import GearSetting_S from 'illustration:./S2_fill_gearSetting_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function GearSetting(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Gift.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Gift.tsx
index b669092497c..0317f477d63 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Gift.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Gift.tsx
@@ -15,7 +15,7 @@ import Gift_M from 'illustration:./S2_fill_gift_generic1_96.svg';
 import Gift_S from 'illustration:./S2_fill_gift_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Gift(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Globe.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Globe.tsx
index 2042e4ed931..66387a707da 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Globe.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Globe.tsx
@@ -15,7 +15,7 @@ import Globe_M from 'illustration:./S2_fill_globe_generic1_96.svg';
 import Globe_S from 'illustration:./S2_fill_globe_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Globe(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GlobeGrid.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GlobeGrid.tsx
index 4a8a6d440bc..478403793c7 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GlobeGrid.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GlobeGrid.tsx
@@ -15,7 +15,7 @@ import GlobeGrid_M from 'illustration:./S2_fill_globeGrid_generic1_96.svg';
 import GlobeGrid_S from 'illustration:./S2_fill_globeGrid_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function GlobeGrid(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GraphBarChart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GraphBarChart.tsx
index f6a44afae1f..fb4a36e6ac9 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GraphBarChart.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/GraphBarChart.tsx
@@ -15,7 +15,7 @@ import GraphBarChart_M from 'illustration:./S2_fill_graphBarChart_generic1_96.sv
 import GraphBarChart_S from 'illustration:./S2_fill_graphBarChart_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function GraphBarChart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Hand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Hand.tsx
index c3defcce7ba..895835a495c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Hand.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Hand.tsx
@@ -15,7 +15,7 @@ import Hand_M from 'illustration:./S2_fill_hand_generic1_96.svg';
 import Hand_S from 'illustration:./S2_fill_hand_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Hand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Handshake.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Handshake.tsx
index a23b42c3fa9..7cbeaa5cc33 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Handshake.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Handshake.tsx
@@ -15,7 +15,7 @@ import Handshake_M from 'illustration:./S2_fill_handshake_generic1_96.svg';
 import Handshake_S from 'illustration:./S2_fill_handshake_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Handshake(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Heart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Heart.tsx
index 5ea79a4adda..03c976dcd06 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Heart.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Heart.tsx
@@ -15,7 +15,7 @@ import Heart_M from 'illustration:./S2_fill_heart_generic1_96.svg';
 import Heart_S from 'illustration:./S2_fill_heart_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Heart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/HelpCircle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/HelpCircle.tsx
index a765a6e9a78..6577ed325c2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/HelpCircle.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/HelpCircle.tsx
@@ -15,7 +15,7 @@ import HelpCircle_M from 'illustration:./S2_fill_helpCircle_generic1_96.svg';
 import HelpCircle_S from 'illustration:./S2_fill_helpCircle_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function HelpCircle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Home.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Home.tsx
index 1d582735266..e21952842af 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Home.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Home.tsx
@@ -15,7 +15,7 @@ import Home_M from 'illustration:./S2_fill_home_generic1_96.svg';
 import Home_S from 'illustration:./S2_fill_home_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Home(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Illustration.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Illustration.tsx
index df7a8430632..f6ba6a1d6f4 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Illustration.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Illustration.tsx
@@ -15,7 +15,7 @@ import Illustration_M from 'illustration:./S2_fill_illustration_generic1_96.svg'
 import Illustration_S from 'illustration:./S2_fill_illustration_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Illustration(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Image.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Image.tsx
index 5499b59afe0..dcf71ddac6d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Image.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Image.tsx
@@ -15,7 +15,7 @@ import Image_M from 'illustration:./S2_fill_image_generic1_96.svg';
 import Image_S from 'illustration:./S2_fill_image_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Image(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ImageStack.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ImageStack.tsx
index 591df857424..7c2fdfcb981 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ImageStack.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ImageStack.tsx
@@ -15,7 +15,7 @@ import ImageStack_M from 'illustration:./S2_fill_imageStack_generic1_96.svg';
 import ImageStack_S from 'illustration:./S2_fill_imageStack_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ImageStack(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/InfiniteLooping.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/InfiniteLooping.tsx
index ea738ccb058..333b57f85df 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/InfiniteLooping.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/InfiniteLooping.tsx
@@ -15,7 +15,7 @@ import InfiniteLooping_M from 'illustration:./S2_fill_infiniteLooping_generic1_9
 import InfiniteLooping_S from 'illustration:./S2_fill_infiniteLooping_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function InfiniteLooping(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Information.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Information.tsx
index 1cdfff81c02..80b772e7b56 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Information.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Information.tsx
@@ -15,7 +15,7 @@ import Information_M from 'illustration:./S2_fill_information_generic1_96.svg';
 import Information_S from 'illustration:./S2_fill_information_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Information(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Interaction.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Interaction.tsx
index 5f8ad49219c..25e194f6598 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Interaction.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Interaction.tsx
@@ -15,7 +15,7 @@ import Interaction_M from 'illustration:./S2_fill_interaction_generic1_96.svg';
 import Interaction_S from 'illustration:./S2_fill_interaction_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Interaction(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Laptop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Laptop.tsx
index 8f2d8f5c84e..54d77dda9a0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Laptop.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Laptop.tsx
@@ -15,7 +15,7 @@ import Laptop_M from 'illustration:./S2_fill_laptop_generic1_96.svg';
 import Laptop_S from 'illustration:./S2_fill_laptop_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Laptop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Layers.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Layers.tsx
index f853619acca..8877e50930b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Layers.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Layers.tsx
@@ -15,7 +15,7 @@ import Layers_M from 'illustration:./S2_fill_layers_generic1_96.svg';
 import Layers_S from 'illustration:./S2_fill_layers_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Layers(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Libraries.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Libraries.tsx
index 8341c97d036..2b8215f97e6 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Libraries.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Libraries.tsx
@@ -15,7 +15,7 @@ import Libraries_M from 'illustration:./S2_fill_libraries_generic1_96.svg';
 import Libraries_S from 'illustration:./S2_fill_libraries_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Libraries(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lightbulb.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lightbulb.tsx
index d3423e2df32..ef0bd68e958 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lightbulb.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lightbulb.tsx
@@ -15,7 +15,7 @@ import Lightbulb_M from 'illustration:./S2_fill_lightbulb_generic1_96.svg';
 import Lightbulb_S from 'illustration:./S2_fill_lightbulb_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Lightbulb(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LightbulbRays.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LightbulbRays.tsx
index f21e5a18b34..dc1e002f9cc 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LightbulbRays.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LightbulbRays.tsx
@@ -15,7 +15,7 @@ import LightbulbRays_M from 'illustration:./S2_fill_lightbulbRays_generic1_96.sv
 import LightbulbRays_S from 'illustration:./S2_fill_lightbulbRays_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function LightbulbRays(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lighten.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lighten.tsx
index f14ddd79675..16199580b13 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lighten.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Lighten.tsx
@@ -15,7 +15,7 @@ import Lighten_M from 'illustration:./S2_fill_lighten_generic1_96.svg';
 import Lighten_S from 'illustration:./S2_fill_lighten_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Lighten(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Link.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Link.tsx
index bc9a2a94168..8a9d8ffc189 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Link.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Link.tsx
@@ -15,7 +15,7 @@ import Link_M from 'illustration:./S2_fill_link_generic1_96.svg';
 import Link_S from 'illustration:./S2_fill_link_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Link(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Location.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Location.tsx
index d41250baeae..55013c60098 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Location.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Location.tsx
@@ -15,7 +15,7 @@ import Location_M from 'illustration:./S2_fill_location_generic1_96.svg';
 import Location_S from 'illustration:./S2_fill_location_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Location(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockClose.tsx
index 3bff1fc2745..eb9b02d5ef7 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockClose.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockClose.tsx
@@ -15,7 +15,7 @@ import LockClose_M from 'illustration:./S2_fill_lockClose_generic1_96.svg';
 import LockClose_S from 'illustration:./S2_fill_lockClose_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function LockClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockOpen.tsx
index ad27638b728..02879d4e7b7 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockOpen.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/LockOpen.tsx
@@ -15,7 +15,7 @@ import LockOpen_M from 'illustration:./S2_fill_lockOpen_generic1_96.svg';
 import LockOpen_S from 'illustration:./S2_fill_lockOpen_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function LockOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Logo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Logo.tsx
index 3fe59612520..2c418eef85b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Logo.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Logo.tsx
@@ -15,7 +15,7 @@ import Logo_M from 'illustration:./S2_fill_logo_generic1_96.svg';
 import Logo_S from 'illustration:./S2_fill_logo_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Logo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MagicWand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MagicWand.tsx
index 1296c05978c..71edd138d4c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MagicWand.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MagicWand.tsx
@@ -15,7 +15,7 @@ import MagicWand_M from 'illustration:./S2_fill_magicWand_generic1_96.svg';
 import MagicWand_S from 'illustration:./S2_fill_magicWand_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MagicWand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailClose.tsx
index b3ed412740b..e9580af523d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailClose.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailClose.tsx
@@ -15,7 +15,7 @@ import MailClose_M from 'illustration:./S2_fill_mailClose_generic1_96.svg';
 import MailClose_S from 'illustration:./S2_fill_mailClose_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MailClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailOpen.tsx
index aaa6bacf3d2..dc7a820e854 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailOpen.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MailOpen.tsx
@@ -15,7 +15,7 @@ import MailOpen_M from 'illustration:./S2_fill_mailOpen_generic1_96.svg';
 import MailOpen_S from 'illustration:./S2_fill_mailOpen_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MailOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Market.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Market.tsx
index c29c674dbd7..01d6c5297d6 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Market.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Market.tsx
@@ -15,7 +15,7 @@ import Market_M from 'illustration:./S2_fill_market_generic1_96.svg';
 import Market_S from 'illustration:./S2_fill_market_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Market(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote.tsx
index 9065d7739e7..76df6ffb9d9 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote.tsx
@@ -15,7 +15,7 @@ import MegaphonePromote_M from 'illustration:./S2_fill_megaphonePromote_generic1
 import MegaphonePromote_S from 'illustration:./S2_fill_megaphonePromote_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MegaphonePromote(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote2.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote2.tsx
index abb949cc31f..04b23a577c8 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote2.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MegaphonePromote2.tsx
@@ -15,7 +15,7 @@ import MegaphonePromote2_M from 'illustration:./S2_fill_megaphonePromote2_generi
 import MegaphonePromote2_S from 'illustration:./S2_fill_megaphonePromote2_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MegaphonePromote2(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Mention.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Mention.tsx
index 8fa7c4f55db..0c1b94cda70 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Mention.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Mention.tsx
@@ -15,7 +15,7 @@ import Mention_M from 'illustration:./S2_fill_mention_generic1_96.svg';
 import Mention_S from 'illustration:./S2_fill_mention_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Mention(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Microphone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Microphone.tsx
index 5a2867aadd5..1c4d00b0db8 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Microphone.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Microphone.tsx
@@ -15,7 +15,7 @@ import Microphone_M from 'illustration:./S2_fill_microphone_generic1_96.svg';
 import Microphone_S from 'illustration:./S2_fill_microphone_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Microphone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Minimize.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Minimize.tsx
index 90152d85165..04123c4a9b7 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Minimize.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Minimize.tsx
@@ -15,7 +15,7 @@ import Minimize_M from 'illustration:./S2_fill_minimize_generic1_96.svg';
 import Minimize_S from 'illustration:./S2_fill_minimize_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Minimize(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MovieCamera.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MovieCamera.tsx
index ba6e8c008f4..443b7dea5e9 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MovieCamera.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MovieCamera.tsx
@@ -15,7 +15,7 @@ import MovieCamera_M from 'illustration:./S2_fill_movieCamera_generic1_96.svg';
 import MovieCamera_S from 'illustration:./S2_fill_movieCamera_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MovieCamera(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MusicNote.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MusicNote.tsx
index c0b8e846062..f32a3697024 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MusicNote.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/MusicNote.tsx
@@ -15,7 +15,7 @@ import MusicNote_M from 'illustration:./S2_fill_musicNote_generic1_96.svg';
 import MusicNote_S from 'illustration:./S2_fill_musicNote_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MusicNote(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/NoElements.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/NoElements.tsx
index 144cdcfb819..0a7ef847aac 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/NoElements.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/NoElements.tsx
@@ -15,7 +15,7 @@ import NoElements_M from 'illustration:./S2_fill_noElements_generic1_96.svg';
 import NoElements_S from 'illustration:./S2_fill_noElements_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoElements(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperairplane.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperairplane.tsx
index 81fcc98ee00..fdd07fee7e6 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperairplane.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperairplane.tsx
@@ -15,7 +15,7 @@ import Paperairplane_M from 'illustration:./S2_fill_paperairplane_generic1_96.sv
 import Paperairplane_S from 'illustration:./S2_fill_paperairplane_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Paperairplane(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperclip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperclip.tsx
index da8a90399dd..6bcaa2174c0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperclip.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Paperclip.tsx
@@ -15,7 +15,7 @@ import Paperclip_M from 'illustration:./S2_fill_paperclip_generic1_96.svg';
 import Paperclip_S from 'illustration:./S2_fill_paperclip_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Paperclip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pause.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pause.tsx
index bd504e5a946..c9f6fdcbb6e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pause.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pause.tsx
@@ -15,7 +15,7 @@ import Pause_M from 'illustration:./S2_fill_pause_generic1_96.svg';
 import Pause_S from 'illustration:./S2_fill_pause_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Pause(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pencil.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pencil.tsx
index 02381e67b72..281f6d72047 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pencil.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pencil.tsx
@@ -15,7 +15,7 @@ import Pencil_M from 'illustration:./S2_fill_pencil_generic1_96.svg';
 import Pencil_S from 'illustration:./S2_fill_pencil_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Pencil(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Phone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Phone.tsx
index 2e46d382cd1..6f00bb4c27c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Phone.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Phone.tsx
@@ -15,7 +15,7 @@ import Phone_M from 'illustration:./S2_fill_phone_generic1_96.svg';
 import Phone_S from 'illustration:./S2_fill_phone_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Phone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PieChart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PieChart.tsx
index fa82452667c..3d5d9757f97 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PieChart.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PieChart.tsx
@@ -15,7 +15,7 @@ import PieChart_M from 'illustration:./S2_fill_pieChart_generic1_96.svg';
 import PieChart_S from 'illustration:./S2_fill_pieChart_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function PieChart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PiggyBank.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PiggyBank.tsx
index 82e7d7f4b32..f50cdd0c79b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PiggyBank.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PiggyBank.tsx
@@ -15,7 +15,7 @@ import PiggyBank_M from 'illustration:./S2_fill_piggyBank_generic1_96.svg';
 import PiggyBank_S from 'illustration:./S2_fill_piggyBank_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function PiggyBank(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pin.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pin.tsx
index 439d26094db..fd3688b767c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pin.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Pin.tsx
@@ -15,7 +15,7 @@ import Pin_M from 'illustration:./S2_fill_pin_generic1_96.svg';
 import Pin_S from 'illustration:./S2_fill_pin_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Pin(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Play.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Play.tsx
index 1b56e807478..bc93c1231c1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Play.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Play.tsx
@@ -15,7 +15,7 @@ import Play_M from 'illustration:./S2_fill_play_generic1_96.svg';
 import Play_S from 'illustration:./S2_fill_play_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Play(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PlayTriangle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PlayTriangle.tsx
index aef2a2f919e..80ef01dcec9 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PlayTriangle.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/PlayTriangle.tsx
@@ -15,7 +15,7 @@ import PlayTriangle_M from 'illustration:./S2_fill_playTriangle_generic1_96.svg'
 import PlayTriangle_S from 'illustration:./S2_fill_playTriangle_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function PlayTriangle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Plugin.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Plugin.tsx
index dc5027817e7..f14ed94f5f6 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Plugin.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Plugin.tsx
@@ -15,7 +15,7 @@ import Plugin_M from 'illustration:./S2_fill_plugin_generic1_96.svg';
 import Plugin_S from 'illustration:./S2_fill_plugin_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Plugin(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Prompt.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Prompt.tsx
index 8c6c51d65e4..b638065b86f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Prompt.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Prompt.tsx
@@ -15,7 +15,7 @@ import Prompt_M from 'illustration:./S2_fill_prompt_generic1_96.svg';
 import Prompt_S from 'illustration:./S2_fill_prompt_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Prompt(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Properties.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Properties.tsx
index 52aa3d65e10..a8ab5bbc8aa 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Properties.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Properties.tsx
@@ -15,7 +15,7 @@ import Properties_M from 'illustration:./S2_fill_properties_generic1_96.svg';
 import Properties_S from 'illustration:./S2_fill_properties_generic1_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Properties(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Redo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Redo.tsx
index b5bc8ce8c29..791e4d9d87b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Redo.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Redo.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Redo_L from 'illustration:./S2_fill_redo_generic1_160.svg';
 import Redo_M from 'illustration:./S2_fill_redo_generic1_96.svg';
 import Redo_S from 'illustration:./S2_fill_redo_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Redo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Remix.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Remix.tsx
index e6942c0932d..99a8ed34b9b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Remix.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Remix.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Remix_L from 'illustration:./S2_fill_remix_generic1_160.svg';
 import Remix_M from 'illustration:./S2_fill_remix_generic1_96.svg';
 import Remix_S from 'illustration:./S2_fill_remix_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Remix(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Replace.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Replace.tsx
index bd054dde9ca..f450458d518 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Replace.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Replace.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Replace_L from 'illustration:./S2_fill_replace_generic1_160.svg';
 import Replace_M from 'illustration:./S2_fill_replace_generic1_96.svg';
 import Replace_S from 'illustration:./S2_fill_replace_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Replace(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Revert.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Revert.tsx
index 405e5a01153..66697c7443a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Revert.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Revert.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Revert_L from 'illustration:./S2_fill_revert_generic1_160.svg';
 import Revert_M from 'illustration:./S2_fill_revert_generic1_96.svg';
 import Revert_S from 'illustration:./S2_fill_revert_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Revert(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ribbon.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ribbon.tsx
index 32ad18a7b93..a9d97e6bdf0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ribbon.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ribbon.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Ribbon_L from 'illustration:./S2_fill_ribbon_generic1_160.svg';
 import Ribbon_M from 'illustration:./S2_fill_ribbon_generic1_96.svg';
 import Ribbon_S from 'illustration:./S2_fill_ribbon_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Ribbon(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Rocket.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Rocket.tsx
index 913684ea19c..75ab3566299 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Rocket.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Rocket.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Rocket_L from 'illustration:./S2_fill_rocket_generic1_160.svg';
 import Rocket_M from 'illustration:./S2_fill_rocket_generic1_96.svg';
 import Rocket_S from 'illustration:./S2_fill_rocket_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Rocket(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCCW.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCCW.tsx
index 14704a0242c..a0a7b0a2b8c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCCW.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCCW.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import RotateCCW_L from 'illustration:./S2_fill_rotateCCW_generic1_160.svg';
 import RotateCCW_M from 'illustration:./S2_fill_rotateCCW_generic1_96.svg';
 import RotateCCW_S from 'illustration:./S2_fill_rotateCCW_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function RotateCCW(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCW.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCW.tsx
index 8d5c145224e..b9e2fdbd80e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCW.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/RotateCW.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import RotateCW_L from 'illustration:./S2_fill_rotateCW_generic1_160.svg';
 import RotateCW_M from 'illustration:./S2_fill_rotateCW_generic1_96.svg';
 import RotateCW_S from 'illustration:./S2_fill_rotateCW_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function RotateCW(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ruler.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ruler.tsx
index 63fe2cc31d2..223baa9077d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ruler.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Ruler.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Ruler_L from 'illustration:./S2_fill_ruler_generic1_160.svg';
 import Ruler_M from 'illustration:./S2_fill_ruler_generic1_96.svg';
 import Ruler_S from 'illustration:./S2_fill_ruler_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Ruler(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Search.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Search.tsx
index b66a72e5023..51a916e386e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Search.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Search.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Search_L from 'illustration:./S2_fill_search_generic1_160.svg';
 import Search_M from 'illustration:./S2_fill_search_generic1_96.svg';
 import Search_S from 'illustration:./S2_fill_search_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Search(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Segmentation.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Segmentation.tsx
index 2a4c558b8a3..b7b62ceca1f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Segmentation.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Segmentation.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Segmentation_L from 'illustration:./S2_fill_segmentation_generic1_160.svg';
 import Segmentation_M from 'illustration:./S2_fill_segmentation_generic1_96.svg';
 import Segmentation_S from 'illustration:./S2_fill_segmentation_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Segmentation(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Server.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Server.tsx
index 420d1e8c03d..66051a40c8d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Server.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Server.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Server_L from 'illustration:./S2_fill_server_generic1_160.svg';
 import Server_M from 'illustration:./S2_fill_server_generic1_96.svg';
 import Server_S from 'illustration:./S2_fill_server_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Server(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Shapes.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Shapes.tsx
index f3808f0b037..97aaf62bf54 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Shapes.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Shapes.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Shapes_L from 'illustration:./S2_fill_shapes_generic1_160.svg';
 import Shapes_M from 'illustration:./S2_fill_shapes_generic1_96.svg';
 import Shapes_S from 'illustration:./S2_fill_shapes_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Shapes(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingBag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingBag.tsx
index bc93e93d166..ce87f2c9cf4 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingBag.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingBag.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import ShoppingBag_L from 'illustration:./S2_fill_shoppingBag_generic1_160.svg';
 import ShoppingBag_M from 'illustration:./S2_fill_shoppingBag_generic1_96.svg';
 import ShoppingBag_S from 'illustration:./S2_fill_shoppingBag_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ShoppingBag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingCart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingCart.tsx
index 54e245495ab..e722b4e830b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingCart.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ShoppingCart.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import ShoppingCart_L from 'illustration:./S2_fill_shoppingCart_generic1_160.svg';
 import ShoppingCart_M from 'illustration:./S2_fill_shoppingCart_generic1_96.svg';
 import ShoppingCart_S from 'illustration:./S2_fill_shoppingCart_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ShoppingCart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Sparkles.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Sparkles.tsx
index 9f609b5b767..0f89a1647fa 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Sparkles.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Sparkles.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Sparkles_L from 'illustration:./S2_fill_sparkles_generic1_160.svg';
 import Sparkles_M from 'illustration:./S2_fill_sparkles_generic1_96.svg';
 import Sparkles_S from 'illustration:./S2_fill_sparkles_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Sparkles(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/SpeedFast.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/SpeedFast.tsx
index 0a1e06391dc..a3d726fb61a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/SpeedFast.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/SpeedFast.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import SpeedFast_L from 'illustration:./S2_fill_speedFast_generic1_160.svg';
 import SpeedFast_M from 'illustration:./S2_fill_speedFast_generic1_96.svg';
 import SpeedFast_S from 'illustration:./S2_fill_speedFast_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function SpeedFast(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StampClone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StampClone.tsx
index 128e0acdf70..7caab5e2f6a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StampClone.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StampClone.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import StampClone_L from 'illustration:./S2_fill_stampClone_generic1_160.svg';
 import StampClone_M from 'illustration:./S2_fill_stampClone_generic1_96.svg';
 import StampClone_S from 'illustration:./S2_fill_stampClone_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function StampClone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Star.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Star.tsx
index c8995e3f8b1..7f0b587f6d2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Star.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Star.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Star_L from 'illustration:./S2_fill_star_generic1_160.svg';
 import Star_M from 'illustration:./S2_fill_star_generic1_96.svg';
 import Star_S from 'illustration:./S2_fill_star_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Star(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StepForward.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StepForward.tsx
index fc325e4b1f0..7126c78edef 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StepForward.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/StepForward.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import StepForward_L from 'illustration:./S2_fill_stepForward_generic1_160.svg';
 import StepForward_M from 'illustration:./S2_fill_stepForward_generic1_96.svg';
 import StepForward_S from 'illustration:./S2_fill_stepForward_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function StepForward(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Switch.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Switch.tsx
index e18dad82b89..4cfb2abe0d3 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Switch.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Switch.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Switch_L from 'illustration:./S2_fill_switch_generic1_160.svg';
 import Switch_M from 'illustration:./S2_fill_switch_generic1_96.svg';
 import Switch_S from 'illustration:./S2_fill_switch_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Switch(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tablet.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tablet.tsx
index 91773114657..daa8940e064 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tablet.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tablet.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Tablet_L from 'illustration:./S2_fill_tablet_generic1_160.svg';
 import Tablet_M from 'illustration:./S2_fill_tablet_generic1_96.svg';
 import Tablet_S from 'illustration:./S2_fill_tablet_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Tablet(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tag.tsx
index 1d776ddd72c..ea97206e35f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tag.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Tag.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Tag_L from 'illustration:./S2_fill_tag_generic1_160.svg';
 import Tag_M from 'illustration:./S2_fill_tag_generic1_96.svg';
 import Tag_S from 'illustration:./S2_fill_tag_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Tag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Targeted.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Targeted.tsx
index 3a804d0cb70..2016372978e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Targeted.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Targeted.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Targeted_L from 'illustration:./S2_fill_targeted_generic1_160.svg';
 import Targeted_M from 'illustration:./S2_fill_targeted_generic1_96.svg';
 import Targeted_S from 'illustration:./S2_fill_targeted_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Targeted(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Text.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Text.tsx
index f9fe2af83b2..b6ed8f433b0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Text.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Text.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Text_L from 'illustration:./S2_fill_text_generic1_160.svg';
 import Text_M from 'illustration:./S2_fill_text_generic1_96.svg';
 import Text_S from 'illustration:./S2_fill_text_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Text(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThreeArrowsCircle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThreeArrowsCircle.tsx
index 384d8791e63..39dc8264371 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThreeArrowsCircle.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThreeArrowsCircle.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import ThreeArrowsCircle_L from 'illustration:./S2_fill_threeArrowsCircle_generic1_160.svg';
 import ThreeArrowsCircle_M from 'illustration:./S2_fill_threeArrowsCircle_generic1_96.svg';
 import ThreeArrowsCircle_S from 'illustration:./S2_fill_threeArrowsCircle_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ThreeArrowsCircle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThumbsUp.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThumbsUp.tsx
index 6c8293f5722..6946c4e3e8b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThumbsUp.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/ThumbsUp.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import ThumbsUp_L from 'illustration:./S2_fill_thumbsUp_generic1_160.svg';
 import ThumbsUp_M from 'illustration:./S2_fill_thumbsUp_generic1_96.svg';
 import ThumbsUp_S from 'illustration:./S2_fill_thumbsUp_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ThumbsUp(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Transform.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Transform.tsx
index de32ee93a97..ccfc9630a98 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Transform.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Transform.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Transform_L from 'illustration:./S2_fill_transform_generic1_160.svg';
 import Transform_M from 'illustration:./S2_fill_transform_generic1_96.svg';
 import Transform_S from 'illustration:./S2_fill_transform_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Transform(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Translate.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Translate.tsx
index c459d01bfc9..439b3853c93 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Translate.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Translate.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Translate_L from 'illustration:./S2_fill_translate_generic1_160.svg';
 import Translate_M from 'illustration:./S2_fill_translate_generic1_96.svg';
 import Translate_S from 'illustration:./S2_fill_translate_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Translate(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trash.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trash.tsx
index bc2d9847724..de3b9a4a188 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trash.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trash.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Trash_L from 'illustration:./S2_fill_trash_generic1_160.svg';
 import Trash_M from 'illustration:./S2_fill_trash_generic1_96.svg';
 import Trash_S from 'illustration:./S2_fill_trash_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Trash(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trophy.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trophy.tsx
index d1ba88085d1..3ba09471d0a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trophy.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Trophy.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Trophy_L from 'illustration:./S2_fill_trophy_generic1_160.svg';
 import Trophy_M from 'illustration:./S2_fill_trophy_generic1_96.svg';
 import Trophy_S from 'illustration:./S2_fill_trophy_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Trophy(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Update.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Update.tsx
index d6b65ec6b6c..f8f2c954d5f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Update.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Update.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Update_L from 'illustration:./S2_fill_update_generic1_160.svg';
 import Update_M from 'illustration:./S2_fill_update_generic1_96.svg';
 import Update_S from 'illustration:./S2_fill_update_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Update(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Upload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Upload.tsx
index fc6349c73ba..202b8d49b81 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Upload.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Upload.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Upload_L from 'illustration:./S2_fill_upload_generic1_160.svg';
 import Upload_M from 'illustration:./S2_fill_upload_generic1_96.svg';
 import Upload_S from 'illustration:./S2_fill_upload_generic1_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Upload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/User.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/User.tsx
index 3c9de971f41..27b0c4e8631 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/User.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/User.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import User_L from 'illustration:./S2_fill_user_generic1_160.svg';
 import User_M from 'illustration:./S2_fill_user_generic1_96.svg';
 import User_S from 'illustration:./S2_fill_user_generic1_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserAvatar.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserAvatar.tsx
index b1f3d224bf2..5619065a9d1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserAvatar.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserAvatar.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import UserAvatar_L from 'illustration:./S2_fill_userAvatar_generic1_160.svg';
 import UserAvatar_M from 'illustration:./S2_fill_userAvatar_generic1_96.svg';
 import UserAvatar_S from 'illustration:./S2_fill_userAvatar_generic1_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserGroup.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserGroup.tsx
index 4a588589438..3d194321897 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserGroup.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/UserGroup.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import UserGroup_L from 'illustration:./S2_fill_userGroup_generic1_160.svg';
 import UserGroup_M from 'illustration:./S2_fill_userGroup_generic1_96.svg';
 import UserGroup_S from 'illustration:./S2_fill_userGroup_generic1_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VectorDraw.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VectorDraw.tsx
index dd7c054fc21..7bdbfd84e03 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VectorDraw.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VectorDraw.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import VectorDraw_L from 'illustration:./S2_fill_vectorDraw_generic1_160.svg';
 import VectorDraw_M from 'illustration:./S2_fill_vectorDraw_generic1_96.svg';
 import VectorDraw_S from 'illustration:./S2_fill_vectorDraw_generic1_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Video.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Video.tsx
index 56b8609bcff..7e581a800f4 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Video.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Video.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import Video_L from 'illustration:./S2_fill_video_generic1_160.svg';
 import Video_M from 'illustration:./S2_fill_video_generic1_96.svg';
 import Video_S from 'illustration:./S2_fill_video_generic1_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Volume.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Volume.tsx
index 72f60c72584..de577df977f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Volume.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Volume.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import Volume_L from 'illustration:./S2_fill_volume_generic1_160.svg';
 import Volume_M from 'illustration:./S2_fill_volume_generic1_96.svg';
 import Volume_S from 'illustration:./S2_fill_volume_generic1_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VolumeOne.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VolumeOne.tsx
index cdeef3226ae..2cd88572910 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VolumeOne.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/VolumeOne.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import VolumeOne_L from 'illustration:./S2_fill_volumeOne_generic1_160.svg';
 import VolumeOne_M from 'illustration:./S2_fill_volumeOne_generic1_96.svg';
 import VolumeOne_S from 'illustration:./S2_fill_volumeOne_generic1_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Wallet.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Wallet.tsx
index 676da52c546..0557af4e86b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Wallet.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic1/Wallet.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import Wallet_L from 'illustration:./S2_fill_wallet_generic1_160.svg';
 import Wallet_M from 'illustration:./S2_fill_wallet_generic1_96.svg';
 import Wallet_S from 'illustration:./S2_fill_wallet_generic1_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3D.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3D.tsx
index 9d0242e552f..c00563e1700 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3D.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3D.tsx
@@ -15,7 +15,7 @@ import _3D_M from 'illustration:./S2_fill_3D_generic2_96.svg';
 import _3D_S from 'illustration:./S2_fill_3D_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function _3D(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3Dasset.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3Dasset.tsx
index b02d02e9ac5..b88ab9d74ed 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3Dasset.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/3Dasset.tsx
@@ -15,7 +15,7 @@ import _3Dasset_M from 'illustration:./S2_fill_3Dasset_generic2_96.svg';
 import _3Dasset_S from 'illustration:./S2_fill_3Dasset_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function _3Dasset(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerate.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerate.tsx
index 46333c41268..1d541254256 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerate.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerate.tsx
@@ -15,7 +15,7 @@ import AIGenerate_M from 'illustration:./S2_fill_AIGenerate_generic2_96.svg';
 import AIGenerate_S from 'illustration:./S2_fill_AIGenerate_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function AIGenerate(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerateImage.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerateImage.tsx
index 73bae747120..a16d8a42423 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerateImage.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIGenerateImage.tsx
@@ -15,7 +15,7 @@ import AIGenerateImage_M from 'illustration:./S2_fill_AIGenerateImage_generic2_9
 import AIGenerateImage_S from 'illustration:./S2_fill_AIGenerateImage_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function AIGenerateImage(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIchat.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIchat.tsx
index 4b1980c88f8..9ccf410d793 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIchat.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AIchat.tsx
@@ -15,7 +15,7 @@ import AIchat_M from 'illustration:./S2_fill_AIchat_generic2_96.svg';
 import AIchat_S from 'illustration:./S2_fill_AIchat_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function AIchat(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Accessibility.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Accessibility.tsx
index 20e97972f08..18e67d5af4e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Accessibility.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Accessibility.tsx
@@ -15,7 +15,7 @@ import Accessibility_M from 'illustration:./S2_fill_accessibility_generic2_96.sv
 import Accessibility_S from 'illustration:./S2_fill_accessibility_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Accessibility(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Animation.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Animation.tsx
index d50aa5076b5..dc87a7fe82e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Animation.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Animation.tsx
@@ -15,7 +15,7 @@ import Animation_M from 'illustration:./S2_fill_animation_generic2_96.svg';
 import Animation_S from 'illustration:./S2_fill_animation_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Animation(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Apps.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Apps.tsx
index 96790597b33..2c5633192c7 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Apps.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Apps.tsx
@@ -15,7 +15,7 @@ import Apps_M from 'illustration:./S2_fill_apps_generic2_96.svg';
 import Apps_S from 'illustration:./S2_fill_apps_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Apps(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Artboard.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Artboard.tsx
index 2182141bee1..b0575b5bc50 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Artboard.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Artboard.tsx
@@ -15,7 +15,7 @@ import Artboard_M from 'illustration:./S2_fill_artboard_generic2_96.svg';
 import Artboard_S from 'illustration:./S2_fill_artboard_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Artboard(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Assets.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Assets.tsx
index e0b34b7d8c0..d9a3266a42e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Assets.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Assets.tsx
@@ -15,7 +15,7 @@ import Assets_M from 'illustration:./S2_fill_assets_generic2_96.svg';
 import Assets_S from 'illustration:./S2_fill_assets_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Assets(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AudioWave.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AudioWave.tsx
index 7da52022f6c..d70221d1984 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AudioWave.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/AudioWave.tsx
@@ -15,7 +15,7 @@ import AudioWave_M from 'illustration:./S2_fill_audioWave_generic2_96.svg';
 import AudioWave_S from 'illustration:./S2_fill_audioWave_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function AudioWave(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BadgeVerified.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BadgeVerified.tsx
index cde5e93784a..7296a273499 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BadgeVerified.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BadgeVerified.tsx
@@ -15,7 +15,7 @@ import BadgeVerified_M from 'illustration:./S2_fill_badgeVerified_generic2_96.sv
 import BadgeVerified_S from 'illustration:./S2_fill_badgeVerified_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function BadgeVerified(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bell.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bell.tsx
index 1e86d0b307a..8d4d80a7be4 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bell.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bell.tsx
@@ -15,7 +15,7 @@ import Bell_M from 'illustration:./S2_fill_bell_generic2_96.svg';
 import Bell_S from 'illustration:./S2_fill_bell_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Bell(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bolt.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bolt.tsx
index d1a4af218ee..8d747ce407c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bolt.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Bolt.tsx
@@ -15,7 +15,7 @@ import Bolt_M from 'illustration:./S2_fill_bolt_generic2_96.svg';
 import Bolt_S from 'illustration:./S2_fill_bolt_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Bolt(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brand.tsx
index f6a94219489..efa8be1f3c1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brand.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brand.tsx
@@ -15,7 +15,7 @@ import Brand_M from 'illustration:./S2_fill_brand_generic2_96.svg';
 import Brand_S from 'illustration:./S2_fill_brand_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Brand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Briefcase.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Briefcase.tsx
index 4b32fb07fee..c82643ff18a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Briefcase.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Briefcase.tsx
@@ -15,7 +15,7 @@ import Briefcase_M from 'illustration:./S2_fill_briefcase_generic2_96.svg';
 import Briefcase_S from 'illustration:./S2_fill_briefcase_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Briefcase(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BrightnessContrast.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BrightnessContrast.tsx
index d3a42f44343..52cc2a908b2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BrightnessContrast.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BrightnessContrast.tsx
@@ -15,7 +15,7 @@ import BrightnessContrast_M from 'illustration:./S2_fill_brightnessContrast_gene
 import BrightnessContrast_S from 'illustration:./S2_fill_brightnessContrast_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function BrightnessContrast(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Browser.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Browser.tsx
index 6953e63eb38..4cb0b1a3069 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Browser.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Browser.tsx
@@ -15,7 +15,7 @@ import Browser_M from 'illustration:./S2_fill_browser_generic2_96.svg';
 import Browser_S from 'illustration:./S2_fill_browser_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Browser(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brush.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brush.tsx
index 5afcb37af51..597786e3417 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brush.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Brush.tsx
@@ -15,7 +15,7 @@ import Brush_M from 'illustration:./S2_fill_brush_generic2_96.svg';
 import Brush_S from 'illustration:./S2_fill_brush_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Brush(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BuildTable.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BuildTable.tsx
index 5883bc4ee9d..81d4c50b535 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BuildTable.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/BuildTable.tsx
@@ -15,7 +15,7 @@ import BuildTable_M from 'illustration:./S2_fill_buildTable_generic2_96.svg';
 import BuildTable_S from 'illustration:./S2_fill_buildTable_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function BuildTable(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Buildings.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Buildings.tsx
index 661754c8ee3..0bc1365d137 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Buildings.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Buildings.tsx
@@ -15,7 +15,7 @@ import Buildings_M from 'illustration:./S2_fill_buildings_generic2_96.svg';
 import Buildings_S from 'illustration:./S2_fill_buildings_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Buildings(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Calendar.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Calendar.tsx
index 9fae896e6f7..42189654747 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Calendar.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Calendar.tsx
@@ -15,7 +15,7 @@ import Calendar_M from 'illustration:./S2_fill_calendar_generic2_96.svg';
 import Calendar_S from 'illustration:./S2_fill_calendar_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Calendar(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Camera.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Camera.tsx
index 5e1dc3fcbb3..d4a05b8231a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Camera.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Camera.tsx
@@ -15,7 +15,7 @@ import Camera_M from 'illustration:./S2_fill_camera_generic2_96.svg';
 import Camera_S from 'illustration:./S2_fill_camera_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Camera(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CardTapPayment.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CardTapPayment.tsx
index 1ffe5edb8eb..94b05443ec8 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CardTapPayment.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CardTapPayment.tsx
@@ -15,7 +15,7 @@ import CardTapPayment_M from 'illustration:./S2_fill_cardTapPayment_generic2_96.
 import CardTapPayment_S from 'illustration:./S2_fill_cardTapPayment_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function CardTapPayment(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Channel.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Channel.tsx
index 954fe0723bf..13a4c13b4f0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Channel.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Channel.tsx
@@ -15,7 +15,7 @@ import Channel_M from 'illustration:./S2_fill_channel_generic2_96.svg';
 import Channel_S from 'illustration:./S2_fill_channel_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Channel(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ChartAreaStack.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ChartAreaStack.tsx
index 0730f78e58e..a4d5c6feb03 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ChartAreaStack.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ChartAreaStack.tsx
@@ -15,7 +15,7 @@ import ChartAreaStack_M from 'illustration:./S2_fill_chartAreaStack_generic2_96.
 import ChartAreaStack_S from 'illustration:./S2_fill_chartAreaStack_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ChartAreaStack(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Chatbubble.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Chatbubble.tsx
index f3999ab8909..cec5c56bd39 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Chatbubble.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Chatbubble.tsx
@@ -15,7 +15,7 @@ import Chatbubble_M from 'illustration:./S2_fill_chatbubble_generic2_96.svg';
 import Chatbubble_S from 'illustration:./S2_fill_chatbubble_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Chatbubble(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Checkmark.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Checkmark.tsx
index da8340d125a..bb249eacdb6 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Checkmark.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Checkmark.tsx
@@ -15,7 +15,7 @@ import Checkmark_M from 'illustration:./S2_fill_checkmark_generic2_96.svg';
 import Checkmark_S from 'illustration:./S2_fill_checkmark_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Checkmark(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clipboard.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clipboard.tsx
index 37fad1f76c3..bd33ae096e4 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clipboard.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clipboard.tsx
@@ -15,7 +15,7 @@ import Clipboard_M from 'illustration:./S2_fill_clipboard_generic2_96.svg';
 import Clipboard_S from 'illustration:./S2_fill_clipboard_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Clipboard(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clock.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clock.tsx
index 30786d2a03a..b48d9ae3511 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clock.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Clock.tsx
@@ -15,7 +15,7 @@ import Clock_M from 'illustration:./S2_fill_clock_generic2_96.svg';
 import Clock_S from 'illustration:./S2_fill_clock_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Clock(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cloud.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cloud.tsx
index c30faa87523..31ac5242f5c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cloud.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cloud.tsx
@@ -15,7 +15,7 @@ import Cloud_M from 'illustration:./S2_fill_cloud_generic2_96.svg';
 import Cloud_S from 'illustration:./S2_fill_cloud_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Cloud(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CloudUpload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CloudUpload.tsx
index a80bc2b13a1..3cd96e2c4b6 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CloudUpload.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CloudUpload.tsx
@@ -15,7 +15,7 @@ import CloudUpload_M from 'illustration:./S2_fill_cloudUpload_generic2_96.svg';
 import CloudUpload_S from 'illustration:./S2_fill_cloudUpload_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function CloudUpload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CodeBrackets.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CodeBrackets.tsx
index 8c93ba7b89c..de188f2fc92 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CodeBrackets.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CodeBrackets.tsx
@@ -15,7 +15,7 @@ import CodeBrackets_M from 'illustration:./S2_fill_CodeBrackets_generic2_96.svg'
 import CodeBrackets_S from 'illustration:./S2_fill_CodeBrackets_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function CodeBrackets(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Color.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Color.tsx
index a1a5dd85042..fad39cfbc49 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Color.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Color.tsx
@@ -15,7 +15,7 @@ import Color_M from 'illustration:./S2_fill_color_generic2_96.svg';
 import Color_S from 'illustration:./S2_fill_color_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Color(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CommentText.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CommentText.tsx
index a279b9b78aa..9cec59bf5d2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CommentText.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/CommentText.tsx
@@ -15,7 +15,7 @@ import CommentText_M from 'illustration:./S2_fill_commentText_generic2_96.svg';
 import CommentText_S from 'illustration:./S2_fill_commentText_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function CommentText(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Confetti.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Confetti.tsx
index b149b5e1d3a..2a205ef30f5 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Confetti.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Confetti.tsx
@@ -15,7 +15,7 @@ import Confetti_M from 'illustration:./S2_fill_confetti_generic2_96.svg';
 import Confetti_S from 'illustration:./S2_fill_confetti_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Confetti(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Conversationbubbles.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Conversationbubbles.tsx
index c815dc280ae..d05b5652a5a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Conversationbubbles.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Conversationbubbles.tsx
@@ -15,7 +15,7 @@ import Conversationbubbles_M from 'illustration:./S2_fill_conversationbubbles_ge
 import Conversationbubbles_S from 'illustration:./S2_fill_conversationbubbles_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Conversationbubbles(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Crop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Crop.tsx
index dc401beb9f3..0683a84aa7c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Crop.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Crop.tsx
@@ -15,7 +15,7 @@ import Crop_M from 'illustration:./S2_fill_crop_generic2_96.svg';
 import Crop_S from 'illustration:./S2_fill_crop_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Crop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cursor.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cursor.tsx
index 90851232b6e..c9fed46d99e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cursor.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cursor.tsx
@@ -15,7 +15,7 @@ import Cursor_M from 'illustration:./S2_fill_cursor_generic2_96.svg';
 import Cursor_S from 'illustration:./S2_fill_cursor_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Cursor(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cut.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cut.tsx
index 9a3cf2b6a11..e2f09a33de6 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cut.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Cut.tsx
@@ -15,7 +15,7 @@ import Cut_M from 'illustration:./S2_fill_cut_generic2_96.svg';
 import Cut_S from 'illustration:./S2_fill_cut_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Cut(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Data.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Data.tsx
index 913341a14f7..a6d4a22f625 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Data.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Data.tsx
@@ -15,7 +15,7 @@ import Data_M from 'illustration:./S2_fill_data_generic2_96.svg';
 import Data_S from 'illustration:./S2_fill_data_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Data(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DataAnalytics.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DataAnalytics.tsx
index 6e60dbc6c50..b0b0db07977 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DataAnalytics.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DataAnalytics.tsx
@@ -15,7 +15,7 @@ import DataAnalytics_M from 'illustration:./S2_fill_dataAnalytics_generic2_96.sv
 import DataAnalytics_S from 'illustration:./S2_fill_dataAnalytics_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function DataAnalytics(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Desktop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Desktop.tsx
index 85dda72d881..dcb3a6ae16a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Desktop.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Desktop.tsx
@@ -15,7 +15,7 @@ import Desktop_M from 'illustration:./S2_fill_desktop_generic2_96.svg';
 import Desktop_S from 'illustration:./S2_fill_desktop_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Desktop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Diamond.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Diamond.tsx
index 424f9dffe79..3cb7500b1e5 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Diamond.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Diamond.tsx
@@ -15,7 +15,7 @@ import Diamond_M from 'illustration:./S2_fill_diamond_generic2_96.svg';
 import Diamond_S from 'illustration:./S2_fill_diamond_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Diamond(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Document.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Document.tsx
index 30cc87f4ba3..388c719ed10 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Document.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Document.tsx
@@ -15,7 +15,7 @@ import Document_M from 'illustration:./S2_fill_document_generic2_96.svg';
 import Document_S from 'illustration:./S2_fill_document_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Document(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Download.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Download.tsx
index 4c0c7ed0da8..552fbe26ae1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Download.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Download.tsx
@@ -15,7 +15,7 @@ import Download_M from 'illustration:./S2_fill_download_generic2_96.svg';
 import Download_S from 'illustration:./S2_fill_download_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Download(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DropToUpload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DropToUpload.tsx
index 110b3b5129c..151b40449ca 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DropToUpload.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/DropToUpload.tsx
@@ -15,7 +15,7 @@ import DropToUpload_M from 'illustration:./S2_fill_dropToUpload_generic2_96.svg'
 import DropToUpload_S from 'illustration:./S2_fill_dropToUpload_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function DropToUpload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Education.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Education.tsx
index 81d3b6df8c5..b3d28ac19f4 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Education.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Education.tsx
@@ -15,7 +15,7 @@ import Education_M from 'illustration:./S2_fill_education_generic2_96.svg';
 import Education_S from 'illustration:./S2_fill_education_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Education(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Effects.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Effects.tsx
index ec801568cd4..11d18732b2c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Effects.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Effects.tsx
@@ -15,7 +15,7 @@ import Effects_M from 'illustration:./S2_fill_effects_generic2_96.svg';
 import Effects_S from 'illustration:./S2_fill_effects_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Effects(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Emoji.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Emoji.tsx
index b1b00e848ff..8b4fcba7f5c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Emoji.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Emoji.tsx
@@ -15,7 +15,7 @@ import Emoji_M from 'illustration:./S2_fill_emoji_generic2_96.svg';
 import Emoji_S from 'illustration:./S2_fill_emoji_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Emoji(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/EmptyStateExport.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/EmptyStateExport.tsx
index 736d429d00f..5e4ec81ecf1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/EmptyStateExport.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/EmptyStateExport.tsx
@@ -15,7 +15,7 @@ import EmptyStateExport_M from 'illustration:./S2_fill_EmptyStateExport_generic2
 import EmptyStateExport_S from 'illustration:./S2_fill_EmptyStateExport_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function EmptyStateExport(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Explosion.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Explosion.tsx
index d76ea88df4d..42f763f0cdd 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Explosion.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Explosion.tsx
@@ -15,7 +15,7 @@ import Explosion_M from 'illustration:./S2_fill_explosion_generic2_96.svg';
 import Explosion_S from 'illustration:./S2_fill_explosion_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Explosion(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ExportTo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ExportTo.tsx
index 530ef34251f..9f6a3050758 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ExportTo.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ExportTo.tsx
@@ -15,7 +15,7 @@ import ExportTo_M from 'illustration:./S2_fill_exportTo_generic2_96.svg';
 import ExportTo_S from 'illustration:./S2_fill_exportTo_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ExportTo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Exposure.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Exposure.tsx
index d2e8a182b8a..a1e8de1fcc7 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Exposure.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Exposure.tsx
@@ -15,7 +15,7 @@ import Exposure_M from 'illustration:./S2_fill_exposure_generic2_96.svg';
 import Exposure_S from 'illustration:./S2_fill_exposure_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Exposure(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileImage.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileImage.tsx
index f010b8713a5..72ff599c59f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileImage.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileImage.tsx
@@ -15,7 +15,7 @@ import FileImage_M from 'illustration:./S2_fill_fileImage_generic2_96.svg';
 import FileImage_S from 'illustration:./S2_fill_fileImage_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileImage(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileShared.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileShared.tsx
index f063d929e73..aa470cca75e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileShared.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileShared.tsx
@@ -15,7 +15,7 @@ import FileShared_M from 'illustration:./S2_fill_fileShared_generic2_96.svg';
 import FileShared_S from 'illustration:./S2_fill_fileShared_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileShared(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileText.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileText.tsx
index e3a44957903..e8e7c358e23 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileText.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileText.tsx
@@ -15,7 +15,7 @@ import FileText_M from 'illustration:./S2_fill_fileText_generic2_96.svg';
 import FileText_S from 'illustration:./S2_fill_fileText_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileText(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileVideo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileVideo.tsx
index 5e9fb2cefcb..ef6418d78de 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileVideo.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileVideo.tsx
@@ -15,7 +15,7 @@ import FileVideo_M from 'illustration:./S2_fill_fileVideo_generic2_96.svg';
 import FileVideo_S from 'illustration:./S2_fill_fileVideo_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileVideo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileZip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileZip.tsx
index 1a047770024..ad4471e56dc 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileZip.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FileZip.tsx
@@ -15,7 +15,7 @@ import FileZip_M from 'illustration:./S2_fill_fileZip_generic2_96.svg';
 import FileZip_S from 'illustration:./S2_fill_fileZip_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileZip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filmstrip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filmstrip.tsx
index 661778ac2d7..08f82bcb767 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filmstrip.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filmstrip.tsx
@@ -15,7 +15,7 @@ import Filmstrip_M from 'illustration:./S2_fill_filmstrip_generic2_96.svg';
 import Filmstrip_S from 'illustration:./S2_fill_filmstrip_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Filmstrip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filter.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filter.tsx
index 0b1c3bff75b..f9ff94968c8 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filter.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filter.tsx
@@ -15,7 +15,7 @@ import Filter_M from 'illustration:./S2_fill_filter_generic2_96.svg';
 import Filter_S from 'illustration:./S2_fill_filter_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Filter(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filters.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filters.tsx
index 5247d3e38bb..fbc457e9dd4 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filters.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Filters.tsx
@@ -15,7 +15,7 @@ import Filters_M from 'illustration:./S2_fill_filters_generic2_96.svg';
 import Filters_S from 'illustration:./S2_fill_filters_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Filters(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Fireworks.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Fireworks.tsx
index 7a31f085538..8ddd298df84 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Fireworks.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Fireworks.tsx
@@ -15,7 +15,7 @@ import Fireworks_M from 'illustration:./S2_fill_fireworks_generic2_96.svg';
 import Fireworks_S from 'illustration:./S2_fill_fireworks_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Fireworks(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Flag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Flag.tsx
index f6186fd55ce..6b9fc869807 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Flag.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Flag.tsx
@@ -15,7 +15,7 @@ import Flag_M from 'illustration:./S2_fill_flag_generic2_96.svg';
 import Flag_S from 'illustration:./S2_fill_flag_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Flag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCheckmark.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCheckmark.tsx
index d178bbdfcee..485dcb5a3ff 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCheckmark.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCheckmark.tsx
@@ -15,7 +15,7 @@ import FlagCheckmark_M from 'illustration:./S2_fill_flagCheckmark_generic2_96.sv
 import FlagCheckmark_S from 'illustration:./S2_fill_flagCheckmark_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FlagCheckmark(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCross.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCross.tsx
index 122bc7d0850..ca0bab48b0e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCross.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FlagCross.tsx
@@ -15,7 +15,7 @@ import FlagCross_M from 'illustration:./S2_fill_flagCross_generic2_96.svg';
 import FlagCross_S from 'illustration:./S2_fill_flagCross_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FlagCross(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderClose.tsx
index 84c7e005382..3d080496b6c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderClose.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderClose.tsx
@@ -15,7 +15,7 @@ import FolderClose_M from 'illustration:./S2_fill_folderClose_generic2_96.svg';
 import FolderClose_S from 'illustration:./S2_fill_folderClose_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FolderClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderOpen.tsx
index 061a8ca7fe6..db43efd843d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderOpen.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderOpen.tsx
@@ -15,7 +15,7 @@ import FolderOpen_M from 'illustration:./S2_fill_folderOpen_generic2_96.svg';
 import FolderOpen_S from 'illustration:./S2_fill_folderOpen_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FolderOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderShared.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderShared.tsx
index 3b2ea8ae83d..545531f4733 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderShared.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/FolderShared.tsx
@@ -15,7 +15,7 @@ import FolderShared_M from 'illustration:./S2_fill_folderShared_generic2_96.svg'
 import FolderShared_S from 'illustration:./S2_fill_folderShared_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FolderShared(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GearSetting.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GearSetting.tsx
index 76ca6b6ba10..e372761ac2f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GearSetting.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GearSetting.tsx
@@ -15,7 +15,7 @@ import GearSetting_M from 'illustration:./S2_fill_gearSetting_generic2_96.svg';
 import GearSetting_S from 'illustration:./S2_fill_gearSetting_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function GearSetting(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Gift.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Gift.tsx
index b63befa0ed4..05784366b56 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Gift.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Gift.tsx
@@ -15,7 +15,7 @@ import Gift_M from 'illustration:./S2_fill_gift_generic2_96.svg';
 import Gift_S from 'illustration:./S2_fill_gift_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Gift(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Globe.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Globe.tsx
index fa1498e8a1e..508b9e40749 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Globe.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Globe.tsx
@@ -15,7 +15,7 @@ import Globe_M from 'illustration:./S2_fill_globe_generic2_96.svg';
 import Globe_S from 'illustration:./S2_fill_globe_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Globe(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GlobeGrid.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GlobeGrid.tsx
index c33a5b2b62a..9ba8ef9bf63 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GlobeGrid.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GlobeGrid.tsx
@@ -15,7 +15,7 @@ import GlobeGrid_M from 'illustration:./S2_fill_globeGrid_generic2_96.svg';
 import GlobeGrid_S from 'illustration:./S2_fill_globeGrid_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function GlobeGrid(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GraphBarChart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GraphBarChart.tsx
index 5a27396ffc1..3df40e58ca1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GraphBarChart.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/GraphBarChart.tsx
@@ -15,7 +15,7 @@ import GraphBarChart_M from 'illustration:./S2_fill_graphBarChart_generic2_96.sv
 import GraphBarChart_S from 'illustration:./S2_fill_graphBarChart_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function GraphBarChart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Hand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Hand.tsx
index 6422d01da52..1febc54125a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Hand.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Hand.tsx
@@ -15,7 +15,7 @@ import Hand_M from 'illustration:./S2_fill_hand_generic2_96.svg';
 import Hand_S from 'illustration:./S2_fill_hand_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Hand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Handshake.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Handshake.tsx
index feb1eead46e..a9fe494bd82 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Handshake.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Handshake.tsx
@@ -15,7 +15,7 @@ import Handshake_M from 'illustration:./S2_fill_handshake_generic2_96.svg';
 import Handshake_S from 'illustration:./S2_fill_handshake_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Handshake(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Heart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Heart.tsx
index 5bf64cf9b4f..a6a77ef61e1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Heart.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Heart.tsx
@@ -15,7 +15,7 @@ import Heart_M from 'illustration:./S2_fill_heart_generic2_96.svg';
 import Heart_S from 'illustration:./S2_fill_heart_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Heart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/HelpCircle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/HelpCircle.tsx
index f5ed7117acc..358185b9e7b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/HelpCircle.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/HelpCircle.tsx
@@ -15,7 +15,7 @@ import HelpCircle_M from 'illustration:./S2_fill_helpCircle_generic2_96.svg';
 import HelpCircle_S from 'illustration:./S2_fill_helpCircle_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function HelpCircle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Home.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Home.tsx
index b1ae690a1bb..79fa1280da5 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Home.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Home.tsx
@@ -15,7 +15,7 @@ import Home_M from 'illustration:./S2_fill_home_generic2_96.svg';
 import Home_S from 'illustration:./S2_fill_home_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Home(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Illustration.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Illustration.tsx
index ffae10c4961..d202b6f98c0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Illustration.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Illustration.tsx
@@ -15,7 +15,7 @@ import Illustration_M from 'illustration:./S2_fill_illustration_generic2_96.svg'
 import Illustration_S from 'illustration:./S2_fill_illustration_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Illustration(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Image.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Image.tsx
index 55229251937..d0782e7c71c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Image.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Image.tsx
@@ -15,7 +15,7 @@ import Image_M from 'illustration:./S2_fill_image_generic2_96.svg';
 import Image_S from 'illustration:./S2_fill_image_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Image(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ImageStack.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ImageStack.tsx
index 66ab51f4e13..fd13910b881 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ImageStack.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ImageStack.tsx
@@ -15,7 +15,7 @@ import ImageStack_M from 'illustration:./S2_fill_imageStack_generic2_96.svg';
 import ImageStack_S from 'illustration:./S2_fill_imageStack_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ImageStack(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/InfiniteLooping.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/InfiniteLooping.tsx
index 66fdfed3ea4..fd9a39d79bf 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/InfiniteLooping.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/InfiniteLooping.tsx
@@ -15,7 +15,7 @@ import InfiniteLooping_M from 'illustration:./S2_fill_infiniteLooping_generic2_9
 import InfiniteLooping_S from 'illustration:./S2_fill_infiniteLooping_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function InfiniteLooping(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Information.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Information.tsx
index 308795d5630..6992a37956f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Information.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Information.tsx
@@ -15,7 +15,7 @@ import Information_M from 'illustration:./S2_fill_information_generic2_96.svg';
 import Information_S from 'illustration:./S2_fill_information_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Information(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Interaction.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Interaction.tsx
index a5038f14177..d197f08d701 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Interaction.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Interaction.tsx
@@ -15,7 +15,7 @@ import Interaction_M from 'illustration:./S2_fill_interaction_generic2_96.svg';
 import Interaction_S from 'illustration:./S2_fill_interaction_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Interaction(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Laptop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Laptop.tsx
index fee7c17c1a1..ff19bb7a6df 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Laptop.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Laptop.tsx
@@ -15,7 +15,7 @@ import Laptop_M from 'illustration:./S2_fill_laptop_generic2_96.svg';
 import Laptop_S from 'illustration:./S2_fill_laptop_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Laptop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Layers.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Layers.tsx
index d617c3181aa..a29c22266fa 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Layers.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Layers.tsx
@@ -15,7 +15,7 @@ import Layers_M from 'illustration:./S2_fill_layers_generic2_96.svg';
 import Layers_S from 'illustration:./S2_fill_layers_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Layers(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Libraries.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Libraries.tsx
index ae78af8f4a2..a9a4077bc32 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Libraries.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Libraries.tsx
@@ -15,7 +15,7 @@ import Libraries_M from 'illustration:./S2_fill_libraries_generic2_96.svg';
 import Libraries_S from 'illustration:./S2_fill_libraries_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Libraries(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lightbulb.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lightbulb.tsx
index f7269938870..52f89d041a2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lightbulb.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lightbulb.tsx
@@ -15,7 +15,7 @@ import Lightbulb_M from 'illustration:./S2_fill_lightbulb_generic2_96.svg';
 import Lightbulb_S from 'illustration:./S2_fill_lightbulb_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Lightbulb(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LightbulbRays.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LightbulbRays.tsx
index d9b43ff6300..44b410635d0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LightbulbRays.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LightbulbRays.tsx
@@ -15,7 +15,7 @@ import LightbulbRays_M from 'illustration:./S2_fill_lightbulbRays_generic2_96.sv
 import LightbulbRays_S from 'illustration:./S2_fill_lightbulbRays_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function LightbulbRays(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lighten.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lighten.tsx
index e830e346d73..c1159fb5d40 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lighten.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Lighten.tsx
@@ -15,7 +15,7 @@ import Lighten_M from 'illustration:./S2_fill_lighten_generic2_96.svg';
 import Lighten_S from 'illustration:./S2_fill_lighten_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Lighten(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Link.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Link.tsx
index b746286b778..54a695aec4a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Link.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Link.tsx
@@ -15,7 +15,7 @@ import Link_M from 'illustration:./S2_fill_link_generic2_96.svg';
 import Link_S from 'illustration:./S2_fill_link_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Link(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Location.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Location.tsx
index b40a57f775b..4685bc2c3c1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Location.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Location.tsx
@@ -15,7 +15,7 @@ import Location_M from 'illustration:./S2_fill_location_generic2_96.svg';
 import Location_S from 'illustration:./S2_fill_location_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Location(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockClose.tsx
index cd174a97cca..9b9f54681d2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockClose.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockClose.tsx
@@ -15,7 +15,7 @@ import LockClose_M from 'illustration:./S2_fill_lockClose_generic2_96.svg';
 import LockClose_S from 'illustration:./S2_fill_lockClose_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function LockClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockOpen.tsx
index 54cce08ca27..baf4cea77ba 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockOpen.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/LockOpen.tsx
@@ -15,7 +15,7 @@ import LockOpen_M from 'illustration:./S2_fill_lockOpen_generic2_96.svg';
 import LockOpen_S from 'illustration:./S2_fill_lockOpen_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function LockOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Logo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Logo.tsx
index e9225c37175..ec1590621b9 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Logo.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Logo.tsx
@@ -15,7 +15,7 @@ import Logo_M from 'illustration:./S2_fill_logo_generic2_96.svg';
 import Logo_S from 'illustration:./S2_fill_logo_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Logo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MagicWand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MagicWand.tsx
index 4fb0022bd0e..81f5c7b5e62 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MagicWand.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MagicWand.tsx
@@ -15,7 +15,7 @@ import MagicWand_M from 'illustration:./S2_fill_magicWand_generic2_96.svg';
 import MagicWand_S from 'illustration:./S2_fill_magicWand_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MagicWand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailClose.tsx
index e452ee5f38a..a796cac43b4 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailClose.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailClose.tsx
@@ -15,7 +15,7 @@ import MailClose_M from 'illustration:./S2_fill_mailClose_generic2_96.svg';
 import MailClose_S from 'illustration:./S2_fill_mailClose_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MailClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailOpen.tsx
index 083abf3c5a6..c24fc3730af 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailOpen.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MailOpen.tsx
@@ -15,7 +15,7 @@ import MailOpen_M from 'illustration:./S2_fill_mailOpen_generic2_96.svg';
 import MailOpen_S from 'illustration:./S2_fill_mailOpen_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MailOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Market.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Market.tsx
index 9ef2649d762..99a5d921524 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Market.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Market.tsx
@@ -15,7 +15,7 @@ import Market_M from 'illustration:./S2_fill_market_generic2_96.svg';
 import Market_S from 'illustration:./S2_fill_market_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Market(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote.tsx
index ec342e0cf23..a74e63efb39 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote.tsx
@@ -15,7 +15,7 @@ import MegaphonePromote_M from 'illustration:./S2_fill_megaphonePromote_generic2
 import MegaphonePromote_S from 'illustration:./S2_fill_megaphonePromote_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MegaphonePromote(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote2.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote2.tsx
index f4ef705e21b..b05e95604e3 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote2.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MegaphonePromote2.tsx
@@ -15,7 +15,7 @@ import MegaphonePromote2_M from 'illustration:./S2_fill_megaphonePromote2_generi
 import MegaphonePromote2_S from 'illustration:./S2_fill_megaphonePromote2_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MegaphonePromote2(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Mention.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Mention.tsx
index e0c8295f22e..51163e5a3eb 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Mention.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Mention.tsx
@@ -15,7 +15,7 @@ import Mention_M from 'illustration:./S2_fill_mention_generic2_96.svg';
 import Mention_S from 'illustration:./S2_fill_mention_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Mention(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Microphone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Microphone.tsx
index 16bca772278..d0a05324f7a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Microphone.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Microphone.tsx
@@ -15,7 +15,7 @@ import Microphone_M from 'illustration:./S2_fill_microphone_generic2_96.svg';
 import Microphone_S from 'illustration:./S2_fill_microphone_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Microphone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Minimize.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Minimize.tsx
index 93cd990406b..228beb036fe 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Minimize.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Minimize.tsx
@@ -15,7 +15,7 @@ import Minimize_M from 'illustration:./S2_fill_minimize_generic2_96.svg';
 import Minimize_S from 'illustration:./S2_fill_minimize_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Minimize(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MovieCamera.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MovieCamera.tsx
index 686537c7112..12d7a7736d0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MovieCamera.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MovieCamera.tsx
@@ -15,7 +15,7 @@ import MovieCamera_M from 'illustration:./S2_fill_movieCamera_generic2_96.svg';
 import MovieCamera_S from 'illustration:./S2_fill_movieCamera_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MovieCamera(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MusicNote.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MusicNote.tsx
index 2e9cf4b032f..6286ef24e92 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MusicNote.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/MusicNote.tsx
@@ -15,7 +15,7 @@ import MusicNote_M from 'illustration:./S2_fill_musicNote_generic2_96.svg';
 import MusicNote_S from 'illustration:./S2_fill_musicNote_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MusicNote(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/NoElements.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/NoElements.tsx
index 303513f3ee1..ed194a51804 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/NoElements.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/NoElements.tsx
@@ -15,7 +15,7 @@ import NoElements_M from 'illustration:./S2_fill_noElements_generic2_96.svg';
 import NoElements_S from 'illustration:./S2_fill_noElements_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoElements(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperairplane.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperairplane.tsx
index 68d464bd601..df1dd3e8c18 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperairplane.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperairplane.tsx
@@ -15,7 +15,7 @@ import Paperairplane_M from 'illustration:./S2_fill_paperairplane_generic2_96.sv
 import Paperairplane_S from 'illustration:./S2_fill_paperairplane_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Paperairplane(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperclip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperclip.tsx
index 1bdf3a905b5..371a3b122d0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperclip.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Paperclip.tsx
@@ -15,7 +15,7 @@ import Paperclip_M from 'illustration:./S2_fill_paperclip_generic2_96.svg';
 import Paperclip_S from 'illustration:./S2_fill_paperclip_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Paperclip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pause.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pause.tsx
index e9536ba42c3..6d67e13f385 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pause.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pause.tsx
@@ -15,7 +15,7 @@ import Pause_M from 'illustration:./S2_fill_pause_generic2_96.svg';
 import Pause_S from 'illustration:./S2_fill_pause_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Pause(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pencil.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pencil.tsx
index 87e1595d395..bf2f91379ff 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pencil.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pencil.tsx
@@ -15,7 +15,7 @@ import Pencil_M from 'illustration:./S2_fill_pencil_generic2_96.svg';
 import Pencil_S from 'illustration:./S2_fill_pencil_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Pencil(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Phone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Phone.tsx
index 411d938f959..b6309668f7a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Phone.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Phone.tsx
@@ -15,7 +15,7 @@ import Phone_M from 'illustration:./S2_fill_phone_generic2_96.svg';
 import Phone_S from 'illustration:./S2_fill_phone_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Phone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PieChart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PieChart.tsx
index 42bfa0f8dae..8f9e935dffb 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PieChart.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PieChart.tsx
@@ -15,7 +15,7 @@ import PieChart_M from 'illustration:./S2_fill_pieChart_generic2_96.svg';
 import PieChart_S from 'illustration:./S2_fill_pieChart_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function PieChart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PiggyBank.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PiggyBank.tsx
index d3ebf1dba92..cc0f7425a21 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PiggyBank.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PiggyBank.tsx
@@ -15,7 +15,7 @@ import PiggyBank_M from 'illustration:./S2_fill_piggyBank_generic2_96.svg';
 import PiggyBank_S from 'illustration:./S2_fill_piggyBank_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function PiggyBank(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pin.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pin.tsx
index 07b0fb7e461..6162cf2fea2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pin.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Pin.tsx
@@ -15,7 +15,7 @@ import Pin_M from 'illustration:./S2_fill_pin_generic2_96.svg';
 import Pin_S from 'illustration:./S2_fill_pin_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Pin(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Play.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Play.tsx
index a8e2b2f5551..a4698f2bb3d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Play.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Play.tsx
@@ -15,7 +15,7 @@ import Play_M from 'illustration:./S2_fill_play_generic2_96.svg';
 import Play_S from 'illustration:./S2_fill_play_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Play(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PlayTriangle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PlayTriangle.tsx
index 5ccfdac43be..7110cdf69fc 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PlayTriangle.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/PlayTriangle.tsx
@@ -15,7 +15,7 @@ import PlayTriangle_M from 'illustration:./S2_fill_playTriangle_generic2_96.svg'
 import PlayTriangle_S from 'illustration:./S2_fill_playTriangle_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function PlayTriangle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Plugin.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Plugin.tsx
index ff567524dfd..65609934f32 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Plugin.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Plugin.tsx
@@ -15,7 +15,7 @@ import Plugin_M from 'illustration:./S2_fill_plugin_generic2_96.svg';
 import Plugin_S from 'illustration:./S2_fill_plugin_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Plugin(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Prompt.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Prompt.tsx
index dd02b0e020b..34f1c2f5f4a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Prompt.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Prompt.tsx
@@ -15,7 +15,7 @@ import Prompt_M from 'illustration:./S2_fill_prompt_generic2_96.svg';
 import Prompt_S from 'illustration:./S2_fill_prompt_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Prompt(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Properties.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Properties.tsx
index eafaa2f3866..c54600302cb 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Properties.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Properties.tsx
@@ -15,7 +15,7 @@ import Properties_M from 'illustration:./S2_fill_properties_generic2_96.svg';
 import Properties_S from 'illustration:./S2_fill_properties_generic2_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Properties(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Redo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Redo.tsx
index fc0e6c6d0b3..88d2b1a5d4e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Redo.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Redo.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Redo_L from 'illustration:./S2_fill_redo_generic2_160.svg';
 import Redo_M from 'illustration:./S2_fill_redo_generic2_96.svg';
 import Redo_S from 'illustration:./S2_fill_redo_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Redo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Remix.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Remix.tsx
index e1f336901ba..015fe0dce72 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Remix.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Remix.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Remix_L from 'illustration:./S2_fill_remix_generic2_160.svg';
 import Remix_M from 'illustration:./S2_fill_remix_generic2_96.svg';
 import Remix_S from 'illustration:./S2_fill_remix_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Remix(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Replace.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Replace.tsx
index a5916f13968..2334e498103 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Replace.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Replace.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Replace_L from 'illustration:./S2_fill_replace_generic2_160.svg';
 import Replace_M from 'illustration:./S2_fill_replace_generic2_96.svg';
 import Replace_S from 'illustration:./S2_fill_replace_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Replace(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Revert.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Revert.tsx
index 250ef9299f8..faaed9d3709 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Revert.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Revert.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Revert_L from 'illustration:./S2_fill_revert_generic2_160.svg';
 import Revert_M from 'illustration:./S2_fill_revert_generic2_96.svg';
 import Revert_S from 'illustration:./S2_fill_revert_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Revert(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ribbon.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ribbon.tsx
index d55b774213f..075d02aabf7 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ribbon.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ribbon.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Ribbon_L from 'illustration:./S2_fill_ribbon_generic2_160.svg';
 import Ribbon_M from 'illustration:./S2_fill_ribbon_generic2_96.svg';
 import Ribbon_S from 'illustration:./S2_fill_ribbon_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Ribbon(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Rocket.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Rocket.tsx
index 56b5c8c1523..81413afe688 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Rocket.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Rocket.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Rocket_L from 'illustration:./S2_fill_rocket_generic2_160.svg';
 import Rocket_M from 'illustration:./S2_fill_rocket_generic2_96.svg';
 import Rocket_S from 'illustration:./S2_fill_rocket_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Rocket(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCCW.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCCW.tsx
index 4dd04c2025c..5afd15fe699 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCCW.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCCW.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import RotateCCW_L from 'illustration:./S2_fill_rotateCCW_generic2_160.svg';
 import RotateCCW_M from 'illustration:./S2_fill_rotateCCW_generic2_96.svg';
 import RotateCCW_S from 'illustration:./S2_fill_rotateCCW_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function RotateCCW(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCW.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCW.tsx
index fc085b36e3a..6aa4f703f42 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCW.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/RotateCW.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import RotateCW_L from 'illustration:./S2_fill_rotateCW_generic2_160.svg';
 import RotateCW_M from 'illustration:./S2_fill_rotateCW_generic2_96.svg';
 import RotateCW_S from 'illustration:./S2_fill_rotateCW_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function RotateCW(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ruler.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ruler.tsx
index 30b949e4b05..59c8b4c335c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ruler.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Ruler.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Ruler_L from 'illustration:./S2_fill_ruler_generic2_160.svg';
 import Ruler_M from 'illustration:./S2_fill_ruler_generic2_96.svg';
 import Ruler_S from 'illustration:./S2_fill_ruler_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Ruler(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Search.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Search.tsx
index ef1ba34b78f..d814b41543b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Search.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Search.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Search_L from 'illustration:./S2_fill_search_generic2_160.svg';
 import Search_M from 'illustration:./S2_fill_search_generic2_96.svg';
 import Search_S from 'illustration:./S2_fill_search_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Search(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Segmentation.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Segmentation.tsx
index 0f2f7f8cdee..a9e526d69fc 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Segmentation.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Segmentation.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Segmentation_L from 'illustration:./S2_fill_segmentation_generic2_160.svg';
 import Segmentation_M from 'illustration:./S2_fill_segmentation_generic2_96.svg';
 import Segmentation_S from 'illustration:./S2_fill_segmentation_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Segmentation(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Server.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Server.tsx
index e08e810e652..a27a51d0de2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Server.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Server.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Server_L from 'illustration:./S2_fill_server_generic2_160.svg';
 import Server_M from 'illustration:./S2_fill_server_generic2_96.svg';
 import Server_S from 'illustration:./S2_fill_server_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Server(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Shapes.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Shapes.tsx
index fe133b77e38..7560e37c604 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Shapes.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Shapes.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Shapes_L from 'illustration:./S2_fill_shapes_generic2_160.svg';
 import Shapes_M from 'illustration:./S2_fill_shapes_generic2_96.svg';
 import Shapes_S from 'illustration:./S2_fill_shapes_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Shapes(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingBag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingBag.tsx
index f5b22d089e2..aff20bd4895 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingBag.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingBag.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import ShoppingBag_L from 'illustration:./S2_fill_shoppingBag_generic2_160.svg';
 import ShoppingBag_M from 'illustration:./S2_fill_shoppingBag_generic2_96.svg';
 import ShoppingBag_S from 'illustration:./S2_fill_shoppingBag_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ShoppingBag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingCart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingCart.tsx
index f484e6a2734..8f62864df88 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingCart.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ShoppingCart.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import ShoppingCart_L from 'illustration:./S2_fill_shoppingCart_generic2_160.svg';
 import ShoppingCart_M from 'illustration:./S2_fill_shoppingCart_generic2_96.svg';
 import ShoppingCart_S from 'illustration:./S2_fill_shoppingCart_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ShoppingCart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Sparkles.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Sparkles.tsx
index 745555d5efc..5f370e20b2b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Sparkles.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Sparkles.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Sparkles_L from 'illustration:./S2_fill_sparkles_generic2_160.svg';
 import Sparkles_M from 'illustration:./S2_fill_sparkles_generic2_96.svg';
 import Sparkles_S from 'illustration:./S2_fill_sparkles_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Sparkles(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/SpeedFast.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/SpeedFast.tsx
index 0c2f9c44228..2244277b9a3 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/SpeedFast.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/SpeedFast.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import SpeedFast_L from 'illustration:./S2_fill_speedFast_generic2_160.svg';
 import SpeedFast_M from 'illustration:./S2_fill_speedFast_generic2_96.svg';
 import SpeedFast_S from 'illustration:./S2_fill_speedFast_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function SpeedFast(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StampClone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StampClone.tsx
index 5e58381d09b..aceb20fced1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StampClone.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StampClone.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import StampClone_L from 'illustration:./S2_fill_stampClone_generic2_160.svg';
 import StampClone_M from 'illustration:./S2_fill_stampClone_generic2_96.svg';
 import StampClone_S from 'illustration:./S2_fill_stampClone_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function StampClone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Star.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Star.tsx
index 3cfbbde1cba..a62f15e7685 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Star.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Star.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Star_L from 'illustration:./S2_fill_star_generic2_160.svg';
 import Star_M from 'illustration:./S2_fill_star_generic2_96.svg';
 import Star_S from 'illustration:./S2_fill_star_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Star(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StepForward.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StepForward.tsx
index 6aa3323fec5..c66507b94d8 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StepForward.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/StepForward.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import StepForward_L from 'illustration:./S2_fill_stepForward_generic2_160.svg';
 import StepForward_M from 'illustration:./S2_fill_stepForward_generic2_96.svg';
 import StepForward_S from 'illustration:./S2_fill_stepForward_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function StepForward(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Switch.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Switch.tsx
index b3c6ae3b8a6..3b177abb992 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Switch.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Switch.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Switch_L from 'illustration:./S2_fill_switch_generic2_160.svg';
 import Switch_M from 'illustration:./S2_fill_switch_generic2_96.svg';
 import Switch_S from 'illustration:./S2_fill_switch_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Switch(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tablet.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tablet.tsx
index 12208d8aa09..49c1212feaf 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tablet.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tablet.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Tablet_L from 'illustration:./S2_fill_tablet_generic2_160.svg';
 import Tablet_M from 'illustration:./S2_fill_tablet_generic2_96.svg';
 import Tablet_S from 'illustration:./S2_fill_tablet_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Tablet(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tag.tsx
index ffdc55a7378..77080c298cd 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tag.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Tag.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Tag_L from 'illustration:./S2_fill_tag_generic2_160.svg';
 import Tag_M from 'illustration:./S2_fill_tag_generic2_96.svg';
 import Tag_S from 'illustration:./S2_fill_tag_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Tag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Targeted.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Targeted.tsx
index cf00ff8b60b..53339f9e029 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Targeted.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Targeted.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Targeted_L from 'illustration:./S2_fill_targeted_generic2_160.svg';
 import Targeted_M from 'illustration:./S2_fill_targeted_generic2_96.svg';
 import Targeted_S from 'illustration:./S2_fill_targeted_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Targeted(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Text.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Text.tsx
index 5b6fb3a5a10..78b38cd53fe 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Text.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Text.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Text_L from 'illustration:./S2_fill_text_generic2_160.svg';
 import Text_M from 'illustration:./S2_fill_text_generic2_96.svg';
 import Text_S from 'illustration:./S2_fill_text_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Text(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThreeArrowsCircle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThreeArrowsCircle.tsx
index 99f2dbaeb04..c1c92b31f61 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThreeArrowsCircle.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThreeArrowsCircle.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import ThreeArrowsCircle_L from 'illustration:./S2_fill_threeArrowsCircle_generic2_160.svg';
 import ThreeArrowsCircle_M from 'illustration:./S2_fill_threeArrowsCircle_generic2_96.svg';
 import ThreeArrowsCircle_S from 'illustration:./S2_fill_threeArrowsCircle_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ThreeArrowsCircle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThumbsUp.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThumbsUp.tsx
index 051fde396fc..34bb680a0cb 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThumbsUp.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/ThumbsUp.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import ThumbsUp_L from 'illustration:./S2_fill_thumbsUp_generic2_160.svg';
 import ThumbsUp_M from 'illustration:./S2_fill_thumbsUp_generic2_96.svg';
 import ThumbsUp_S from 'illustration:./S2_fill_thumbsUp_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ThumbsUp(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Transform.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Transform.tsx
index 0b3b8bbc337..eda7d92283d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Transform.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Transform.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Transform_L from 'illustration:./S2_fill_transform_generic2_160.svg';
 import Transform_M from 'illustration:./S2_fill_transform_generic2_96.svg';
 import Transform_S from 'illustration:./S2_fill_transform_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Transform(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Translate.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Translate.tsx
index 84cf63ca00c..939b5a5d6a9 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Translate.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Translate.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Translate_L from 'illustration:./S2_fill_translate_generic2_160.svg';
 import Translate_M from 'illustration:./S2_fill_translate_generic2_96.svg';
 import Translate_S from 'illustration:./S2_fill_translate_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Translate(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trash.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trash.tsx
index 7317bc4f279..a686e79b114 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trash.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trash.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Trash_L from 'illustration:./S2_fill_trash_generic2_160.svg';
 import Trash_M from 'illustration:./S2_fill_trash_generic2_96.svg';
 import Trash_S from 'illustration:./S2_fill_trash_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Trash(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trophy.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trophy.tsx
index 6779df02b70..7671e2099d0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trophy.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Trophy.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Trophy_L from 'illustration:./S2_fill_trophy_generic2_160.svg';
 import Trophy_M from 'illustration:./S2_fill_trophy_generic2_96.svg';
 import Trophy_S from 'illustration:./S2_fill_trophy_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Trophy(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Update.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Update.tsx
index 922c6b7e8bd..710a5da0804 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Update.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Update.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Update_L from 'illustration:./S2_fill_update_generic2_160.svg';
 import Update_M from 'illustration:./S2_fill_update_generic2_96.svg';
 import Update_S from 'illustration:./S2_fill_update_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Update(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Upload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Upload.tsx
index 40f910bdffc..070419f20ba 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Upload.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Upload.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../../src/Icon';
 import Upload_L from 'illustration:./S2_fill_upload_generic2_160.svg';
 import Upload_M from 'illustration:./S2_fill_upload_generic2_96.svg';
 import Upload_S from 'illustration:./S2_fill_upload_generic2_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Upload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/User.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/User.tsx
index 5e691173199..8b7f5e0847c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/User.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/User.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import User_L from 'illustration:./S2_fill_user_generic2_160.svg';
 import User_M from 'illustration:./S2_fill_user_generic2_96.svg';
 import User_S from 'illustration:./S2_fill_user_generic2_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserAvatar.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserAvatar.tsx
index d880dd5e2f9..a5070281fab 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserAvatar.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserAvatar.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import UserAvatar_L from 'illustration:./S2_fill_userAvatar_generic2_160.svg';
 import UserAvatar_M from 'illustration:./S2_fill_userAvatar_generic2_96.svg';
 import UserAvatar_S from 'illustration:./S2_fill_userAvatar_generic2_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserGroup.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserGroup.tsx
index 53667892720..5046a361905 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserGroup.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/UserGroup.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import UserGroup_L from 'illustration:./S2_fill_userGroup_generic2_160.svg';
 import UserGroup_M from 'illustration:./S2_fill_userGroup_generic2_96.svg';
 import UserGroup_S from 'illustration:./S2_fill_userGroup_generic2_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VectorDraw.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VectorDraw.tsx
index 4fd2d6a8376..020e5bf59d1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VectorDraw.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VectorDraw.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import VectorDraw_L from 'illustration:./S2_fill_vectorDraw_generic2_160.svg';
 import VectorDraw_M from 'illustration:./S2_fill_vectorDraw_generic2_96.svg';
 import VectorDraw_S from 'illustration:./S2_fill_vectorDraw_generic2_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Video.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Video.tsx
index 27d6fa9435c..18ccd96b428 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Video.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Video.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import Video_L from 'illustration:./S2_fill_video_generic2_160.svg';
 import Video_M from 'illustration:./S2_fill_video_generic2_96.svg';
 import Video_S from 'illustration:./S2_fill_video_generic2_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Volume.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Volume.tsx
index a3662cdd73d..59acb903da4 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Volume.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Volume.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import Volume_L from 'illustration:./S2_fill_volume_generic2_160.svg';
 import Volume_M from 'illustration:./S2_fill_volume_generic2_96.svg';
 import Volume_S from 'illustration:./S2_fill_volume_generic2_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VolumeOne.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VolumeOne.tsx
index 8c52aa2a8fa..bc4619127fd 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VolumeOne.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/VolumeOne.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import VolumeOne_L from 'illustration:./S2_fill_volumeOne_generic2_160.svg';
 import VolumeOne_M from 'illustration:./S2_fill_volumeOne_generic2_96.svg';
 import VolumeOne_S from 'illustration:./S2_fill_volumeOne_generic2_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Wallet.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Wallet.tsx
index 34c2bf37fbc..a4bed52c2bb 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Wallet.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/gradient/generic2/Wallet.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import Wallet_L from 'illustration:./S2_fill_wallet_generic2_160.svg';
 import Wallet_M from 'illustration:./S2_fill_wallet_generic2_96.svg';
 import Wallet_S from 'illustration:./S2_fill_wallet_generic2_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/3D.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/3D.tsx
index b170425af33..6bdabc064a3 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/3D.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/3D.tsx
@@ -15,7 +15,7 @@ import _3D_M from 'illustration:./S2_lin_3D_96.svg';
 import _3D_S from 'illustration:./S2_lin_3D_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function _3D(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/3Dasset.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/3Dasset.tsx
index b5b7a1a8dc1..53cec728ca8 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/3Dasset.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/3Dasset.tsx
@@ -15,7 +15,7 @@ import _3Dasset_M from 'illustration:./S2_lin_3Dasset_96.svg';
 import _3Dasset_S from 'illustration:./S2_lin_3Dasset_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function _3Dasset(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIChat.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIChat.tsx
index 409356f7e97..481d863e62a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIChat.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIChat.tsx
@@ -15,7 +15,7 @@ import AIChat_M from 'illustration:./S2_lin_AIChat_96.svg';
 import AIChat_S from 'illustration:./S2_lin_AIChat_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function AIChat(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerate.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerate.tsx
index 4cd4d83aa01..ab8b2ed26ca 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerate.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerate.tsx
@@ -15,7 +15,7 @@ import AIGenerate_M from 'illustration:./S2_lin_AIGenerate_96.svg';
 import AIGenerate_S from 'illustration:./S2_lin_AIGenerate_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function AIGenerate(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerateImage.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerateImage.tsx
index a59f1e182fc..3be62333307 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerateImage.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AIGenerateImage.tsx
@@ -15,7 +15,7 @@ import AIGenerateImage_M from 'illustration:./S2_lin_AIGenerateImage_96.svg';
 import AIGenerateImage_S from 'illustration:./S2_lin_AIGenerateImage_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function AIGenerateImage(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Accessibility.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Accessibility.tsx
index 7d3b926b83d..7392902b8b6 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Accessibility.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Accessibility.tsx
@@ -15,7 +15,7 @@ import Accessibility_M from 'illustration:./S2_lin_accessibility_96.svg';
 import Accessibility_S from 'illustration:./S2_lin_accessibility_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Accessibility(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Addproject.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Addproject.tsx
index c128c08b9fb..aa1d0e72ee9 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Addproject.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Addproject.tsx
@@ -15,7 +15,7 @@ import Addproject_M from 'illustration:./S2_lin_addproject_96.svg';
 import Addproject_S from 'illustration:./S2_lin_addproject_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Addproject(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AlertNotice.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AlertNotice.tsx
index 78bc6b462ad..6d38169eb12 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AlertNotice.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AlertNotice.tsx
@@ -15,7 +15,7 @@ import AlertNotice_M from 'illustration:./S2_lin_alertNotice_96.svg';
 import AlertNotice_S from 'illustration:./S2_lin_alertNotice_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function AlertNotice(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Animation.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Animation.tsx
index d97b931ced7..96f4a168598 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Animation.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Animation.tsx
@@ -15,7 +15,7 @@ import Animation_M from 'illustration:./S2_lin_animation_96.svg';
 import Animation_S from 'illustration:./S2_lin_animation_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Animation(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Apps.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Apps.tsx
index 9a86454384e..f87519cc3be 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Apps.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Apps.tsx
@@ -15,7 +15,7 @@ import Apps_M from 'illustration:./S2_lin_apps_96.svg';
 import Apps_S from 'illustration:./S2_lin_apps_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Apps(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowDown.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowDown.tsx
index a90b86f234f..e1f6fc281fa 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowDown.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowDown.tsx
@@ -15,7 +15,7 @@ import ArrowDown_M from 'illustration:./S2_lin_arrowDown_96.svg';
 import ArrowDown_S from 'illustration:./S2_lin_arrowDown_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ArrowDown(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowLeft.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowLeft.tsx
index dd55339b8e8..8b6b60e987e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowLeft.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowLeft.tsx
@@ -15,7 +15,7 @@ import ArrowLeft_M from 'illustration:./S2_lin_arrowLeft_96.svg';
 import ArrowLeft_S from 'illustration:./S2_lin_arrowLeft_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ArrowLeft(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowRight.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowRight.tsx
index 57f23600182..82cd0bbb694 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowRight.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowRight.tsx
@@ -15,7 +15,7 @@ import ArrowRight_M from 'illustration:./S2_lin_arrowRight_96.svg';
 import ArrowRight_S from 'illustration:./S2_lin_arrowRight_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ArrowRight(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowUp.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowUp.tsx
index cd50fff130e..c01f71823fc 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowUp.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ArrowUp.tsx
@@ -15,7 +15,7 @@ import ArrowUp_M from 'illustration:./S2_lin_arrowUp_96.svg';
 import ArrowUp_S from 'illustration:./S2_lin_arrowUp_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ArrowUp(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Artboard.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Artboard.tsx
index 2e215b95b18..8f45728c84f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Artboard.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Artboard.tsx
@@ -15,7 +15,7 @@ import Artboard_M from 'illustration:./S2_lin_artboard_96.svg';
 import Artboard_S from 'illustration:./S2_lin_artboard_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Artboard(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Assets.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Assets.tsx
index 2e64bee6c4f..b6a4eef3ce0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Assets.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Assets.tsx
@@ -15,7 +15,7 @@ import Assets_M from 'illustration:./S2_lin_assets_96.svg';
 import Assets_S from 'illustration:./S2_lin_assets_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Assets(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AudioWave.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AudioWave.tsx
index fab27a83987..d7a82cc4b14 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/AudioWave.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/AudioWave.tsx
@@ -15,7 +15,7 @@ import AudioWave_M from 'illustration:./S2_lin_audioWave_96.svg';
 import AudioWave_S from 'illustration:./S2_lin_audioWave_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function AudioWave(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BadgeVerified.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BadgeVerified.tsx
index 58165065fe9..bfcf5f5f203 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BadgeVerified.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BadgeVerified.tsx
@@ -15,7 +15,7 @@ import BadgeVerified_M from 'illustration:./S2_lin_badgeVerified_96.svg';
 import BadgeVerified_S from 'illustration:./S2_lin_badgeVerified_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function BadgeVerified(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bell.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bell.tsx
index 10a332edeae..27ec08e6d2d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bell.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bell.tsx
@@ -15,7 +15,7 @@ import Bell_M from 'illustration:./S2_lin_bell_96.svg';
 import Bell_S from 'illustration:./S2_lin_bell_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Bell(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bolt.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bolt.tsx
index 83a5212c8ca..4c8db3438f1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bolt.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bolt.tsx
@@ -15,7 +15,7 @@ import Bolt_M from 'illustration:./S2_lin_bolt_96.svg';
 import Bolt_S from 'illustration:./S2_lin_bolt_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Bolt(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brand.tsx
index cf79e3260b1..67ef1d409ff 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brand.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brand.tsx
@@ -15,7 +15,7 @@ import Brand_M from 'illustration:./S2_lin_brand_96.svg';
 import Brand_S from 'illustration:./S2_lin_brand_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Brand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Briefcase.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Briefcase.tsx
index a60aeef06b8..ae33de5f8ed 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Briefcase.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Briefcase.tsx
@@ -15,7 +15,7 @@ import Briefcase_M from 'illustration:./S2_lin_briefcase_96.svg';
 import Briefcase_S from 'illustration:./S2_lin_briefcase_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Briefcase(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrightnessContrast.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrightnessContrast.tsx
index 9563ee38eb8..09643f9ef92 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrightnessContrast.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrightnessContrast.tsx
@@ -15,7 +15,7 @@ import BrightnessContrast_M from 'illustration:./S2_lin_brightnessContrast_96.sv
 import BrightnessContrast_S from 'illustration:./S2_lin_brightnessContrast_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function BrightnessContrast(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Browser.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Browser.tsx
index 6dc208d8e33..1d90c77ac70 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Browser.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Browser.tsx
@@ -15,7 +15,7 @@ import Browser_M from 'illustration:./S2_lin_browser_96.svg';
 import Browser_S from 'illustration:./S2_lin_browser_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Browser(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserError.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserError.tsx
index e22fb8ee606..72c05d35325 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserError.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserError.tsx
@@ -15,7 +15,7 @@ import BrowserError_M from 'illustration:./S2_lin_browserError_96.svg';
 import BrowserError_S from 'illustration:./S2_lin_browserError_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function BrowserError(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserNotCompatible.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserNotCompatible.tsx
index dd9afdfc9b9..c131872d7ce 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserNotCompatible.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BrowserNotCompatible.tsx
@@ -15,7 +15,7 @@ import BrowserNotCompatible_M from 'illustration:./S2_lin_browserNotCompatible_9
 import BrowserNotCompatible_S from 'illustration:./S2_lin_browserNotCompatible_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function BrowserNotCompatible(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brush.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brush.tsx
index 9832f4b1020..a1416af3a9c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brush.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Brush.tsx
@@ -15,7 +15,7 @@ import Brush_M from 'illustration:./S2_lin_brush_96.svg';
 import Brush_S from 'illustration:./S2_lin_brush_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Brush(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bug.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bug.tsx
index 41fae4f7b5f..2248ba5584a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bug.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Bug.tsx
@@ -15,7 +15,7 @@ import Bug_M from 'illustration:./S2_lin_bug_96.svg';
 import Bug_S from 'illustration:./S2_lin_bug_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Bug(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BuildTable.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BuildTable.tsx
index 570cea0798c..24322f8d04e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/BuildTable.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/BuildTable.tsx
@@ -15,7 +15,7 @@ import BuildTable_M from 'illustration:./S2_lin_buildTable_96.svg';
 import BuildTable_S from 'illustration:./S2_lin_buildTable_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function BuildTable(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Buildings.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Buildings.tsx
index 231e44e0f39..e9a661ea478 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Buildings.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Buildings.tsx
@@ -15,7 +15,7 @@ import Buildings_M from 'illustration:./S2_lin_buildings_96.svg';
 import Buildings_S from 'illustration:./S2_lin_buildings_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Buildings(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Calendar.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Calendar.tsx
index ff9d1681eb8..c54cc94303e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Calendar.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Calendar.tsx
@@ -15,7 +15,7 @@ import Calendar_M from 'illustration:./S2_lin_calendar_96.svg';
 import Calendar_S from 'illustration:./S2_lin_calendar_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Calendar(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Camera.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Camera.tsx
index 4649dd944e6..6665d1c2778 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Camera.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Camera.tsx
@@ -15,7 +15,7 @@ import Camera_M from 'illustration:./S2_lin_camera_96.svg';
 import Camera_S from 'illustration:./S2_lin_camera_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Camera(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CardTapPayment.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CardTapPayment.tsx
index 6ef9e44ae74..53fa4d07d48 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CardTapPayment.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CardTapPayment.tsx
@@ -15,7 +15,7 @@ import CardTapPayment_M from 'illustration:./S2_lin_cardTapPayment_96.svg';
 import CardTapPayment_S from 'illustration:./S2_lin_cardTapPayment_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function CardTapPayment(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Channel.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Channel.tsx
index cecaf110ad2..c9d072b6113 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Channel.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Channel.tsx
@@ -15,7 +15,7 @@ import Channel_M from 'illustration:./S2_lin_channel_96.svg';
 import Channel_S from 'illustration:./S2_lin_channel_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Channel(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ChartAreaStack.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ChartAreaStack.tsx
index 40e6649ac53..91c3d5ab8d5 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ChartAreaStack.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ChartAreaStack.tsx
@@ -15,7 +15,7 @@ import ChartAreaStack_M from 'illustration:./S2_lin_chartAreaStack_96.svg';
 import ChartAreaStack_S from 'illustration:./S2_lin_chartAreaStack_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ChartAreaStack(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Chatbubble.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Chatbubble.tsx
index 6a6b430c1f3..cc091f60edf 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Chatbubble.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Chatbubble.tsx
@@ -15,7 +15,7 @@ import Chatbubble_M from 'illustration:./S2_lin_chatbubble_96.svg';
 import Chatbubble_S from 'illustration:./S2_lin_chatbubble_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Chatbubble(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Check.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Check.tsx
index 49e04ce73c6..6c5cc08c4de 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Check.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Check.tsx
@@ -15,7 +15,7 @@ import Check_M from 'illustration:./S2_lin_check_96.svg';
 import Check_S from 'illustration:./S2_lin_check_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Check(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clipboard.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clipboard.tsx
index eb0f2a9dd71..a0ffce39447 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clipboard.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clipboard.tsx
@@ -15,7 +15,7 @@ import Clipboard_M from 'illustration:./S2_lin_clipboard_96.svg';
 import Clipboard_S from 'illustration:./S2_lin_clipboard_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Clipboard(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clock.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clock.tsx
index 96318b9c05a..831105e3e77 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clock.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Clock.tsx
@@ -15,7 +15,7 @@ import Clock_M from 'illustration:./S2_lin_clock_96.svg';
 import Clock_S from 'illustration:./S2_lin_clock_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Clock(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Close.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Close.tsx
index 86f4b7c6965..c742ef58256 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Close.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Close.tsx
@@ -15,7 +15,7 @@ import Close_M from 'illustration:./S2_lin_close_96.svg';
 import Close_S from 'illustration:./S2_lin_close_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Close(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cloud.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cloud.tsx
index 00a6e376274..8cc45ebbe36 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cloud.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cloud.tsx
@@ -15,7 +15,7 @@ import Cloud_M from 'illustration:./S2_lin_cloud_96.svg';
 import Cloud_S from 'illustration:./S2_lin_cloud_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Cloud(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateDisconnected.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateDisconnected.tsx
index ec5c0103034..e9766111cb1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateDisconnected.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateDisconnected.tsx
@@ -15,7 +15,7 @@ import CloudStateDisconnected_M from 'illustration:./S2_lin_cloudStateDisconnect
 import CloudStateDisconnected_S from 'illustration:./S2_lin_cloudStateDisconnected_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function CloudStateDisconnected(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateError.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateError.tsx
index fb764b693b9..113aeafcb12 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateError.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudStateError.tsx
@@ -15,7 +15,7 @@ import CloudStateError_M from 'illustration:./S2_lin_cloudStateError_96.svg';
 import CloudStateError_S from 'illustration:./S2_lin_cloudStateError_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function CloudStateError(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudUpload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudUpload.tsx
index 82b5b73c1db..7aceeb85108 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudUpload.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CloudUpload.tsx
@@ -15,7 +15,7 @@ import CloudUpload_M from 'illustration:./S2_lin_cloudUpload_96.svg';
 import CloudUpload_S from 'illustration:./S2_lin_cloudUpload_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function CloudUpload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CodeBrackets.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CodeBrackets.tsx
index cc46a04b154..94fb047ac23 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CodeBrackets.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CodeBrackets.tsx
@@ -15,7 +15,7 @@ import CodeBrackets_M from 'illustration:./S2_lin_codeBrackets_96.svg';
 import CodeBrackets_S from 'illustration:./S2_lin_codeBrackets_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function CodeBrackets(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Color.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Color.tsx
index 08873192754..ffb36735c84 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Color.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Color.tsx
@@ -15,7 +15,7 @@ import Color_M from 'illustration:./S2_lin_color_96.svg';
 import Color_S from 'illustration:./S2_lin_color_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Color(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CommentText.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CommentText.tsx
index 2477e99325a..81a385cfee5 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/CommentText.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/CommentText.tsx
@@ -15,7 +15,7 @@ import CommentText_M from 'illustration:./S2_lin_commentText_96.svg';
 import CommentText_S from 'illustration:./S2_lin_commentText_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function CommentText(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ConfettiCelebration.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ConfettiCelebration.tsx
index e55103e3468..ec0e180df6b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ConfettiCelebration.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ConfettiCelebration.tsx
@@ -15,7 +15,7 @@ import ConfettiCelebration_M from 'illustration:./S2_lin_confettiCelebration_96.
 import ConfettiCelebration_S from 'illustration:./S2_lin_confettiCelebration_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ConfettiCelebration(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Conversationbubbles.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Conversationbubbles.tsx
index 96ca199aa2a..81691538779 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Conversationbubbles.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Conversationbubbles.tsx
@@ -15,7 +15,7 @@ import Conversationbubbles_M from 'illustration:./S2_lin_conversationbubbles_96.
 import Conversationbubbles_S from 'illustration:./S2_lin_conversationbubbles_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Conversationbubbles(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Crop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Crop.tsx
index d6e4f119ebb..d1319a76a35 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Crop.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Crop.tsx
@@ -15,7 +15,7 @@ import Crop_M from 'illustration:./S2_lin_crop_96.svg';
 import Crop_S from 'illustration:./S2_lin_crop_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Crop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cursor.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cursor.tsx
index 10735f4ba98..9126322ebd2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cursor.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cursor.tsx
@@ -15,7 +15,7 @@ import Cursor_M from 'illustration:./S2_lin_cursor_96.svg';
 import Cursor_S from 'illustration:./S2_lin_cursor_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Cursor(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cut.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cut.tsx
index 5d02879ef62..a41b564e181 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cut.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Cut.tsx
@@ -15,7 +15,7 @@ import Cut_M from 'illustration:./S2_lin_cut_96.svg';
 import Cut_S from 'illustration:./S2_lin_cut_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Cut(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Data.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Data.tsx
index 7f7cf1f9dd7..b1b78dc2521 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Data.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Data.tsx
@@ -15,7 +15,7 @@ import Data_M from 'illustration:./S2_lin_data_96.svg';
 import Data_S from 'illustration:./S2_lin_data_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Data(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/DataAnalytics.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/DataAnalytics.tsx
index 9387e948e23..8ab3fd14e3d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/DataAnalytics.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/DataAnalytics.tsx
@@ -15,7 +15,7 @@ import DataAnalytics_M from 'illustration:./S2_lin_dataAnalytics_96.svg';
 import DataAnalytics_S from 'illustration:./S2_lin_dataAnalytics_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function DataAnalytics(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Desktop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Desktop.tsx
index 3e4dd07a4b3..8996ee1a452 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Desktop.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Desktop.tsx
@@ -15,7 +15,7 @@ import Desktop_M from 'illustration:./S2_lin_desktop_96.svg';
 import Desktop_S from 'illustration:./S2_lin_desktop_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Desktop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Diamond.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Diamond.tsx
index 3932c444669..ba66a7a54af 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Diamond.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Diamond.tsx
@@ -15,7 +15,7 @@ import Diamond_M from 'illustration:./S2_lin_diamond_96.svg';
 import Diamond_S from 'illustration:./S2_lin_diamond_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Diamond(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Document.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Document.tsx
index 46744e17cdb..512edee63dc 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Document.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Document.tsx
@@ -15,7 +15,7 @@ import Document_M from 'illustration:./S2_lin_document_96.svg';
 import Document_S from 'illustration:./S2_lin_document_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Document(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Download.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Download.tsx
index 6a9c500739e..569501f9abd 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Download.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Download.tsx
@@ -15,7 +15,7 @@ import Download_M from 'illustration:./S2_lin_download_96.svg';
 import Download_S from 'illustration:./S2_lin_download_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Download(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/DropToUpload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/DropToUpload.tsx
index f97d5149693..b1933868bae 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/DropToUpload.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/DropToUpload.tsx
@@ -15,7 +15,7 @@ import DropToUpload_M from 'illustration:./S2_lin_dropToUpload_96.svg';
 import DropToUpload_S from 'illustration:./S2_lin_dropToUpload_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function DropToUpload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Education.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Education.tsx
index 760dd050481..a0f2753fda7 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Education.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Education.tsx
@@ -15,7 +15,7 @@ import Education_M from 'illustration:./S2_lin_education_96.svg';
 import Education_S from 'illustration:./S2_lin_education_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Education(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Effects.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Effects.tsx
index 43b3c25959f..93cd51dd0e2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Effects.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Effects.tsx
@@ -15,7 +15,7 @@ import Effects_M from 'illustration:./S2_lin_effects_96.svg';
 import Effects_S from 'illustration:./S2_lin_effects_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Effects(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Emoji160.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Emoji160.tsx
index 0a4f19da181..129107f405f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Emoji160.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Emoji160.tsx
@@ -15,7 +15,7 @@ import Emoji160_M from 'illustration:./S2_lin_emoji_160_96.svg';
 import Emoji160_S from 'illustration:./S2_lin_emoji_160_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Emoji160(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/EmptyStateExport.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/EmptyStateExport.tsx
index ea917226a8d..fd18dbe7b81 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/EmptyStateExport.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/EmptyStateExport.tsx
@@ -15,7 +15,7 @@ import EmptyStateExport_M from 'illustration:./S2_lin_emptyStateExport_96.svg';
 import EmptyStateExport_S from 'illustration:./S2_lin_emptyStateExport_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function EmptyStateExport(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Error.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Error.tsx
index 2aeed76b190..a78e42a35e9 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Error.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Error.tsx
@@ -15,7 +15,7 @@ import Error_M from 'illustration:./S2_lin_error_96.svg';
 import Error_S from 'illustration:./S2_lin_error_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Error(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Explosion.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Explosion.tsx
index 3e38d5faf4a..b91361073c7 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Explosion.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Explosion.tsx
@@ -15,7 +15,7 @@ import Explosion_M from 'illustration:./S2_lin_explosion_96.svg';
 import Explosion_S from 'illustration:./S2_lin_explosion_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Explosion(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ExportTo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ExportTo.tsx
index c1aafb8df32..a02d83fbc76 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ExportTo.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ExportTo.tsx
@@ -15,7 +15,7 @@ import ExportTo_M from 'illustration:./S2_lin_exportTo_96.svg';
 import ExportTo_S from 'illustration:./S2_lin_exportTo_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ExportTo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Exposure.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Exposure.tsx
index bb6c4d24f29..dacd5eabeb2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Exposure.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Exposure.tsx
@@ -15,7 +15,7 @@ import Exposure_M from 'illustration:./S2_lin_exposure_96.svg';
 import Exposure_S from 'illustration:./S2_lin_exposure_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Exposure(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileAlert.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileAlert.tsx
index 48b8e765dee..e391276126f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileAlert.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileAlert.tsx
@@ -15,7 +15,7 @@ import FileAlert_M from 'illustration:./S2_lin_fileAlert_96.svg';
 import FileAlert_S from 'illustration:./S2_lin_fileAlert_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileAlert(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileImage.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileImage.tsx
index be1cb51da47..6f27b6d98d5 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileImage.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileImage.tsx
@@ -15,7 +15,7 @@ import FileImage_M from 'illustration:./S2_lin_fileImage_96.svg';
 import FileImage_S from 'illustration:./S2_lin_fileImage_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileImage(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileText.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileText.tsx
index 3a27e443ca9..1adbcd48d20 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileText.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileText.tsx
@@ -15,7 +15,7 @@ import FileText_M from 'illustration:./S2_lin_fileText_96.svg';
 import FileText_S from 'illustration:./S2_lin_fileText_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileText(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileVideo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileVideo.tsx
index 47a015cad28..173982851dc 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileVideo.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileVideo.tsx
@@ -15,7 +15,7 @@ import FileVideo_M from 'illustration:./S2_lin_fileVideo_96.svg';
 import FileVideo_S from 'illustration:./S2_lin_fileVideo_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileVideo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileZip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileZip.tsx
index 08ad1e6965a..61f2eb0eb23 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileZip.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FileZip.tsx
@@ -15,7 +15,7 @@ import FileZip_M from 'illustration:./S2_lin_fileZip_96.svg';
 import FileZip_S from 'illustration:./S2_lin_fileZip_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FileZip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filmstrip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filmstrip.tsx
index 2660e7eeb7e..e6eacd04ac6 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filmstrip.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filmstrip.tsx
@@ -15,7 +15,7 @@ import Filmstrip_M from 'illustration:./S2_lin_filmstrip_96.svg';
 import Filmstrip_S from 'illustration:./S2_lin_filmstrip_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Filmstrip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filter.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filter.tsx
index a5332374291..ee958c715a0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filter.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filter.tsx
@@ -15,7 +15,7 @@ import Filter_M from 'illustration:./S2_lin_filter_96.svg';
 import Filter_S from 'illustration:./S2_lin_filter_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Filter(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filters.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filters.tsx
index f18fded480c..a7fe208f48d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filters.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Filters.tsx
@@ -15,7 +15,7 @@ import Filters_M from 'illustration:./S2_lin_filters_96.svg';
 import Filters_S from 'illustration:./S2_lin_filters_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Filters(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Fireworks.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Fireworks.tsx
index 9bfd64763db..51ff865be61 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Fireworks.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Fireworks.tsx
@@ -15,7 +15,7 @@ import Fireworks_M from 'illustration:./S2_lin_fireworks_96.svg';
 import Fireworks_S from 'illustration:./S2_lin_fireworks_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Fireworks(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Flag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Flag.tsx
index d963971d460..0cef37420ac 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Flag.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Flag.tsx
@@ -15,7 +15,7 @@ import Flag_M from 'illustration:./S2_lin_flag_96.svg';
 import Flag_S from 'illustration:./S2_lin_flag_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Flag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCheckmark.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCheckmark.tsx
index 497acdbd3ac..610e09d684f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCheckmark.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCheckmark.tsx
@@ -15,7 +15,7 @@ import FlagCheckmark_M from 'illustration:./S2_lin_flagCheckmark_96.svg';
 import FlagCheckmark_S from 'illustration:./S2_lin_flagCheckmark_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FlagCheckmark(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCross.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCross.tsx
index 20fa82cefce..f36fc0a0a12 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCross.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FlagCross.tsx
@@ -15,7 +15,7 @@ import FlagCross_M from 'illustration:./S2_lin_flagCross_96.svg';
 import FlagCross_S from 'illustration:./S2_lin_flagCross_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FlagCross(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderClose.tsx
index 0706c295e1f..3fb54c938a8 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderClose.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderClose.tsx
@@ -15,7 +15,7 @@ import FolderClose_M from 'illustration:./S2_lin_folderClose_96.svg';
 import FolderClose_S from 'illustration:./S2_lin_folderClose_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FolderClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderOpen.tsx
index b79e40764e4..a5e75b5d20b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderOpen.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderOpen.tsx
@@ -15,7 +15,7 @@ import FolderOpen_M from 'illustration:./S2_lin_folderOpen_96.svg';
 import FolderOpen_S from 'illustration:./S2_lin_folderOpen_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FolderOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderShared.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderShared.tsx
index c523d50fa6f..156bce3bf06 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderShared.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/FolderShared.tsx
@@ -15,7 +15,7 @@ import FolderShared_M from 'illustration:./S2_lin_folderShared_96.svg';
 import FolderShared_S from 'illustration:./S2_lin_folderShared_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function FolderShared(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/GearSetting.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/GearSetting.tsx
index af493e3eeeb..48948512e6d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/GearSetting.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/GearSetting.tsx
@@ -15,7 +15,7 @@ import GearSetting_M from 'illustration:./S2_lin_gearSetting_96.svg';
 import GearSetting_S from 'illustration:./S2_lin_gearSetting_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function GearSetting(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Gift.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Gift.tsx
index 8bae29bd8d6..bf97ac1aa76 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Gift.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Gift.tsx
@@ -15,7 +15,7 @@ import Gift_M from 'illustration:./S2_lin_gift_96.svg';
 import Gift_S from 'illustration:./S2_lin_gift_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Gift(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Globe.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Globe.tsx
index 7f8447238ac..2d1c296f31b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Globe.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Globe.tsx
@@ -15,7 +15,7 @@ import Globe_M from 'illustration:./S2_lin_globe_96.svg';
 import Globe_S from 'illustration:./S2_lin_globe_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Globe(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/GlobeGrid.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/GlobeGrid.tsx
index ae92fb93c00..2d4b60253ea 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/GlobeGrid.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/GlobeGrid.tsx
@@ -15,7 +15,7 @@ import GlobeGrid_M from 'illustration:./S2_lin_globeGrid_96.svg';
 import GlobeGrid_S from 'illustration:./S2_lin_globeGrid_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function GlobeGrid(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/GraphBarChart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/GraphBarChart.tsx
index b9f02907b46..5483fffb03c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/GraphBarChart.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/GraphBarChart.tsx
@@ -15,7 +15,7 @@ import GraphBarChart_M from 'illustration:./S2_lin_graphBarChart_96.svg';
 import GraphBarChart_S from 'illustration:./S2_lin_graphBarChart_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function GraphBarChart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Hand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Hand.tsx
index 8134a6f4ba7..d626a7c6766 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Hand.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Hand.tsx
@@ -15,7 +15,7 @@ import Hand_M from 'illustration:./S2_lin_hand_96.svg';
 import Hand_S from 'illustration:./S2_lin_hand_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Hand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Handshake.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Handshake.tsx
index 9472da28daa..9acf00becc6 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Handshake.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Handshake.tsx
@@ -15,7 +15,7 @@ import Handshake_M from 'illustration:./S2_lin_handshake_96.svg';
 import Handshake_S from 'illustration:./S2_lin_handshake_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Handshake(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Heart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Heart.tsx
index 6aa57b8d0bc..c1df176027f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Heart.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Heart.tsx
@@ -15,7 +15,7 @@ import Heart_M from 'illustration:./S2_lin_heart_96.svg';
 import Heart_S from 'illustration:./S2_lin_heart_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Heart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/HelpCircle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/HelpCircle.tsx
index 4f97a9bab17..5879e30bc4d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/HelpCircle.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/HelpCircle.tsx
@@ -15,7 +15,7 @@ import HelpCircle_M from 'illustration:./S2_lin_helpCircle_96.svg';
 import HelpCircle_S from 'illustration:./S2_lin_helpCircle_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function HelpCircle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Home.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Home.tsx
index 26272a6a3b7..bc55ad6569f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Home.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Home.tsx
@@ -15,7 +15,7 @@ import Home_M from 'illustration:./S2_lin_home_96.svg';
 import Home_S from 'illustration:./S2_lin_home_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Home(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Illustration.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Illustration.tsx
index f75d2ad1ec8..d0f45fbd039 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Illustration.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Illustration.tsx
@@ -15,7 +15,7 @@ import Illustration_M from 'illustration:./S2_lin_illustration_96.svg';
 import Illustration_S from 'illustration:./S2_lin_illustration_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Illustration(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Image.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Image.tsx
index 6233865495f..b2c846f7199 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Image.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Image.tsx
@@ -15,7 +15,7 @@ import Image_M from 'illustration:./S2_lin_image_96.svg';
 import Image_S from 'illustration:./S2_lin_image_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Image(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ImageStack.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ImageStack.tsx
index d76b235fd76..9aa10bde25d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ImageStack.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ImageStack.tsx
@@ -15,7 +15,7 @@ import ImageStack_M from 'illustration:./S2_lin_imageStack_96.svg';
 import ImageStack_S from 'illustration:./S2_lin_imageStack_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ImageStack(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/InfiniteLooping.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/InfiniteLooping.tsx
index 3defdcd96c1..627986cf9df 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/InfiniteLooping.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/InfiniteLooping.tsx
@@ -15,7 +15,7 @@ import InfiniteLooping_M from 'illustration:./S2_lin_infiniteLooping_96.svg';
 import InfiniteLooping_S from 'illustration:./S2_lin_infiniteLooping_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function InfiniteLooping(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Information.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Information.tsx
index 8760bea9919..6b87e156d9f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Information.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Information.tsx
@@ -15,7 +15,7 @@ import Information_M from 'illustration:./S2_lin_information_96.svg';
 import Information_S from 'illustration:./S2_lin_information_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Information(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Interaction.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Interaction.tsx
index ac097d41dea..cc43f49a531 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Interaction.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Interaction.tsx
@@ -15,7 +15,7 @@ import Interaction_M from 'illustration:./S2_lin_interaction_96.svg';
 import Interaction_S from 'illustration:./S2_lin_interaction_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Interaction(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Laptop.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Laptop.tsx
index 30d73512897..e10e971183c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Laptop.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Laptop.tsx
@@ -15,7 +15,7 @@ import Laptop_M from 'illustration:./S2_lin_laptop_96.svg';
 import Laptop_S from 'illustration:./S2_lin_laptop_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Laptop(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Layers.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Layers.tsx
index cd07ec82874..22b320977a9 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Layers.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Layers.tsx
@@ -15,7 +15,7 @@ import Layers_M from 'illustration:./S2_lin_layers_96.svg';
 import Layers_S from 'illustration:./S2_lin_layers_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Layers(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Libraries.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Libraries.tsx
index d8e90978103..9c4e1979e72 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Libraries.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Libraries.tsx
@@ -15,7 +15,7 @@ import Libraries_M from 'illustration:./S2_lin_libraries_96.svg';
 import Libraries_S from 'illustration:./S2_lin_libraries_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Libraries(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lightbulb.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lightbulb.tsx
index 1573914dbe3..c5b150f8109 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lightbulb.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lightbulb.tsx
@@ -15,7 +15,7 @@ import Lightbulb_M from 'illustration:./S2_lin_lightbulb_96.svg';
 import Lightbulb_S from 'illustration:./S2_lin_lightbulb_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Lightbulb(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/LightbulbRays.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/LightbulbRays.tsx
index d365ed093c1..e6f83a43c92 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/LightbulbRays.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/LightbulbRays.tsx
@@ -15,7 +15,7 @@ import LightbulbRays_M from 'illustration:./S2_lin_lightbulbRays_96.svg';
 import LightbulbRays_S from 'illustration:./S2_lin_lightbulbRays_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function LightbulbRays(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lighten.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lighten.tsx
index b1167ae8d90..46ca267af85 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lighten.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Lighten.tsx
@@ -15,7 +15,7 @@ import Lighten_M from 'illustration:./S2_lin_lighten_96.svg';
 import Lighten_S from 'illustration:./S2_lin_lighten_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Lighten(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Link.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Link.tsx
index 697de6ff163..3324f20f2fb 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Link.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Link.tsx
@@ -15,7 +15,7 @@ import Link_M from 'illustration:./S2_lin_link_96.svg';
 import Link_S from 'illustration:./S2_lin_link_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Link(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Location.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Location.tsx
index cfbe28803bc..d2c17dee784 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Location.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Location.tsx
@@ -15,7 +15,7 @@ import Location_M from 'illustration:./S2_lin_location_96.svg';
 import Location_S from 'illustration:./S2_lin_location_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Location(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockClose.tsx
index 253b7a78700..a2800a8f2ac 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockClose.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockClose.tsx
@@ -15,7 +15,7 @@ import LockClose_M from 'illustration:./S2_lin_lockClose_96.svg';
 import LockClose_S from 'illustration:./S2_lin_lockClose_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function LockClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockOpen.tsx
index dcb7c547a6d..78c8aa4d60b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockOpen.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/LockOpen.tsx
@@ -15,7 +15,7 @@ import LockOpen_M from 'illustration:./S2_lin_lockOpen_96.svg';
 import LockOpen_S from 'illustration:./S2_lin_lockOpen_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function LockOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Logo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Logo.tsx
index 1ee864b54af..5c1cb6c497f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Logo.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Logo.tsx
@@ -15,7 +15,7 @@ import Logo_M from 'illustration:./S2_lin_logo_96.svg';
 import Logo_S from 'illustration:./S2_lin_logo_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Logo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MagicWand.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MagicWand.tsx
index dd7fc7a0e75..b88c185d10f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MagicWand.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MagicWand.tsx
@@ -15,7 +15,7 @@ import MagicWand_M from 'illustration:./S2_lin_magicWand_96.svg';
 import MagicWand_S from 'illustration:./S2_lin_magicWand_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MagicWand(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailClose.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailClose.tsx
index a416542eb97..4b8ddc9743a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailClose.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailClose.tsx
@@ -15,7 +15,7 @@ import MailClose_M from 'illustration:./S2_lin_mailClose_96.svg';
 import MailClose_S from 'illustration:./S2_lin_mailClose_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MailClose(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailOpen.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailOpen.tsx
index 6da07ecaba0..08049b727f0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailOpen.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MailOpen.tsx
@@ -15,7 +15,7 @@ import MailOpen_M from 'illustration:./S2_lin_mailOpen_96.svg';
 import MailOpen_S from 'illustration:./S2_lin_mailOpen_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MailOpen(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Market.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Market.tsx
index 3f2cb987e5a..30ab431a61c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Market.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Market.tsx
@@ -15,7 +15,7 @@ import Market_M from 'illustration:./S2_lin_market_96.svg';
 import Market_S from 'illustration:./S2_lin_market_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Market(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromote.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromote.tsx
index d6bfcffe65b..1e8d45b62cd 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromote.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromote.tsx
@@ -15,7 +15,7 @@ import MegaphonePromote_M from 'illustration:./S2_lin_megaphonePromote_96.svg';
 import MegaphonePromote_S from 'illustration:./S2_lin_megaphonePromote_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MegaphonePromote(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromoteExpressive.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromoteExpressive.tsx
index 4ef2d3f5d0f..e91a12b2613 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromoteExpressive.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MegaphonePromoteExpressive.tsx
@@ -15,7 +15,7 @@ import MegaphonePromoteExpressive_M from 'illustration:./S2_lin_megaphonePromote
 import MegaphonePromoteExpressive_S from 'illustration:./S2_lin_megaphonePromote_Expressive_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MegaphonePromoteExpressive(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Mention.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Mention.tsx
index cf8e45528ed..815fa97dc01 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Mention.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Mention.tsx
@@ -15,7 +15,7 @@ import Mention_M from 'illustration:./S2_lin_mention_96.svg';
 import Mention_S from 'illustration:./S2_lin_mention_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Mention(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Microphone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Microphone.tsx
index 16ebfc17254..198b5c3dddd 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Microphone.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Microphone.tsx
@@ -15,7 +15,7 @@ import Microphone_M from 'illustration:./S2_lin_microphone_96.svg';
 import Microphone_S from 'illustration:./S2_lin_microphone_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Microphone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MicrophoneOff.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MicrophoneOff.tsx
index 68ed559f37f..c49c64c1715 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MicrophoneOff.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MicrophoneOff.tsx
@@ -15,7 +15,7 @@ import MicrophoneOff_M from 'illustration:./S2_lin_microphoneOff_96.svg';
 import MicrophoneOff_S from 'illustration:./S2_lin_microphoneOff_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MicrophoneOff(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Minimize.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Minimize.tsx
index 60d6ea39674..1d6da0a07a1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Minimize.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Minimize.tsx
@@ -15,7 +15,7 @@ import Minimize_M from 'illustration:./S2_lin_minimize_96.svg';
 import Minimize_S from 'illustration:./S2_lin_minimize_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Minimize(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MovieCamera.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MovieCamera.tsx
index e3988d45f9c..25fb29fce69 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MovieCamera.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MovieCamera.tsx
@@ -15,7 +15,7 @@ import MovieCamera_M from 'illustration:./S2_lin_movieCamera_96.svg';
 import MovieCamera_S from 'illustration:./S2_lin_movieCamera_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MovieCamera(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MusicNote.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MusicNote.tsx
index 2a127556550..8f15e21ee6c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/MusicNote.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/MusicNote.tsx
@@ -15,7 +15,7 @@ import MusicNote_M from 'illustration:./S2_lin_musicNote_96.svg';
 import MusicNote_S from 'illustration:./S2_lin_musicNote_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function MusicNote(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoBrands.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoBrands.tsx
index 14105ddcd74..600cb99a03a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoBrands.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoBrands.tsx
@@ -15,7 +15,7 @@ import NoBrands_M from 'illustration:./S2_lin_noBrands_96.svg';
 import NoBrands_S from 'illustration:./S2_lin_noBrands_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoBrands(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComment.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComment.tsx
index 6a5b080084b..ff2706589fe 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComment.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComment.tsx
@@ -15,7 +15,7 @@ import NoComment_M from 'illustration:./S2_lin_noComment_96.svg';
 import NoComment_S from 'illustration:./S2_lin_noComment_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoComment(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComments.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComments.tsx
index e0f1091376c..da8260697a2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComments.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoComments.tsx
@@ -15,7 +15,7 @@ import NoComments_M from 'illustration:./S2_lin_noComments_96.svg';
 import NoComments_S from 'illustration:./S2_lin_noComments_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoComments(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoElements.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoElements.tsx
index d5f6814bb11..9b815e718c7 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoElements.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoElements.tsx
@@ -15,7 +15,7 @@ import NoElements_M from 'illustration:./S2_lin_noElements_96.svg';
 import NoElements_S from 'illustration:./S2_lin_noElements_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoElements(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFile.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFile.tsx
index 6387bd40495..a354e324b43 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFile.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFile.tsx
@@ -15,7 +15,7 @@ import NoFile_M from 'illustration:./S2_lin_noFile_96.svg';
 import NoFile_S from 'illustration:./S2_lin_noFile_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoFile(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFilter.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFilter.tsx
index d9212d5d5b4..5da2292e8a7 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFilter.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoFilter.tsx
@@ -15,7 +15,7 @@ import NoFilter_M from 'illustration:./S2_lin_noFilter_96.svg';
 import NoFilter_S from 'illustration:./S2_lin_noFilter_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoFilter(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoImage.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoImage.tsx
index 55fcf28c6c1..39a73962910 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoImage.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoImage.tsx
@@ -15,7 +15,7 @@ import NoImage_M from 'illustration:./S2_lin_noImage_96.svg';
 import NoImage_S from 'illustration:./S2_lin_noImage_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoImage(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoInternetConnection.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoInternetConnection.tsx
index 45968905846..3de50c2f0e8 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoInternetConnection.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoInternetConnection.tsx
@@ -15,7 +15,7 @@ import NoInternetConnection_M from 'illustration:./S2_lin_noInternetConnection_9
 import NoInternetConnection_S from 'illustration:./S2_lin_noInternetConnection_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoInternetConnection(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibraries.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibraries.tsx
index d41b2e65468..8f9fc89f381 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibraries.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibraries.tsx
@@ -15,7 +15,7 @@ import NoLibraries_M from 'illustration:./S2_lin_noLibraries_96.svg';
 import NoLibraries_S from 'illustration:./S2_lin_noLibraries_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoLibraries(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibrariesBrands.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibrariesBrands.tsx
index 378b922f89b..50fdc367d6c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibrariesBrands.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoLibrariesBrands.tsx
@@ -15,7 +15,7 @@ import NoLibrariesBrands_M from 'illustration:./S2_lin_noLibrariesBrands_96.svg'
 import NoLibrariesBrands_S from 'illustration:./S2_lin_noLibrariesBrands_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoLibrariesBrands(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoReviewLinks.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoReviewLinks.tsx
index 6779724dad0..7d50a240995 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoReviewLinks.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoReviewLinks.tsx
@@ -15,7 +15,7 @@ import NoReviewLinks_M from 'illustration:./S2_lin_noReviewLinks_96.svg';
 import NoReviewLinks_S from 'illustration:./S2_lin_noReviewLinks_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoReviewLinks(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSearchResults.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSearchResults.tsx
index 49bee504c46..2c5e0bb6478 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSearchResults.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSearchResults.tsx
@@ -15,7 +15,7 @@ import NoSearchResults_M from 'illustration:./S2_lin_noSearchResults_96.svg';
 import NoSearchResults_S from 'illustration:./S2_lin_noSearchResults_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoSearchResults(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSharedFile.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSharedFile.tsx
index 07493e7009d..3054d141147 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSharedFile.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/NoSharedFile.tsx
@@ -15,7 +15,7 @@ import NoSharedFile_M from 'illustration:./S2_lin_noSharedFile_96.svg';
 import NoSharedFile_S from 'illustration:./S2_lin_noSharedFile_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function NoSharedFile(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperairplane.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperairplane.tsx
index 65427ef8517..fd6c17f6eb5 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperairplane.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperairplane.tsx
@@ -15,7 +15,7 @@ import Paperairplane_M from 'illustration:./S2_lin_paperairplane_96.svg';
 import Paperairplane_S from 'illustration:./S2_lin_paperairplane_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Paperairplane(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperclip.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperclip.tsx
index d3bd1da3cc0..1770b811e92 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperclip.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Paperclip.tsx
@@ -15,7 +15,7 @@ import Paperclip_M from 'illustration:./S2_lin_paperclip_96.svg';
 import Paperclip_S from 'illustration:./S2_lin_paperclip_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Paperclip(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pause.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pause.tsx
index d92aa9bad34..96bfda31205 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pause.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pause.tsx
@@ -15,7 +15,7 @@ import Pause_M from 'illustration:./S2_lin_pause_96.svg';
 import Pause_S from 'illustration:./S2_lin_pause_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Pause(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pencil.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pencil.tsx
index 4ba8d753351..7d01ea1d7d6 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pencil.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pencil.tsx
@@ -15,7 +15,7 @@ import Pencil_M from 'illustration:./S2_lin_pencil_96.svg';
 import Pencil_S from 'illustration:./S2_lin_pencil_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Pencil(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Phone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Phone.tsx
index d21ad31c13b..b329b72fc5a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Phone.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Phone.tsx
@@ -15,7 +15,7 @@ import Phone_M from 'illustration:./S2_lin_phone_96.svg';
 import Phone_S from 'illustration:./S2_lin_phone_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Phone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/PieChart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/PieChart.tsx
index e67688dfacf..cb3a630ac06 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/PieChart.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/PieChart.tsx
@@ -15,7 +15,7 @@ import PieChart_M from 'illustration:./S2_lin_pieChart_96.svg';
 import PieChart_S from 'illustration:./S2_lin_pieChart_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function PieChart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/PiggyBank.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/PiggyBank.tsx
index 4d07d4003a2..94778b59394 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/PiggyBank.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/PiggyBank.tsx
@@ -15,7 +15,7 @@ import PiggyBank_M from 'illustration:./S2_lin_piggyBank_96.svg';
 import PiggyBank_S from 'illustration:./S2_lin_piggyBank_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function PiggyBank(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pin.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pin.tsx
index 77e568d1f4a..709a0b18d32 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pin.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Pin.tsx
@@ -15,7 +15,7 @@ import Pin_M from 'illustration:./S2_lin_pin_96.svg';
 import Pin_S from 'illustration:./S2_lin_pin_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Pin(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Play.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Play.tsx
index 830496a0240..83e6b37c357 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Play.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Play.tsx
@@ -15,7 +15,7 @@ import Play_M from 'illustration:./S2_lin_play_96.svg';
 import Play_S from 'illustration:./S2_lin_play_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Play(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/PlayTriangle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/PlayTriangle.tsx
index 3589f3c53d0..e42a3bf9904 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/PlayTriangle.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/PlayTriangle.tsx
@@ -15,7 +15,7 @@ import PlayTriangle_M from 'illustration:./S2_lin_playTriangle_96.svg';
 import PlayTriangle_S from 'illustration:./S2_lin_playTriangle_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function PlayTriangle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Plugin.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Plugin.tsx
index 0c66e88e866..7916c7739a2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Plugin.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Plugin.tsx
@@ -15,7 +15,7 @@ import Plugin_M from 'illustration:./S2_lin_plugin_96.svg';
 import Plugin_S from 'illustration:./S2_lin_plugin_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Plugin(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Prompt.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Prompt.tsx
index 2ca083dc39f..537a852497b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Prompt.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Prompt.tsx
@@ -15,7 +15,7 @@ import Prompt_M from 'illustration:./S2_lin_prompt_96.svg';
 import Prompt_S from 'illustration:./S2_lin_prompt_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Prompt(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Properties.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Properties.tsx
index b40c1781e0b..d84c800d731 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Properties.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Properties.tsx
@@ -15,7 +15,7 @@ import Properties_M from 'illustration:./S2_lin_properties_96.svg';
 import Properties_S from 'illustration:./S2_lin_properties_48.svg';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Properties(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Redo.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Redo.tsx
index 45c0d48433a..9c7bd571207 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Redo.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Redo.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Redo_L from 'illustration:./S2_lin_redo_160.svg';
 import Redo_M from 'illustration:./S2_lin_redo_96.svg';
 import Redo_S from 'illustration:./S2_lin_redo_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Redo(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Remix.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Remix.tsx
index a48a4bd1e24..a05e3b09392 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Remix.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Remix.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Remix_L from 'illustration:./S2_lin_remix_160.svg';
 import Remix_M from 'illustration:./S2_lin_remix_96.svg';
 import Remix_S from 'illustration:./S2_lin_remix_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Remix(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Replace.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Replace.tsx
index 888229ab65d..e6998cc9c34 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Replace.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Replace.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Replace_L from 'illustration:./S2_lin_replace_160.svg';
 import Replace_M from 'illustration:./S2_lin_replace_96.svg';
 import Replace_S from 'illustration:./S2_lin_replace_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Replace(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ReportAbuse.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ReportAbuse.tsx
index 51dccb3cb14..72a574e0d50 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ReportAbuse.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ReportAbuse.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import ReportAbuse_L from 'illustration:./S2_lin_reportAbuse_160.svg';
 import ReportAbuse_M from 'illustration:./S2_lin_reportAbuse_96.svg';
 import ReportAbuse_S from 'illustration:./S2_lin_reportAbuse_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ReportAbuse(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Revert.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Revert.tsx
index 09f8461fa24..3df8dfb3ac3 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Revert.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Revert.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Revert_L from 'illustration:./S2_lin_revert_160.svg';
 import Revert_M from 'illustration:./S2_lin_revert_96.svg';
 import Revert_S from 'illustration:./S2_lin_revert_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Revert(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ribbon.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ribbon.tsx
index 4f3e9ae778b..4ed3d162881 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ribbon.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ribbon.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Ribbon_L from 'illustration:./S2_lin_ribbon_160.svg';
 import Ribbon_M from 'illustration:./S2_lin_ribbon_96.svg';
 import Ribbon_S from 'illustration:./S2_lin_ribbon_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Ribbon(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Rocket.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Rocket.tsx
index cb91566788d..e8c49bdab1d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Rocket.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Rocket.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Rocket_L from 'illustration:./S2_lin_rocket_160.svg';
 import Rocket_M from 'illustration:./S2_lin_rocket_96.svg';
 import Rocket_S from 'illustration:./S2_lin_rocket_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Rocket(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCCW.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCCW.tsx
index 39f02450ac2..be44cd7eb66 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCCW.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCCW.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import RotateCCW_L from 'illustration:./S2_lin_rotateCCW_160.svg';
 import RotateCCW_M from 'illustration:./S2_lin_rotateCCW_96.svg';
 import RotateCCW_S from 'illustration:./S2_lin_rotateCCW_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function RotateCCW(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCW.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCW.tsx
index bab8850aeeb..b836393c34b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCW.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/RotateCW.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import RotateCW_L from 'illustration:./S2_lin_rotateCW_160.svg';
 import RotateCW_M from 'illustration:./S2_lin_rotateCW_96.svg';
 import RotateCW_S from 'illustration:./S2_lin_rotateCW_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function RotateCW(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ruler.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ruler.tsx
index 867f1e2013d..2684dfab48a 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ruler.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Ruler.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Ruler_L from 'illustration:./S2_lin_ruler_160.svg';
 import Ruler_M from 'illustration:./S2_lin_ruler_96.svg';
 import Ruler_S from 'illustration:./S2_lin_ruler_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Ruler(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Search.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Search.tsx
index ee841c05445..261e60bc093 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Search.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Search.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Search_L from 'illustration:./S2_lin_search_160.svg';
 import Search_M from 'illustration:./S2_lin_search_96.svg';
 import Search_S from 'illustration:./S2_lin_search_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Search(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Segmentation.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Segmentation.tsx
index 01c8e575eae..f4cf5999d50 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Segmentation.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Segmentation.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Segmentation_L from 'illustration:./S2_lin_segmentation_160.svg';
 import Segmentation_M from 'illustration:./S2_lin_segmentation_96.svg';
 import Segmentation_S from 'illustration:./S2_lin_segmentation_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Segmentation(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Server.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Server.tsx
index db0c55d16ad..e91061c974c 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Server.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Server.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Server_L from 'illustration:./S2_lin_server_160.svg';
 import Server_M from 'illustration:./S2_lin_server_96.svg';
 import Server_S from 'illustration:./S2_lin_server_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Server(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Shapes.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Shapes.tsx
index 4e0976cc4df..b2ab4199499 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Shapes.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Shapes.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Shapes_L from 'illustration:./S2_lin_shapes_160.svg';
 import Shapes_M from 'illustration:./S2_lin_shapes_96.svg';
 import Shapes_S from 'illustration:./S2_lin_shapes_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Shapes(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingBag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingBag.tsx
index 74b6141f8e8..452ae0caacf 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingBag.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingBag.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import ShoppingBag_L from 'illustration:./S2_lin_shoppingBag_160.svg';
 import ShoppingBag_M from 'illustration:./S2_lin_shoppingBag_96.svg';
 import ShoppingBag_S from 'illustration:./S2_lin_shoppingBag_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ShoppingBag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingCart.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingCart.tsx
index 559ada634b7..12cbabc73f2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingCart.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ShoppingCart.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import ShoppingCart_L from 'illustration:./S2_lin_shoppingCart_160.svg';
 import ShoppingCart_M from 'illustration:./S2_lin_shoppingCart_96.svg';
 import ShoppingCart_S from 'illustration:./S2_lin_shoppingCart_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ShoppingCart(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/SocialPost.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/SocialPost.tsx
index f7282356d14..6786057a494 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/SocialPost.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/SocialPost.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import SocialPost_L from 'illustration:./S2_lin_socialPost_160.svg';
 import SocialPost_M from 'illustration:./S2_lin_socialPost_96.svg';
 import SocialPost_S from 'illustration:./S2_lin_socialPost_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function SocialPost(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Sparkles.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Sparkles.tsx
index faaf684d9b5..2f55e44e137 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Sparkles.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Sparkles.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Sparkles_L from 'illustration:./S2_lin_sparkles_160.svg';
 import Sparkles_M from 'illustration:./S2_lin_sparkles_96.svg';
 import Sparkles_S from 'illustration:./S2_lin_sparkles_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Sparkles(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/SpeedFast.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/SpeedFast.tsx
index e586af82d5f..45f7d71428f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/SpeedFast.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/SpeedFast.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import SpeedFast_L from 'illustration:./S2_lin_speedFast_160.svg';
 import SpeedFast_M from 'illustration:./S2_lin_speedFast_96.svg';
 import SpeedFast_S from 'illustration:./S2_lin_speedFast_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function SpeedFast(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/StampClone.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/StampClone.tsx
index 831946dc3ac..72ef68cebc0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/StampClone.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/StampClone.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import StampClone_L from 'illustration:./S2_lin_stampClone_160.svg';
 import StampClone_M from 'illustration:./S2_lin_stampClone_96.svg';
 import StampClone_S from 'illustration:./S2_lin_stampClone_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function StampClone(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Star.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Star.tsx
index 3c4450a5bf6..8831726f73f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Star.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Star.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Star_L from 'illustration:./S2_lin_star_160.svg';
 import Star_M from 'illustration:./S2_lin_star_96.svg';
 import Star_S from 'illustration:./S2_lin_star_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Star(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/StepForward.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/StepForward.tsx
index ca9c72942ca..629f6677a34 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/StepForward.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/StepForward.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import StepForward_L from 'illustration:./S2_lin_stepForward_160.svg';
 import StepForward_M from 'illustration:./S2_lin_stepForward_96.svg';
 import StepForward_S from 'illustration:./S2_lin_stepForward_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function StepForward(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Stopwatch.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Stopwatch.tsx
index dd5fcbde698..f9a48007dba 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Stopwatch.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Stopwatch.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Stopwatch_L from 'illustration:./S2_lin_stopwatch_160.svg';
 import Stopwatch_M from 'illustration:./S2_lin_stopwatch_96.svg';
 import Stopwatch_S from 'illustration:./S2_lin_stopwatch_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Stopwatch(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Switch.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Switch.tsx
index 2f97fe70a89..acd6a2ec4cb 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Switch.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Switch.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Switch_L from 'illustration:./S2_lin_switch_160.svg';
 import Switch_M from 'illustration:./S2_lin_switch_96.svg';
 import Switch_S from 'illustration:./S2_lin_switch_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Switch(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tablet.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tablet.tsx
index 8d16c067fc2..3dbbb6a17f1 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tablet.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tablet.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Tablet_L from 'illustration:./S2_lin_tablet_160.svg';
 import Tablet_M from 'illustration:./S2_lin_tablet_96.svg';
 import Tablet_S from 'illustration:./S2_lin_tablet_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Tablet(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tag.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tag.tsx
index 9cc79ea1f31..503998e8ba2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tag.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Tag.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Tag_L from 'illustration:./S2_lin_tag_160.svg';
 import Tag_M from 'illustration:./S2_lin_tag_96.svg';
 import Tag_S from 'illustration:./S2_lin_tag_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Tag(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Targeted.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Targeted.tsx
index df8977453a2..cb60e8ffe6b 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Targeted.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Targeted.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Targeted_L from 'illustration:./S2_lin_targeted_160.svg';
 import Targeted_M from 'illustration:./S2_lin_targeted_96.svg';
 import Targeted_S from 'illustration:./S2_lin_targeted_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Targeted(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Text.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Text.tsx
index aa1f20d2076..a10152b64ce 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Text.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Text.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Text_L from 'illustration:./S2_lin_text_160.svg';
 import Text_M from 'illustration:./S2_lin_text_96.svg';
 import Text_S from 'illustration:./S2_lin_text_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Text(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThreeArrowsCircle.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThreeArrowsCircle.tsx
index c845d80a4a6..9682c0bd60e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThreeArrowsCircle.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThreeArrowsCircle.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import ThreeArrowsCircle_L from 'illustration:./S2_lin_threeArrowsCircle_160.svg';
 import ThreeArrowsCircle_M from 'illustration:./S2_lin_threeArrowsCircle_96.svg';
 import ThreeArrowsCircle_S from 'illustration:./S2_lin_threeArrowsCircle_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ThreeArrowsCircle(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsDown.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsDown.tsx
index 40fc7cbd367..d1b10ccf65e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsDown.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsDown.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import ThumbsDown_L from 'illustration:./S2_lin_thumbsDown_160.svg';
 import ThumbsDown_M from 'illustration:./S2_lin_thumbsDown_96.svg';
 import ThumbsDown_S from 'illustration:./S2_lin_thumbsDown_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ThumbsDown(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsUp.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsUp.tsx
index 7f0e29eb56c..8a78422083d 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsUp.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/ThumbsUp.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import ThumbsUp_L from 'illustration:./S2_lin_thumbsUp_160.svg';
 import ThumbsUp_M from 'illustration:./S2_lin_thumbsUp_96.svg';
 import ThumbsUp_S from 'illustration:./S2_lin_thumbsUp_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function ThumbsUp(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Transform.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Transform.tsx
index e9b40264d08..8ce41a13d4e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Transform.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Transform.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Transform_L from 'illustration:./S2_lin_transform_160.svg';
 import Transform_M from 'illustration:./S2_lin_transform_96.svg';
 import Transform_S from 'illustration:./S2_lin_transform_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Transform(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Translate.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Translate.tsx
index 8bbecf35d93..f409d36da99 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Translate.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Translate.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Translate_L from 'illustration:./S2_lin_translate_160.svg';
 import Translate_M from 'illustration:./S2_lin_translate_96.svg';
 import Translate_S from 'illustration:./S2_lin_translate_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Translate(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trash.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trash.tsx
index 8e708669767..18beb7893b2 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trash.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trash.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Trash_L from 'illustration:./S2_lin_trash_160.svg';
 import Trash_M from 'illustration:./S2_lin_trash_96.svg';
 import Trash_S from 'illustration:./S2_lin_trash_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Trash(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trophy.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trophy.tsx
index bfa74d39638..5d9f88d6050 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trophy.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Trophy.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Trophy_L from 'illustration:./S2_lin_trophy_160.svg';
 import Trophy_M from 'illustration:./S2_lin_trophy_96.svg';
 import Trophy_S from 'illustration:./S2_lin_trophy_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Trophy(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Update.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Update.tsx
index 4b0ce399262..6312c9c57d8 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Update.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Update.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Update_L from 'illustration:./S2_lin_update_160.svg';
 import Update_M from 'illustration:./S2_lin_update_96.svg';
 import Update_S from 'illustration:./S2_lin_update_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Update(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Upload.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Upload.tsx
index 0d8e4eb10fe..ca6155d24e3 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Upload.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Upload.tsx
@@ -15,7 +15,7 @@ import {IconProps, IllustrationContext} from '../../src/Icon';
 import Upload_L from 'illustration:./S2_lin_upload_160.svg';
 import Upload_M from 'illustration:./S2_lin_upload_96.svg';
 import Upload_S from 'illustration:./S2_lin_upload_48.svg';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 
 export default function Upload(props: IconProps & {size?: 'L' | 'S' | 'M'}): ReactNode {
   [props] = useContextProps(props, null, IllustrationContext);
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/User.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/User.tsx
index 733b2c801f6..c344db52244 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/User.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/User.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import User_L from 'illustration:./S2_lin_user_160.svg';
 import User_M from 'illustration:./S2_lin_user_96.svg';
 import User_S from 'illustration:./S2_lin_user_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserAvatar.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserAvatar.tsx
index 365899d33f6..134f8c8cc49 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserAvatar.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserAvatar.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import UserAvatar_L from 'illustration:./S2_lin_userAvatar_160.svg';
 import UserAvatar_M from 'illustration:./S2_lin_userAvatar_96.svg';
 import UserAvatar_S from 'illustration:./S2_lin_userAvatar_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserGroup.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserGroup.tsx
index 33bf0d34f7d..8420e460a4f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserGroup.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/UserGroup.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import UserGroup_L from 'illustration:./S2_lin_userGroup_160.svg';
 import UserGroup_M from 'illustration:./S2_lin_userGroup_96.svg';
 import UserGroup_S from 'illustration:./S2_lin_userGroup_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/VectorDraw.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/VectorDraw.tsx
index a89780e3789..67a094e942e 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/VectorDraw.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/VectorDraw.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import VectorDraw_L from 'illustration:./S2_lin_vectorDraw_160.svg';
 import VectorDraw_M from 'illustration:./S2_lin_vectorDraw_96.svg';
 import VectorDraw_S from 'illustration:./S2_lin_vectorDraw_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Video.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Video.tsx
index ce9fcf6d8bf..5afd97af1f7 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Video.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Video.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import Video_L from 'illustration:./S2_lin_video_160.svg';
 import Video_M from 'illustration:./S2_lin_video_96.svg';
 import Video_S from 'illustration:./S2_lin_video_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Volume.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Volume.tsx
index 8278a248053..e4ab1129f62 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Volume.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Volume.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import Volume_L from 'illustration:./S2_lin_volume_160.svg';
 import Volume_M from 'illustration:./S2_lin_volume_96.svg';
 import Volume_S from 'illustration:./S2_lin_volume_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOff.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOff.tsx
index 07e99edcbfa..0db2701e704 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOff.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOff.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import VolumeOff_L from 'illustration:./S2_lin_volumeOff_160.svg';
 import VolumeOff_M from 'illustration:./S2_lin_volumeOff_96.svg';
 import VolumeOff_S from 'illustration:./S2_lin_volumeOff_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOne.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOne.tsx
index d668e19d299..aa77a29d322 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOne.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/VolumeOne.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import VolumeOne_L from 'illustration:./S2_lin_volumeOne_160.svg';
 import VolumeOne_M from 'illustration:./S2_lin_volumeOne_96.svg';
 import VolumeOne_S from 'illustration:./S2_lin_volumeOne_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Wallet.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Wallet.tsx
index a6d4ff600dc..eced80cde8f 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Wallet.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Wallet.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import Wallet_L from 'illustration:./S2_lin_wallet_160.svg';
 import Wallet_M from 'illustration:./S2_lin_wallet_96.svg';
 import Wallet_S from 'illustration:./S2_lin_wallet_48.svg';
diff --git a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Warning.tsx b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Warning.tsx
index c579f73fc2a..5c2d86693b0 100644
--- a/packages/@react-spectrum/s2/spectrum-illustrations/linear/Warning.tsx
+++ b/packages/@react-spectrum/s2/spectrum-illustrations/linear/Warning.tsx
@@ -12,7 +12,7 @@
 'use client';
 import {ReactNode} from 'react';
 import {IconProps, IllustrationContext} from '../../src/Icon';
-import {useContextProps} from 'react-aria-components';
+import {useContextProps} from 'react-aria-components/utils';
 import Warning_L from 'illustration:./S2_lin_warning_160.svg';
 import Warning_M from 'illustration:./S2_lin_warning_96.svg';
 import Warning_S from 'illustration:./S2_lin_warning_48.svg';
diff --git a/packages/@react-spectrum/s2/src/Accordion.tsx b/packages/@react-spectrum/s2/src/Accordion.tsx
index 0dfb3a76a86..723e1cb5470 100644
--- a/packages/@react-spectrum/s2/src/Accordion.tsx
+++ b/packages/@react-spectrum/s2/src/Accordion.tsx
@@ -11,7 +11,7 @@
  */
 
 import {AriaLabelingProps, DOMProps, DOMRef, DOMRefValue, Key} from '@react-types/shared';
-import {ContextValue, DisclosureGroup, RenderProps, SlotProps} from 'react-aria-components';
+import {ContextValue, RenderProps, SlotProps} from 'react-aria-components/utils';
 import {
   Disclosure,
   DisclosureContext,
@@ -19,6 +19,7 @@ import {
   DisclosurePanel,
   DisclosureTitle
 } from './Disclosure';
+import {DisclosureGroup} from 'react-aria-components/Disclosure';
 import {getAllowedOverrides, StyleProps, StylesPropWithHeight, UnsafeStyles} from './style-utils' with { type: 'macro' };
 import React, {createContext, forwardRef, ReactNode} from 'react';
 import {style} from '../style' with { type: 'macro' };
diff --git a/packages/@react-spectrum/s2/src/ActionBar.tsx b/packages/@react-spectrum/s2/src/ActionBar.tsx
index 0d94b3e7841..460dae50378 100644
--- a/packages/@react-spectrum/s2/src/ActionBar.tsx
+++ b/packages/@react-spectrum/s2/src/ActionBar.tsx
@@ -11,20 +11,23 @@
  */
 
 import {ActionButtonGroup} from './ActionButtonGroup';
-import {announce} from '@react-aria/live-announcer';
+import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
 import {CloseButton} from './CloseButton';
-import {ContextValue, SlotProps} from 'react-aria-components';
+import {ContextValue, SlotProps} from 'react-aria-components/utils';
 import {createContext, ForwardedRef, forwardRef, ReactElement, ReactNode, RefObject, useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {DOMProps, DOMRef, DOMRefValue, Key} from '@react-types/shared';
-import {FocusScope, useKeyboard} from 'react-aria';
-// @ts-ignore
+import {FocusScope} from 'react-aria/FocusScope';
 import intlMessages from '../intl/*.json';
+// @ts-ignore
 import {lightDark, style} from '../style' with {type: 'macro'};
 import {StyleProps} from './style-utils' with { type: 'macro' };
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from 'react-stately/private/utils/useControlledState';
 import {useDOMRef} from './useDOMRef';
-import {useEnterAnimation, useExitAnimation, useObjectRef, useResizeObserver} from '@react-aria/utils';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useEnterAnimation, useExitAnimation} from 'react-aria/private/utils/animation';
+import {useKeyboard} from 'react-aria/useKeyboard';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 const actionBarStyles = style({
diff --git a/packages/@react-spectrum/s2/src/ActionButton.tsx b/packages/@react-spectrum/s2/src/ActionButton.tsx
index 7584a9eba5f..9642053d64c 100644
--- a/packages/@react-spectrum/s2/src/ActionButton.tsx
+++ b/packages/@react-spectrum/s2/src/ActionButton.tsx
@@ -13,23 +13,25 @@
 import {ActionButtonGroupContext} from './ActionButtonGroup';
 import {AvatarContext} from './Avatar';
 import {baseColor, focusRing, fontRelative, lightDark, style} from '../style' with { type: 'macro' };
-import {ButtonProps, ButtonRenderProps, ContextValue, OverlayTriggerStateContext, Provider, Button as RACButton, useSlottedContext} from 'react-aria-components';
+import {ButtonProps, ButtonRenderProps, Button as RACButton} from 'react-aria-components/Button';
 import {centerBaseline} from './CenterBaseline';
+import {ContextValue, Provider, useSlottedContext} from 'react-aria-components/utils';
 import {control, getAllowedOverrides, staticColor, StyleProps} from './style-utils' with { type: 'macro' };
 import {createContext, forwardRef, ReactNode, useContext} from 'react';
 import {FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {IconContext} from './Icon';
 import {ImageContext} from './Image';
-// @ts-ignore
 import intlMessages from '../intl/*.json';
+// @ts-ignore
 import {NotificationBadgeContext} from './NotificationBadge';
+import {OverlayTriggerStateContext} from 'react-aria-components/Dialog';
 import {pressScale} from './pressScale';
 import {ProgressCircle} from './ProgressCircle';
 import {SkeletonContext} from './Skeleton';
 import {Text, TextContext} from './Content';
 import {useFocusableRef} from './useDOMRef';
 import {useFormProps} from './Form';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {usePendingState} from './Button';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
diff --git a/packages/@react-spectrum/s2/src/ActionButtonGroup.tsx b/packages/@react-spectrum/s2/src/ActionButtonGroup.tsx
index f8e6d479ed6..c97ff6a8153 100644
--- a/packages/@react-spectrum/s2/src/ActionButtonGroup.tsx
+++ b/packages/@react-spectrum/s2/src/ActionButtonGroup.tsx
@@ -11,10 +11,11 @@
  */
 
 import {AriaLabelingProps} from '@react-types/shared';
-import {ContextValue, SlotProps, Toolbar} from 'react-aria-components';
+import {ContextValue, SlotProps} from 'react-aria-components/utils';
 import {createContext, ForwardedRef, forwardRef, ReactNode} from 'react';
 import {getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {style} from '../style' with {type: 'macro'};
+import {Toolbar} from 'react-aria-components/Toolbar';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface ActionButtonGroupProps extends AriaLabelingProps, UnsafeStyles, SlotProps {
diff --git a/packages/@react-spectrum/s2/src/ActionMenu.tsx b/packages/@react-spectrum/s2/src/ActionMenu.tsx
index c533d2c1702..d4ce8173316 100644
--- a/packages/@react-spectrum/s2/src/ActionMenu.tsx
+++ b/packages/@react-spectrum/s2/src/ActionMenu.tsx
@@ -12,16 +12,16 @@
 
 import {ActionButton, ActionButtonProps} from './ActionButton';
 import {AriaLabelingProps, DOMProps, FocusableRef, FocusableRefValue} from '@react-types/shared';
-import {ContextValue} from 'react-aria-components';
+import {ContextValue} from 'react-aria-components/utils';
 import {createContext, forwardRef} from 'react';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {forwardRefType} from './types';
 // @ts-ignore
 import intlMessages from '../intl/*.json';
 import {Menu, MenuProps, MenuTrigger, MenuTriggerProps} from './Menu';
 import MoreIcon from '../s2wf-icons/S2_Icon_More_20_N.svg';
 import {StyleProps} from './style-utils' with { type: 'macro' };
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface ActionMenuProps<T> extends
diff --git a/packages/@react-spectrum/s2/src/AlertDialog.tsx b/packages/@react-spectrum/s2/src/AlertDialog.tsx
index 7395b3169be..23352fac67f 100644
--- a/packages/@react-spectrum/s2/src/AlertDialog.tsx
+++ b/packages/@react-spectrum/s2/src/AlertDialog.tsx
@@ -14,7 +14,7 @@ import AlertTriangle from '../s2wf-icons/S2_Icon_AlertTriangle_20_N.svg';
 import {Button} from './Button';
 import {ButtonGroup} from './ButtonGroup';
 import {CenterBaseline} from './CenterBaseline';
-import {chain} from '@react-aria/utils';
+import {chain} from 'react-aria/private/utils/chain';
 import {Content, Heading} from './Content';
 import {Dialog} from './Dialog';
 import {DOMProps, DOMRef} from '@react-types/shared';
@@ -23,10 +23,10 @@ import {IconContext} from './Icon';
 // @ts-ignore
 import intlMessages from '../intl/*.json';
 import NoticeSquare from '../s2wf-icons/S2_Icon_AlertDiamond_20_N.svg';
-import {Provider} from 'react-aria-components';
+import {Provider} from 'react-aria-components/utils';
 import {style} from '../style' with {type: 'macro'};
 import {UnsafeStyles} from './style-utils' with {type: 'macro'};
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 
 export interface AlertDialogProps extends DOMProps, UnsafeStyles {
   /**
diff --git a/packages/@react-spectrum/s2/src/Avatar.tsx b/packages/@react-spectrum/s2/src/Avatar.tsx
index 76662f37550..9c007741f87 100644
--- a/packages/@react-spectrum/s2/src/Avatar.tsx
+++ b/packages/@react-spectrum/s2/src/Avatar.tsx
@@ -11,10 +11,10 @@
  */
 
 import {centerBaselineBefore} from './CenterBaseline';
-import {ContextValue, SlotProps} from 'react-aria-components';
+import {ContextValue, SlotProps} from 'react-aria-components/utils';
 import {createContext, forwardRef} from 'react';
 import {DOMProps, DOMRef, DOMRefValue} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {getAllowedOverrides, StylesPropWithoutWidth, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {Image} from './Image';
 import {isDocsEnv} from './macros' with {type: 'macro'};
diff --git a/packages/@react-spectrum/s2/src/AvatarGroup.tsx b/packages/@react-spectrum/s2/src/AvatarGroup.tsx
index 47331274ea7..c8ecd4032d9 100644
--- a/packages/@react-spectrum/s2/src/AvatarGroup.tsx
+++ b/packages/@react-spectrum/s2/src/AvatarGroup.tsx
@@ -12,13 +12,13 @@
 
 import {AriaLabelingProps, DOMProps, DOMRef, DOMRefValue} from '@react-types/shared';
 import {AvatarContext} from './Avatar';
-import {ContextValue, SlotProps} from 'react-aria-components';
+import {ContextValue, SlotProps} from 'react-aria-components/utils';
 import {createContext, CSSProperties, forwardRef, ReactNode} from 'react';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {getAllowedOverrides, StylesPropWithoutWidth, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
-import {useLabel} from 'react-aria';
+import {useLabel} from 'react-aria/useLabel';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface AvatarGroupProps extends UnsafeStyles, DOMProps, AriaLabelingProps, SlotProps {
diff --git a/packages/@react-spectrum/s2/src/Badge.tsx b/packages/@react-spectrum/s2/src/Badge.tsx
index 19db9d14970..c8a95b8f85e 100644
--- a/packages/@react-spectrum/s2/src/Badge.tsx
+++ b/packages/@react-spectrum/s2/src/Badge.tsx
@@ -12,11 +12,12 @@
 
 import {AriaLabelingProps, DOMProps, DOMRef, DOMRefValue} from '@react-types/shared';
 import {centerBaseline} from './CenterBaseline';
-import {ContextValue, Provider, TextContext as RACTextContext, SlotProps} from 'react-aria-components';
+import {ContextValue, Provider, SlotProps} from 'react-aria-components/utils';
 import {control, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {fontRelative, lightDark, style} from '../style' with {type: 'macro'};
 import {IconContext} from './Icon';
+import {TextContext as RACTextContext} from 'react-aria-components/Text';
 import React, {createContext, forwardRef, ReactNode} from 'react';
 import {SkeletonWrapper} from './Skeleton';
 import {Text, TextContext} from './Content';
diff --git a/packages/@react-spectrum/s2/src/Breadcrumbs.tsx b/packages/@react-spectrum/s2/src/Breadcrumbs.tsx
index afb14b42a56..a221fe0b836 100644
--- a/packages/@react-spectrum/s2/src/Breadcrumbs.tsx
+++ b/packages/@react-spectrum/s2/src/Breadcrumbs.tsx
@@ -11,36 +11,36 @@
  */
 
 import {ActionButton} from './ActionButton';
+
 import {
   Breadcrumb as AriaBreadcrumb,
   BreadcrumbProps as AriaBreadcrumbItemProps,
   BreadcrumbsProps as AriaBreadcrumbsProps,
-  CollectionRenderer,
-  CollectionRendererContext,
-  ContextValue,
-  DefaultCollectionRenderer,
-  HeadingContext,
-  Link,
-  LinkRenderProps,
-  Provider,
   Breadcrumbs as RACBreadcrumbs
-} from 'react-aria-components';
+} from 'react-aria-components/Breadcrumbs';
+
 import {baseColor, focusRing, size, style} from '../style' with { type: 'macro' };
 import ChevronIcon from '../ui-icons/Chevron';
 import {Collection, DOMRef, DOMRefValue, GlobalDOMAttributes, LinkDOMProps, Node} from '@react-types/shared';
+import {CollectionRenderer, CollectionRendererContext, DefaultCollectionRenderer} from 'react-aria-components/Collection';
+import {ContextValue, Provider} from 'react-aria-components/utils';
 import {controlFont, controlSize, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {createContext, forwardRef, Fragment, ReactNode, RefObject, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
-// @ts-ignore
 import FolderIcon from '../s2wf-icons/S2_Icon_FolderBreadcrumb_20_N.svg';
 import {forwardRefType} from './types';
-import {inertValue, useLayoutEffect, useResizeObserver} from '@react-aria/utils';
 // @ts-ignore
+import {HeadingContext} from 'react-aria-components/Heading';
+import {inertValue} from 'react-aria/private/utils/inertValue';
 import intlMessages from '../intl/*.json';
+import {Link, LinkRenderProps} from 'react-aria-components/Link';
 import {Menu, MenuItem, MenuTrigger} from './Menu';
+// @ts-ignore
 import {Text} from './Content';
 import {useDOMRef} from './useDOMRef';
-import {useLocale} from 'react-aria';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 const MIN_VISIBLE_ITEMS = 1;
diff --git a/packages/@react-spectrum/s2/src/Button.tsx b/packages/@react-spectrum/s2/src/Button.tsx
index f030e995245..e0d25e367bd 100644
--- a/packages/@react-spectrum/s2/src/Button.tsx
+++ b/packages/@react-spectrum/s2/src/Button.tsx
@@ -11,22 +11,25 @@
  */
 
 import {baseColor, focusRing, fontRelative, lightDark, style} from '../style' with {type: 'macro'};
-import {ButtonRenderProps, ContextValue, Link, LinkProps, OverlayTriggerStateContext, Provider, Button as RACButton, ButtonProps as RACButtonProps} from 'react-aria-components';
+import {ButtonRenderProps, Button as RACButton, ButtonProps as RACButtonProps} from 'react-aria-components/Button';
 import {centerBaseline} from './CenterBaseline';
+import {ContextValue, Provider} from 'react-aria-components/utils';
 import {control, getAllowedOverrides, staticColor, StyleProps} from './style-utils' with {type: 'macro'};
 import {createContext, forwardRef, ReactNode, useContext, useEffect, useState} from 'react';
 import {FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {IconContext} from './Icon';
-// @ts-ignore
 import intlMessages from '../intl/*.json';
 import {linearGradient} from '../style/spectrum-theme' with {type: 'macro'};
+// @ts-ignore
+import {Link, LinkProps} from 'react-aria-components/Link';
+import {OverlayTriggerStateContext} from 'react-aria-components/Dialog';
 import {pressScale} from './pressScale';
 import {ProgressCircle} from './ProgressCircle';
 import {SkeletonContext} from './Skeleton';
 import {Text, TextContext} from './Content';
 import {useFocusableRef} from './useDOMRef';
 import {useFormProps} from './Form';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 interface ButtonStyleProps {
diff --git a/packages/@react-spectrum/s2/src/ButtonGroup.tsx b/packages/@react-spectrum/s2/src/ButtonGroup.tsx
index 56729db4e64..85be1769f9c 100644
--- a/packages/@react-spectrum/s2/src/ButtonGroup.tsx
+++ b/packages/@react-spectrum/s2/src/ButtonGroup.tsx
@@ -11,14 +11,17 @@
  */
 
 import {ButtonContext, LinkButtonContext} from './Button';
-import {ContextValue, Provider, SlotProps} from 'react-aria-components';
+import {ContextValue, Provider, SlotProps} from 'react-aria-components/utils';
 import {createContext, forwardRef, ReactNode, useCallback, useRef} from 'react';
 import {DOMProps, DOMRef, DOMRefValue} from '@react-types/shared';
-import {filterDOMProps, useLayoutEffect, useResizeObserver, useValueEffect} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
+import {useValueEffect} from 'react-aria/private/utils/useValueEffect';
 
 interface ButtonGroupStyleProps {
   /**
diff --git a/packages/@react-spectrum/s2/src/Calendar.tsx b/packages/@react-spectrum/s2/src/Calendar.tsx
index 57736226afd..05417319e35 100644
--- a/packages/@react-spectrum/s2/src/Calendar.tsx
+++ b/packages/@react-spectrum/s2/src/Calendar.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, Header, HeaderContext, Heading, HeadingContext, pressScale} from './';
+import {ActionButton} from './ActionButton';
+
 import {
   Calendar as AriaCalendar,
   CalendarCell as AriaCalendarCell,
@@ -18,39 +19,42 @@ import {
   CalendarGrid as AriaCalendarGrid,
   CalendarHeaderCell as AriaCalendarHeaderCell,
   CalendarProps as AriaCalendarProps,
-  ButtonProps,
   CalendarCellProps,
   CalendarCellRenderProps,
   CalendarGridBody,
   CalendarGridHeader,
   CalendarHeaderCellProps,
-  CalendarState,
   CalendarStateContext,
-  ContextValue,
-  DateValue,
-  Provider,
   RangeCalendarContext,
-  RangeCalendarState,
-  RangeCalendarStateContext,
-  Text,
-  useSlottedContext
-} from 'react-aria-components';
-import {AriaCalendarGridProps} from '@react-aria/calendar';
+  RangeCalendarStateContext
+} from 'react-aria-components/Calendar';
+import {AriaCalendarGridProps} from 'react-aria/useCalendar';
+
 import {baseColor, focusRing, lightDark, style} from '../style' with {type: 'macro'};
+
+import {ButtonProps} from 'react-aria-components/Button';
 import {
   CalendarDate,
   getDayOfWeek,
   startOfMonth
 } from '@internationalized/date';
+import {CalendarState, RangeCalendarState} from 'react-stately/private/calendar/types';
 import ChevronLeftIcon from '../s2wf-icons/S2_Icon_ChevronLeft_20_N.svg';
 import ChevronRightIcon from '../s2wf-icons/S2_Icon_ChevronRight_20_N.svg';
+import {ContextValue, Provider, useSlottedContext} from 'react-aria-components/utils';
+import {DateValue} from '@react-types/datepicker';
 import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared';
 import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
+import {Header, HeaderContext, Heading, HeadingContext} from './Content';
 import {helpTextStyles} from './Field';
-// @ts-ignore
 import intlMessages from '../intl/*.json';
+import {pressScale} from './pressScale';
+// @ts-ignore
 import React, {createContext, CSSProperties, ForwardedRef, forwardRef, Fragment, PropsWithChildren, ReactElement, ReactNode, useContext, useMemo, useRef} from 'react';
-import {useDateFormatter, useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
+import {Text} from 'react-aria-components/Text';
+import {useDateFormatter} from 'react-aria/useDateFormatter';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 
diff --git a/packages/@react-spectrum/s2/src/Card.tsx b/packages/@react-spectrum/s2/src/Card.tsx
index 776781f250e..88b8eb07fe6 100644
--- a/packages/@react-spectrum/s2/src/Card.tsx
+++ b/packages/@react-spectrum/s2/src/Card.tsx
@@ -15,16 +15,19 @@ import {AvatarContext} from './Avatar';
 import {ButtonContext, LinkButtonContext} from './Button';
 import {Checkbox} from './Checkbox';
 import {color, focusRing, lightDark, space, style} from '../style' with {type: 'macro'};
-import {composeRenderProps, ContextValue, DEFAULT_SLOT, type GridListItem, GridListItemProps, Link, Provider} from 'react-aria-components';
+import {composeRenderProps, ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/utils';
 import {ContentContext, FooterContext, TextContext} from './Content';
 import {createContext, CSSProperties, forwardRef, ReactNode, useContext} from 'react';
 import {DividerContext} from './Divider';
 import {DOMProps, DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared';
-import {filterDOMProps, inertValue} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {getAllowedOverrides, StyleProps, UnsafeStyles} from './style-utils' with {type: 'macro'};
+import {GridListItem, GridListItemProps} from 'react-aria-components/GridList';
 import {IllustrationContext} from './Icon';
 import {ImageContext} from './Image';
 import {ImageCoordinator} from './ImageCoordinator';
+import {inertValue} from 'react-aria/private/utils/inertValue';
+import {Link} from 'react-aria-components/Link';
 import {mergeStyles} from '../style/runtime';
 import {pressScale} from './pressScale';
 import {SkeletonContext, SkeletonWrapper, useIsSkeleton} from './Skeleton';
diff --git a/packages/@react-spectrum/s2/src/CardView.tsx b/packages/@react-spectrum/s2/src/CardView.tsx
index adc1c2e11f8..41de45f4a57 100644
--- a/packages/@react-spectrum/s2/src/CardView.tsx
+++ b/packages/@react-spectrum/s2/src/CardView.tsx
@@ -12,27 +12,30 @@
 
 import {
   GridList as AriaGridList,
-  Collection,
-  ContextValue,
-  GridLayout,
   GridListItem,
   GridListLoadMoreItem,
   GridListProps,
-  GridListRenderProps,
-  Size,
-  Virtualizer,
-  WaterfallLayout
-} from 'react-aria-components';
+  GridListRenderProps
+} from 'react-aria-components/GridList';
+
 import {CardContext, InternalCardViewContext} from './Card';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {ContextValue} from 'react-aria-components/utils';
 import {createContext, forwardRef, ReactElement, useCallback, useMemo, useRef, useState} from 'react';
 import {DOMRef, DOMRefValue, forwardRefType, GlobalDOMAttributes, Key, LoadingState} from '@react-types/shared';
 import {focusRing, style} from '../style' with {type: 'macro'};
 import {getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
+import {GridLayout} from 'react-stately/private/layout/GridLayout';
 import {ImageCoordinator} from './ImageCoordinator';
+import {Size} from 'react-stately/private/virtualizer/Size';
 import {useActionBarContainer} from './ActionBar';
 import {useDOMRef} from './useDOMRef';
-import {useEffectEvent, useLayoutEffect, useResizeObserver} from '@react-aria/utils';
+import {useEffectEvent} from 'react-aria/private/utils/useEffectEvent';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
+import {Virtualizer} from 'react-aria-components/Virtualizer';
+import {WaterfallLayout} from 'react-stately/private/layout/WaterfallLayout';
 
 export interface CardViewProps<T> extends Omit<GridListProps<T>, 'layout' | 'keyboardNavigationBehavior' | 'selectionBehavior' | 'className' | 'style' | 'render' | 'isLoading' | keyof GlobalDOMAttributes>, UnsafeStyles {
   /**
diff --git a/packages/@react-spectrum/s2/src/Checkbox.tsx b/packages/@react-spectrum/s2/src/Checkbox.tsx
index 552b07f4e57..96604751494 100644
--- a/packages/@react-spectrum/s2/src/Checkbox.tsx
+++ b/packages/@react-spectrum/s2/src/Checkbox.tsx
@@ -10,10 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-import {Checkbox as AriaCheckbox, CheckboxProps as AriaCheckboxProps, CheckboxGroupStateContext, CheckboxRenderProps, ContextValue, useSlottedContext} from 'react-aria-components';
+import {
+  Checkbox as AriaCheckbox,
+  CheckboxProps as AriaCheckboxProps,
+  CheckboxGroupStateContext,
+  CheckboxRenderProps
+} from 'react-aria-components/Checkbox';
+
 import {baseColor, focusRing, space, style} from '../style' with {type: 'macro'};
 import {CenterBaseline} from './CenterBaseline';
 import CheckmarkIcon from '../ui-icons/Checkmark';
+import {ContextValue, useSlottedContext} from 'react-aria-components/utils';
 import {controlBorderRadius, controlFont, controlSize, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {createContext, forwardRef, ReactNode, useContext, useRef} from 'react';
 import DashIcon from '../ui-icons/Dash';
diff --git a/packages/@react-spectrum/s2/src/CheckboxGroup.tsx b/packages/@react-spectrum/s2/src/CheckboxGroup.tsx
index bbe1c4cbe10..2978e502faa 100644
--- a/packages/@react-spectrum/s2/src/CheckboxGroup.tsx
+++ b/packages/@react-spectrum/s2/src/CheckboxGroup.tsx
@@ -12,10 +12,11 @@
 
 import {
   CheckboxGroup as AriaCheckboxGroup,
-  CheckboxGroupProps as AriaCheckboxGroupProps,
-  ContextValue
-} from 'react-aria-components';
+  CheckboxGroupProps as AriaCheckboxGroupProps
+} from 'react-aria-components/Checkbox';
+
 import {CheckboxContext} from './Checkbox';
+import {ContextValue} from 'react-aria-components/utils';
 import {createContext, forwardRef, ReactNode, useContext} from 'react';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes, HelpTextProps, Orientation, SpectrumLabelableProps} from '@react-types/shared';
 import {field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
diff --git a/packages/@react-spectrum/s2/src/ClearButton.tsx b/packages/@react-spectrum/s2/src/ClearButton.tsx
index 868806c6802..a50c3aa7b76 100644
--- a/packages/@react-spectrum/s2/src/ClearButton.tsx
+++ b/packages/@react-spectrum/s2/src/ClearButton.tsx
@@ -10,11 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  Button,
-  ButtonProps,
-  ButtonRenderProps
-} from 'react-aria-components';
+import {Button, ButtonProps, ButtonRenderProps} from 'react-aria-components/Button';
 import {controlSize} from './style-utils' with {type: 'macro'};
 import CrossIcon from '../ui-icons/Cross';
 import {FocusableRef} from '@react-types/shared';
diff --git a/packages/@react-spectrum/s2/src/CloseButton.tsx b/packages/@react-spectrum/s2/src/CloseButton.tsx
index b85b0c30bce..d8149ab1c0b 100644
--- a/packages/@react-spectrum/s2/src/CloseButton.tsx
+++ b/packages/@react-spectrum/s2/src/CloseButton.tsx
@@ -11,7 +11,8 @@
  */
 
 import {baseColor, focusRing, style} from '../style' with {type: 'macro'};
-import {Button, ButtonProps, ContextValue} from 'react-aria-components';
+import {Button, ButtonProps} from 'react-aria-components/Button';
+import {ContextValue} from 'react-aria-components/utils';
 import {controlSize, getAllowedOverrides, staticColor, StyleProps} from './style-utils' with {type: 'macro'};
 import {createContext, forwardRef} from 'react';
 import CrossIcon from '../ui-icons/Cross';
@@ -20,7 +21,7 @@ import {FocusableRef, FocusableRefValue} from '@react-types/shared';
 import intlMessages from '../intl/*.json';
 import {pressScale} from './pressScale';
 import {useFocusableRef} from './useDOMRef';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface CloseButtonProps extends Pick<ButtonProps, 'isDisabled' | 'onPress'>, StyleProps {
diff --git a/packages/@react-spectrum/s2/src/CoachMark.tsx b/packages/@react-spectrum/s2/src/CoachMark.tsx
index d84dde75282..056399d63d2 100644
--- a/packages/@react-spectrum/s2/src/CoachMark.tsx
+++ b/packages/@react-spectrum/s2/src/CoachMark.tsx
@@ -11,25 +11,21 @@
  * governing permissions and limitations under the License.
  */
 import {ActionMenuContext} from './ActionMenu';
+
 import {
   DialogTriggerProps as AriaDialogTriggerProps,
-  Popover as AriaPopover,
-  ContextValue,
-  DEFAULT_SLOT,
   DialogContext,
-  OverlayTriggerStateContext,
-  PopoverContext,
-  PopoverProps,
-  Provider,
-  RootMenuTriggerStateContext,
-  useContextProps
-} from 'react-aria-components';
+  OverlayTriggerStateContext
+} from 'react-aria-components/Dialog';
+
+import {Popover as AriaPopover, PopoverContext, PopoverProps} from 'react-aria-components/Popover';
 import {ButtonContext} from './Button';
 import {Card} from './Card';
 import {CheckboxContext} from './Checkbox';
 import {colorScheme, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {ColorSchemeContext} from './Provider';
 import {ContentContext, FooterContext, KeyboardContext, TextContext} from './Content';
+import {ContextValue, DEFAULT_SLOT, Provider, useContextProps} from 'react-aria-components/utils';
 import {
   createContext,
   ForwardedRef,
@@ -45,12 +41,15 @@ import {ImageContext} from './Image';
 import {ImageCoordinator} from './ImageCoordinator';
 import {keyframes, raw} from '../style/style-macro' with {type: 'macro'};
 import {mergeStyles} from '../style/runtime';
-import {PressResponder} from '@react-aria/interactions';
+import {PressResponder} from 'react-aria/private/interactions/PressResponder';
+import {RootMenuTriggerStateContext} from 'react-aria-components/Menu';
 import {SliderContext} from './Slider';
 import {space, style} from '../style' with {type: 'macro'};
-import {useId, useObjectRef, useOverlayTrigger} from 'react-aria';
-import {useLayoutEffect} from '@react-aria/utils';
-import {useMenuTriggerState} from 'react-stately';
+import {useId} from 'react-aria/useId';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useMenuTriggerState} from 'react-stately/useMenuTriggerState';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useOverlayTrigger} from 'react-aria/useOverlayTrigger';
 
 export interface CoachMarkProps extends Omit<PopoverProps, 'children' | 'arrowBoundaryOffset' | 'isKeyboardDismissDisabled' | 'isNonModal' | keyof GlobalDOMAttributes>, StyleProps {
   /** The children of the coach mark. */
diff --git a/packages/@react-spectrum/s2/src/ColorArea.tsx b/packages/@react-spectrum/s2/src/ColorArea.tsx
index ee12fc22d54..ba49d761cf7 100644
--- a/packages/@react-spectrum/s2/src/ColorArea.tsx
+++ b/packages/@react-spectrum/s2/src/ColorArea.tsx
@@ -10,18 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  ColorArea as AriaColorArea,
-  ColorAreaProps as AriaColorAreaProps,
-  ContextValue,
-  useLocale
-} from 'react-aria-components';
+import {ColorArea as AriaColorArea, ColorAreaProps as AriaColorAreaProps} from 'react-aria-components/ColorArea';
+
 import {ColorHandle} from './ColorHandle';
+import {ContextValue} from 'react-aria-components/utils';
 import {createContext, forwardRef} from 'react';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
+import {useLocale} from 'react-aria/I18nProvider';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface ColorAreaProps extends Omit<AriaColorAreaProps, 'children' | 'className' | 'style' | 'render' | keyof GlobalDOMAttributes>, StyleProps {}
diff --git a/packages/@react-spectrum/s2/src/ColorField.tsx b/packages/@react-spectrum/s2/src/ColorField.tsx
index 147c2caf5ef..36f4c13bcf0 100644
--- a/packages/@react-spectrum/s2/src/ColorField.tsx
+++ b/packages/@react-spectrum/s2/src/ColorField.tsx
@@ -10,18 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  ColorField as AriaColorField,
-  ColorFieldProps as AriaColorFieldProps,
-  ContextValue,
-  InputProps
-} from 'react-aria-components';
+import {ColorField as AriaColorField, ColorFieldProps as AriaColorFieldProps} from 'react-aria-components/ColorField';
+
+import {ContextValue} from 'react-aria-components/utils';
 import {createContext, forwardRef, Ref, useContext, useImperativeHandle, useRef} from 'react';
 import {createFocusableRef} from './useDOMRef';
 import {field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {FieldErrorIcon, FieldGroup, FieldLabel, HelpText, Input} from './Field';
 import {FormContext, useFormProps} from './Form';
 import {GlobalDOMAttributes, HelpTextProps, SpectrumLabelableProps} from '@react-types/shared';
+import {InputProps} from 'react-aria-components/Input';
 import {style} from '../style' with {type: 'macro'};
 import {TextFieldRef} from '@react-types/textfield';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
diff --git a/packages/@react-spectrum/s2/src/ColorHandle.tsx b/packages/@react-spectrum/s2/src/ColorHandle.tsx
index 1830c4c2ece..ef156e3f531 100644
--- a/packages/@react-spectrum/s2/src/ColorHandle.tsx
+++ b/packages/@react-spectrum/s2/src/ColorHandle.tsx
@@ -11,11 +11,12 @@
  */
 
 import {cloneElement, JSX, ReactNode, RefObject, useState} from 'react';
-import {ColorThumb} from 'react-aria-components';
+import {ColorThumb} from 'react-aria-components/ColorThumb';
 import {createPortal} from 'react-dom';
 import {keyframes} from '../style/style-macro' with {type: 'macro'};
 import {style} from '../style' with {type: 'macro'};
-import {useId, useLayoutEffect} from '@react-aria/utils';
+import {useId} from 'react-aria/useId';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
 
 const HANDLE_SIZE = 16;
 const LOUPE_HEIGHT = 64; // Does not include borders
diff --git a/packages/@react-spectrum/s2/src/ColorSlider.tsx b/packages/@react-spectrum/s2/src/ColorSlider.tsx
index 9ddbe46a300..38bfa6cb8de 100644
--- a/packages/@react-spectrum/s2/src/ColorSlider.tsx
+++ b/packages/@react-spectrum/s2/src/ColorSlider.tsx
@@ -10,21 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  ColorSlider as AriaColorSlider,
-  ColorSliderProps as AriaColorSliderProps,
-  ContextValue,
-  SliderOutput,
-  SliderTrack,
-  useLocale
-} from 'react-aria-components';
+import {ColorSlider as AriaColorSlider, ColorSliderProps as AriaColorSliderProps} from 'react-aria-components/ColorSlider';
+
 import {ColorHandle} from './ColorHandle';
+import {ContextValue} from 'react-aria-components/utils';
 import {controlFont, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {createContext, forwardRef, useRef} from 'react';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes, SpectrumLabelableProps} from '@react-types/shared';
 import {FieldLabel} from './Field';
+import {SliderOutput, SliderTrack} from 'react-aria-components/Slider';
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
+import {useLocale} from 'react-aria/I18nProvider';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface ColorSliderProps extends Omit<AriaColorSliderProps, 'children' | 'className' | 'style' | 'render' | keyof GlobalDOMAttributes>, Pick<SpectrumLabelableProps, 'contextualHelp'>, StyleProps {
@@ -44,7 +41,7 @@ export const ColorSlider = forwardRef(function ColorSlider(props: ColorSliderPro
   let {direction, locale} = useLocale();
 
   return (
-    <AriaColorSlider
+    (<AriaColorSlider
       {...props}
       ref={containerRef}
       style={UNSAFE_style}
@@ -80,9 +77,9 @@ export const ColorSlider = forwardRef(function ColorSlider(props: ColorSliderPro
           // default to displaying the localized channel value.
           // Specifically check if label is undefined. If label is `null` then display no visible label.
           // A default aria-label is provided by useColorSlider in that case.
-          <FieldLabel isDisabled={isDisabled} contextualHelp={props.contextualHelp}>
+          (<FieldLabel isDisabled={isDisabled} contextualHelp={props.contextualHelp}>
             {props.label || state.value.getChannelName(props.channel, locale)}
-          </FieldLabel>
+          </FieldLabel>)
         )}
         {orientation === 'horizontal' &&
           <SliderOutput
@@ -140,6 +137,6 @@ export const ColorSlider = forwardRef(function ColorSlider(props: ColorSliderPro
             }} />
         </SliderTrack>
       </>)}
-    </AriaColorSlider>
+    </AriaColorSlider>)
   );
 });
diff --git a/packages/@react-spectrum/s2/src/ColorSwatch.tsx b/packages/@react-spectrum/s2/src/ColorSwatch.tsx
index 15db3196b1a..75aa04f24cb 100644
--- a/packages/@react-spectrum/s2/src/ColorSwatch.tsx
+++ b/packages/@react-spectrum/s2/src/ColorSwatch.tsx
@@ -10,16 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  ColorSwatch as AriaColorSwatch,
-  ColorSwatchProps as AriaColorSwatchProps,
-  Color,
-  ContextValue,
-  parseColor
-} from 'react-aria-components';
+import {ColorSwatch as AriaColorSwatch, ColorSwatchProps as AriaColorSwatchProps} from 'react-aria-components/ColorSwatch';
+
+import {Color} from '@react-types/color';
+import {ContextValue} from 'react-aria-components/utils';
 import {createContext, forwardRef, JSX, ReactElement, useContext, useMemo} from 'react';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
+import {parseColor} from 'react-stately/Color';
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
diff --git a/packages/@react-spectrum/s2/src/ColorSwatchPicker.tsx b/packages/@react-spectrum/s2/src/ColorSwatchPicker.tsx
index 75322ed4060..69d52a39f51 100644
--- a/packages/@react-spectrum/s2/src/ColorSwatchPicker.tsx
+++ b/packages/@react-spectrum/s2/src/ColorSwatchPicker.tsx
@@ -10,8 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorSwatchPicker as AriaColorSwatchPicker, ColorSwatchPickerItem as AriaColorSwatchPickerItem, Color, ContextValue, SlotProps} from 'react-aria-components';
+import {
+  ColorSwatchPicker as AriaColorSwatchPicker,
+  ColorSwatchPickerItem as AriaColorSwatchPickerItem
+} from 'react-aria-components/ColorSwatchPicker';
+
+import {Color} from '@react-types/color';
 import {ColorSwatchProps, InternalColorSwatchContext} from './ColorSwatch';
+import {ContextValue, SlotProps} from 'react-aria-components/utils';
 import {createContext, forwardRef, ReactElement, ReactNode} from 'react';
 import {DOMRef, DOMRefValue, ValueBase} from '@react-types/shared';
 import {focusRing, space, style} from '../style' with {type: 'macro'};
diff --git a/packages/@react-spectrum/s2/src/ColorWheel.tsx b/packages/@react-spectrum/s2/src/ColorWheel.tsx
index 8eb251a1e3e..fdaf951106a 100644
--- a/packages/@react-spectrum/s2/src/ColorWheel.tsx
+++ b/packages/@react-spectrum/s2/src/ColorWheel.tsx
@@ -13,10 +13,11 @@
 import {
   ColorWheel as AriaColorWheel,
   ColorWheelProps as AriaColorWheelProps,
-  ColorWheelTrack,
-  ContextValue
-} from 'react-aria-components';
+  ColorWheelTrack
+} from 'react-aria-components/ColorWheel';
+
 import {ColorHandle} from './ColorHandle';
+import {ContextValue} from 'react-aria-components/utils';
 import {createContext, forwardRef} from 'react';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {style} from '../style' with {type: 'macro'};
diff --git a/packages/@react-spectrum/s2/src/ComboBox.tsx b/packages/@react-spectrum/s2/src/ComboBox.tsx
index 9d379c1f870..d4d97bedc75 100644
--- a/packages/@react-spectrum/s2/src/ComboBox.tsx
+++ b/packages/@react-spectrum/s2/src/ComboBox.tsx
@@ -13,30 +13,25 @@
 import {
   ComboBox as AriaComboBox,
   ComboBoxProps as AriaComboBoxProps,
+  ComboBoxStateContext
+} from 'react-aria-components/ComboBox';
+
+import {
   ListBoxSection as AriaListBoxSection,
-  PopoverProps as AriaPopoverProps,
-  Button,
-  ButtonRenderProps,
-  Collection,
-  ComboBoxStateContext,
-  ContextValue,
-  InputContext,
-  InputProps,
   ListBox,
   ListBoxItem,
   ListBoxItemProps,
   ListBoxLoadMoreItem,
   ListBoxProps,
-  ListLayout,
-  ListStateContext,
-  Provider,
-  SectionProps,
-  Virtualizer
-} from 'react-aria-components';
+  ListStateContext
+} from 'react-aria-components/ListBox';
+
+import {PopoverProps as AriaPopoverProps} from 'react-aria-components/Popover';
 import {AsyncLoadable, GlobalDOMAttributes, HelpTextProps, LoadingState, SingleSelection, SpectrumLabelableProps} from '@react-types/shared';
 import {AvatarContext} from './Avatar';
-import {BaseCollection, CollectionNode, createLeafComponent} from '@react-aria/collections';
+import {BaseCollection, CollectionNode} from 'react-aria/private/collections/BaseCollection';
 import {baseColor, focusRing, space, style} from '../style' with {type: 'macro'};
+import {Button, ButtonRenderProps} from 'react-aria-components/Button';
 import {centerBaseline} from './CenterBaseline';
 import {centerPadding, control, controlBorderRadius, controlFont, controlSize, field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {
@@ -49,26 +44,35 @@ import {
 } from './Menu';
 import CheckmarkIcon from '../ui-icons/Checkmark';
 import ChevronIcon from '../ui-icons/Chevron';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {ContextValue, Provider} from 'react-aria-components/utils';
 import {createContext, CSSProperties, ForwardedRef, forwardRef, ReactNode, Ref, useCallback, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
 import {createFocusableRef} from './useDOMRef';
+import {createLeafComponent} from 'react-aria/private/collections/CollectionBuilder';
 import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'};
 import {FieldErrorIcon, FieldGroup, FieldLabel, HelpText, Input} from './Field';
 import {FormContext, useFormProps} from './Form';
 import {forwardRefType} from './types';
 import {HeaderContext, HeadingContext, Text, TextContext} from './Content';
 import {IconContext} from './Icon';
-// @ts-ignore
+import {InputContext, InputProps} from 'react-aria-components/Input';
 import intlMessages from '../intl/*.json';
-import {mergeRefs, useResizeObserver, useSlotId} from '@react-aria/utils';
-import {Node} from 'react-stately';
-import {Placement} from 'react-aria';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
+// @ts-ignore
+import {Node} from '@react-types/shared';
+import {Placement} from '@react-types/overlays';
 import {Popover} from './Popover';
 import {pressScale} from './pressScale';
 import {ProgressCircle} from './ProgressCircle';
+import {SectionProps} from 'react-aria-components/Collection';
 import {TextFieldRef} from '@react-types/textfield';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
 import {useScale} from './utils';
+import {useSlotId} from 'react-aria/private/utils/useId';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
+import {Virtualizer} from 'react-aria-components/Virtualizer';
 
 export interface ComboboxStyleProps {
   /**
diff --git a/packages/@react-spectrum/s2/src/Content.tsx b/packages/@react-spectrum/s2/src/Content.tsx
index 93575b8f908..21c8274623d 100644
--- a/packages/@react-spectrum/s2/src/Content.tsx
+++ b/packages/@react-spectrum/s2/src/Content.tsx
@@ -10,10 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {ContextValue, Keyboard as KeyboardAria, Header as RACHeader, Heading as RACHeading, TextContext as RACTextContext, SlotProps, Text as TextAria} from 'react-aria-components';
+import {ContextValue, SlotProps} from 'react-aria-components/utils';
+
 import {createContext, forwardRef, ReactNode, useContext} from 'react';
 import {DOMRef, DOMRefValue} from '@react-types/shared';
-import {inertValue} from '@react-aria/utils';
+import {inertValue} from 'react-aria/private/utils/inertValue';
+import {Keyboard as KeyboardAria} from 'react-aria-components/Keyboard';
+import {Header as RACHeader} from 'react-aria-components/Header';
+import {Heading as RACHeading} from 'react-aria-components/Heading';
+import {TextContext as RACTextContext, Text as TextAria} from 'react-aria-components/Text';
 import {StyleString} from '../style/types';
 import {UnsafeStyles} from './style-utils';
 import {useDOMRef} from './useDOMRef';
diff --git a/packages/@react-spectrum/s2/src/ContextualHelp.tsx b/packages/@react-spectrum/s2/src/ContextualHelp.tsx
index 8f9e20eb039..23cc87246c5 100644
--- a/packages/@react-spectrum/s2/src/ContextualHelp.tsx
+++ b/packages/@react-spectrum/s2/src/ContextualHelp.tsx
@@ -1,21 +1,25 @@
 import {ActionButton} from './ActionButton';
 import {AriaLabelingProps, DOMProps, FocusableRef, FocusableRefValue} from '@react-types/shared';
 import {ContentContext, FooterContext, HeadingContext, TextContext as SpectrumTextContext} from './Content';
-import {ContextValue, DEFAULT_SLOT, Provider, TextContext} from 'react-aria-components';
+import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/utils';
 import {createContext, forwardRef, ReactNode} from 'react';
 import {dialogInner} from './Dialog';
 import {DialogTrigger, DialogTriggerProps} from './DialogTrigger';
-import {filterDOMProps, mergeProps, useId, useLabels} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import HelpIcon from '../s2wf-icons/S2_Icon_HelpCircle_20_N.svg';
 import InfoIcon from '../s2wf-icons/S2_Icon_InfoCircle_20_N.svg';
-// @ts-ignore
 import intlMessages from '../intl/*.json';
+import {mergeProps} from 'react-aria/mergeProps';
 import {mergeStyles} from '../style/runtime';
 import {Placement} from '@react-types/overlays';
+// @ts-ignore
 import {Popover, PopoverDialogProps} from './Popover';
 import {space, style} from '../style' with {type: 'macro'};
 import {StyleProps} from './style-utils' with { type: 'macro' };
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {TextContext} from 'react-aria-components/Text';
+import {useId} from 'react-aria/useId';
+import {useLabels} from 'react-aria/private/utils/useLabels';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface ContextualHelpPopoverProps extends PopoverDialogProps {
diff --git a/packages/@react-spectrum/s2/src/CustomDialog.tsx b/packages/@react-spectrum/s2/src/CustomDialog.tsx
index f7b8fcd59f6..5d56d3e1883 100644
--- a/packages/@react-spectrum/s2/src/CustomDialog.tsx
+++ b/packages/@react-spectrum/s2/src/CustomDialog.tsx
@@ -10,11 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-import {composeRenderProps, OverlayTriggerStateContext, Dialog as RACDialog, DialogProps as RACDialogProps} from 'react-aria-components';
+import {composeRenderProps} from 'react-aria-components/utils';
+
 import {DOMRef, GlobalDOMAttributes} from '@react-types/shared';
+
 import {forwardRef} from 'react';
 import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {Modal} from './Modal';
+import {
+  OverlayTriggerStateContext,
+  Dialog as RACDialog,
+  DialogProps as RACDialogProps
+} from 'react-aria-components/Dialog';
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
 
@@ -68,7 +75,7 @@ export const CustomDialog = forwardRef(function CustomDialog(props: CustomDialog
   let domRef = useDOMRef(ref);
 
   return (
-    <Modal size={size} isDismissable={isDismissible} isKeyboardDismissDisabled={isKeyboardDismissDisabled}>
+    (<Modal size={size} isDismissable={isDismissible} isKeyboardDismissDisabled={isKeyboardDismissDisabled}>
       <RACDialog
         {...props}
         ref={domRef}
@@ -76,11 +83,11 @@ export const CustomDialog = forwardRef(function CustomDialog(props: CustomDialog
         className={(props.UNSAFE_className || '') + dialogStyle({padding}, props.styles)}>
         {composeRenderProps(props.children, (children) => (
           // Reset OverlayTriggerStateContext so the buttons inside the dialog don't retain their hover state.
-          <OverlayTriggerStateContext.Provider value={null}>
+          (<OverlayTriggerStateContext.Provider value={null}>
             {children}
-          </OverlayTriggerStateContext.Provider>
+          </OverlayTriggerStateContext.Provider>)
         ))}
       </RACDialog>
-    </Modal>
+    </Modal>)
   );
 });
diff --git a/packages/@react-spectrum/s2/src/DateField.tsx b/packages/@react-spectrum/s2/src/DateField.tsx
index cc9c65a05bf..55a4bbdb0cb 100644
--- a/packages/@react-spectrum/s2/src/DateField.tsx
+++ b/packages/@react-spectrum/s2/src/DateField.tsx
@@ -15,15 +15,16 @@ import {
   DateFieldProps as AriaDateFieldProps,
   DateInput as AriaDateInput,
   DateSegment as AriaDateSegment,
-  ContextValue,
   DateInputProps,
-  DateSegmentRenderProps,
-  DateValue,
-  FormContext
-} from 'react-aria-components';
+  DateSegmentRenderProps
+} from 'react-aria-components/DateField';
+
+import {ContextValue} from 'react-aria-components/utils';
 import {createContext, forwardRef, PropsWithChildren, ReactElement, Ref, useContext} from 'react';
+import {DateValue} from '@react-types/datepicker';
 import {field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {FieldErrorIcon, FieldGroup, FieldLabel, HelpText} from './Field';
+import {FormContext} from 'react-aria-components/Form';
 import {forwardRefType, GlobalDOMAttributes, HelpTextProps, SpectrumLabelableProps} from '@react-types/shared';
 import {style} from '../style' with {type: 'macro'};
 import {useSpectrumContextProps} from './useSpectrumContextProps';
diff --git a/packages/@react-spectrum/s2/src/DatePicker.tsx b/packages/@react-spectrum/s2/src/DatePicker.tsx
index c5e1ee8ca40..9faec67bb8b 100644
--- a/packages/@react-spectrum/s2/src/DatePicker.tsx
+++ b/packages/@react-spectrum/s2/src/DatePicker.tsx
@@ -10,33 +10,29 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  DatePicker as AriaDatePicker,
-  DatePickerProps as AriaDatePickerProps,
-  Button,
-  ButtonRenderProps,
-  ContextValue,
-  DateValue,
-  Dialog,
-  FormContext,
-  OverlayTriggerStateContext,
-  PopoverProps,
-  Provider,
-  TimeValue
-} from 'react-aria-components';
+import {DatePicker as AriaDatePicker, DatePickerProps as AriaDatePickerProps} from 'react-aria-components/DatePicker';
+
 import {baseColor, focusRing, fontRelative, space, style} from '../style' with {type: 'macro'};
-import {Calendar, CalendarProps, IconContext, TimeField} from '../';
+import {Button, ButtonRenderProps} from 'react-aria-components/Button';
+import {Calendar, CalendarProps} from './Calendar';
 import CalendarIcon from '../s2wf-icons/S2_Icon_Calendar_20_N.svg';
+import {ContextValue, Provider} from 'react-aria-components/utils';
 import {controlBorderRadius, field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {createContext, forwardRef, ReactElement, ReactNode, Ref, useContext, useRef, useState} from 'react';
 import {DateInput, DateInputContainer, InvalidIndicator} from './DateField';
+import {DateValue, TimeValue} from '@react-types/datepicker';
+import {Dialog, OverlayTriggerStateContext} from 'react-aria-components/Dialog';
 import {FieldGroup, FieldLabel, HelpText} from './Field';
+import {FormContext} from 'react-aria-components/Form';
 import {forwardRefType, GlobalDOMAttributes, HelpTextProps, SpectrumLabelableProps} from '@react-types/shared';
-// @ts-ignore
+import {IconContext} from './Icon';
 import intlMessages from '../intl/*.json';
 import {Popover} from './Popover';
+// @ts-ignore
+import {PopoverProps} from 'react-aria-components/Popover';
 import {pressScale} from './pressScale';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {TimeField} from './TimeField';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 
diff --git a/packages/@react-spectrum/s2/src/DateRangePicker.tsx b/packages/@react-spectrum/s2/src/DateRangePicker.tsx
index fbf54a71bf4..adbbaf92170 100644
--- a/packages/@react-spectrum/s2/src/DateRangePicker.tsx
+++ b/packages/@react-spectrum/s2/src/DateRangePicker.tsx
@@ -12,23 +12,25 @@
 
 import {
   DateRangePicker as AriaDateRangePicker,
-  DateRangePickerProps as AriaDateRangePickerProps,
-  ContextValue,
-  DateValue,
-  FormContext,
-  PopoverProps
-} from 'react-aria-components';
+  DateRangePickerProps as AriaDateRangePickerProps
+} from 'react-aria-components/DatePicker';
+
 import {CalendarButton, CalendarPopover, timeField} from './DatePicker';
+import {ContextValue} from 'react-aria-components/utils';
 import {createContext, forwardRef, ReactElement, Ref, useContext, useState} from 'react';
 import {DateInput, DateInputContainer, InvalidIndicator} from './DateField';
+import {DateValue} from '@react-types/datepicker';
 import {field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {FieldGroup, FieldLabel, HelpText} from './Field';
+import {FormContext} from 'react-aria-components/Form';
 import {forwardRefType, GlobalDOMAttributes, HelpTextProps, SpectrumLabelableProps} from '@react-types/shared';
-// @ts-ignore
 import intlMessages from '../intl/*.json';
-import {RangeCalendar, RangeCalendarProps, TimeField} from '../';
+// @ts-ignore
+import {PopoverProps} from 'react-aria-components/Popover';
+import {RangeCalendar, RangeCalendarProps} from './RangeCalendar';
 import {style} from '../style' with {type: 'macro'};
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {TimeField} from './TimeField';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 
diff --git a/packages/@react-spectrum/s2/src/Dialog.tsx b/packages/@react-spectrum/s2/src/Dialog.tsx
index 05ed9c71073..f14d31cec04 100644
--- a/packages/@react-spectrum/s2/src/Dialog.tsx
+++ b/packages/@react-spectrum/s2/src/Dialog.tsx
@@ -12,12 +12,19 @@
 
 import {ButtonGroupContext} from './ButtonGroup';
 import {CloseButton} from './CloseButton';
-import {composeRenderProps, OverlayTriggerStateContext, Provider, Dialog as RACDialog, DialogProps as RACDialogProps} from 'react-aria-components';
+import {composeRenderProps, Provider} from 'react-aria-components/utils';
+
 import {ContentContext, FooterContext, HeaderContext, HeadingContext} from './Content';
+
 import {DOMRef, GlobalDOMAttributes} from '@react-types/shared';
 import {forwardRef} from 'react';
 import {ImageContext} from './Image';
 import {Modal} from './Modal';
+import {
+  OverlayTriggerStateContext,
+  Dialog as RACDialog,
+  DialogProps as RACDialogProps
+} from 'react-aria-components/Dialog';
 import {style} from '../style' with {type: 'macro'};
 import {StyleProps} from './style-utils';
 import {useDOMRef} from './useDOMRef';
@@ -103,7 +110,7 @@ export const Dialog = forwardRef(function Dialog(props: DialogProps, ref: DOMRef
   let domRef = useDOMRef(ref);
 
   return (
-    <Modal size={size} isDismissable={isDismissible} isKeyboardDismissDisabled={isKeyboardDismissDisabled}>
+    (<Modal size={size} isDismissable={isDismissible} isKeyboardDismissDisabled={isKeyboardDismissDisabled}>
       <RACDialog
         {...props}
         ref={domRef}
@@ -113,7 +120,7 @@ export const Dialog = forwardRef(function Dialog(props: DialogProps, ref: DOMRef
           // Render the children multiple times inside the wrappers we need to implement the layout.
           // Each instance hides certain children so that they are all rendered in the correct locations.
           // Reset OverlayTriggerStateContext so the buttons inside the dialog don't retain their hover state.
-          <OverlayTriggerStateContext.Provider value={null}>
+          (<OverlayTriggerStateContext.Provider value={null}>
             {/* Hero image */}
             <Provider
               values={[
@@ -227,9 +234,9 @@ export const Dialog = forwardRef(function Dialog(props: DialogProps, ref: DOMRef
                 {children}
               </Provider>
             </div>
-          </OverlayTriggerStateContext.Provider>
+          </OverlayTriggerStateContext.Provider>)
         ))}
       </RACDialog>
-    </Modal>
+    </Modal>)
   );
 });
diff --git a/packages/@react-spectrum/s2/src/DialogContainer.tsx b/packages/@react-spectrum/s2/src/DialogContainer.tsx
index ac26bcdc84c..afc9a74cde4 100644
--- a/packages/@react-spectrum/s2/src/DialogContainer.tsx
+++ b/packages/@react-spectrum/s2/src/DialogContainer.tsx
@@ -10,9 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {ModalContext, useSlottedContext} from 'react-aria-components';
+import {ModalContext} from 'react-aria-components/Modal';
+
 import React, {ReactElement, ReactNode, useState} from 'react';
 import {SpectrumDialogContainerProps} from '@react-types/dialog';
+import {useSlottedContext} from 'react-aria-components/utils';
 
 export interface DialogContainerProps extends Omit<SpectrumDialogContainerProps, 'type' | 'isDismissable' | 'isKeyboardDismissDisabled'> {}
 
diff --git a/packages/@react-spectrum/s2/src/DialogTrigger.tsx b/packages/@react-spectrum/s2/src/DialogTrigger.tsx
index 339855f79c3..a2973b0c05a 100644
--- a/packages/@react-spectrum/s2/src/DialogTrigger.tsx
+++ b/packages/@react-spectrum/s2/src/DialogTrigger.tsx
@@ -10,8 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {DialogTrigger as AriaDialogTrigger, DialogTriggerProps as AriaDialogTriggerProps} from 'react-aria-components';
-import {PressResponder} from '@react-aria/interactions';
+import {
+  DialogTrigger as AriaDialogTrigger,
+  DialogTriggerProps as AriaDialogTriggerProps
+} from 'react-aria-components/Dialog';
+import {PressResponder} from 'react-aria/private/interactions/PressResponder';
 import {ReactNode} from 'react';
 
 export interface DialogTriggerProps extends AriaDialogTriggerProps {}
diff --git a/packages/@react-spectrum/s2/src/Disclosure.tsx b/packages/@react-spectrum/s2/src/Disclosure.tsx
index 74b61202ea8..a7970e715ed 100644
--- a/packages/@react-spectrum/s2/src/Disclosure.tsx
+++ b/packages/@react-spectrum/s2/src/Disclosure.tsx
@@ -13,13 +13,25 @@
 import {ActionButtonContext} from './ActionButton';
 import {AriaLabelingProps, DOMProps, DOMRef, DOMRefValue, forwardRefType, GlobalDOMAttributes} from '@react-types/shared';
 import {baseColor, focusRing, lightDark, space, style} from '../style' with { type: 'macro' };
-import {Button, ContextValue, DisclosureStateContext, Heading, Provider, Disclosure as RACDisclosure, DisclosurePanel as RACDisclosurePanel, DisclosurePanelProps as RACDisclosurePanelProps, DisclosureProps as RACDisclosureProps, useLocale, useSlottedContext} from 'react-aria-components';
+import {Button} from 'react-aria-components/Button';
 import {CenterBaseline} from './CenterBaseline';
+
 import {centerPadding, getAllowedOverrides, StyleProps, UnsafeStyles} from './style-utils' with { type: 'macro' };
+
 import Chevron from '../ui-icons/Chevron';
-import {filterDOMProps} from '@react-aria/utils';
+import {ContextValue, Provider, useSlottedContext} from 'react-aria-components/utils';
+import {
+  DisclosureStateContext,
+  Disclosure as RACDisclosure,
+  DisclosurePanel as RACDisclosurePanel,
+  DisclosurePanelProps as RACDisclosurePanelProps,
+  DisclosureProps as RACDisclosureProps
+} from 'react-aria-components/Disclosure';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {Heading} from 'react-aria-components/Heading';
 import React, {createContext, forwardRef, ReactNode, useContext} from 'react';
 import {useDOMRef} from './useDOMRef';
+import {useLocale} from 'react-aria/I18nProvider';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface DisclosureProps extends Omit<RACDisclosureProps, 'className' | 'style' | 'render' | 'children' | keyof GlobalDOMAttributes>, StyleProps {
diff --git a/packages/@react-spectrum/s2/src/Divider.tsx b/packages/@react-spectrum/s2/src/Divider.tsx
index 43d1833a359..0cbc5fd6664 100644
--- a/packages/@react-spectrum/s2/src/Divider.tsx
+++ b/packages/@react-spectrum/s2/src/Divider.tsx
@@ -10,10 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {ContextValue, Separator as RACSeparator, SeparatorProps as RACSeparatorProps} from 'react-aria-components';
+import {ContextValue} from 'react-aria-components/utils';
+
 import {createContext, forwardRef} from 'react';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {getAllowedOverrides, staticColor, StyleProps} from './style-utils' with {type: 'macro'};
+import {Separator as RACSeparator, SeparatorProps as RACSeparatorProps} from 'react-aria-components/Separator';
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
diff --git a/packages/@react-spectrum/s2/src/DropZone.tsx b/packages/@react-spectrum/s2/src/DropZone.tsx
index 32febe41b15..7c41ec9026e 100644
--- a/packages/@react-spectrum/s2/src/DropZone.tsx
+++ b/packages/@react-spectrum/s2/src/DropZone.tsx
@@ -10,16 +10,23 @@
  * governing permissions and limitations under the License.
  */
 
-import {ContextValue, DropZoneRenderProps, DropZone as RACDropZone, DropZoneProps as RACDropZoneProps} from 'react-aria-components';
+import {ContextValue} from 'react-aria-components/utils';
+
 import {createContext, forwardRef, ReactNode} from 'react';
+
 import {DOMProps, DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared';
+import {
+  DropZoneRenderProps,
+  DropZone as RACDropZone,
+  DropZoneProps as RACDropZoneProps
+} from 'react-aria-components/DropZone';
 import {getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {IllustratedMessageContext} from './IllustratedMessage';
 // @ts-ignore
 import intlMessages from '../intl/*.json';
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface DropZoneProps extends Omit<RACDropZoneProps, 'className' | 'style' | 'render' | 'children' | 'isDisabled' | 'onHover' | 'onHoverStart' | 'onHoverEnd' | 'onHoverChange' | keyof GlobalDOMAttributes>, UnsafeStyles, DOMProps {
diff --git a/packages/@react-spectrum/s2/src/Field.tsx b/packages/@react-spectrum/s2/src/Field.tsx
index e8d263d1fca..fb64cf347ca 100644
--- a/packages/@react-spectrum/s2/src/Field.tsx
+++ b/packages/@react-spectrum/s2/src/Field.tsx
@@ -15,18 +15,24 @@ import {Alignment, DOMRef, NecessityIndicator} from '@react-types/shared';
 import AsteriskIcon from '../ui-icons/Asterisk';
 import {baseColor, focusRing, fontRelative, style} from '../style' with {type: 'macro'};
 import {CenterBaseline, centerBaseline, centerBaselineBefore} from './CenterBaseline';
-import {composeRenderProps, FieldError, FieldErrorProps, Group, GroupProps, Label, LabelProps, Provider, Input as RACInput, InputProps as RACInputProps, Text} from 'react-aria-components';
+import {composeRenderProps, Provider} from 'react-aria-components/utils';
 import {ContextualHelpContext} from './ContextualHelp';
 import {control, controlFont, fieldInput, fieldLabel, StyleProps, UnsafeStyles} from './style-utils' with {type: 'macro'};
+import {FieldError, FieldErrorProps} from 'react-aria-components/FieldError';
 import {ForwardedRef, forwardRef, ReactNode} from 'react';
-import {getEventTarget, useId} from '@react-aria/utils';
+import {getEventTarget} from 'react-aria/private/utils/shadowdom/DOMFunctions';
+import {Group, GroupProps} from 'react-aria-components/Group';
 import {IconContext} from './Icon';
-// @ts-ignore
 import intlMessages from '../intl/*.json';
+import {Label, LabelProps} from 'react-aria-components/Label';
 import {mergeStyles} from '../style/runtime';
+import {Input as RACInput, InputProps as RACInputProps} from 'react-aria-components/Input';
+// @ts-ignore
 import {StyleString} from '../style/types';
+import {Text} from 'react-aria-components/Text';
 import {useDOMRef} from './useDOMRef';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useId} from 'react-aria/useId';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 
 interface FieldLabelProps extends Omit<LabelProps, 'className' | 'style' | 'render' | 'children'>, StyleProps {
   isDisabled?: boolean,
diff --git a/packages/@react-spectrum/s2/src/Fonts.tsx b/packages/@react-spectrum/s2/src/Fonts.tsx
index 98e56eef77a..55ab092d31b 100644
--- a/packages/@react-spectrum/s2/src/Fonts.tsx
+++ b/packages/@react-spectrum/s2/src/Fonts.tsx
@@ -1,6 +1,6 @@
 import ReactDOM from 'react-dom';
 import {ReactNode, version as ReactVersion, useEffect, useMemo, useRef} from 'react';
-import {useLocale} from 'react-aria';
+import {useLocale} from 'react-aria/I18nProvider';
 import './font-faces.css';
 
 // Typekit ids for each CJK locale. These use dynamic subsetting, so cannot be loaded as CSS.
diff --git a/packages/@react-spectrum/s2/src/Form.tsx b/packages/@react-spectrum/s2/src/Form.tsx
index 9a4a41b619a..a8a36396ebe 100644
--- a/packages/@react-spectrum/s2/src/Form.tsx
+++ b/packages/@react-spectrum/s2/src/Form.tsx
@@ -13,7 +13,7 @@
 import {createContext, forwardRef, ReactNode, useContext, useMemo} from 'react';
 import {DOMRef, GlobalDOMAttributes, SpectrumLabelableProps} from '@react-types/shared';
 import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
-import {Form as RACForm, FormProps as RACFormProps} from 'react-aria-components';
+import {Form as RACForm, FormProps as RACFormProps} from 'react-aria-components/Form';
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
 import {useIsSkeleton} from './Skeleton';
diff --git a/packages/@react-spectrum/s2/src/FullscreenDialog.tsx b/packages/@react-spectrum/s2/src/FullscreenDialog.tsx
index 39a9cc25995..48dd889ac9f 100644
--- a/packages/@react-spectrum/s2/src/FullscreenDialog.tsx
+++ b/packages/@react-spectrum/s2/src/FullscreenDialog.tsx
@@ -11,11 +11,18 @@
  */
 
 import {ButtonGroupContext} from './ButtonGroup';
-import {composeRenderProps, OverlayTriggerStateContext, Provider, Dialog as RACDialog, DialogProps as RACDialogProps} from 'react-aria-components';
+import {composeRenderProps, Provider} from 'react-aria-components/utils';
+
 import {ContentContext, HeaderContext, HeadingContext} from './Content';
+
 import {DOMRef, GlobalDOMAttributes} from '@react-types/shared';
 import {forwardRef} from 'react';
 import {Modal} from './Modal';
+import {
+  OverlayTriggerStateContext,
+  Dialog as RACDialog,
+  DialogProps as RACDialogProps
+} from 'react-aria-components/Dialog';
 import {style} from '../style' with {type: 'macro'};
 import {StyleProps} from './style-utils';
 import {useDOMRef} from './useDOMRef';
@@ -126,7 +133,7 @@ export const FullscreenDialog = forwardRef(function FullscreenDialog(props: Full
   let domRef = useDOMRef(ref);
 
   return (
-    <Modal size={variant} isKeyboardDismissDisabled={isKeyboardDismissDisabled}>
+    (<Modal size={variant} isKeyboardDismissDisabled={isKeyboardDismissDisabled}>
       <RACDialog
         {...props}
         ref={domRef}
@@ -134,7 +141,7 @@ export const FullscreenDialog = forwardRef(function FullscreenDialog(props: Full
         className={(props.UNSAFE_className || '') + dialogInner}>
         {composeRenderProps(props.children, (children) => (
           // Reset OverlayTriggerStateContext so the buttons inside the dialog don't retain their hover state.
-          <OverlayTriggerStateContext.Provider value={null}>
+          (<OverlayTriggerStateContext.Provider value={null}>
             <Provider
               values={[
                 [HeadingContext, {styles: heading}],
@@ -144,10 +151,10 @@ export const FullscreenDialog = forwardRef(function FullscreenDialog(props: Full
               ]}>
               {children}
             </Provider>
-          </OverlayTriggerStateContext.Provider>
+          </OverlayTriggerStateContext.Provider>)
         ))}
       </RACDialog>
-    </Modal>
+    </Modal>)
   );
 });
 
diff --git a/packages/@react-spectrum/s2/src/Icon.tsx b/packages/@react-spectrum/s2/src/Icon.tsx
index de728ab8155..e2564c28006 100644
--- a/packages/@react-spectrum/s2/src/Icon.tsx
+++ b/packages/@react-spectrum/s2/src/Icon.tsx
@@ -12,7 +12,7 @@
 
 import {AriaLabelingProps, DOMProps} from '@react-types/shared';
 import {ComponentType, Context, createContext, FunctionComponent, ReactNode, SVGProps, useRef} from 'react';
-import {ContextValue, SlotProps} from 'react-aria-components';
+import {ContextValue, SlotProps} from 'react-aria-components/utils';
 import {mergeStyles} from '../style/runtime';
 import {SkeletonWrapper, useSkeletonIcon} from './Skeleton';
 import {style} from '../style' with {type: 'macro'};
diff --git a/packages/@react-spectrum/s2/src/IllustratedMessage.tsx b/packages/@react-spectrum/s2/src/IllustratedMessage.tsx
index 98a02aeb25b..7632c9e8bb0 100644
--- a/packages/@react-spectrum/s2/src/IllustratedMessage.tsx
+++ b/packages/@react-spectrum/s2/src/IllustratedMessage.tsx
@@ -12,11 +12,11 @@
 
 import {ButtonGroupContext} from './ButtonGroup';
 import {ContentContext, HeadingContext} from './Content';
-import {ContextValue, Provider} from 'react-aria-components';
+import {ContextValue, Provider} from 'react-aria-components/utils';
 import {controlFont, getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {createContext, forwardRef, ReactNode} from 'react';
 import {DOMProps, DOMRef, DOMRefValue} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {IllustrationContext} from './Icon';
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
diff --git a/packages/@react-spectrum/s2/src/Image.tsx b/packages/@react-spectrum/s2/src/Image.tsx
index 8f14a9bbe88..8c7945277fc 100644
--- a/packages/@react-spectrum/s2/src/Image.tsx
+++ b/packages/@react-spectrum/s2/src/Image.tsx
@@ -1,5 +1,5 @@
 import {ColorSchemeContext} from './Provider';
-import {ContextValue, SlotProps} from 'react-aria-components';
+import {ContextValue, SlotProps} from 'react-aria-components/utils';
 import {createContext, ForwardedRef, forwardRef, HTMLAttributeReferrerPolicy, JSX, ReactNode, useCallback, useContext, useMemo, useReducer, useRef, version} from 'react';
 import {DefaultImageGroup, ImageGroup} from './ImageCoordinator';
 import {loadingStyle, useIsSkeleton, useLoadingAnimation} from './Skeleton';
@@ -7,7 +7,7 @@ import {mergeStyles} from '../style/runtime';
 import {style} from '../style' with {type: 'macro'};
 import {StyleString} from '../style/types';
 import {UnsafeStyles} from './style-utils';
-import {useLayoutEffect} from '@react-aria/utils';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface ImageSource {
diff --git a/packages/@react-spectrum/s2/src/InlineAlert.tsx b/packages/@react-spectrum/s2/src/InlineAlert.tsx
index 625d5c27682..f6109f79a50 100644
--- a/packages/@react-spectrum/s2/src/InlineAlert.tsx
+++ b/packages/@react-spectrum/s2/src/InlineAlert.tsx
@@ -14,9 +14,9 @@ import AlertTriangle from '../s2wf-icons/S2_Icon_AlertTriangle_20_N.svg';
 import CheckmarkCircle from '../s2wf-icons/S2_Icon_CheckmarkCircle_20_N.svg';
 import {ComponentType, createContext, forwardRef, ReactNode, useEffect, useRef} from 'react';
 import {ContentContext, HeadingContext} from './Content';
-import {ContextValue, Provider, SlotProps} from 'react-aria-components';
+import {ContextValue, Provider, SlotProps} from 'react-aria-components/utils';
 import {DOMProps, DOMRef, DOMRefValue} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {focusRing, style} from '../style' with {type: 'macro'};
 import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {IconContext} from './Icon';
@@ -25,8 +25,8 @@ import InfoCircle from '../s2wf-icons/S2_Icon_InfoCircle_20_N.svg';
 import intlMessages from '../intl/*.json';
 import NoticeSquare from '../s2wf-icons/S2_Icon_AlertDiamond_20_N.svg';
 import {useDOMRef} from './useDOMRef';
-import {useFocusRing} from 'react-aria';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface InlineAlertProps extends DOMProps, StyleProps, InlineStylesProps, SlotProps {
diff --git a/packages/@react-spectrum/s2/src/Link.tsx b/packages/@react-spectrum/s2/src/Link.tsx
index a39f0b9f0a9..e68c5d5c454 100644
--- a/packages/@react-spectrum/s2/src/Link.tsx
+++ b/packages/@react-spectrum/s2/src/Link.tsx
@@ -11,13 +11,14 @@
  */
 
 import {baseColor, focusRing, style} from '../style' with {type: 'macro'};
-import {ContextValue, LinkRenderProps, Link as RACLink, LinkProps as RACLinkProps} from 'react-aria-components';
+import {ContextValue} from 'react-aria-components/utils';
 import {createContext, forwardRef, ReactNode, useContext} from 'react';
 import {FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {getAllowedOverrides, staticColor, StyleProps} from './style-utils' with {type: 'macro'};
+import {LinkRenderProps, Link as RACLink, LinkProps as RACLinkProps} from 'react-aria-components/Link';
 import {SkeletonContext, useSkeletonText} from './Skeleton';
 import {useFocusableRef} from './useDOMRef';
-import {useLayoutEffect} from '@react-aria/utils';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 interface LinkStyleProps {
diff --git a/packages/@react-spectrum/s2/src/ListBox.tsx b/packages/@react-spectrum/s2/src/ListBox.tsx
index 4b510f8b605..86c4bf29046 100644
--- a/packages/@react-spectrum/s2/src/ListBox.tsx
+++ b/packages/@react-spectrum/s2/src/ListBox.tsx
@@ -15,7 +15,7 @@ import {
   ListBoxItem as AriaListBoxItem,
   ListBoxItemProps,
   ListBoxProps
-} from 'react-aria-components';
+} from 'react-aria-components/ListBox';
 import {ReactNode} from 'react';
 
 
diff --git a/packages/@react-spectrum/s2/src/ListView.tsx b/packages/@react-spectrum/s2/src/ListView.tsx
index baa48564348..262d06dae2c 100644
--- a/packages/@react-spectrum/s2/src/ListView.tsx
+++ b/packages/@react-spectrum/s2/src/ListView.tsx
@@ -15,45 +15,43 @@ import {ActionMenuContext} from './ActionMenu';
 import {baseColor, colorMix, focusRing, fontRelative, space, style} from '../style' with {type: 'macro'};
 import {centerBaseline} from './CenterBaseline';
 import {Checkbox} from './Checkbox';
+import {CheckboxContext} from 'react-aria-components/Checkbox';
+import Chevron from '../ui-icons/Chevron';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {CollectionRendererContext, DefaultCollectionRenderer} from 'react-aria-components/Collection';
+
+import {ContextValue, DEFAULT_SLOT, Provider, SlotProps, useSlottedContext} from 'react-aria-components/utils';
+
+import {controlFont, getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
+import {createContext, forwardRef, ReactElement, ReactNode, useContext, useRef} from 'react';
+import {DOMProps, DOMRef, DOMRefValue, forwardRefType, GlobalDOMAttributes, LoadingState} from '@react-types/shared';
+import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'};
 import {
-  CheckboxContext,
-  Collection,
-  CollectionRendererContext,
-  ContextValue,
-  DEFAULT_SLOT,
-  DefaultCollectionRenderer,
   GridList,
   GridListItem,
   GridListItemProps,
   GridListItemRenderProps,
   GridListLoadMoreItem,
   GridListProps,
-  GridListRenderProps,
-  Key,
-  ListLayout,
-  ListState,
-  Provider,
-  SlotProps,
-  useSlottedContext,
-  Virtualizer
-} from 'react-aria-components';
-import Chevron from '../ui-icons/Chevron';
-import {controlFont, getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
-import {createContext, forwardRef, ReactElement, ReactNode, useContext, useRef} from 'react';
-import {DOMProps, DOMRef, DOMRefValue, forwardRefType, GlobalDOMAttributes, LoadingState} from '@react-types/shared';
-import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'};
+  GridListRenderProps
+} from 'react-aria-components/GridList';
 import {IconContext} from './Icon';
 import {ImageContext} from './Image';
-// @ts-ignore
 import intlMessages from '../intl/*.json';
+import {Key} from '@react-types/shared';
 import LinkOutIcon from '../ui-icons/LinkOut';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
+// @ts-ignore
+import {ListState} from 'react-stately/useListState';
 import {ProgressCircle} from './ProgressCircle';
 import {Text, TextContext} from './Content';
 import {useActionBarContainer} from './ActionBar';
 import {useDOMRef} from './useDOMRef';
-import {useLocale, useLocalizedStringFormatter} from 'react-aria';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useScale} from './utils';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
+import {Virtualizer} from 'react-aria-components/Virtualizer';
 
 export interface ListViewProps<T> extends Omit<GridListProps<T>, 'className' | 'style' | 'children' | 'selectionBehavior' | 'dragAndDropHooks' | 'layout' | 'render' | 'keyboardNavigationBehavior' | keyof GlobalDOMAttributes>, DOMProps, UnsafeStyles, ListViewStylesProps, SlotProps {
   /** Spectrum-defined styles, returned by the `style()` macro. */
diff --git a/packages/@react-spectrum/s2/src/Menu.tsx b/packages/@react-spectrum/s2/src/Menu.tsx
index ea1731cffc9..8346cc44201 100644
--- a/packages/@react-spectrum/s2/src/Menu.tsx
+++ b/packages/@react-spectrum/s2/src/Menu.tsx
@@ -21,19 +21,16 @@ import {
   MenuTriggerProps as AriaMenuTriggerProps,
   SubmenuTrigger as AriaSubmenuTrigger,
   SubmenuTriggerProps as AriaSubmenuTriggerProps,
-  ContextValue,
-  DEFAULT_SLOT,
-  MenuItemRenderProps,
-  Provider,
-  Separator,
-  SeparatorProps
-} from 'react-aria-components';
+  MenuItemRenderProps
+} from 'react-aria-components/Menu';
+
 import {baseColor, focusRing, fontRelative, size, space, style} from '../style' with {type: 'macro'};
 import {box, iconStyles} from './Checkbox';
 import {centerBaseline} from './CenterBaseline';
 import {centerPadding, control, controlFont, controlSize, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import CheckmarkIcon from '../ui-icons/Checkmark';
 import ChevronRightIcon from '../ui-icons/Chevron';
+import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/utils';
 import {createContext, forwardRef, JSX, ReactElement, ReactNode, useContext, useRef, useState} from 'react';
 import {divider} from './Divider';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes, PressEvent} from '@react-types/shared';
@@ -41,18 +38,21 @@ import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'};
 import {forwardRefType} from './types';
 import {HeaderContext, HeadingContext, KeyboardContext, Text, TextContext} from './Content';
 import {IconContext} from './Icon';
-import {ImageContext} from './Image'; // chevron right removed??
-import InfoCircleIcon from '../s2wf-icons/S2_Icon_InfoCircle_20_N.svg';
+import {ImageContext} from './Image';
+import InfoCircleIcon from '../s2wf-icons/S2_Icon_InfoCircle_20_N.svg'; // chevron right removed??
 import {InPopoverContext, Popover, PopoverContext} from './Popover';
-// @ts-ignore
 import intlMessages from '../intl/*.json';
+// @ts-ignore
 import LinkOutIcon from '../ui-icons/LinkOut';
 import {mergeStyles} from '../style/runtime';
-import {Placement, useLocale} from 'react-aria';
-import {PressResponder} from '@react-aria/interactions';
+import {Placement} from '@react-types/overlays';
+import {PressResponder} from 'react-aria/private/interactions/PressResponder';
 import {pressScale} from './pressScale';
-import {useGlobalListeners, useId} from '@react-aria/utils';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {Separator, SeparatorProps} from 'react-aria-components/Separator';
+import {useGlobalListeners} from 'react-aria/private/utils/useGlobalListeners';
+import {useId} from 'react-aria/useId';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 // viewbox on LinkOut is super weird just because i copied the icon from designs...
 // need to strip id's from icons
diff --git a/packages/@react-spectrum/s2/src/Meter.tsx b/packages/@react-spectrum/s2/src/Meter.tsx
index fcbd8683d30..f1c90169ad4 100644
--- a/packages/@react-spectrum/s2/src/Meter.tsx
+++ b/packages/@react-spectrum/s2/src/Meter.tsx
@@ -10,12 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  Meter as AriaMeter,
-  MeterProps as AriaMeterProps,
-  ContextValue
-} from 'react-aria-components';
+import {Meter as AriaMeter, MeterProps as AriaMeterProps} from 'react-aria-components/Meter';
+
 import {bar, track} from './bar-utils'  with {type: 'macro'};
+import {ContextValue} from 'react-aria-components/utils';
 import {createContext, forwardRef, ReactNode} from 'react';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes, LabelPosition} from '@react-types/shared';
 import {FieldLabel} from './Field';
diff --git a/packages/@react-spectrum/s2/src/Modal.tsx b/packages/@react-spectrum/s2/src/Modal.tsx
index 68c9c0861a1..bde7fca23df 100644
--- a/packages/@react-spectrum/s2/src/Modal.tsx
+++ b/packages/@react-spectrum/s2/src/Modal.tsx
@@ -14,9 +14,10 @@ import {colorScheme} from './style-utils' with {type: 'macro'};
 import {ColorSchemeContext} from './Provider';
 import {DOMRef, GlobalDOMAttributes} from '@react-types/shared';
 import {forwardRef, MutableRefObject, useCallback, useContext} from 'react';
-import {ModalOverlay, ModalOverlayProps, Modal as RACModal, useLocale} from 'react-aria-components';
+import {ModalOverlay, ModalOverlayProps, Modal as RACModal} from 'react-aria-components/Modal';
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
+import {useLocale} from 'react-aria/I18nProvider';
 
 interface ModalProps extends Omit<ModalOverlayProps, 'className' | 'style' | 'render' | keyof GlobalDOMAttributes> {
   /**
diff --git a/packages/@react-spectrum/s2/src/NotificationBadge.tsx b/packages/@react-spectrum/s2/src/NotificationBadge.tsx
index b89dd893dee..daa8d921667 100644
--- a/packages/@react-spectrum/s2/src/NotificationBadge.tsx
+++ b/packages/@react-spectrum/s2/src/NotificationBadge.tsx
@@ -11,8 +11,8 @@
  */
 
 import {AriaLabelingProps, DOMProps, DOMRef, DOMRefValue} from '@react-types/shared';
-import {ContextValue, SlotProps} from 'react-aria-components';
-import {filterDOMProps} from '@react-aria/utils';
+import {ContextValue, SlotProps} from 'react-aria-components/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {fontRelative, style} from '../style' with {type: 'macro'};
 import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 // @ts-ignore
@@ -20,7 +20,8 @@ import intlMessages from '../intl/*.json';
 import {NumberFormatter} from '@internationalized/number';
 import React, {createContext, forwardRef} from 'react';
 import {useDOMRef} from './useDOMRef';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface NotificationBadgeStyleProps {
diff --git a/packages/@react-spectrum/s2/src/NumberField.tsx b/packages/@react-spectrum/s2/src/NumberField.tsx
index 028e916c520..0167d8e3909 100644
--- a/packages/@react-spectrum/s2/src/NumberField.tsx
+++ b/packages/@react-spectrum/s2/src/NumberField.tsx
@@ -11,29 +11,26 @@
  */
 
 import Add from '../ui-icons/Add';
-import {
-  ButtonProps as AriaButtonProps,
-  NumberField as AriaNumberField,
-  NumberFieldProps as AriaNumberFieldProps,
-  ButtonContext,
-  ButtonRenderProps,
-  ContextValue,
-  InputContext,
-  InputProps,
-  useContextProps
-} from 'react-aria-components';
+import {ButtonProps as AriaButtonProps, ButtonContext, ButtonRenderProps} from 'react-aria-components/Button';
+import {NumberField as AriaNumberField, NumberFieldProps as AriaNumberFieldProps} from 'react-aria-components/NumberField';
 import {baseColor, space, style} from '../style' with {type: 'macro'};
+import {ContextValue, useContextProps} from 'react-aria-components/utils';
 import {controlBorderRadius, field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {createContext, CSSProperties, ForwardedRef, forwardRef, ReactNode, Ref, useContext, useImperativeHandle, useMemo, useRef} from 'react';
 import {createFocusableRef} from './useDOMRef';
 import Dash from '../ui-icons/Dash';
 import {FieldErrorIcon, FieldGroup, FieldLabel, HelpText, Input} from './Field';
-import {filterDOMProps, mergeProps, mergeRefs} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FormContext, useFormProps} from './Form';
 import {GlobalDOMAttributes, HelpTextProps, SpectrumLabelableProps} from '@react-types/shared';
+import {InputContext, InputProps} from 'react-aria-components/Input';
+import {mergeProps} from 'react-aria/mergeProps';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
 import {pressScale} from './pressScale';
 import {TextFieldRef} from '@react-types/textfield';
-import {useButton, useFocusRing, useHover} from 'react-aria';
+import {useButton} from 'react-aria/useButton';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 
diff --git a/packages/@react-spectrum/s2/src/Picker.tsx b/packages/@react-spectrum/s2/src/Picker.tsx
index a9bbdb318b4..30266e26e9f 100644
--- a/packages/@react-spectrum/s2/src/Picker.tsx
+++ b/packages/@react-spectrum/s2/src/Picker.tsx
@@ -12,31 +12,28 @@
 
 import {
   ListBoxSection as AriaListBoxSection,
-  PopoverProps as AriaPopoverProps,
-  Select as AriaSelect,
-  SelectProps as AriaSelectProps,
-  SelectRenderProps as AriaSelectRenderProps,
-  Button,
-  ButtonRenderProps,
-  Collection,
-  ContextValue,
-  DEFAULT_SLOT,
   ListBox,
   ListBoxItem,
   ListBoxItemProps,
   ListBoxLoadMoreItem,
-  ListBoxProps,
-  ListLayout,
-  Provider,
-  SectionProps,
+  ListBoxProps
+} from 'react-aria-components/ListBox';
+
+import {PopoverProps as AriaPopoverProps} from 'react-aria-components/Popover';
+
+import {
+  Select as AriaSelect,
+  SelectProps as AriaSelectProps,
+  SelectRenderProps as AriaSelectRenderProps,
   SelectStateContext,
-  SelectValue,
-  Virtualizer
-} from 'react-aria-components';
+  SelectValue
+} from 'react-aria-components/Select';
+
 import {AsyncLoadable, FocusableRef, FocusableRefValue, GlobalDOMAttributes, HelpTextProps, LoadingState, PressEvent, RefObject, SpectrumLabelableProps} from '@react-types/shared';
 import {AvatarContext} from './Avatar';
 import {baseColor, focusRing, style} from '../style' with {type: 'macro'};
 import {box, iconStyles as checkboxIconStyles} from './Checkbox';
+import {Button, ButtonRenderProps} from 'react-aria-components/Button';
 import {centerBaseline} from './CenterBaseline';
 import {
   checkbox,
@@ -49,9 +46,11 @@ import {
 } from './Menu';
 import CheckmarkIcon from '../ui-icons/Checkmark';
 import ChevronIcon from '../ui-icons/Chevron';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/utils';
 import {control, controlBorderRadius, controlFont, field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
-import {createHideableComponent} from '@react-aria/collections';
-import {createShadowTreeWalker, getOwnerDocument, isFocusable, useGlobalListeners, useSlotId} from '@react-aria/utils';
+import {createHideableComponent} from 'react-aria/private/collections/Hidden';
+import {createShadowTreeWalker} from 'react-aria/private/utils/shadowdom/ShadowTreeWalker';
 import {
   Divider,
   listbox,
@@ -67,22 +66,30 @@ import {
 } from './Field';
 import {FormContext, useFormProps} from './Form';
 import {forwardRefType} from './types';
+import {getOwnerDocument} from 'react-aria/private/utils/domHelpers';
 import {HeaderContext, HeadingContext, Text, TextContext} from './Content';
 import {IconContext} from './Icon';
-// @ts-ignore
 import intlMessages from '../intl/*.json';
+import {isFocusable} from 'react-aria/private/utils/isFocusable';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
 import {mergeStyles} from '../style/runtime';
-import {Placement} from 'react-aria';
+import {Placement} from '@react-types/overlays';
 import {Popover} from './Popover';
-import {PressResponder} from '@react-aria/interactions';
+// @ts-ignore
+import {PressResponder} from 'react-aria/private/interactions/PressResponder';
 import {pressScale} from './pressScale';
 import {ProgressCircle} from './ProgressCircle';
 import {raw} from '../style/style-macro' with {type: 'macro'};
 import React, {createContext, forwardRef, ReactNode, useContext, useEffect, useMemo, useRef, useState} from 'react';
+import {SectionProps} from 'react-aria-components/Collection';
 import {useFocusableRef} from './useDOMRef';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useGlobalListeners} from 'react-aria/private/utils/useGlobalListeners';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useScale} from './utils';
+import {useSlotId} from 'react-aria/private/utils/useId';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
+import {Virtualizer} from 'react-aria-components/Virtualizer';
 
 export interface PickerStyleProps {
   /**
diff --git a/packages/@react-spectrum/s2/src/Popover.tsx b/packages/@react-spectrum/s2/src/Popover.tsx
index f80d6f43b0d..5dd35100dc5 100644
--- a/packages/@react-spectrum/s2/src/Popover.tsx
+++ b/packages/@react-spectrum/s2/src/Popover.tsx
@@ -10,25 +10,21 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  Popover as AriaPopover,
-  PopoverProps as AriaPopoverProps,
-  composeRenderProps,
-  ContextValue,
-  DialogProps,
-  OverlayArrow,
-  OverlayTriggerStateContext,
-  useLocale
-} from 'react-aria-components';
+import {Popover as AriaPopover, PopoverProps as AriaPopoverProps} from 'react-aria-components/Popover';
+
 import {colorScheme, getAllowedOverrides, heightProperties, UnsafeStyles, widthProperties} from './style-utils' with {type: 'macro'};
 import {ColorSchemeContext} from './Provider';
+import {composeRenderProps, ContextValue} from 'react-aria-components/utils';
 import {createContext, ForwardedRef, forwardRef, ReactNode, useCallback, useContext, useMemo} from 'react';
+import {DialogProps, OverlayTriggerStateContext} from 'react-aria-components/Dialog';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {lightDark, style} from '../style' with {type: 'macro'};
-import {mergeRefs} from '@react-aria/utils';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
 import {mergeStyles} from '../style/runtime';
+import {OverlayArrow} from 'react-aria-components/OverlayArrow';
 import {StyleString} from '../style/types' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
+import {useLocale} from 'react-aria/I18nProvider';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface PopoverProps extends UnsafeStyles, Omit<AriaPopoverProps,
diff --git a/packages/@react-spectrum/s2/src/ProgressBar.tsx b/packages/@react-spectrum/s2/src/ProgressBar.tsx
index a2bf2423e27..c95aa295f04 100644
--- a/packages/@react-spectrum/s2/src/ProgressBar.tsx
+++ b/packages/@react-spectrum/s2/src/ProgressBar.tsx
@@ -10,12 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  ProgressBar as AriaProgressBar,
-  ProgressBarProps as AriaProgressBarProps,
-  ContextValue
-} from 'react-aria-components';
+import {ProgressBar as AriaProgressBar, ProgressBarProps as AriaProgressBarProps} from 'react-aria-components/ProgressBar';
+
 import {bar, track} from './bar-utils'  with {type: 'macro'};
+import {ContextValue} from 'react-aria-components/utils';
 import {createContext, forwardRef, ReactNode} from 'react';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes, LabelPosition} from '@react-types/shared';
 import {FieldLabel} from './Field';
@@ -24,7 +22,7 @@ import {keyframes} from '../style/style-macro' with {type: 'macro'};
 import {mergeStyles} from '../style/runtime';
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
-import {useLocale} from '@react-aria/i18n';
+import {useLocale} from 'react-aria/I18nProvider';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 interface ProgressBarStyleProps {
diff --git a/packages/@react-spectrum/s2/src/ProgressCircle.tsx b/packages/@react-spectrum/s2/src/ProgressCircle.tsx
index c930332cc72..bc346b08bb2 100644
--- a/packages/@react-spectrum/s2/src/ProgressCircle.tsx
+++ b/packages/@react-spectrum/s2/src/ProgressCircle.tsx
@@ -10,12 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {ContextValue, ProgressBar as RACProgressBar, ProgressBarProps as RACProgressBarProps} from 'react-aria-components';
+import {ContextValue} from 'react-aria-components/utils';
+
 import {createContext, forwardRef} from 'react';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {getAllowedOverrides, staticColor, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {keyframes} from '../style/style-macro' with {type: 'macro'};
 import {pxToRem} from './progress-utils' with {type: 'macro'};
+import {ProgressBar as RACProgressBar, ProgressBarProps as RACProgressBarProps} from 'react-aria-components/ProgressBar';
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
diff --git a/packages/@react-spectrum/s2/src/Provider.tsx b/packages/@react-spectrum/s2/src/Provider.tsx
index 704519dc913..5bc39f9d797 100644
--- a/packages/@react-spectrum/s2/src/Provider.tsx
+++ b/packages/@react-spectrum/s2/src/Provider.tsx
@@ -14,11 +14,12 @@ import type {ColorScheme, Router} from '@react-types/provider';
 import {colorScheme, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {createContext, JSX, ReactNode, useContext} from 'react';
 import {DOMProps} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {Fonts} from './Fonts';
 import {generateDefaultColorSchemeStyles} from './page.macro' with {type: 'macro'};
-import {I18nProvider, RouterProvider, useLocale} from 'react-aria-components';
+import {I18nProvider, useLocale} from 'react-aria/I18nProvider';
 import {mergeStyles} from '../style/runtime';
+import {RouterProvider} from 'react-aria/private/utils/openLink';
 import {style} from '../style' with {type: 'macro'};
 import {StyleString} from '../style/types';
 
diff --git a/packages/@react-spectrum/s2/src/RadioGroup.tsx b/packages/@react-spectrum/s2/src/RadioGroup.tsx
index c880e2b6d0a..28266184347 100644
--- a/packages/@react-spectrum/s2/src/RadioGroup.tsx
+++ b/packages/@react-spectrum/s2/src/RadioGroup.tsx
@@ -14,12 +14,13 @@ import {
   Radio as AriaRadio,
   RadioGroup as AriaRadioGroup,
   RadioGroupProps as AriaRadioGroupProps,
-    RadioProps as AriaRadioProps,
-  ContextValue,
+  RadioProps as AriaRadioProps,
   RadioRenderProps
-} from 'react-aria-components';
+} from 'react-aria-components/RadioGroup';
+
 import {baseColor, focusRing, space, style} from '../style' with {type: 'macro'};
 import {CenterBaseline} from './CenterBaseline';
+import {ContextValue} from 'react-aria-components/utils';
 import {controlFont, controlSize, field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {DOMRef, DOMRefValue, FocusableRef, GlobalDOMAttributes, HelpTextProps, Orientation, SpectrumLabelableProps} from '@react-types/shared';
 import {FieldLabel, HelpText} from './Field';
diff --git a/packages/@react-spectrum/s2/src/RangeCalendar.tsx b/packages/@react-spectrum/s2/src/RangeCalendar.tsx
index fc0ae4b1a98..8f466e2202a 100644
--- a/packages/@react-spectrum/s2/src/RangeCalendar.tsx
+++ b/packages/@react-spectrum/s2/src/RangeCalendar.tsx
@@ -12,24 +12,24 @@
 
 import {
   RangeCalendar as AriaRangeCalendar,
-  RangeCalendarProps as AriaRangeCalendarProps,
-  ContextValue,
-  DateValue,
-  Provider,
-  Text
-} from 'react-aria-components';
+  RangeCalendarProps as AriaRangeCalendarProps
+} from 'react-aria-components/Calendar';
+
 import {CalendarButton, CalendarGrid, CalendarHeading} from './Calendar';
 import ChevronLeftIcon from '../s2wf-icons/S2_Icon_ChevronLeft_20_N.svg';
 import ChevronRightIcon from '../s2wf-icons/S2_Icon_ChevronRight_20_N.svg';
+import {ContextValue, Provider} from 'react-aria-components/utils';
 import {createContext, ForwardedRef, forwardRef, ReactNode} from 'react';
+import {DateValue} from '@react-types/datepicker';
 import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared';
 import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
-import {Header, HeaderContext, HeadingContext} from './';
+import {Header, HeaderContext, HeadingContext} from './Content';
 import {helpTextStyles} from './Field';
-// @ts-ignore
 import intlMessages from '../intl/*.json';
+// @ts-ignore
 import {style} from '../style' with {type: 'macro'};
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {Text} from 'react-aria-components/Text';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 
diff --git a/packages/@react-spectrum/s2/src/RangeSlider.tsx b/packages/@react-spectrum/s2/src/RangeSlider.tsx
index 491743a5d8c..ea1f67a8ea1 100644
--- a/packages/@react-spectrum/s2/src/RangeSlider.tsx
+++ b/packages/@react-spectrum/s2/src/RangeSlider.tsx
@@ -10,20 +10,19 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  ContextValue,
-  SliderThumb,
-  SliderTrack
-} from 'react-aria-components';
+import {ContextValue} from 'react-aria-components/utils';
+
 import {createContext, forwardRef, useContext, useRef} from 'react';
 import {filledTrack, SliderBase, SliderBaseProps, thumb, thumbContainer, thumbHitArea, track, upperTrack} from './Slider';
 import {FocusableRef, FocusableRefValue, RangeValue} from '@react-types/shared';
 import {FormContext, useFormProps} from './Form';
-// @ts-ignore
 import intlMessages from '../intl/*.json';
+// @ts-ignore
 import {pressScale} from './pressScale';
+import {SliderThumb, SliderTrack} from 'react-aria-components/Slider';
 import {useFocusableRef} from './useDOMRef';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface RangeSliderProps extends Omit<SliderBaseProps<RangeValue<number>>, 'children'> {
diff --git a/packages/@react-spectrum/s2/src/SearchField.tsx b/packages/@react-spectrum/s2/src/SearchField.tsx
index f22b38ef70a..febac5d21bf 100644
--- a/packages/@react-spectrum/s2/src/SearchField.tsx
+++ b/packages/@react-spectrum/s2/src/SearchField.tsx
@@ -10,16 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  SearchField as AriaSearchField,
-  SearchFieldProps as AriaSearchFieldProps,
-  ContextValue,
-  InputProps,
-  Provider
-} from 'react-aria-components';
+import {SearchField as AriaSearchField, SearchFieldProps as AriaSearchFieldProps} from 'react-aria-components/SearchField';
+
 import {baseColor, fontRelative, style} from '../style' with {type: 'macro'};
 import {centerBaseline} from './CenterBaseline';
 import {ClearButton} from './ClearButton';
+import {ContextValue, Provider} from 'react-aria-components/utils';
 import {createContext, forwardRef, Ref, useContext, useImperativeHandle, useRef} from 'react';
 import {createFocusableRef} from './useDOMRef';
 import {field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
@@ -27,6 +23,7 @@ import {FieldGroup, FieldLabel, HelpText, Input} from './Field';
 import {FormContext, useFormProps} from './Form';
 import {GlobalDOMAttributes, HelpTextProps, SpectrumLabelableProps} from '@react-types/shared';
 import {IconContext} from './Icon';
+import {InputProps} from 'react-aria-components/Input';
 import {raw} from '../style/style-macro' with {type: 'macro'};
 import SearchIcon from '../s2wf-icons/S2_Icon_Search_20_N.svg';
 import {TextFieldRef} from '@react-types/textfield';
diff --git a/packages/@react-spectrum/s2/src/SegmentedControl.tsx b/packages/@react-spectrum/s2/src/SegmentedControl.tsx
index a06ca907b15..e36fa0feca3 100644
--- a/packages/@react-spectrum/s2/src/SegmentedControl.tsx
+++ b/packages/@react-spectrum/s2/src/SegmentedControl.tsx
@@ -13,14 +13,18 @@
 import {AriaLabelingProps, DOMRef, DOMRefValue, FocusableRef, Key} from '@react-types/shared';
 import {baseColor, focusRing, style} from '../style' with {type: 'macro'};
 import {centerBaseline} from './CenterBaseline';
-import {ContextValue, DEFAULT_SLOT, Provider, TextContext as RACTextContext, SelectionIndicator, SlotProps, ToggleButton, ToggleButtonGroup, ToggleButtonRenderProps, ToggleGroupStateContext} from 'react-aria-components';
+import {ContextValue, DEFAULT_SLOT, Provider, SlotProps} from 'react-aria-components/utils';
 import {control, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {createContext, forwardRef, ReactNode, useCallback, useContext, useRef} from 'react';
 import {IconContext} from './Icon';
 import {pressScale} from './pressScale';
+import {TextContext as RACTextContext} from 'react-aria-components/Text';
+import {SelectionIndicator} from 'react-aria-components/SelectionIndicator';
 import {Text, TextContext} from './Content';
+import {ToggleButton, ToggleButtonRenderProps} from 'react-aria-components/ToggleButton';
+import {ToggleButtonGroup, ToggleGroupStateContext} from 'react-aria-components/ToggleButtonGroup';
 import {useDOMRef, useFocusableRef} from './useDOMRef';
-import {useLayoutEffect} from '@react-aria/utils';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface SegmentedControlProps extends AriaLabelingProps, StyleProps, SlotProps {
diff --git a/packages/@react-spectrum/s2/src/SelectBoxGroup.tsx b/packages/@react-spectrum/s2/src/SelectBoxGroup.tsx
index 3b6f40b20d4..7bbda4031b0 100644
--- a/packages/@react-spectrum/s2/src/SelectBoxGroup.tsx
+++ b/packages/@react-spectrum/s2/src/SelectBoxGroup.tsx
@@ -12,22 +12,16 @@
 import {baseColor, focusRing, style} from '../style' with {type: 'macro'};
 import {box, iconStyles} from './Checkbox';
 import Checkmark from '../ui-icons/Checkmark';
-import {
-  ContextValue,
-  DEFAULT_SLOT,
-  ListBox,
-  ListBoxItem,
-  ListBoxProps,
-  Provider
-} from 'react-aria-components';
+import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/utils';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes, Key, Orientation} from '@react-types/shared';
 import {forwardRefType} from './types';
 import {getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {IllustrationContext} from '../src/Icon';
+import {ListBox, ListBoxItem, ListBoxProps} from 'react-aria-components/ListBox';
 import {pressScale} from './pressScale';
 import React, {createContext, forwardRef, ReactNode, useContext, useMemo, useRef} from 'react';
 import {TextContext} from './Content';
-import {useFocusVisible} from 'react-aria';
+import {useFocusVisible} from 'react-aria/useFocusVisible';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface SelectBoxGroupProps<T> extends StyleProps, Omit<ListBoxProps<T>, keyof GlobalDOMAttributes | 'layout' | 'dragAndDropHooks' | 'dependencies' | 'renderEmptyState' | 'children' | 'onAction' | 'shouldFocusOnHover' | 'selectionBehavior' | 'shouldSelectOnPressUp' | 'shouldFocusWrap' | 'style' | 'className' | 'render'> {
diff --git a/packages/@react-spectrum/s2/src/Skeleton.tsx b/packages/@react-spectrum/s2/src/Skeleton.tsx
index 5c61ad33595..7076611fa69 100644
--- a/packages/@react-spectrum/s2/src/Skeleton.tsx
+++ b/packages/@react-spectrum/s2/src/Skeleton.tsx
@@ -12,7 +12,8 @@
 
 import {cloneElement, createContext, CSSProperties, ReactElement, ReactNode, Ref, useCallback, useContext, useRef} from 'react';
 import {color, style} from '../style' with {type: 'macro'};
-import {inertValue, mergeRefs} from '@react-aria/utils';
+import {inertValue} from 'react-aria/private/utils/inertValue';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
 import {mergeStyles} from '../style/runtime';
 import {raw} from '../style/style-macro' with {type: 'macro'};
 import {StyleString} from '../style/types';
diff --git a/packages/@react-spectrum/s2/src/SkeletonCollection.tsx b/packages/@react-spectrum/s2/src/SkeletonCollection.tsx
index ca2d2206bb1..b41d6fa6f94 100644
--- a/packages/@react-spectrum/s2/src/SkeletonCollection.tsx
+++ b/packages/@react-spectrum/s2/src/SkeletonCollection.tsx
@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {CollectionNode, createLeafComponent} from '@react-aria/collections';
+import {CollectionNode} from 'react-aria/private/collections/BaseCollection';
+
+import {createLeafComponent} from 'react-aria/private/collections/CollectionBuilder';
 import {ReactNode} from 'react';
 import {Skeleton} from './Skeleton';
 
diff --git a/packages/@react-spectrum/s2/src/Slider.tsx b/packages/@react-spectrum/s2/src/Slider.tsx
index 4d1552c4a27..df40c31853e 100644
--- a/packages/@react-spectrum/s2/src/Slider.tsx
+++ b/packages/@react-spectrum/s2/src/Slider.tsx
@@ -13,13 +13,14 @@
 import {
   Slider as AriaSlider,
   SliderProps as AriaSliderProps,
-  ContextValue,
   SliderOutput,
   SliderThumb,
   SliderThumbRenderProps,
   SliderTrack
-} from 'react-aria-components';
-import {clamp} from '@react-aria/utils';
+} from 'react-aria-components/Slider';
+
+import {clamp} from 'react-stately/private/utils/number';
+import {ContextValue} from 'react-aria-components/utils';
 import {controlFont, field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {createContext, forwardRef, ReactNode, RefObject, useContext, useRef} from 'react';
 import {FieldLabel} from './Field';
@@ -29,7 +30,8 @@ import {FormContext, useFormProps} from './Form';
 import {mergeStyles} from '../style/runtime';
 import {pressScale} from './pressScale';
 import {useFocusableRef} from './useDOMRef';
-import {useLocale, useNumberFormatter} from '@react-aria/i18n';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useNumberFormatter} from 'react-aria/useNumberFormatter';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface SliderBaseProps<T> extends Omit<AriaSliderProps<T>, 'children' | 'style' | 'className' | 'render' | 'orientation' | keyof GlobalDOMAttributes>, Omit<SpectrumLabelableProps, 'necessityIndicator' | 'isRequired'>, StyleProps {
diff --git a/packages/@react-spectrum/s2/src/StatusLight.tsx b/packages/@react-spectrum/s2/src/StatusLight.tsx
index 7e1d2160897..f92505f74b0 100644
--- a/packages/@react-spectrum/s2/src/StatusLight.tsx
+++ b/packages/@react-spectrum/s2/src/StatusLight.tsx
@@ -12,10 +12,10 @@
 
 import {AriaLabelingProps, DOMProps, DOMRef, DOMRefValue} from '@react-types/shared';
 import {CenterBaseline} from './CenterBaseline';
-import {ContextValue, SlotProps} from 'react-aria-components';
+import {ContextValue, SlotProps} from 'react-aria-components/utils';
 import {controlFont, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {createContext, forwardRef, ReactNode} from 'react';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {style} from '../style' with {type: 'macro'};
 import {Text} from './Content';
 import {useDOMRef} from './useDOMRef';
diff --git a/packages/@react-spectrum/s2/src/Switch.tsx b/packages/@react-spectrum/s2/src/Switch.tsx
index fd8e65a8098..937aaf15f92 100644
--- a/packages/@react-spectrum/s2/src/Switch.tsx
+++ b/packages/@react-spectrum/s2/src/Switch.tsx
@@ -10,21 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  Switch as AriaSwitch,
-  SwitchProps as AriaSwitchProps,
-  ContextValue,
-  SwitchRenderProps,
-  useLocale
-} from 'react-aria-components';
+import {Switch as AriaSwitch, SwitchProps as AriaSwitchProps, SwitchRenderProps} from 'react-aria-components/Switch';
+
 import {baseColor, focusRing, fontRelative, style} from '../style' with {type: 'macro'};
 import {CenterBaseline} from './CenterBaseline';
+import {ContextValue} from 'react-aria-components/utils';
 import {controlFont, controlSize, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {createContext, forwardRef, ReactNode, useContext, useRef} from 'react';
 import {Direction, FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {FormContext, useFormProps} from './Form';
 import {pressScale} from './pressScale';
 import {useFocusableRef} from './useDOMRef';
+import {useLocale} from 'react-aria/I18nProvider';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 interface SwitchStyleProps {
diff --git a/packages/@react-spectrum/s2/src/TableView.tsx b/packages/@react-spectrum/s2/src/TableView.tsx
index c09f394a0ba..b22bdd6b237 100644
--- a/packages/@react-spectrum/s2/src/TableView.tsx
+++ b/packages/@react-spectrum/s2/src/TableView.tsx
@@ -12,27 +12,18 @@
 
 import {ActionButton, ActionButtonContext} from './ActionButton';
 import {baseColor, colorMix, focusRing, fontRelative, lightDark, space, style} from '../style' with {type: 'macro'};
+import {Button, ButtonContext} from 'react-aria-components/Button';
+
+import {ButtonGroup} from './ButtonGroup';
+
 import {
-  Button,
-  ButtonContext,
   CellRenderProps,
-  Collection,
-  CollectionRendererContext,
   ColumnRenderProps,
   ColumnResizer,
-  ContextValue,
-  DEFAULT_SLOT,
-  DefaultCollectionRenderer,
-  Form,
-  Key,
-  OverlayTriggerStateContext,
-  Provider,
   Cell as RACCell,
   CellProps as RACCellProps,
-  CheckboxContext as RACCheckboxContext,
   Column as RACColumn,
   ColumnProps as RACColumnProps,
-  Popover as RACPopover,
   Row as RACRow,
   RowProps as RACRowProps,
   Table as RACTable,
@@ -41,47 +32,58 @@ import {
   TableHeader as RACTableHeader,
   TableHeaderProps as RACTableHeaderProps,
   TableProps as RACTableProps,
-  Rect,
   ResizableTableContainer,
   RowRenderProps,
   TableBodyRenderProps,
   TableLayout,
   TableLoadMoreItem,
   TableRenderProps,
-  useSlottedContext,
-  useTableOptions,
-  Virtualizer
-} from 'react-aria-components';
-import {ButtonGroup} from './ButtonGroup';
+  useTableOptions
+} from 'react-aria-components/Table';
 import {centerPadding, colorScheme, controlFont, getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {Checkbox} from './Checkbox';
 import Checkmark from '../s2wf-icons/S2_Icon_Checkmark_20_N.svg';
 import Chevron from '../ui-icons/Chevron';
 import Close from '../s2wf-icons/S2_Icon_Close_20_N.svg';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {CollectionRendererContext, DefaultCollectionRenderer} from 'react-aria-components/Collection';
 import {ColumnSize} from '@react-types/table';
-import {CustomDialog, DialogContainer} from '..';
+import {ContextValue, DEFAULT_SLOT, Provider, useSlottedContext} from 'react-aria-components/utils';
+import {CustomDialog} from './CustomDialog';
+import {DialogContainer} from './DialogContainer';
 import {DOMProps, DOMRef, DOMRefValue, forwardRefType, GlobalDOMAttributes, LinkDOMProps, LoadingState, Node} from '@react-types/shared';
-import {getActiveElement, getOwnerDocument, isFocusWithin, nodeContains, useLayoutEffect, useObjectRef} from '@react-aria/utils';
+import {Form} from 'react-aria-components/Form';
+import {getActiveElement, isFocusWithin, nodeContains} from 'react-aria/private/utils/shadowdom/DOMFunctions';
+import {getOwnerDocument} from 'react-aria/private/utils/domHelpers';
 import {GridNode} from '@react-types/grid';
 import {IconContext} from './Icon';
-// @ts-ignore
 import intlMessages from '../intl/*.json';
-import {LayoutNode} from '@react-stately/layout';
+import {Key} from '@react-types/shared';
+import {LayoutNode} from 'react-stately/private/layout/ListLayout';
 import {Menu, MenuItem, MenuSection, MenuTrigger} from './Menu';
 import Nubbin from '../ui-icons/S2_MoveHorizontalTableWidget.svg';
+import {OverlayTriggerStateContext} from 'react-aria-components/Dialog';
 import {ProgressCircle} from './ProgressCircle';
+import {CheckboxContext as RACCheckboxContext} from 'react-aria-components/Checkbox';
+// @ts-ignore
+import {Popover as RACPopover} from 'react-aria-components/Popover';
 import {raw} from '../style/style-macro' with {type: 'macro'};
 import React, {createContext, CSSProperties, FormEvent, FormHTMLAttributes, ForwardedRef, forwardRef, ReactElement, ReactNode, RefObject, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
+import {Rect} from 'react-stately/private/virtualizer/Rect';
 import SortDownArrow from '../s2wf-icons/S2_Icon_SortDown_20_N.svg';
 import SortUpArrow from '../s2wf-icons/S2_Icon_SortUp_20_N.svg';
 import {Button as SpectrumButton} from './Button';
 import {useActionBarContainer} from './ActionBar';
 import {useDOMRef} from './useDOMRef';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useMediaQuery} from './useMediaQuery';
+import {useObjectRef} from 'react-aria/useObjectRef';
 import {useScale} from './utils';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
-import {VisuallyHidden} from 'react-aria';
+import {Virtualizer} from 'react-aria-components/Virtualizer';
+import {VisuallyHidden} from 'react-aria/VisuallyHidden';
 
 interface S2TableProps {
   /** Whether the Table should be displayed with a quiet style. */
@@ -905,7 +907,7 @@ export const TableHeader = /*#__PURE__*/ (forwardRef as forwardRefType)(function
   let domRef = useDOMRef(ref);
 
   return (
-    <RACTableHeader
+    (<RACTableHeader
       // @ts-ignore
       ref={domRef}
       className={tableHeader}>
@@ -913,7 +915,7 @@ export const TableHeader = /*#__PURE__*/ (forwardRef as forwardRefType)(function
       {selectionBehavior === 'toggle' && (
         // Also isSticky prop is applied just for the layout, will decide what the RAC api should be later
         // @ts-ignore
-        <RACColumn isSticky width={scale === 'medium' ? 40 : 52} minWidth={scale === 'medium' ? 40 : 52} className={selectAllCheckboxColumn({isQuiet})}>
+        (<RACColumn isSticky width={scale === 'medium' ? 40 : 52} minWidth={scale === 'medium' ? 40 : 52} className={selectAllCheckboxColumn({isQuiet})}>
           {({isFocusVisible}) => (
             <>
               {selectionMode === 'single' &&
@@ -927,12 +929,12 @@ export const TableHeader = /*#__PURE__*/ (forwardRef as forwardRefType)(function
               }
             </>
           )}
-        </RACColumn>
+        </RACColumn>)
       )}
       <Collection items={columns} dependencies={dependencies}>
         {children}
       </Collection>
-    </RACTableHeader>
+    </RACTableHeader>)
   );
 });
 
@@ -1467,7 +1469,7 @@ function EditableCellInner(props: EditableCellProps & {isFocusVisible: boolean,
       </Provider>
     </Provider>
   );
-};
+}
 
 // Use color-mix instead of transparency so sticky cells work correctly.
 const selectedBackground = colorMix('gray-25', 'gray-900', 7);
@@ -1576,7 +1578,7 @@ export const Row = /*#__PURE__*/ (forwardRef as forwardRefType)(function Row<T e
   let domRef = useDOMRef(ref);
 
   return (
-    <RACRow
+    (<RACRow
       // @ts-ignore
       ref={domRef}
       id={id}
@@ -1590,13 +1592,13 @@ export const Row = /*#__PURE__*/ (forwardRef as forwardRefType)(function Row<T e
         // Not sure what we want to do with this className, in Cell it currently overrides the className that would have been applied.
         // The `spread` otherProps must be after className in Cell.
         // @ts-ignore
-        <Cell isSticky className={checkboxCellStyle}>
+        (<Cell isSticky className={checkboxCellStyle}>
           <Checkbox slot="selection" styles={selectionCheckbox} />
-        </Cell>
+        </Cell>)
       )}
       <Collection items={columns} dependencies={[...dependencies, columns]}>
         {children}
       </Collection>
-    </RACRow>
+    </RACRow>)
   );
 });
diff --git a/packages/@react-spectrum/s2/src/Tabs.tsx b/packages/@react-spectrum/s2/src/Tabs.tsx
index 2f6b89ca8ad..5e15678da85 100644
--- a/packages/@react-spectrum/s2/src/Tabs.tsx
+++ b/packages/@react-spectrum/s2/src/Tabs.tsx
@@ -16,30 +16,35 @@ import {
   TabPanelProps as AriaTabPanelProps,
   TabProps as AriaTabProps,
   TabsProps as AriaTabsProps,
-  ContextValue,
-  Group,
-  Provider,
   Tab as RACTab,
   TabList as RACTabList,
   Tabs as RACTabs,
-  SelectionIndicator,
   TabListStateContext,
   TabRenderProps
-} from 'react-aria-components';
+} from 'react-aria-components/Tabs';
+
 import {baseColor, focusRing, size, style} from '../style' with {type: 'macro'};
 import {centerBaseline} from './CenterBaseline';
 import {Collection, DOMRef, DOMRefValue, GlobalDOMAttributes, Key, Node, Orientation, RefObject} from '@react-types/shared';
-import {CollectionBuilder} from '@react-aria/collections';
+import {CollectionBuilder} from 'react-aria/private/collections/CollectionBuilder';
+import {ContextValue, Provider} from 'react-aria-components/utils';
 import {createContext, forwardRef, ReactNode, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
 import {getAllowedOverrides, StyleProps, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
+import {Group} from 'react-aria-components/Group';
 import {IconContext} from './Icon';
-import {inertValue, useEffectEvent, useId, useLabels, useLayoutEffect, useResizeObserver} from '@react-aria/utils';
+import {inertValue} from 'react-aria/private/utils/inertValue';
 import {Picker, PickerItem} from './TabsPicker';
+import {SelectionIndicator} from 'react-aria-components/SelectionIndicator';
 import {Text, TextContext} from './Content';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from 'react-stately/private/utils/useControlledState';
 import {useDOMRef} from './useDOMRef';
-import {useHasTabbableChild} from '@react-aria/focus';
-import {useLocale} from '@react-aria/i18n';
+import {useEffectEvent} from 'react-aria/private/utils/useEffectEvent';
+import {useHasTabbableChild} from 'react-aria/private/focus/useHasTabbableChild';
+import {useId} from 'react-aria/useId';
+import {useLabels} from 'react-aria/private/utils/useLabels';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface TabsProps extends Omit<AriaTabsProps, 'className' | 'style' | 'render' | 'children' | keyof GlobalDOMAttributes>, UnsafeStyles {
diff --git a/packages/@react-spectrum/s2/src/TabsPicker.tsx b/packages/@react-spectrum/s2/src/TabsPicker.tsx
index 083bd7f23d2..7bd3d645290 100644
--- a/packages/@react-spectrum/s2/src/TabsPicker.tsx
+++ b/packages/@react-spectrum/s2/src/TabsPicker.tsx
@@ -9,21 +9,11 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {
-  PopoverProps as AriaPopoverProps,
-  Select as AriaSelect,
-  SelectProps as AriaSelectProps,
-  Button,
-  ContextValue,
-  DEFAULT_SLOT,
-  ListBox,
-  ListBoxItem,
-  ListBoxItemProps,
-  ListBoxProps,
-  Provider,
-  SelectValue
-} from 'react-aria-components';
+import {PopoverProps as AriaPopoverProps} from 'react-aria-components/Popover';
+
+import {Select as AriaSelect, SelectProps as AriaSelectProps, SelectValue} from 'react-aria-components/Select';
 import {baseColor, focusRing, size, style} from '../style' with {type: 'macro'};
+import {Button} from 'react-aria-components/Button';
 import {centerBaseline} from './CenterBaseline';
 import {
   checkmark,
@@ -36,6 +26,7 @@ import {
 } from './Menu';
 import CheckmarkIcon from '../ui-icons/Checkmark';
 import ChevronIcon from '../ui-icons/Chevron';
+import {ContextValue, DEFAULT_SLOT, Provider} from 'react-aria-components/utils';
 import {controlFont, fieldInput, StyleProps} from './style-utils' with {type: 'macro'};
 import {edgeToText} from '../style/spectrum-theme' with {type: 'macro'};
 import {
@@ -45,13 +36,15 @@ import {FocusableRef, FocusableRefValue, SpectrumLabelableProps} from '@react-ty
 import {forwardRefType} from './types';
 import {HeaderContext, HeadingContext, Text, TextContext} from './Content';
 import {IconContext} from './Icon';
-import {Placement, useLocale} from 'react-aria';
+import {ListBox, ListBoxItem, ListBoxItemProps, ListBoxProps} from 'react-aria-components/ListBox';
+import {Placement} from '@react-types/overlays';
 import {Popover} from './Popover';
 import {pressScale} from './pressScale';
 import {raw} from '../style/style-macro' with {type: 'macro'};
 import React, {createContext, forwardRef, ReactNode, useContext, useRef} from 'react';
 import {useFocusableRef} from './useDOMRef';
 import {useFormProps} from './Form';
+import {useLocale} from 'react-aria/I18nProvider';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 export interface PickerStyleProps {
 }
diff --git a/packages/@react-spectrum/s2/src/TagGroup.tsx b/packages/@react-spectrum/s2/src/TagGroup.tsx
index fc5ff467e37..c4c2014869b 100644
--- a/packages/@react-spectrum/s2/src/TagGroup.tsx
+++ b/packages/@react-spectrum/s2/src/TagGroup.tsx
@@ -12,27 +12,23 @@
 
 import {ActionButton} from './ActionButton';
 import AlertIcon from '../s2wf-icons/S2_Icon_AlertTriangle_20_N.svg';
+
 import {
   Tag as AriaTag,
   TagGroup as AriaTagGroup,
   TagGroupProps as AriaTagGroupProps,
   TagProps as AriaTagProps,
-  composeRenderProps,
-  ContextValue,
-  Provider,
-  ButtonContext as RACButtonContext,
-  TextContext as RACTextContext,
   TagList,
   TagListProps,
-  TagRenderProps,
-  useLocale,
-  useSlottedContext
-} from 'react-aria-components';
+  TagRenderProps
+} from 'react-aria-components/TagGroup';
+
 import {AvatarContext} from './Avatar';
 import {baseColor, focusRing, fontRelative, lightDark, style} from '../style' with { type: 'macro' };
 import {CenterBaseline, centerBaseline} from './CenterBaseline';
 import {ClearButton} from './ClearButton';
-import {Collection, CollectionBuilder} from '@react-aria/collections';
+import {Collection, CollectionBuilder} from 'react-aria/private/collections/CollectionBuilder';
+import {composeRenderProps, ContextValue, Provider, useSlottedContext} from 'react-aria-components/utils';
 import {control, field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {createContext, forwardRef, ReactNode, useContext, useEffect, useMemo, useRef, useState} from 'react';
 import {DOMRef, DOMRefValue, GlobalDOMAttributes, HelpTextProps, LabelableProps, Node, SpectrumLabelableProps} from '@react-types/shared';
@@ -42,13 +38,20 @@ import {FormContext, useFormProps} from './Form';
 import {forwardRefType} from './types';
 import {IconContext} from './Icon';
 import {ImageContext} from './Image';
-import {inertValue, useEffectEvent, useId, useLayoutEffect, useResizeObserver} from '@react-aria/utils';
-// @ts-ignore
+import {inertValue} from 'react-aria/private/utils/inertValue';
 import intlMessages from '../intl/*.json';
 import {pressScale} from './pressScale';
+import {ButtonContext as RACButtonContext} from 'react-aria-components/Button';
+import {TextContext as RACTextContext} from 'react-aria-components/Text';
 import {Text, TextContext} from './Content';
 import {useDOMRef} from './useDOMRef';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useEffectEvent} from 'react-aria/private/utils/useEffectEvent';
+// @ts-ignore
+import {useId} from 'react-aria/useId';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 // Get types from RSP and extend those?
diff --git a/packages/@react-spectrum/s2/src/TextField.tsx b/packages/@react-spectrum/s2/src/TextField.tsx
index 3a892067be3..9046e155bba 100644
--- a/packages/@react-spectrum/s2/src/TextField.tsx
+++ b/packages/@react-spectrum/s2/src/TextField.tsx
@@ -10,24 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  TextArea as AriaTextArea,
-  TextAreaContext as AriaTextAreaContext,
-  TextField as AriaTextField,
-  TextFieldProps as AriaTextFieldProps,
-  composeRenderProps,
-  ContextValue,
-  InputContext,
-  InputProps,
-  useSlottedContext
-} from 'react-aria-components';
+import {TextArea as AriaTextArea, TextAreaContext as AriaTextAreaContext} from 'react-aria-components/TextArea';
+
+import {TextField as AriaTextField, TextFieldProps as AriaTextFieldProps} from 'react-aria-components/TextField';
 import {centerPadding, controlSize, field, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
+import {composeRenderProps, ContextValue, useSlottedContext} from 'react-aria-components/utils';
 import {createContext, forwardRef, ReactNode, Ref, useContext, useImperativeHandle, useRef} from 'react';
 import {createFocusableRef} from './useDOMRef';
 import {FieldErrorIcon, FieldGroup, FieldLabel, HelpText, Input} from './Field';
 import {FormContext, useFormProps} from './Form';
 import {GlobalDOMAttributes, HelpTextProps, RefObject, SpectrumLabelableProps} from '@react-types/shared';
-import {mergeRefs} from '@react-aria/utils';
+import {InputContext, InputProps} from 'react-aria-components/Input';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
 import {style} from '../style' with {type: 'macro'};
 import {StyleString} from '../style/types';
 import {TextFieldRef} from '@react-types/textfield';
diff --git a/packages/@react-spectrum/s2/src/TimeField.tsx b/packages/@react-spectrum/s2/src/TimeField.tsx
index 2909dfce5df..fd544093ef1 100644
--- a/packages/@react-spectrum/s2/src/TimeField.tsx
+++ b/packages/@react-spectrum/s2/src/TimeField.tsx
@@ -10,19 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  TimeField as AriaTimeField,
-  TimeFieldProps as AriaTimeFieldProps,
-  ContextValue,
-  FormContext,
-  TimeValue
-} from 'react-aria-components';
+import {TimeField as AriaTimeField, TimeFieldProps as AriaTimeFieldProps} from 'react-aria-components/DateField';
+
+import {ContextValue} from 'react-aria-components/utils';
 import {createContext, forwardRef, ReactElement, Ref, useContext} from 'react';
 import {DateInput, DateInputContainer, InvalidIndicator} from './DateField';
 import {field, fieldInput, getAllowedOverrides, StyleProps} from './style-utils' with {type: 'macro'};
 import {FieldGroup, FieldLabel, HelpText} from './Field';
+import {FormContext} from 'react-aria-components/Form';
 import {forwardRefType, GlobalDOMAttributes, HelpTextProps, SpectrumLabelableProps} from '@react-types/shared';
 import {style} from '../style' with {type: 'macro'};
+import {TimeValue} from '@react-types/datepicker';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 
diff --git a/packages/@react-spectrum/s2/src/Toast.tsx b/packages/@react-spectrum/s2/src/Toast.tsx
index b0f02021995..0507726bcb4 100644
--- a/packages/@react-spectrum/s2/src/Toast.tsx
+++ b/packages/@react-spectrum/s2/src/Toast.tsx
@@ -19,19 +19,34 @@ import Chevron from '../s2wf-icons/S2_Icon_ChevronDown_20_N.svg';
 import {CloseButton} from './CloseButton';
 import {createContext, ReactNode, useContext, useEffect, useMemo, useRef} from 'react';
 import {DOMProps} from '@react-types/shared';
-import {filterDOMProps, getEventTarget, isWebKit, useEvent} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {flushSync} from 'react-dom';
 import {focusRing, style} from '../style' with {type: 'macro'};
-import {FocusScope, useModalOverlay} from 'react-aria';
+import {FocusScope} from 'react-aria/FocusScope';
+import {getEventTarget} from 'react-aria/private/utils/shadowdom/DOMFunctions';
 import InfoIcon from '../s2wf-icons/S2_Icon_InfoCircle_20_N.svg';
-// @ts-ignore
 import intlMessages from '../intl/*.json';
-import {ToastOptions as RACToastOptions, UNSTABLE_Toast as Toast, UNSTABLE_ToastContent as ToastContent, UNSTABLE_ToastList as ToastList, ToastProps, UNSTABLE_ToastQueue as ToastQueue, UNSTABLE_ToastRegion as ToastRegion, ToastRegionProps, UNSTABLE_ToastStateContext as ToastStateContext} from 'react-aria-components';
+import {isWebKit} from 'react-aria/private/utils/platform';
+import {ToastOptions as RACToastOptions, ToastQueue} from 'react-stately/useToastState';
+// @ts-ignore
 import {Text} from './Content';
+import {
+  UNSTABLE_Toast as Toast,
+  UNSTABLE_ToastContent as ToastContent,
+  UNSTABLE_ToastList as ToastList,
+  ToastProps,
+  UNSTABLE_ToastRegion as ToastRegion,
+  ToastRegionProps,
+  UNSTABLE_ToastStateContext as ToastStateContext
+} from 'react-aria-components/Toast';
+
 import toastCss from './Toast.module.css';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+
+import {useEvent} from 'react-aria/private/utils/useEvent';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useMediaQuery} from './useMediaQuery';
-import {useOverlayTriggerState} from 'react-stately';
+import {useModalOverlay} from 'react-aria/useModalOverlay';
+import {useOverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 
 export type ToastPlacement = 'top' | 'top end' | 'bottom' | 'bottom end';
 export interface ToastContainerProps extends Omit<ToastRegionProps<SpectrumToastValue>, 'queue' | 'children' | 'style' | 'className' | 'render'> {
@@ -396,7 +411,7 @@ export function ToastContainer(props: ToastContainerProps): ReactNode {
   }, [reduceMotion]);
 
   return (
-    <ToastRegion
+    (<ToastRegion
       {...props}
       ref={regionRef}
       queue={queue}
@@ -410,9 +425,9 @@ export function ToastContainer(props: ToastContainerProps): ReactNode {
         <ToastContainerContext.Provider value={ctx}>
           {isExpanded && (
             // eslint-disable-next-line
-            <div
+            (<div
               className={toastCss['toast-background'] + style({position: 'fixed', inset: 0, backgroundColor: 'transparent-black-500'})}
-              onClick={collapse} />
+              onClick={collapse} />)
           )}
           <SpectrumToastList
             placement={placement}
@@ -435,7 +450,7 @@ export function ToastContainer(props: ToastContainerProps): ReactNode {
           </div>
         </ToastContainerContext.Provider>
       </FocusScope>
-    </ToastRegion>
+    </ToastRegion>)
   );
 }
 
diff --git a/packages/@react-spectrum/s2/src/ToggleButton.tsx b/packages/@react-spectrum/s2/src/ToggleButton.tsx
index e2176403237..3fcb19fb862 100644
--- a/packages/@react-spectrum/s2/src/ToggleButton.tsx
+++ b/packages/@react-spectrum/s2/src/ToggleButton.tsx
@@ -12,12 +12,13 @@
 
 import {ActionButtonStyleProps, btnStyles} from './ActionButton';
 import {centerBaseline} from './CenterBaseline';
-import {ContextValue, Provider, ToggleButton as RACToggleButton, ToggleButtonProps as RACToggleButtonProps, useSlottedContext} from 'react-aria-components';
+import {ContextValue, Provider, useSlottedContext} from 'react-aria-components/utils';
 import {createContext, forwardRef, ReactNode} from 'react';
 import {FocusableRef, FocusableRefValue, GlobalDOMAttributes} from '@react-types/shared';
 import {fontRelative, style} from '../style' with {type: 'macro'};
 import {IconContext} from './Icon';
 import {pressScale} from './pressScale';
+import {ToggleButton as RACToggleButton, ToggleButtonProps as RACToggleButtonProps} from 'react-aria-components/ToggleButton';
 import {SkeletonContext} from './Skeleton';
 import {StyleProps} from './style-utils';
 import {Text, TextContext} from './Content';
diff --git a/packages/@react-spectrum/s2/src/ToggleButtonGroup.tsx b/packages/@react-spectrum/s2/src/ToggleButtonGroup.tsx
index a45ebd3fc60..2df87401101 100644
--- a/packages/@react-spectrum/s2/src/ToggleButtonGroup.tsx
+++ b/packages/@react-spectrum/s2/src/ToggleButtonGroup.tsx
@@ -11,9 +11,15 @@
  */
 
 import {ActionButtonGroupProps, actionGroupStyle} from './ActionButtonGroup';
-import {ContextValue, ToggleButtonGroup as RACToggleButtonGroup, ToggleButtonGroupProps as RACToggleButtonGroupProps} from 'react-aria-components';
+import {ContextValue} from 'react-aria-components/utils';
+
 import {createContext, ForwardedRef, forwardRef} from 'react';
+
 import {DOMProps, GlobalDOMAttributes} from '@react-types/shared';
+import {
+  ToggleButtonGroup as RACToggleButtonGroup,
+  ToggleButtonGroupProps as RACToggleButtonGroupProps
+} from 'react-aria-components/ToggleButtonGroup';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface ToggleButtonGroupProps extends ActionButtonGroupProps, Omit<RACToggleButtonGroupProps, 'children' | 'style' | 'className' | 'render' | keyof GlobalDOMAttributes>, DOMProps {
diff --git a/packages/@react-spectrum/s2/src/Toolbar.tsx b/packages/@react-spectrum/s2/src/Toolbar.tsx
index 51cf1786765..533126d3e9c 100644
--- a/packages/@react-spectrum/s2/src/Toolbar.tsx
+++ b/packages/@react-spectrum/s2/src/Toolbar.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Toolbar as RACToolbar, ToolbarProps} from 'react-aria-components';
+import {Toolbar as RACToolbar, ToolbarProps} from 'react-aria-components/Toolbar';
 import {ReactNode} from 'react';
 
 
diff --git a/packages/@react-spectrum/s2/src/Tooltip.tsx b/packages/@react-spectrum/s2/src/Tooltip.tsx
index ab51cb6705b..cda8570a8b1 100644
--- a/packages/@react-spectrum/s2/src/Tooltip.tsx
+++ b/packages/@react-spectrum/s2/src/Tooltip.tsx
@@ -15,17 +15,18 @@ import {
   TooltipProps as AriaTooltipProps,
   TooltipTrigger as AriaTooltipTrigger,
   TooltipTriggerComponentProps as AriaTooltipTriggerComponentProps,
-  OverlayArrow,
-  TooltipRenderProps,
-  useLocale
-} from 'react-aria-components';
+  TooltipRenderProps
+} from 'react-aria-components/Tooltip';
+
 import {centerPadding, colorScheme, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {ColorScheme} from '@react-types/provider';
 import {ColorSchemeContext} from './Provider';
 import {createContext, forwardRef, MutableRefObject, ReactNode, useCallback, useContext, useState} from 'react';
 import {DOMProps, DOMRef, GlobalDOMAttributes} from '@react-types/shared';
+import {OverlayArrow} from 'react-aria-components/OverlayArrow';
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from './useDOMRef';
+import {useLocale} from 'react-aria/I18nProvider';
 
 export interface TooltipTriggerProps extends Omit<AriaTooltipTriggerComponentProps, 'children' | 'closeDelay' | keyof GlobalDOMAttributes>, Pick<AriaTooltipProps, 'shouldFlip' | 'containerPadding' | 'crossOffset'> {
   /** The content of the tooltip. */
diff --git a/packages/@react-spectrum/s2/src/TreeView.tsx b/packages/@react-spectrum/s2/src/TreeView.tsx
index 0d3409a9456..91765fba13d 100644
--- a/packages/@react-spectrum/s2/src/TreeView.tsx
+++ b/packages/@react-spectrum/s2/src/TreeView.tsx
@@ -13,38 +13,39 @@
 import {ActionButtonGroupContext} from './ActionButtonGroup';
 import {ActionMenuContext} from './ActionMenu';
 import {baseColor, colorMix, focusRing, fontRelative, style} from '../style' with {type: 'macro'};
-import {
-  Button,
-  ButtonContext,
-  ListLayout,
-  Provider,
-  TreeItemProps as RACTreeItemProps,
-  TreeProps as RACTreeProps,
-  Tree,
-  TreeItem,
-  TreeItemContent,
-  TreeItemContentProps,
-  TreeLoadMoreItem,
-  TreeLoadMoreItemProps,
-  useContextProps,
-  Virtualizer
-} from 'react-aria-components';
+import {Button, ButtonContext} from 'react-aria-components/Button';
 import {centerBaseline} from './CenterBaseline';
 import {Checkbox} from './Checkbox';
+
 import Chevron from '../ui-icons/Chevron';
+
 import {DOMRef, forwardRefType, GlobalDOMAttributes, Key, LoadingState} from '@react-types/shared';
 import {getAllowedOverrides, StylesPropWithHeight, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {IconContext} from './Icon';
-// @ts-ignore
 import intlMessages from '../intl/*.json';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
 import {ProgressCircle} from './ProgressCircle';
+import {Provider, useContextProps} from 'react-aria-components/utils';
+// @ts-ignore
+import {
+  TreeItemProps as RACTreeItemProps,
+  TreeProps as RACTreeProps,
+  Tree,
+  TreeItem,
+  TreeItemContent,
+  TreeItemContentProps,
+  TreeLoadMoreItem,
+  TreeLoadMoreItemProps
+} from 'react-aria-components/Tree';
 import {raw} from '../style/style-macro' with {type: 'macro'};
 import React, {createContext, forwardRef, JSXElementConstructor, ReactElement, ReactNode, useRef} from 'react';
 import {Text, TextContext} from './Content';
 import {useActionBarContainer} from './ActionBar';
 import {useDOMRef} from './useDOMRef';
-import {useLocale, useLocalizedStringFormatter} from 'react-aria';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 import {useScale} from './utils';
+import {Virtualizer} from 'react-aria-components/Virtualizer';
 
 interface S2TreeProps {
   /** Handler that is called when a user performs an action on a row. */
@@ -321,7 +322,7 @@ export const TreeViewItemContent = (props: TreeViewItemContentProps): ReactNode
   let scale = useScale();
 
   return (
-    <TreeItemContent>
+    (<TreeItemContent>
       {({isExpanded, hasChildItems, selectionMode, selectionBehavior, isDisabled, isSelected, id, state}) => {
         let isNextSelected = false;
         let isNextFocused = false;
@@ -331,12 +332,12 @@ export const TreeViewItemContent = (props: TreeViewItemContentProps): ReactNode
         }
         let isFirst = state.collection.getFirstKey() === id;
         return (
-          <div className={treeCellGrid({isDisabled, isNextSelected, isSelected, isFirst, isNextFocused})}>
+          (<div className={treeCellGrid({isDisabled, isNextSelected, isSelected, isFirst, isNextFocused})}>
             {selectionMode !== 'none' && selectionBehavior === 'toggle' && (
               // TODO: add transition?
-              <div className={treeCheckbox({isDisabled: isDisabled || !state.selectionManager.canSelectItem(id) || state.disabledKeys.has(id)})}>
+              (<div className={treeCheckbox({isDisabled: isDisabled || !state.selectionManager.canSelectItem(id) || state.disabledKeys.has(id)})}>
                 <Checkbox slot="selection" />
-              </div>
+              </div>)
             )}
             <div
               className={style({
@@ -356,10 +357,10 @@ export const TreeViewItemContent = (props: TreeViewItemContentProps): ReactNode
               ]}>
               {typeof children === 'string' ? <Text>{children}</Text> : children}
             </Provider>
-          </div>
+          </div>)
         );
       }}
-    </TreeItemContent>
+    </TreeItemContent>)
   );
 };
 
diff --git a/packages/@react-spectrum/s2/src/pressScale.ts b/packages/@react-spectrum/s2/src/pressScale.ts
index 5e954bd4d9b..ac9c094cc3e 100644
--- a/packages/@react-spectrum/s2/src/pressScale.ts
+++ b/packages/@react-spectrum/s2/src/pressScale.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {composeRenderProps} from 'react-aria-components';
+import {composeRenderProps} from 'react-aria-components/utils';
 import {CSSProperties, RefObject} from 'react';
 
 export function pressScale<R extends {isPressed: boolean}>(ref: RefObject<HTMLElement | null>, style?: CSSProperties | ((renderProps: R) => CSSProperties)): (renderProps: R) => CSSProperties {
diff --git a/packages/@react-spectrum/s2/src/useMediaQuery.ts b/packages/@react-spectrum/s2/src/useMediaQuery.ts
index 826ebc430b1..bfe501caef2 100644
--- a/packages/@react-spectrum/s2/src/useMediaQuery.ts
+++ b/packages/@react-spectrum/s2/src/useMediaQuery.ts
@@ -11,7 +11,7 @@
  */
 
 import {useEffect, useState} from 'react';
-import {useIsSSR} from '@react-aria/ssr';
+import {useIsSSR} from 'react-aria/SSRProvider';
 
 export function useMediaQuery(query: string): boolean {
   let supportsMatchMedia = typeof window !== 'undefined' && typeof window.matchMedia === 'function';
diff --git a/packages/@react-spectrum/s2/src/useSpectrumContextProps.ts b/packages/@react-spectrum/s2/src/useSpectrumContextProps.ts
index 69c0daaac14..d74861ee65b 100644
--- a/packages/@react-spectrum/s2/src/useSpectrumContextProps.ts
+++ b/packages/@react-spectrum/s2/src/useSpectrumContextProps.ts
@@ -11,11 +11,12 @@
  */
 
 import {Context, ForwardedRef, useMemo} from 'react';
-import {ContextValue, SlotProps, useSlottedContext} from 'react-aria-components';
-import {mergeProps, useObjectRef} from 'react-aria';
-import {mergeRefs} from '@react-aria/utils';
+import {ContextValue, SlotProps, useSlottedContext} from 'react-aria-components/utils';
+import {mergeProps} from 'react-aria/mergeProps';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
 import {mergeStyles} from '../style/runtime';
 import {RefObject} from '@react-types/shared';
+import {useObjectRef} from 'react-aria/useObjectRef';
 
 export function useSpectrumContextProps<T, U extends SlotProps, E>(props: T & SlotProps, ref: ForwardedRef<E>, context: Context<ContextValue<U, E>>): [T, RefObject<E | null>] {
   let ctx = useSlottedContext(context, props.slot) || {};
diff --git a/packages/@react-spectrum/s2/stories/Accordion.stories.tsx b/packages/@react-spectrum/s2/stories/Accordion.stories.tsx
index e39dbe0ffd0..7343a212588 100644
--- a/packages/@react-spectrum/s2/stories/Accordion.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Accordion.stories.tsx
@@ -10,12 +10,21 @@
  * governing permissions and limitations under the License.
  */
 
-import {Accordion, AccordionItem, AccordionItemHeader, AccordionItemPanel, AccordionItemTitle, ActionButton, TextField} from '../src';
-import {Key} from 'react-aria';
+import {
+  Accordion,
+  AccordionItem,
+  AccordionItemHeader,
+  AccordionItemPanel,
+  AccordionItemTitle
+} from '../src/Accordion';
+
+import {ActionButton} from '../src/ActionButton';
+import {Key} from '@react-types/shared';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import React from 'react';
 import {style} from '../style' with { type: 'macro' };
+import {TextField} from '../src/TextField';
 
 
 const meta: Meta<typeof Accordion> = {
diff --git a/packages/@react-spectrum/s2/stories/ActionBar.stories.tsx b/packages/@react-spectrum/s2/stories/ActionBar.stories.tsx
index ed25b6a5bb9..191f1b5dd7e 100644
--- a/packages/@react-spectrum/s2/stories/ActionBar.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/ActionBar.stories.tsx
@@ -14,7 +14,7 @@ import {action} from 'storybook/actions';
 import {ActionBar} from '../src/ActionBar';
 import {ActionButton} from '../src/ActionButton';
 import {ExampleRender as CardViewExample} from './CardView.stories';
-import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../src';
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../src/TableView';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style' with { type: 'macro' };
 
@@ -52,7 +52,7 @@ export const Example: Story = {
 export const CardExample: Story = {
   render: args => (
     // @ts-ignore
-    <CardViewExample
+    (<CardViewExample
       selectionMode="multiple"
       renderActionBar={selectedKeys => (
         <ActionBar {...args}>
@@ -60,7 +60,7 @@ export const CardExample: Story = {
           <ActionButton onPress={() => action('copy')([...selectedKeys])}>Copy</ActionButton>
           <ActionButton onPress={() => action('delete')([...selectedKeys])}>Delete</ActionButton>
         </ActionBar>
-      )} />
+      )} />)
   ),
   parameters: {
     layout: 'fullscreen'
diff --git a/packages/@react-spectrum/s2/stories/ActionButton.stories.tsx b/packages/@react-spectrum/s2/stories/ActionButton.stories.tsx
index ac6e630ffd4..d53a08d0760 100644
--- a/packages/@react-spectrum/s2/stories/ActionButton.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/ActionButton.stories.tsx
@@ -10,15 +10,20 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, Avatar, NotificationBadge, Provider, Text} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {Avatar} from '../src/Avatar';
 import BellIcon from '../s2wf-icons/S2_Icon_Bell_20_N.svg';
 import {categorizeArgTypes, getActionArgs, StaticColorDecorator} from './utils';
 import CommentIcon from '../s2wf-icons/S2_Icon_Comment_20_N.svg';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
+import {NotificationBadge} from '../src/NotificationBadge';
+import {Provider} from '../src/Provider';
 import {style} from '../style' with { type: 'macro' };
+import {Text} from '../src/Content';
 import './unsafe.css';
-import {useNumberFormatter} from 'react-aria';
+import {useNumberFormatter} from 'react-aria/useNumberFormatter';
 
 const events = ['onPress', 'onPressChange', 'onPressEnd', 'onPressStart', 'onPressUp'];
 
diff --git a/packages/@react-spectrum/s2/stories/ActionButtonGroup.stories.tsx b/packages/@react-spectrum/s2/stories/ActionButtonGroup.stories.tsx
index 3892145b986..463a6ccb12f 100644
--- a/packages/@react-spectrum/s2/stories/ActionButtonGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/ActionButtonGroup.stories.tsx
@@ -10,13 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, ActionButtonGroup, Text} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {ActionButtonGroup} from '../src/ActionButtonGroup';
 import Copy from '../s2wf-icons/S2_Icon_Copy_20_N.svg';
 import Cut from '../s2wf-icons/S2_Icon_Cut_20_N.svg';
 import type {Meta, StoryFn} from '@storybook/react';
 import Paste from '../s2wf-icons/S2_Icon_Paste_20_N.svg';
 import {StaticColorDecorator} from './utils';
 import {style} from '../style' with {type: 'macro'};
+import {Text} from '../src/Content';
 
 const meta: Meta<typeof ActionButtonGroup> = {
   component: ActionButtonGroup,
diff --git a/packages/@react-spectrum/s2/stories/ActionMenu.stories.tsx b/packages/@react-spectrum/s2/stories/ActionMenu.stories.tsx
index f08008d9dad..8771ecb82b3 100644
--- a/packages/@react-spectrum/s2/stories/ActionMenu.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/ActionMenu.stories.tsx
@@ -10,9 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionMenu, MenuItem} from '../src';
+import {ActionMenu} from '../src/ActionMenu';
 
 import {categorizeArgTypes, getActionArgs} from './utils';
+
+import {MenuItem} from '../src/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
 
 const events = ['onAction', 'onOpenChange'];
diff --git a/packages/@react-spectrum/s2/stories/AlertDialog.stories.tsx b/packages/@react-spectrum/s2/stories/AlertDialog.stories.tsx
index 9610b152c9b..10efe1eb983 100644
--- a/packages/@react-spectrum/s2/stories/AlertDialog.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/AlertDialog.stories.tsx
@@ -10,7 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, AlertDialog, DialogTrigger} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {AlertDialog} from '../src/AlertDialog';
+import {DialogTrigger} from '../src/DialogTrigger';
 import type {Meta, StoryObj} from '@storybook/react';
 
 const meta: Meta<typeof AlertDialog> = {
diff --git a/packages/@react-spectrum/s2/stories/Avatar.stories.tsx b/packages/@react-spectrum/s2/stories/Avatar.stories.tsx
index 082131074d0..fd337a0aeef 100644
--- a/packages/@react-spectrum/s2/stories/Avatar.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Avatar.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Avatar} from '../src';
+import {Avatar} from '../src/Avatar';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style' with { type: 'macro' };
 
diff --git a/packages/@react-spectrum/s2/stories/AvatarGroup.stories.tsx b/packages/@react-spectrum/s2/stories/AvatarGroup.stories.tsx
index 4a5512f1458..3c3ae44556c 100644
--- a/packages/@react-spectrum/s2/stories/AvatarGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/AvatarGroup.stories.tsx
@@ -10,8 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {Avatar, AvatarGroup, Provider} from '../src';
+import {Avatar} from '../src/Avatar';
+
+import {AvatarGroup} from '../src/AvatarGroup';
 import type {Meta, StoryObj} from '@storybook/react';
+import {Provider} from '../src/Provider';
 import {style} from '../style' with {type: 'macro'};
 
 const meta: Meta<typeof AvatarGroup> = {
diff --git a/packages/@react-spectrum/s2/stories/Badge.stories.tsx b/packages/@react-spectrum/s2/stories/Badge.stories.tsx
index 7d497f8ad4b..d0c7a91f3a1 100644
--- a/packages/@react-spectrum/s2/stories/Badge.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Badge.stories.tsx
@@ -10,10 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {Badge, Text} from '../src';
+import {Badge} from '../src/Badge';
+
 import CheckmarkCircle from '../s2wf-icons/S2_Icon_CheckmarkCircle_20_N.svg';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style' with { type: 'macro' };
+import {Text} from '../src/Content';
 
 const meta: Meta<typeof Badge> = {
   component: Badge,
diff --git a/packages/@react-spectrum/s2/stories/Breadcrumbs.stories.tsx b/packages/@react-spectrum/s2/stories/Breadcrumbs.stories.tsx
index f0496119262..549eb63b3ce 100644
--- a/packages/@react-spectrum/s2/stories/Breadcrumbs.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Breadcrumbs.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {action} from 'storybook/actions';
-import {Breadcrumb, Breadcrumbs, BreadcrumbsProps} from '../src';
+import {Breadcrumb, Breadcrumbs, BreadcrumbsProps} from '../src/Breadcrumbs';
 import type {Meta, StoryObj} from '@storybook/react';
 
 const meta: Meta<typeof Breadcrumbs> = {
diff --git a/packages/@react-spectrum/s2/stories/Button.stories.tsx b/packages/@react-spectrum/s2/stories/Button.stories.tsx
index a4108053a4f..c02c0e7a1be 100644
--- a/packages/@react-spectrum/s2/stories/Button.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Button.stories.tsx
@@ -11,11 +11,12 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button, Text} from '../src';
+import {Button} from '../src/Button';
 import {categorizeArgTypes, getActionArgs, StaticColorDecorator} from './utils';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import {style} from '../style/spectrum-theme' with { type: 'macro' };
+import {Text} from '../src/Content';
 import {useEffect, useRef, useState} from 'react';
 
 const events = ['onPress', 'onPressChange', 'onPressEnd', 'onPressStart', 'onPressUp'];
diff --git a/packages/@react-spectrum/s2/stories/ButtonGroup.stories.tsx b/packages/@react-spectrum/s2/stories/ButtonGroup.stories.tsx
index e25adc80486..09330745361 100644
--- a/packages/@react-spectrum/s2/stories/ButtonGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/ButtonGroup.stories.tsx
@@ -10,10 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, ButtonGroup, Text} from '../src';
+import {Button} from '../src/Button';
+
+import {ButtonGroup} from '../src/ButtonGroup';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import {style} from '../style' with { type: 'macro' };
+import {Text} from '../src/Content';
 
 const meta: Meta<typeof ButtonGroup> = {
   component: ButtonGroup,
diff --git a/packages/@react-spectrum/s2/stories/Calendar.stories.tsx b/packages/@react-spectrum/s2/stories/Calendar.stories.tsx
index a469e8bbfa7..45942e7930e 100644
--- a/packages/@react-spectrum/s2/stories/Calendar.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Calendar.stories.tsx
@@ -10,11 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, Calendar, CalendarProps} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {Calendar, CalendarProps} from '../src/Calendar';
 import {CalendarDate, getLocalTimeZone, today} from '@internationalized/date';
 import {CalendarSwitcher, categorizeArgTypes, getActionArgs} from './utils';
 import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
-import {DateValue} from 'react-aria';
+import {DateValue} from '@react-types/datepicker';
 import type {Meta, StoryObj} from '@storybook/react';
 import {ReactElement, useState} from 'react';
 import {style} from '../style' with {type: 'macro'};
diff --git a/packages/@react-spectrum/s2/stories/Card.stories.tsx b/packages/@react-spectrum/s2/stories/Card.stories.tsx
index ce82175adaf..2dec1d6b5da 100644
--- a/packages/@react-spectrum/s2/stories/Card.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Card.stories.tsx
@@ -10,12 +10,33 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionMenu, AssetCard, Avatar, Badge, Button, Card, CardPreview, CardProps, CollectionCardPreview, Content, Divider, Footer, Image, MenuItem, Meter, ProductCard, Skeleton, StatusLight, Text, UserCard} from '../src';
+import {ActionMenu} from '../src/ActionMenu';
+
+import {
+  AssetCard,
+  Card,
+  CardPreview,
+  CardProps,
+  CollectionCardPreview,
+  ProductCard,
+  UserCard
+} from '../src/Card';
+
+import {Avatar} from '../src/Avatar';
+import {Badge} from '../src/Badge';
+import {Button} from '../src/Button';
+import {Content, Footer, Text} from '../src/Content';
+import {Divider} from '../src/Divider';
 import Folder from '../s2wf-icons/S2_Icon_Folder_20_N.svg';
 import FolderGradient from '../spectrum-illustrations/gradient/generic2/FolderClose';
+import {Image} from '../src/Image';
+import {MenuItem} from '../src/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
+import {Meter} from '../src/Meter';
 import Project from '../s2wf-icons/S2_Icon_Project_20_N.svg';
 import Select from '../s2wf-icons/S2_Icon_Select_20_N.svg';
+import {Skeleton} from '../src/Skeleton';
+import {StatusLight} from '../src/StatusLight';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
 
 const meta: Meta<CardProps & {isLoading?: boolean}> = {
diff --git a/packages/@react-spectrum/s2/stories/CardView.stories.tsx b/packages/@react-spectrum/s2/stories/CardView.stories.tsx
index b140f012c17..79bd53426e5 100644
--- a/packages/@react-spectrum/s2/stories/CardView.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/CardView.stories.tsx
@@ -10,30 +10,24 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  ActionMenu,
-  Avatar,
-  Card,
-  CardPreview,
-  CardView,
-  CardViewProps,
-  Collection,
-  CollectionCardPreview,
-  Content,
-  Heading,
-  IllustratedMessage,
-  Image,
-  MenuItem,
-  SkeletonCollection,
-  Text
-} from '../src';
+import {ActionMenu} from '../src/ActionMenu';
+
+import {Avatar} from '../src/Avatar';
+import {Card, CardPreview, CollectionCardPreview} from '../src/Card';
+import {CardView, CardViewProps} from '../src/CardView';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {Content, Heading, Text} from '../src/Content';
 import EmptyIcon from '../spectrum-illustrations/gradient/generic1/Image';
 import ErrorIcon from '../spectrum-illustrations/linear/AlertNotice';
 import {fn} from 'storybook/test';
 import Folder from '../s2wf-icons/S2_Icon_Folder_20_N.svg';
+import {IllustratedMessage} from '../src/IllustratedMessage';
+import {Image} from '../src/Image';
+import {MenuItem} from '../src/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
+import {SkeletonCollection} from '../src/SkeletonCollection';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
-import {useAsyncList} from 'react-stately';
+import {useAsyncList} from 'react-stately/useAsyncList';
 
 const meta: Meta<typeof CardView> = {
   component: CardView,
diff --git a/packages/@react-spectrum/s2/stories/Checkbox.stories.tsx b/packages/@react-spectrum/s2/stories/Checkbox.stories.tsx
index f1693481c84..04bde949d51 100644
--- a/packages/@react-spectrum/s2/stories/Checkbox.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Checkbox.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Checkbox} from '../src';
+import {Checkbox} from '../src/Checkbox';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style' with {type: 'macro'};
 
diff --git a/packages/@react-spectrum/s2/stories/CheckboxGroup.stories.tsx b/packages/@react-spectrum/s2/stories/CheckboxGroup.stories.tsx
index f3f7821db64..b8dde83fba1 100644
--- a/packages/@react-spectrum/s2/stories/CheckboxGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/CheckboxGroup.stories.tsx
@@ -10,16 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  Checkbox,
-  CheckboxGroup,
-  Content,
-  ContextualHelp,
-  Footer,
-  Heading,
-  Link,
-  Text
-} from '../src';
+import {Checkbox} from '../src/Checkbox';
+
+import {CheckboxGroup} from '../src/CheckboxGroup';
+import {Content, Footer, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 
 const meta: Meta<typeof CheckboxGroup> = {
diff --git a/packages/@react-spectrum/s2/stories/CoachMark.stories.tsx b/packages/@react-spectrum/s2/stories/CoachMark.stories.tsx
index 3c213163383..bcc2677e4d9 100644
--- a/packages/@react-spectrum/s2/stories/CoachMark.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/CoachMark.stories.tsx
@@ -9,23 +9,19 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {
-  ActionButton,
-  ActionMenu,
-  Button,
-  CardPreview,
-  Checkbox,
-  Content,
-  Footer,
-  Image,
-  Keyboard,
-  MenuItem,
-  Slider,
-  Text
-} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {ActionMenu} from '../src/ActionMenu';
+import {Button} from '../src/Button';
+import {CardPreview} from '../src/Card';
+import {Checkbox} from '../src/Checkbox';
 import {CoachMark, CoachMarkTrigger} from '../src/CoachMark';
+import {Content, Footer, Keyboard, Text} from '../src/Content';
 import Filter from '../s2wf-icons/S2_Icon_Filter_20_N.svg';
+import {Image} from '../src/Image';
+import {MenuItem} from '../src/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
+import {Slider} from '../src/Slider';
 import {style} from '../style' with {type: 'macro'};
 import {useState} from 'react';
 
diff --git a/packages/@react-spectrum/s2/stories/ColorField.stories.tsx b/packages/@react-spectrum/s2/stories/ColorField.stories.tsx
index c82e5f4635b..b72ed550603 100644
--- a/packages/@react-spectrum/s2/stories/ColorField.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/ColorField.stories.tsx
@@ -10,15 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  ColorField,
-  Content,
-  ContextualHelp,
-  Footer,
-  Heading,
-  Link,
-  Text
-} from '../src';
+import {ColorField} from '../src/ColorField';
+
+import {Content, Footer, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 
 const meta: Meta<typeof ColorField> = {
diff --git a/packages/@react-spectrum/s2/stories/ComboBox.stories.tsx b/packages/@react-spectrum/s2/stories/ComboBox.stories.tsx
index 647fc8d49c0..4498c2ddcc6 100644
--- a/packages/@react-spectrum/s2/stories/ComboBox.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/ComboBox.stories.tsx
@@ -10,15 +10,24 @@
  * governing permissions and limitations under the License.
  */
 
-import {Avatar, Button, ComboBox, ComboBoxItem, ComboBoxSection, Content, ContextualHelp, Dialog, DialogTrigger, Footer, Form, Header, Heading, Link, Text} from '../src';
+import {Avatar} from '../src/Avatar';
+
+import {Button} from '../src/Button';
 import {categorizeArgTypes, getActionArgs} from './utils';
-import {ComboBoxProps} from 'react-aria-components';
+import {ComboBox, ComboBoxItem, ComboBoxSection} from '../src/ComboBox';
+import {ComboBoxProps} from 'react-aria-components/ComboBox';
+import {Content, Footer, Header, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
 import DeviceDesktopIcon from '../s2wf-icons/S2_Icon_DeviceDesktop_20_N.svg';
 import DeviceTabletIcon from '../s2wf-icons/S2_Icon_DeviceTablet_20_N.svg';
+import {Dialog} from '../src/Dialog';
+import {DialogTrigger} from '../src/DialogTrigger';
+import {Form} from '../src/Form';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 import {ReactElement, useState} from 'react';
 import {style} from '../style' with {type: 'macro'};
-import {useAsyncList} from 'react-stately';
+import {useAsyncList} from 'react-stately/useAsyncList';
 
 const events = ['onInputChange', 'onOpenChange', 'onSelectionChange', 'onLoadMore'];
 
diff --git a/packages/@react-spectrum/s2/stories/ContextualHelp.stories.tsx b/packages/@react-spectrum/s2/stories/ContextualHelp.stories.tsx
index 301663a4223..3e78fbe1f5b 100644
--- a/packages/@react-spectrum/s2/stories/ContextualHelp.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/ContextualHelp.stories.tsx
@@ -1,4 +1,5 @@
-import {Content, ContextualHelp, Footer, Heading, Text} from '../src';
+import {Content, Footer, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
 import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 
diff --git a/packages/@react-spectrum/s2/stories/CustomDialog.stories.tsx b/packages/@react-spectrum/s2/stories/CustomDialog.stories.tsx
index 2b099772af0..2669742956d 100644
--- a/packages/@react-spectrum/s2/stories/CustomDialog.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/CustomDialog.stories.tsx
@@ -10,11 +10,22 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, Button, ButtonGroup, CloseButton, Content, CustomDialog, DialogTrigger, DropZone, Heading, IllustratedMessage, Image, TextField} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {Button} from '../src/Button';
+import {ButtonGroup} from '../src/ButtonGroup';
 import Checkmark from '../spectrum-illustrations/gradient/generic1/Checkmark';
+import {CloseButton} from '../src/CloseButton';
+import {Content, Heading} from '../src/Content';
+import {CustomDialog} from '../src/CustomDialog';
+import {DialogTrigger} from '../src/DialogTrigger';
 import DropToUpload from '../spectrum-illustrations/linear/DropToUpload';
+import {DropZone} from '../src/DropZone';
+import {IllustratedMessage} from '../src/IllustratedMessage';
+import {Image} from '../src/Image';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
+import {TextField} from '../src/TextField';
 
 const meta: Meta<typeof CustomDialog> = {
   component: CustomDialog,
diff --git a/packages/@react-spectrum/s2/stories/DateField.stories.tsx b/packages/@react-spectrum/s2/stories/DateField.stories.tsx
index bae4eb76b59..a5ee1c388fc 100644
--- a/packages/@react-spectrum/s2/stories/DateField.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/DateField.stories.tsx
@@ -10,8 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Content, ContextualHelp, DateField, Footer, Form, Heading, Link, Text} from '../src';
+import {Button} from '../src/Button';
+
 import {CalendarSwitcher, categorizeArgTypes, getActionArgs} from './utils';
+import {Content, Footer, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
+import {DateField} from '../src/DateField';
+import {Form} from '../src/Form';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 import {parseDate, toZoned} from '@internationalized/date';
 import {style} from '../style' with {type: 'macro'};
diff --git a/packages/@react-spectrum/s2/stories/DatePicker.stories.tsx b/packages/@react-spectrum/s2/stories/DatePicker.stories.tsx
index 21236b7393e..dd606da9827 100644
--- a/packages/@react-spectrum/s2/stories/DatePicker.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/DatePicker.stories.tsx
@@ -10,8 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Content, ContextualHelp, DatePicker, Footer, Form, Heading, Link, Text} from '../src';
+import {Button} from '../src/Button';
+
 import {CalendarSwitcher, categorizeArgTypes, getActionArgs} from './utils';
+import {Content, Footer, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
+import {DatePicker} from '../src/DatePicker';
+import {Form} from '../src/Form';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 import {parseDate, toZoned} from '@internationalized/date';
 import {style} from '../style' with {type: 'macro'};
diff --git a/packages/@react-spectrum/s2/stories/DateRangePicker.stories.tsx b/packages/@react-spectrum/s2/stories/DateRangePicker.stories.tsx
index 47ee4c0e3ae..65c7c0f0ec1 100644
--- a/packages/@react-spectrum/s2/stories/DateRangePicker.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/DateRangePicker.stories.tsx
@@ -10,8 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Content, ContextualHelp, DateRangePicker, Footer, Form, Heading, Link, Text} from '../src';
+import {Button} from '../src/Button';
+
 import {CalendarSwitcher, categorizeArgTypes, getActionArgs} from './utils';
+import {Content, Footer, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
+import {DateRangePicker} from '../src/DateRangePicker';
+import {Form} from '../src/Form';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 import {parseDate, toZoned} from '@internationalized/date';
 import {style} from '../style' with {type: 'macro'};
diff --git a/packages/@react-spectrum/s2/stories/Dialog.stories.tsx b/packages/@react-spectrum/s2/stories/Dialog.stories.tsx
index da39010cc37..48a0d568d80 100644
--- a/packages/@react-spectrum/s2/stories/Dialog.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Dialog.stories.tsx
@@ -10,8 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, ButtonGroup, Checkbox, Content, Dialog, DialogContainer, DialogProps, DialogTrigger, Footer, Header, Heading, Image, Provider} from '../src';
+import {Button} from '../src/Button';
+
+import {ButtonGroup} from '../src/ButtonGroup';
+import {Checkbox} from '../src/Checkbox';
+import {Content, Footer, Header, Heading} from '../src/Content';
+import {Dialog, DialogProps} from '../src/Dialog';
+import {DialogContainer} from '../src/DialogContainer';
+import {DialogTrigger} from '../src/DialogTrigger';
+import {Image} from '../src/Image';
 import type {Meta, StoryObj} from '@storybook/react';
+import {Provider} from '../src/Provider';
 import {ReactElement, useState} from 'react';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
 
diff --git a/packages/@react-spectrum/s2/stories/Disclosure.stories.tsx b/packages/@react-spectrum/s2/stories/Disclosure.stories.tsx
index bd824962e2c..2fee9a1a711 100644
--- a/packages/@react-spectrum/s2/stories/Disclosure.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Disclosure.stories.tsx
@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, Disclosure, DisclosureHeader, DisclosurePanel, DisclosureTitle} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {Disclosure, DisclosureHeader, DisclosurePanel, DisclosureTitle} from '../src/Disclosure';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import React from 'react';
diff --git a/packages/@react-spectrum/s2/stories/Divider.stories.tsx b/packages/@react-spectrum/s2/stories/Divider.stories.tsx
index 624c680be5d..4cd583d5e9d 100644
--- a/packages/@react-spectrum/s2/stories/Divider.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Divider.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {baseColor, style} from '../style' with {type: 'macro'};
-import {Divider} from '../src';
+import {Divider} from '../src/Divider';
 
 import type {Meta, StoryObj} from '@storybook/react';
 import {StaticColorDecorator} from './utils';
diff --git a/packages/@react-spectrum/s2/stories/DropZone.stories.tsx b/packages/@react-spectrum/s2/stories/DropZone.stories.tsx
index cd7fa767637..1d0dfaabbe2 100644
--- a/packages/@react-spectrum/s2/stories/DropZone.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/DropZone.stories.tsx
@@ -10,15 +10,25 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, ButtonGroup, Content, DropZone, DropZoneProps, FileTrigger, Heading, IllustratedMessage} from '../src';
+import {Button} from '../src/Button';
+
+import {ButtonGroup} from '../src/ButtonGroup';
 import {categorizeArgTypes, getActionArgs} from './utils';
 import Cloud from '../spectrum-illustrations/linear/Cloud';
 import CloudUpload from '../spectrum-illustrations/gradient/generic1/CloudUpload';
+import {Content, Heading} from '../src/Content';
 import DropToUpload from '../spectrum-illustrations/linear/DropToUpload';
-import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from 'react-aria';
+import {DropZone, DropZoneProps} from '../src/DropZone';
+import {FileTrigger} from 'react-aria-components/FileTrigger';
+import {FocusRing} from 'react-aria/FocusRing';
+import {IllustratedMessage} from '../src/IllustratedMessage';
+import {mergeProps} from 'react-aria/mergeProps';
 import type {Meta, StoryObj} from '@storybook/react';
 import React, {ReactElement, useState} from 'react';
 import {style} from '../style' with { type: 'macro' };
+import {useButton} from 'react-aria/useButton';
+import {useClipboard} from 'react-aria/useClipboard';
+import {useDrag} from 'react-aria/useDrag';
 
 const events = ['onDrop', 'onDropActivate', 'onDropEnter', 'onDropExit', 'onDropMove'];
 
diff --git a/packages/@react-spectrum/s2/stories/Form.stories.tsx b/packages/@react-spectrum/s2/stories/Form.stories.tsx
index 97efe202ccf..d2357defb81 100644
--- a/packages/@react-spectrum/s2/stories/Form.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Form.stories.tsx
@@ -10,44 +10,36 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  ActionButton,
-  Button,
-  Checkbox,
-  CheckboxGroup,
-  ColorField,
-  ColorSlider,
-  ComboBox,
-  ComboBoxItem,
-  Content,
-  ContextualHelp,
-  Divider,
-  Form,
-  FormProps,
-  Heading,
-  Meter,
-  NumberField,
-  Picker,
-  PickerItem,
-  ProgressBar,
-  Radio,
-  RadioGroup,
-  RangeSlider,
-  SearchField,
-  Slider,
-  Switch,
-  Tag,
-  TagGroup,
-  TextArea,
-  TextField,
-  ToggleButton
-} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {Button} from '../src/Button';
 import {categorizeArgTypes, getActionArgs} from './utils';
+import {Checkbox} from '../src/Checkbox';
+import {CheckboxGroup} from '../src/CheckboxGroup';
+import {ColorField} from '../src/ColorField';
+import {ColorSlider} from '../src/ColorSlider';
+import {ComboBox, ComboBoxItem} from '../src/ComboBox';
+import {Content, Heading} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
+import {Divider} from '../src/Divider';
+import {Form, FormProps} from '../src/Form';
 import type {Meta, StoryObj} from '@storybook/react';
+import {Meter} from '../src/Meter';
+import {NumberField} from '../src/NumberField';
+import {Picker, PickerItem} from '../src/Picker';
+import {ProgressBar} from '../src/ProgressBar';
+import {Radio, RadioGroup} from '../src/RadioGroup';
+import {RangeSlider} from '../src/RangeSlider';
 import {ReactElement, useState} from 'react';
+import {SearchField} from '../src/SearchField';
+import {Slider} from '../src/Slider';
 import SortDown from '../s2wf-icons/S2_Icon_SortDown_20_N.svg';
 import SortUp from '../s2wf-icons/S2_Icon_SortUp_20_N.svg';
 import {style} from '../style' with {type: 'macro'};
+import {Switch} from '../src/Switch';
+import {Tag, TagGroup} from '../src/TagGroup';
+import {TextArea, TextField} from '../src/TextField';
+import {ToggleButton} from '../src/ToggleButton';
 
 const events = ['onInvalid', 'onReset', 'onSubmit'];
 
diff --git a/packages/@react-spectrum/s2/stories/FullscreenDialog.stories.tsx b/packages/@react-spectrum/s2/stories/FullscreenDialog.stories.tsx
index e8a8627deec..3289e8a2f71 100644
--- a/packages/@react-spectrum/s2/stories/FullscreenDialog.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/FullscreenDialog.stories.tsx
@@ -10,7 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, ButtonGroup, Content, DialogTrigger, FullscreenDialog, FullscreenDialogProps, Header, Heading} from '../src';
+import {Button} from '../src/Button';
+
+import {ButtonGroup} from '../src/ButtonGroup';
+import {Content, Header, Heading} from '../src/Content';
+import {DialogTrigger} from '../src/DialogTrigger';
+import {FullscreenDialog, FullscreenDialogProps} from '../src/FullscreenDialog';
 import type {Meta, StoryObj} from '@storybook/react';
 
 const meta: Meta<typeof FullscreenDialog> = {
diff --git a/packages/@react-spectrum/s2/stories/Icon.stories.tsx b/packages/@react-spectrum/s2/stories/Icon.stories.tsx
index a9056649aa4..c6ecaa6af70 100644
--- a/packages/@react-spectrum/s2/stories/Icon.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Icon.stories.tsx
@@ -12,7 +12,7 @@
 
 import AlertIcon from '../s2wf-icons/S2_Icon_AlertTriangle_20_N.svg';
 import {FunctionComponent} from 'react';
-import {IconProps} from '../src';
+import {IconProps} from '../src/Icon';
 import {iconStyle} from '../style' with {type: 'macro'};
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
diff --git a/packages/@react-spectrum/s2/stories/IllustratedMessage.stories.tsx b/packages/@react-spectrum/s2/stories/IllustratedMessage.stories.tsx
index 2b9481c8d3e..03304160e2e 100644
--- a/packages/@react-spectrum/s2/stories/IllustratedMessage.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/IllustratedMessage.stories.tsx
@@ -10,9 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, ButtonGroup, Content, Heading, IllustratedMessage} from '../src';
+import {Button} from '../src/Button';
+
+import {ButtonGroup} from '../src/ButtonGroup';
 import Cloud from '../spectrum-illustrations/linear/Cloud';
+import {Content, Heading} from '../src/Content';
 import Folder from '../spectrum-illustrations/gradient/generic2/FolderOpen';
+import {IllustratedMessage} from '../src/IllustratedMessage';
 import type {Meta, StoryObj} from '@storybook/react';
 
 const meta: Meta<typeof IllustratedMessage> = {
diff --git a/packages/@react-spectrum/s2/stories/InlineAlert.stories.tsx b/packages/@react-spectrum/s2/stories/InlineAlert.stories.tsx
index 7d19dbd9d91..7e9050d5cf1 100644
--- a/packages/@react-spectrum/s2/stories/InlineAlert.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/InlineAlert.stories.tsx
@@ -10,7 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Content, Heading, InlineAlert, InlineAlertProps} from '../src';
+import {Button} from '../src/Button';
+
+import {Content, Heading} from '../src/Content';
+import {InlineAlert, InlineAlertProps} from '../src/InlineAlert';
 import type {Meta, StoryObj} from '@storybook/react';
 import {ReactElement, useState} from 'react';
 import {style} from '../style' with {type: 'macro'};
diff --git a/packages/@react-spectrum/s2/stories/Link.stories.tsx b/packages/@react-spectrum/s2/stories/Link.stories.tsx
index 078a3b0d790..fb76731eb87 100644
--- a/packages/@react-spectrum/s2/stories/Link.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Link.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import {categorizeArgTypes, getActionArgs, StaticColorDecorator} from './utils';
-import {Link} from '../src';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style' with {type: 'macro'};
 
diff --git a/packages/@react-spectrum/s2/stories/LinkButton.stories.tsx b/packages/@react-spectrum/s2/stories/LinkButton.stories.tsx
index dd41f6f74c7..64d3749770c 100644
--- a/packages/@react-spectrum/s2/stories/LinkButton.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/LinkButton.stories.tsx
@@ -11,10 +11,11 @@
  */
 
 import {categorizeArgTypes, getActionArgs, StaticColorDecorator} from './utils';
-import {LinkButton, Text} from '../src';
+import {LinkButton} from '../src/Button';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import {style} from '../style' with { type: 'macro' };
+import {Text} from '../src/Content';
 
 const events = ['onPress', 'onPressChange', 'onPressEnd', 'onPressStart', 'onPressUp'];
 
diff --git a/packages/@react-spectrum/s2/stories/ListView.stories.tsx b/packages/@react-spectrum/s2/stories/ListView.stories.tsx
index d2fd339d4d0..30f42843fe5 100644
--- a/packages/@react-spectrum/s2/stories/ListView.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/ListView.stories.tsx
@@ -11,20 +11,29 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionBar, ActionButton, ActionButtonGroup, ActionMenu, Breadcrumb, Breadcrumbs, Content, Heading, IllustratedMessage, Image, ListView, ListViewItem, MenuItem, Text} from '../';
+import {ActionBar} from '../src/ActionBar';
+import {ActionButton} from '../src/ActionButton';
+import {ActionButtonGroup} from '../src/ActionButtonGroup';
+import {ActionMenu} from '../src/ActionMenu';
+import {Breadcrumb, Breadcrumbs} from '../src/Breadcrumbs';
 import {categorizeArgTypes} from './utils';
-import {chain} from '@react-aria/utils';
+import {chain} from 'react-aria/private/utils/chain';
+import {Content, Heading, Text} from '../src/Content';
 import Copy from '../s2wf-icons/S2_Icon_Copy_20_N.svg';
 import Delete from '../s2wf-icons/S2_Icon_Delete_20_N.svg';
 import Edit from '../s2wf-icons/S2_Icon_Edit_20_N.svg';
 import File from '../s2wf-icons/S2_Icon_File_20_N.svg';
 import Folder from '../s2wf-icons/S2_Icon_Folder_20_N.svg';
 import FolderOpen from '../spectrum-illustrations/linear/FolderOpen';
-import {Key} from 'react-aria';
+import {IllustratedMessage} from '../src/IllustratedMessage';
+import {Image} from '../src/Image';
+import {Key} from '@react-types/shared';
+import {ListView, ListViewItem} from '../src/ListView';
+import {MenuItem} from '../src/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
 import {ReactNode, useState} from 'react';
 import {style} from '../style' with {type: 'macro'};
-import {useAsyncList} from 'react-stately';
+import {useAsyncList} from 'react-stately/useAsyncList';
 
 const meta: Meta<typeof ListView> = {
   component: ListView,
diff --git a/packages/@react-spectrum/s2/stories/Menu.stories.tsx b/packages/@react-spectrum/s2/stories/Menu.stories.tsx
index 1ba6e103ad9..e25093aec5d 100644
--- a/packages/@react-spectrum/s2/stories/Menu.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Menu.stories.tsx
@@ -14,24 +14,39 @@ import AlignLeft from '../s2wf-icons/S2_Icon_TextAlignLeft_20_N.svg';
 import AlignMiddle from '../s2wf-icons/S2_Icon_TextAlignCenter_20_N.svg';
 import AlignRight from '../s2wf-icons/S2_Icon_TextAlignRight_20_N.svg';
 import Bold from '../s2wf-icons/S2_Icon_TextBold_20_N.svg';
-import {Button, Content, ContextualHelpPopover, Footer, Header, Heading, Image, Keyboard, Link, Menu, MenuItem, MenuProps, MenuSection, MenuTrigger,  SubmenuTrigger, Text, UnavailableMenuItemTrigger} from '../src';
+import {Button} from '../src/Button';
 import {categorizeArgTypes, getActionArgs} from './utils';
 import ClockPendingIcon from '../s2wf-icons/S2_Icon_ClockPending_20_N.svg';
 import {CombinedMenu} from '../src/Menu';
 import CommentTextIcon from '../s2wf-icons/S2_Icon_CommentText_20_N.svg';
+
 import CommunityIcon from '../s2wf-icons/S2_Icon_Community_20_N.svg';
+
+import {Content, Footer, Header, Heading, Keyboard, Text} from '../src/Content';
+import {ContextualHelpPopover} from '../src/ContextualHelp';
 import Copy from '../s2wf-icons/S2_Icon_Copy_20_N.svg';
 import Cut from '../s2wf-icons/S2_Icon_Cut_20_N.svg';
 import DeviceDesktopIcon from '../s2wf-icons/S2_Icon_DeviceDesktop_20_N.svg';
 import DeviceTabletIcon from '../s2wf-icons/S2_Icon_DeviceTablet_20_N.svg';
+import {Image} from '../src/Image';
 import ImgIcon from '../s2wf-icons/S2_Icon_Image_20_N.svg';
 import Italic from '../s2wf-icons/S2_Icon_TextItalic_20_N.svg';
+import {Link} from '../src/Link';
+import {
+  Menu,
+  MenuItem,
+  MenuProps,
+  MenuSection,
+  MenuTrigger,
+  SubmenuTrigger,
+  UnavailableMenuItemTrigger
+} from '../src/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
 import More from '../s2wf-icons/S2_Icon_More_20_N.svg';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import Paste from '../s2wf-icons/S2_Icon_Paste_20_N.svg';
 import {ReactElement, useState} from 'react';
-import {Selection} from 'react-aria-components';
+import {Selection} from '@react-types/shared';
 import TextIcon from '../s2wf-icons/S2_Icon_Text_20_N.svg';
 import Underline from '../s2wf-icons/S2_Icon_TextUnderline_20_N.svg';
 
diff --git a/packages/@react-spectrum/s2/stories/NotificationBadge.stories.tsx b/packages/@react-spectrum/s2/stories/NotificationBadge.stories.tsx
index 7d831b91cbf..aab3e243366 100644
--- a/packages/@react-spectrum/s2/stories/NotificationBadge.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/NotificationBadge.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import type {Meta, StoryObj} from '@storybook/react';
-import {NotificationBadge} from '../src';
+import {NotificationBadge} from '../src/NotificationBadge';
 
 const meta: Meta<typeof NotificationBadge> = {
   component: NotificationBadge,
diff --git a/packages/@react-spectrum/s2/stories/NumberField.stories.tsx b/packages/@react-spectrum/s2/stories/NumberField.stories.tsx
index 94167cef0a2..ea2d2d56c37 100644
--- a/packages/@react-spectrum/s2/stories/NumberField.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/NumberField.stories.tsx
@@ -10,18 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  Button,
-  Content,
-  ContextualHelp,
-  Footer,
-  Form,
-  Heading,
-  Link,
-  NumberField,
-  Text
-} from '../src';
+import {Button} from '../src/Button';
+
+import {Content, Footer, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
+import {Form} from '../src/Form';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
+import {NumberField} from '../src/NumberField';
 import {style} from '../style' with {type: 'macro'};
 
 const meta: Meta<typeof NumberField> = {
diff --git a/packages/@react-spectrum/s2/stories/Picker.stories.tsx b/packages/@react-spectrum/s2/stories/Picker.stories.tsx
index fdd5514d098..6e7896e64a8 100644
--- a/packages/@react-spectrum/s2/stories/Picker.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Picker.stories.tsx
@@ -10,29 +10,21 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  Avatar,
-  Button,
-  Content,
-  ContextualHelp,
-  Footer,
-  Form,
-  Header,
-  Heading,
-  Link,
-  Picker,
-  PickerItem,
-  PickerProps,
-  PickerSection,
-  Text
-} from '../src';
+import {Avatar} from '../src/Avatar';
+
+import {Button} from '../src/Button';
 import {categorizeArgTypes, getActionArgs, StaticColorDecorator} from './utils';
+import {Content, Footer, Header, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
 import DeviceDesktopIcon from '../s2wf-icons/S2_Icon_DeviceDesktop_20_N.svg';
 import DeviceTabletIcon from '../s2wf-icons/S2_Icon_DeviceTablet_20_N.svg';
+import {Form} from '../src/Form';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
+import {Picker, PickerItem, PickerProps, PickerSection} from '../src/Picker';
 import {ReactElement} from 'react';
 import {style} from '../style' with {type: 'macro'};
-import {useAsyncList} from '@react-stately/data';
+import {useAsyncList} from 'react-stately/useAsyncList';
 
 const events = ['onOpenChange', 'onChange', 'onLoadMore'];
 
diff --git a/packages/@react-spectrum/s2/stories/Popover.stories.tsx b/packages/@react-spectrum/s2/stories/Popover.stories.tsx
index b6071eec89f..d3421beef61 100644
--- a/packages/@react-spectrum/s2/stories/Popover.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Popover.stories.tsx
@@ -10,23 +10,40 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, ActionMenu, Avatar, Button, Card, CardPreview, Content, DialogTrigger, Divider, Form, Image, Menu, MenuItem, MenuSection, Popover, SearchField, SubmenuTrigger, Switch, Tab, TabList, TabPanel, Tabs, Text, TextField} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {ActionMenu} from '../src/ActionMenu';
+import {Avatar} from '../src/Avatar';
+import {Button} from '../src/Button';
+import {Card, CardPreview} from '../src/Card';
 import Cloud from '../s2wf-icons/S2_Icon_Cloud_20_N.svg';
 import Comment from '../s2wf-icons/S2_Icon_Comment_20_N.svg';
 import CommentText from '../s2wf-icons/S2_Icon_CommentText_20_N.svg';
+import {Content, Text} from '../src/Content';
 import Copy from '../s2wf-icons/S2_Icon_Copy_20_N.svg';
+import {DialogTrigger} from '../src/DialogTrigger';
+import {Divider} from '../src/Divider';
 import Education from '../s2wf-icons/S2_Icon_Education_20_N.svg';
 import File from '../s2wf-icons/S2_Icon_File_20_N.svg';
+import {Form} from '../src/Form';
 import Help from '../s2wf-icons/S2_Icon_HelpCircle_20_N.svg';
+import {Image} from '../src/Image';
 import Lightbulb from '../s2wf-icons/S2_Icon_Lightbulb_20_N.svg';
+import {Menu, MenuItem, MenuSection, SubmenuTrigger} from '../src/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
 import Org from '../s2wf-icons/S2_Icon_Buildings_20_N.svg';
 import Paste from '../s2wf-icons/S2_Icon_Paste_20_N.svg';
-import {Autocomplete as RACAutocomplete, useFilter} from 'react-aria-components';
+import {Popover} from '../src/Popover';
+import {Autocomplete as RACAutocomplete} from 'react-aria-components/Autocomplete';
 import {ReactElement, useRef, useState} from 'react';
+import {SearchField} from '../src/SearchField';
 import Settings from '../s2wf-icons/S2_Icon_Settings_20_N.svg';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
+import {Switch} from '../src/Switch';
+import {Tab, TabList, TabPanel, Tabs} from '../src/Tabs';
+import {TextField} from '../src/TextField';
 import ThumbUp from '../s2wf-icons/S2_Icon_ThumbUp_20_N.svg';
+import {useFilter} from 'react-aria/useFilter';
 import User from '../s2wf-icons/S2_Icon_User_20_N.svg';
 import Users from '../s2wf-icons/S2_Icon_UserGroup_20_N.svg';
 
diff --git a/packages/@react-spectrum/s2/stories/ProgressBar.stories.tsx b/packages/@react-spectrum/s2/stories/ProgressBar.stories.tsx
index a9216940572..b8928de6ede 100644
--- a/packages/@react-spectrum/s2/stories/ProgressBar.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/ProgressBar.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import type {Meta, StoryObj} from '@storybook/react';
-import {ProgressBar} from '../src';
+import {ProgressBar} from '../src/ProgressBar';
 import {StaticColorDecorator} from './utils';
 import {style} from '../style' with {type: 'macro'};
 
diff --git a/packages/@react-spectrum/s2/stories/ProgressCircle.stories.tsx b/packages/@react-spectrum/s2/stories/ProgressCircle.stories.tsx
index 4e52c75f664..bb3dd8823a2 100644
--- a/packages/@react-spectrum/s2/stories/ProgressCircle.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/ProgressCircle.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import type {Meta, StoryObj} from '@storybook/react';
-import {ProgressCircle} from '../src';
+import {ProgressCircle} from '../src/ProgressCircle';
 import {StaticColorDecorator} from './utils';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
 
diff --git a/packages/@react-spectrum/s2/stories/RadioGroup.stories.tsx b/packages/@react-spectrum/s2/stories/RadioGroup.stories.tsx
index 653f8b8826d..7177651c600 100644
--- a/packages/@react-spectrum/s2/stories/RadioGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/RadioGroup.stories.tsx
@@ -10,17 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  Content,
-  ContextualHelp,
-  Footer,
-  Heading,
-  Link,
-  Radio,
-  RadioGroup,
-  Text
-} from '../src';
+import {Content, Footer, Heading, Text} from '../src/Content';
+
+import {ContextualHelp} from '../src/ContextualHelp';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
+import {Radio, RadioGroup} from '../src/RadioGroup';
 import {style} from '../style' with {type: 'macro'};
 
 const meta: Meta<typeof RadioGroup> = {
diff --git a/packages/@react-spectrum/s2/stories/RangeCalendar.stories.tsx b/packages/@react-spectrum/s2/stories/RangeCalendar.stories.tsx
index 0003e6e0aa3..63efaf4415e 100644
--- a/packages/@react-spectrum/s2/stories/RangeCalendar.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/RangeCalendar.stories.tsx
@@ -10,15 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, RangeCalendar, RangeCalendarProps} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
 import {CalendarDate, getLocalTimeZone, isWeekend, today} from '@internationalized/date';
 import {CalendarSwitcher, categorizeArgTypes, getActionArgs} from './utils';
 import {Custom454Calendar} from '/packages/@internationalized/date/tests/customCalendarImpl';
-import {DateValue} from 'react-aria';
+import {DateValue} from '@react-types/datepicker';
 import type {Meta, StoryObj} from '@storybook/react';
+import {RangeCalendar, RangeCalendarProps} from '../src/RangeCalendar';
 import {ReactElement, useState} from 'react';
 import {style} from '../style' with {type: 'macro'};
-import {useLocale} from '@react-aria/i18n';
+import {useLocale} from 'react-aria/I18nProvider';
 
 const events = ['onChange'];
 
diff --git a/packages/@react-spectrum/s2/stories/RangeSlider.stories.tsx b/packages/@react-spectrum/s2/stories/RangeSlider.stories.tsx
index 7226db2a6b6..9c5c37860df 100644
--- a/packages/@react-spectrum/s2/stories/RangeSlider.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/RangeSlider.stories.tsx
@@ -14,7 +14,7 @@ import {Content, Footer, Heading, Text} from '../src/Content';
 import {ContextualHelp} from '../src/ContextualHelp';
 import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
-import {RangeSlider} from '../src';
+import {RangeSlider} from '../src/RangeSlider';
 
 const meta: Meta<typeof RangeSlider> = {
   component: RangeSlider,
diff --git a/packages/@react-spectrum/s2/stories/SearchField.stories.tsx b/packages/@react-spectrum/s2/stories/SearchField.stories.tsx
index 8e86d649fb5..6d98275a503 100644
--- a/packages/@react-spectrum/s2/stories/SearchField.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/SearchField.stories.tsx
@@ -11,16 +11,11 @@
  */
 
 import {categorizeArgTypes, getActionArgs} from './utils';
-import {
-  Content,
-  ContextualHelp,
-  Footer,
-  Heading,
-  Link,
-  SearchField,
-  Text
-} from '../src';
+import {Content, Footer, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
+import {SearchField} from '../src/SearchField';
 import {style} from '../style' with {type: 'macro'};
 
 const events = ['onChange', 'onClear', 'onSubmit'];
diff --git a/packages/@react-spectrum/s2/stories/SegmentedControl.stories.tsx b/packages/@react-spectrum/s2/stories/SegmentedControl.stories.tsx
index 7bb200851b8..aefd8526bb1 100644
--- a/packages/@react-spectrum/s2/stories/SegmentedControl.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/SegmentedControl.stories.tsx
@@ -18,8 +18,9 @@ import ListBulleted from '../s2wf-icons/S2_Icon_ListBulleted_20_N.svg';
 import ListMultiSelect from '../s2wf-icons/S2_Icon_ListMultiSelect_20_N.svg';
 import ListNumbered from '../s2wf-icons/S2_Icon_ListNumbered_20_N.svg';
 import type {Meta, StoryObj} from '@storybook/react';
-import {SegmentedControl, SegmentedControlItem, Text} from '../src';
+import {SegmentedControl, SegmentedControlItem} from '../src/SegmentedControl';
 import {style} from '../style' with {type: 'macro'};
+import {Text} from '../src/Content';
 
 
 const meta: Meta<typeof SegmentedControl> = {
diff --git a/packages/@react-spectrum/s2/stories/SelectBoxGroup.stories.tsx b/packages/@react-spectrum/s2/stories/SelectBoxGroup.stories.tsx
index 95a58cda690..1d41d553c1c 100644
--- a/packages/@react-spectrum/s2/stories/SelectBoxGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/SelectBoxGroup.stories.tsx
@@ -15,10 +15,11 @@ import AlertNotice from '../spectrum-illustrations/linear/AlertNotice';
 import type {Meta, StoryObj} from '@storybook/react';
 import PaperAirplane from '../spectrum-illustrations/linear/Paperairplane';
 import React from 'react';
-import {SelectBox, SelectBoxGroup, Text} from '../src';
+import {SelectBox, SelectBoxGroup} from '../src/SelectBoxGroup';
 import Server from '../spectrum-illustrations/linear/Server';
 import StarFilled1 from '../spectrum-illustrations/linear/Star';
 import {style} from '../style' with {type: 'macro'};
+import {Text} from '../src/Content';
 
 const headingStyles = style({
   font: 'heading',
diff --git a/packages/@react-spectrum/s2/stories/StatusLight.stories.tsx b/packages/@react-spectrum/s2/stories/StatusLight.stories.tsx
index e4deebe2f41..21fdd08d5b9 100644
--- a/packages/@react-spectrum/s2/stories/StatusLight.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/StatusLight.stories.tsx
@@ -11,7 +11,7 @@
  */
 
 import type {Meta, StoryObj} from '@storybook/react';
-import {StatusLight} from '../src';
+import {StatusLight} from '../src/StatusLight';
 import {style} from '../style' with {type: 'macro'};
 
 const meta: Meta<typeof StatusLight> = {
diff --git a/packages/@react-spectrum/s2/stories/StyleMacro.stories.tsx b/packages/@react-spectrum/s2/stories/StyleMacro.stories.tsx
index de4f2beff2f..1911daf5cd6 100644
--- a/packages/@react-spectrum/s2/stories/StyleMacro.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/StyleMacro.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Link} from '../src';
+import {Link} from '../src/Link';
 import type {Meta} from '@storybook/react';
 import React, {ReactElement} from 'react';
 import {style} from '../style' with {type: 'macro'};
diff --git a/packages/@react-spectrum/s2/stories/Switch.stories.tsx b/packages/@react-spectrum/s2/stories/Switch.stories.tsx
index db08b6433d5..d901c48d34d 100644
--- a/packages/@react-spectrum/s2/stories/Switch.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Switch.stories.tsx
@@ -12,7 +12,7 @@
 
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style' with {type: 'macro'};
-import {Switch} from '../src';
+import {Switch} from '../src/Switch';
 
 const meta: Meta<typeof Switch> = {
   component: Switch,
diff --git a/packages/@react-spectrum/s2/stories/TableView.stories.tsx b/packages/@react-spectrum/s2/stories/TableView.stories.tsx
index 1bee8605955..2f1939354a9 100644
--- a/packages/@react-spectrum/s2/stories/TableView.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/TableView.stories.tsx
@@ -11,42 +11,42 @@
  */
 
 import {action} from 'storybook/actions';
+import {ActionButton} from '../src/ActionButton';
+
+import {categorizeArgTypes, getActionArgs} from './utils';
+
 import {
-  ActionButton,
   Cell,
-  Collection,
   Column,
   ColumnProps,
-  Content,
   EditableCell,
-  Heading,
-  IllustratedMessage,
-  Link,
-  MenuItem,
-  MenuSection,
-  Picker,
-  PickerItem,
   Row,
-  SortDescriptor,
-  StatusLight,
   TableBody,
   TableHeader,
   TableView,
-  TableViewProps,
-  Text,
-  TextField
-} from '../src';
-import {categorizeArgTypes, getActionArgs} from './utils';
+  TableViewProps
+} from '../src/TableView';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {Content, Heading, Text} from '../src/Content';
 import Edit from '../s2wf-icons/S2_Icon_Edit_20_N.svg';
 import Filter from '../s2wf-icons/S2_Icon_Filter_20_N.svg';
 import FolderOpen from '../spectrum-illustrations/linear/FolderOpen';
+import {IllustratedMessage} from '../src/IllustratedMessage';
 import {Key} from '@react-types/shared';
+import {Link} from '../src/Link';
+import {MenuItem, MenuSection} from '../src/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
+import {Picker, PickerItem} from '../src/Picker';
 import React, {ReactElement, useCallback, useEffect, useRef, useState} from 'react';
+import {SortDescriptor} from '@react-types/shared';
+import {StatusLight} from '../src/StatusLight';
 import {style} from '../style/spectrum-theme' with {type: 'macro'};
-import {useAsyncList, useListData, useTreeData} from '@react-stately/data';
-import {useEffectEvent} from '@react-aria/utils';
+import {TextField} from '../src/TextField';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useEffectEvent} from 'react-aria/private/utils/useEffectEvent';
+import {useListData} from 'react-stately/useListData';
 import User from '../s2wf-icons/S2_Icon_User_20_N.svg';
+import {useTreeData} from 'react-stately/useTreeData';
 
 let onActionFunc = action('onAction');
 let noOnAction = null;
diff --git a/packages/@react-spectrum/s2/stories/Tabs.stories.tsx b/packages/@react-spectrum/s2/stories/Tabs.stories.tsx
index 3d20a6df280..7f4bb80a26c 100644
--- a/packages/@react-spectrum/s2/stories/Tabs.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Tabs.stories.tsx
@@ -11,14 +11,16 @@
  */
 
 import Bell from '../s2wf-icons/S2_Icon_Bell_20_N.svg';
-import {Button, Tab, TabList, TabPanel, Tabs, TabsProps} from '../src';
-import {Collection, Text} from '@react-spectrum/s2';
+import {Button} from '../src/Button';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
 import Edit from '../s2wf-icons/S2_Icon_Edit_20_N.svg';
 import {fn} from 'storybook/test';
 import Heart from '../s2wf-icons/S2_Icon_Heart_20_N.svg';
 import type {Meta, StoryObj} from '@storybook/react';
 import React, {ReactElement} from 'react';
 import {style} from '../style' with { type: 'macro' };
+import {Tab, TabList, TabPanel, Tabs, TabsProps} from '../src/Tabs';
+import {Text} from '../src/Content';
 
 const meta: Meta<typeof Tabs> = {
   component: Tabs,
diff --git a/packages/@react-spectrum/s2/stories/TagGroup.stories.tsx b/packages/@react-spectrum/s2/stories/TagGroup.stories.tsx
index 3e7b79888de..cc0e7cccbf6 100644
--- a/packages/@react-spectrum/s2/stories/TagGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/TagGroup.stories.tsx
@@ -11,21 +11,15 @@
  */
 
 import {action} from 'storybook/actions';
-import {
-  Avatar,
-  Content,
-  ContextualHelp,
-  Footer,
-  Heading,
-  Image,
-  Link,
-  Tag,
-  TagGroup,
-  Text
-} from '../src';
+import {Avatar} from '../src/Avatar';
+import {Content, Footer, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
+import {Image} from '../src/Image';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import {style} from '../style' with {type: 'macro'};
+import {Tag, TagGroup} from '../src/TagGroup';
 
 const meta: Meta<typeof TagGroup<any>> = {
   component: TagGroup,
diff --git a/packages/@react-spectrum/s2/stories/TextField.stories.tsx b/packages/@react-spectrum/s2/stories/TextField.stories.tsx
index b57be304857..475241e8560 100644
--- a/packages/@react-spectrum/s2/stories/TextField.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/TextField.stories.tsx
@@ -10,12 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Form, TextArea, TextField} from '../src';
+import {Button} from '../src/Button';
+
 import {Content, Footer, Heading, Text} from '../src/Content';
 import {ContextualHelp} from '../src/ContextualHelp';
+import {Form} from '../src/Form';
 import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style' with {type: 'macro'};
+import {TextArea, TextField} from '../src/TextField';
 
 const meta: Meta<typeof TextField> = {
   component: TextField,
diff --git a/packages/@react-spectrum/s2/stories/TimeField.stories.tsx b/packages/@react-spectrum/s2/stories/TimeField.stories.tsx
index 458ac1c155f..f3d1fc2352a 100644
--- a/packages/@react-spectrum/s2/stories/TimeField.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/TimeField.stories.tsx
@@ -10,10 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Content, ContextualHelp, Footer, Form, Heading, Link, Text, TimeField} from '../src';
+import {Button} from '../src/Button';
+
 import {CalendarSwitcher, categorizeArgTypes, getActionArgs} from './utils';
+import {Content, Footer, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
+import {Form} from '../src/Form';
+import {Link} from '../src/Link';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style' with {type: 'macro'};
+import {TimeField} from '../src/TimeField';
 
 const events = ['onChange'];
 
diff --git a/packages/@react-spectrum/s2/stories/Toast.stories.tsx b/packages/@react-spectrum/s2/stories/Toast.stories.tsx
index d5407d90205..c67097a37b8 100644
--- a/packages/@react-spectrum/s2/stories/Toast.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Toast.stories.tsx
@@ -11,11 +11,13 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button, ButtonGroup, ToastContainer, ToastQueue} from '../src';
+import {Button} from '../src/Button';
+import {ButtonGroup} from '../src/ButtonGroup';
 import type {Meta, StoryObj} from '@storybook/react';
 import {SpectrumToast, SpectrumToastValue, ToastOptions, ToastPlacement} from '../src/Toast';
-import {UNSTABLE_ToastStateContext} from 'react-aria-components';
-import {useToastState} from 'react-stately';
+import {ToastContainer, ToastQueue} from '../src/Toast';
+import {UNSTABLE_ToastStateContext} from 'react-aria-components/Toast';
+import {useToastState} from 'react-stately/useToastState';
 
 const meta: Meta<ToastStoryProps> = {
   parameters: {
diff --git a/packages/@react-spectrum/s2/stories/ToggleButton.stories.tsx b/packages/@react-spectrum/s2/stories/ToggleButton.stories.tsx
index 275d29c2e6a..8d3db10deff 100644
--- a/packages/@react-spectrum/s2/stories/ToggleButton.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/ToggleButton.stories.tsx
@@ -13,7 +13,8 @@
 import {categorizeArgTypes, getActionArgs, StaticColorDecorator} from './utils';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
-import {Text, ToggleButton} from '../src';
+import {Text} from '../src/Content';
+import {ToggleButton} from '../src/ToggleButton';
 
 const events = ['onPress', 'onPressChange', 'onPressEnd', 'onPressStart', 'onPressUp', 'onChange'];
 
diff --git a/packages/@react-spectrum/s2/stories/ToggleButtonGroup.stories.tsx b/packages/@react-spectrum/s2/stories/ToggleButtonGroup.stories.tsx
index 60e9aa16a1d..77719e285ee 100644
--- a/packages/@react-spectrum/s2/stories/ToggleButtonGroup.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/ToggleButtonGroup.stories.tsx
@@ -15,7 +15,9 @@ import {categorizeArgTypes, getActionArgs, StaticColorDecorator} from './utils';
 import Italic from '../s2wf-icons/S2_Icon_TextItalic_20_N.svg';
 import type {Meta, StoryObj} from '@storybook/react';
 import {style} from '../style' with {type: 'macro'};
-import {Text, ToggleButton, ToggleButtonGroup} from '../src';
+import {Text} from '../src/Content';
+import {ToggleButton} from '../src/ToggleButton';
+import {ToggleButtonGroup} from '../src/ToggleButtonGroup';
 import Underline from '../s2wf-icons/S2_Icon_TextUnderline_20_N.svg';
 
 const events = ['onSelectionChange'];
diff --git a/packages/@react-spectrum/s2/stories/Tooltip.stories.tsx b/packages/@react-spectrum/s2/stories/Tooltip.stories.tsx
index e9d20abc1c8..19619dbfba5 100644
--- a/packages/@react-spectrum/s2/stories/Tooltip.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/Tooltip.stories.tsx
@@ -10,12 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, Button, Provider, Tooltip, TooltipTrigger} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {Button} from '../src/Button';
 import {CombinedTooltip} from '../src/Tooltip';
 import Crop from '../s2wf-icons/S2_Icon_Crop_20_N.svg';
 import LassoSelect from '../s2wf-icons/S2_Icon_LassoSelect_20_N.svg';
 import type {Meta, StoryObj} from '@storybook/react';
+import {Provider} from '../src/Provider';
 import {style} from '../style' with {type: 'macro'};
+import {Tooltip, TooltipTrigger} from '../src/Tooltip';
 
 const meta: Meta<typeof CombinedTooltip> = {
   component: CombinedTooltip,
diff --git a/packages/@react-spectrum/s2/stories/TreeView.stories.tsx b/packages/@react-spectrum/s2/stories/TreeView.stories.tsx
index 35d098674a1..5497576f9a1 100644
--- a/packages/@react-spectrum/s2/stories/TreeView.stories.tsx
+++ b/packages/@react-spectrum/s2/stories/TreeView.stories.tsx
@@ -11,37 +11,38 @@
  */
 
 import {action} from 'storybook/actions';
-import {
-  ActionBar,
-  ActionButton,
-  ActionMenu,
-  Collection,
-  Content,
-  Heading,
-  IllustratedMessage,
-  Link,
-  MenuItem,
-  Text,
-  TreeView,
-  TreeViewItem,
-  TreeViewItemContent,
-  TreeViewItemProps,
-  TreeViewLoadMoreItem,
-  TreeViewLoadMoreItemProps,
-  TreeViewProps
-} from '../src';
+import {ActionBar} from '../src/ActionBar';
+import {ActionButton} from '../src/ActionButton';
+import {ActionMenu} from '../src/ActionMenu';
 import {categorizeArgTypes, getActionArgs} from './utils';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {Content, Heading, Text} from '../src/Content';
 import Copy from '../s2wf-icons/S2_Icon_Copy_20_N.svg';
 import Delete from '../s2wf-icons/S2_Icon_Delete_20_N.svg';
+
 import Edit from '../s2wf-icons/S2_Icon_Edit_20_N.svg';
+
 import FileTxt from '../s2wf-icons/S2_Icon_FileText_20_N.svg';
 import Folder from '../s2wf-icons/S2_Icon_Folder_20_N.svg';
 import FolderOpen from '../spectrum-illustrations/linear/FolderOpen';
-import {Key} from 'react-aria';
+import {IllustratedMessage} from '../src/IllustratedMessage';
+import {Key} from '@react-types/shared';
+import {Link} from '../src/Link';
+import {MenuItem} from '../src/Menu';
 import type {Meta, StoryObj} from '@storybook/react';
 import React, {ReactElement, useCallback, useState} from 'react';
 import {style} from '../style' with {type: 'macro'};
-import {useAsyncList, useListData} from 'react-stately';
+import {
+  TreeView,
+  TreeViewItem,
+  TreeViewItemContent,
+  TreeViewItemProps,
+  TreeViewLoadMoreItem,
+  TreeViewLoadMoreItemProps,
+  TreeViewProps
+} from '../src/TreeView';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useListData} from 'react-stately/useListData';
 
 let onActionFunc = action('onAction');
 let noOnAction = null;
diff --git a/packages/@react-spectrum/s2/stories/utils.tsx b/packages/@react-spectrum/s2/stories/utils.tsx
index 8dc80322479..3ca007be5a8 100644
--- a/packages/@react-spectrum/s2/stories/utils.tsx
+++ b/packages/@react-spectrum/s2/stories/utils.tsx
@@ -11,11 +11,16 @@
  */
 
 
-import {Collection, Header, Heading, Picker, PickerItem, PickerSection, Provider} from '../src';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+
 import {fn} from 'storybook/test';
-import {Key, useLocale} from 'react-aria';
+import {Header, Heading} from '../src/Content';
+import {Key} from '@react-types/shared';
+import {Picker, PickerItem, PickerSection} from '../src/Picker';
 import {PropsWithChildren, ReactElement, ReactNode, useMemo, useState} from 'react';
+import {Provider} from '../src/Provider';
 import {style} from '../style' with {type: 'macro'};
+import {useLocale} from 'react-aria/I18nProvider';
 
 type StaticColor = 'black' | 'white' | 'auto' | undefined;
 
diff --git a/packages/@react-spectrum/s2/test/ActionButtonGroup.test.tsx b/packages/@react-spectrum/s2/test/ActionButtonGroup.test.tsx
index 9565351a525..3886a779c0a 100644
--- a/packages/@react-spectrum/s2/test/ActionButtonGroup.test.tsx
+++ b/packages/@react-spectrum/s2/test/ActionButtonGroup.test.tsx
@@ -10,8 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton, ActionButtonGroup, Text} from '../src';
+import {ActionButton} from '../src/ActionButton';
+
+import {ActionButtonGroup} from '../src/ActionButtonGroup';
 import {render} from '@react-spectrum/test-utils-internal';
+import {Text} from '../src/Content';
 
 describe('ActionButtonGroup', () => {
 
diff --git a/packages/@react-spectrum/s2/test/CheckboxGroup.test.tsx b/packages/@react-spectrum/s2/test/CheckboxGroup.test.tsx
index 8081ede4888..b42afec1e93 100644
--- a/packages/@react-spectrum/s2/test/CheckboxGroup.test.tsx
+++ b/packages/@react-spectrum/s2/test/CheckboxGroup.test.tsx
@@ -11,7 +11,10 @@
  */
 
 import {act, pointerMap, render, User} from '@react-spectrum/test-utils-internal';
-import {Checkbox, CheckboxGroup, Form, Provider} from '../src';
+import {Checkbox} from '../src/Checkbox';
+import {CheckboxGroup} from '../src/CheckboxGroup';
+import {Form} from '../src/Form';
+import {Provider} from '../src/Provider';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/s2/test/CoachMark.test.tsx b/packages/@react-spectrum/s2/test/CoachMark.test.tsx
index 6814ac9d717..f961a190563 100644
--- a/packages/@react-spectrum/s2/test/CoachMark.test.tsx
+++ b/packages/@react-spectrum/s2/test/CoachMark.test.tsx
@@ -11,19 +11,14 @@
  */
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {
-  ActionMenu,
-  Button,
-  CardPreview,
-  Checkbox,
-  Content,
-  Footer,
-  Image,
-  Keyboard,
-  MenuItem,
-  Text
-} from '../src';
+import {ActionMenu} from '../src/ActionMenu';
+import {Button} from '../src/Button';
+import {CardPreview} from '../src/Card';
+import {Checkbox} from '../src/Checkbox';
 import {CoachMark, CoachMarkTrigger} from '../src/CoachMark';
+import {Content, Footer, Keyboard, Text} from '../src/Content';
+import {Image} from '../src/Image';
+import {MenuItem} from '../src/Menu';
 import React from 'react';
 import userEvent, {UserEvent} from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/s2/test/Combobox.test.tsx b/packages/@react-spectrum/s2/test/Combobox.test.tsx
index c6d188c6416..f925a5a137d 100644
--- a/packages/@react-spectrum/s2/test/Combobox.test.tsx
+++ b/packages/@react-spectrum/s2/test/Combobox.test.tsx
@@ -10,10 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
 import {act, pointerMap, render, setupIntersectionObserverMock, waitFor, within} from '@react-spectrum/test-utils-internal';
-import {announce} from '@react-aria/live-announcer';
-import {Button, ComboBox, ComboBoxItem, Content, ContextualHelp, Dialog, DialogTrigger, Heading, Text} from '../src';
+import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
+import {Button} from '../src/Button';
+import {ComboBox, ComboBoxItem} from '../src/ComboBox';
+import {Content, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
+import {Dialog} from '../src/Dialog';
+import {DialogTrigger} from '../src/DialogTrigger';
 import React from 'react';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/@react-spectrum/s2/test/CustomDialog.test.tsx b/packages/@react-spectrum/s2/test/CustomDialog.test.tsx
index 0dd0ce47bb8..eff390dfce2 100644
--- a/packages/@react-spectrum/s2/test/CustomDialog.test.tsx
+++ b/packages/@react-spectrum/s2/test/CustomDialog.test.tsx
@@ -11,8 +11,11 @@
  */
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {ActionButton, CustomDialog, DialogTrigger, Tag, TagGroup} from '../src';
+import {ActionButton} from '../src/ActionButton';
+import {CustomDialog} from '../src/CustomDialog';
+import {DialogTrigger} from '../src/DialogTrigger';
 import React from 'react';
+import {Tag, TagGroup} from '../src/TagGroup';
 import userEvent from '@testing-library/user-event';
 
 describe('CustomDialog', () => {
diff --git a/packages/@react-spectrum/s2/test/EditableTableView.test.tsx b/packages/@react-spectrum/s2/test/EditableTableView.test.tsx
index 560fdd4a338..270bd1668b5 100644
--- a/packages/@react-spectrum/s2/test/EditableTableView.test.tsx
+++ b/packages/@react-spectrum/s2/test/EditableTableView.test.tsx
@@ -10,32 +10,33 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
-jest.mock('@react-aria/utils/src/scrollIntoView');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
+jest.mock('react-aria/src/utils/scrollIntoView');
 import {act, render, within} from '@react-spectrum/test-utils-internal';
+import {ActionButton} from '../src/ActionButton';
+
 import {
-  ActionButton,
   Cell,
   Column,
   ColumnProps,
   EditableCell,
-  Picker,
-  PickerItem,
   Row,
-  StatusLight,
   TableBody,
   TableHeader,
   TableView,
-  TableViewProps,
-  Text,
-  TextField
-} from '../src';
+  TableViewProps
+} from '../src/TableView';
+
 import Edit from '../s2wf-icons/S2_Icon_Edit_20_N.svg';
 import {installPointerEvent, pointerMap, User} from '@react-aria/test-utils';
 import {Key} from '@react-types/shared';
+import {Picker, PickerItem} from '../src/Picker';
 import React, {useCallback, useEffect, useRef} from 'react';
-import {useEffectEvent} from '@react-aria/utils';
-import {useListData} from '@react-stately/data';
+import {StatusLight} from '../src/StatusLight';
+import {Text} from '../src/Content';
+import {TextField} from '../src/TextField';
+import {useEffectEvent} from 'react-aria/private/utils/useEffectEvent';
+import {useListData} from 'react-stately/useListData';
 import userEvent from '@testing-library/user-event';
 
 // @ts-ignore
diff --git a/packages/@react-spectrum/s2/test/Image.test.tsx b/packages/@react-spectrum/s2/test/Image.test.tsx
index 014a0f01cbf..a619a29a639 100644
--- a/packages/@react-spectrum/s2/test/Image.test.tsx
+++ b/packages/@react-spectrum/s2/test/Image.test.tsx
@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {Image, Provider} from '../src';
+import {Image} from '../src/Image';
+
+import {Provider} from '../src/Provider';
 import {render} from '@react-spectrum/test-utils-internal';
 
 describe('Image', () => {
diff --git a/packages/@react-spectrum/s2/test/Menu.test.tsx b/packages/@react-spectrum/s2/test/Menu.test.tsx
index 134a997ad00..6b746df895a 100644
--- a/packages/@react-spectrum/s2/test/Menu.test.tsx
+++ b/packages/@react-spectrum/s2/test/Menu.test.tsx
@@ -11,7 +11,20 @@
  */
 
 import {AriaMenuTests} from '../../../react-aria-components/test/AriaMenu.test-util';
-import {Button, Collection, Content, ContextualHelpPopover, Header, Heading, Menu, MenuItem, MenuSection, MenuTrigger, SubmenuTrigger, UnavailableMenuItemTrigger} from '../src';
+import {Button} from '../src/Button';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {Content, Header, Heading} from '../src/Content';
+import {ContextualHelpPopover} from '../src/ContextualHelp';
+
+import {
+  Menu,
+  MenuItem,
+  MenuSection,
+  MenuTrigger,
+  SubmenuTrigger,
+  UnavailableMenuItemTrigger
+} from '../src/Menu';
+
 import {pointerMap} from '@react-aria/test-utils';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
diff --git a/packages/@react-spectrum/s2/test/Picker.test.tsx b/packages/@react-spectrum/s2/test/Picker.test.tsx
index 35efe33433c..5c62d97a82f 100644
--- a/packages/@react-spectrum/s2/test/Picker.test.tsx
+++ b/packages/@react-spectrum/s2/test/Picker.test.tsx
@@ -11,7 +11,9 @@
  */
 
 import {act, render, setupIntersectionObserverMock} from '@react-spectrum/test-utils-internal';
-import {Content, ContextualHelp, Heading, Picker, PickerItem, Text} from '../src';
+import {Content, Heading, Text} from '../src/Content';
+import {ContextualHelp} from '../src/ContextualHelp';
+import {Picker, PickerItem} from '../src/Picker';
 import {pointerMap, User} from '@react-aria/test-utils';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/@react-spectrum/s2/test/RadioGroup.test.tsx b/packages/@react-spectrum/s2/test/RadioGroup.test.tsx
index 1868fe10e7e..9a3dfbb8693 100644
--- a/packages/@react-spectrum/s2/test/RadioGroup.test.tsx
+++ b/packages/@react-spectrum/s2/test/RadioGroup.test.tsx
@@ -10,10 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
 import {Direction} from '@react-types/shared';
 import {pointerMap, render, User} from '@react-spectrum/test-utils-internal';
-import {Provider, Radio, RadioGroup} from '../src';
+import {Provider} from '../src/Provider';
+import {Radio, RadioGroup} from '../src/RadioGroup';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/s2/test/SearchField.test.tsx b/packages/@react-spectrum/s2/test/SearchField.test.tsx
index a8ccddc2ae3..2d4df6514b5 100644
--- a/packages/@react-spectrum/s2/test/SearchField.test.tsx
+++ b/packages/@react-spectrum/s2/test/SearchField.test.tsx
@@ -10,10 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {Autocomplete} from 'react-aria-components';
-import {Menu, MenuItem, SearchField} from '../src';
+import {Autocomplete} from 'react-aria-components/Autocomplete';
+
+import {Menu, MenuItem} from '../src/Menu';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
+import {SearchField} from '../src/SearchField';
 import userEvent from '@testing-library/user-event';
 
 describe('SearchField', () => {
diff --git a/packages/@react-spectrum/s2/test/SelectBoxGroup.test.tsx b/packages/@react-spectrum/s2/test/SelectBoxGroup.test.tsx
index 8fd18a33e3e..1045929855a 100644
--- a/packages/@react-spectrum/s2/test/SelectBoxGroup.test.tsx
+++ b/packages/@react-spectrum/s2/test/SelectBoxGroup.test.tsx
@@ -1,8 +1,9 @@
 import {act, pointerMap, render, screen, waitFor} from '@react-spectrum/test-utils-internal';
 import Calendar from '../spectrum-illustrations/linear/Calendar';
 import React from 'react';
-import {SelectBox, SelectBoxGroup, Text} from '../src';
+import {SelectBox, SelectBoxGroup} from '../src/SelectBoxGroup';
 import {Selection} from '@react-types/shared';
+import {Text} from '../src/Content';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-spectrum/s2/test/TableView.test.tsx b/packages/@react-spectrum/s2/test/TableView.test.tsx
index 1491f8f8006..e6d01c5662f 100644
--- a/packages/@react-spectrum/s2/test/TableView.test.tsx
+++ b/packages/@react-spectrum/s2/test/TableView.test.tsx
@@ -10,27 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
-jest.mock('@react-aria/utils/src/scrollIntoView');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
+jest.mock('react-aria/src/utils/scrollIntoView');
 import {act, render} from '@react-spectrum/test-utils-internal';
-import {
-  Cell,
-  Column,
-  MenuItem,
-  MenuSection,
-  Row,
-  Tab,
-  TableBody,
-  TableHeader,
-  TableView,
-  TabList,
-  Tabs,
-  Text
-} from '../src';
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../src/TableView';
 import {DisabledBehavior} from '@react-types/shared';
 import Filter from '../s2wf-icons/S2_Icon_Filter_20_N.svg';
+import {MenuItem, MenuSection} from '../src/Menu';
 import {pointerMap, User} from '@react-aria/test-utils';
 import React, {useState} from 'react';
+import {Tab, TabList, Tabs} from '../src/Tabs';
+import {Text} from '../src/Content';
 import userEvent from '@testing-library/user-event';
 
 // @ts-ignore
diff --git a/packages/@react-spectrum/s2/test/TagGroup.test.tsx b/packages/@react-spectrum/s2/test/TagGroup.test.tsx
index 9deff9e855d..90409723d07 100644
--- a/packages/@react-spectrum/s2/test/TagGroup.test.tsx
+++ b/packages/@react-spectrum/s2/test/TagGroup.test.tsx
@@ -12,7 +12,7 @@
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {Tag, TagGroup} from '../src';
+import {Tag, TagGroup} from '../src/TagGroup';
 import userEvent from '@testing-library/user-event';
 
 
diff --git a/packages/@react-spectrum/s2/test/TextField.test.tsx b/packages/@react-spectrum/s2/test/TextField.test.tsx
index bad48cc0ccd..10e27add725 100644
--- a/packages/@react-spectrum/s2/test/TextField.test.tsx
+++ b/packages/@react-spectrum/s2/test/TextField.test.tsx
@@ -11,7 +11,7 @@
  */
 
 import {fireEvent, render} from '@react-spectrum/test-utils-internal';
-import {TextArea} from '../src';
+import {TextArea} from '../src/TextField';
 
 describe('TextField', () => {
   it('should focus textarea when tapping invalid icon', async () => {
diff --git a/packages/@react-spectrum/s2/test/ToggleButtonGroup.test.tsx b/packages/@react-spectrum/s2/test/ToggleButtonGroup.test.tsx
index c0d87ca68b1..c3a25b6d106 100644
--- a/packages/@react-spectrum/s2/test/ToggleButtonGroup.test.tsx
+++ b/packages/@react-spectrum/s2/test/ToggleButtonGroup.test.tsx
@@ -11,7 +11,9 @@
  */
 
 import {render} from '@react-spectrum/test-utils-internal';
-import {Text, ToggleButton, ToggleButtonGroup} from '../src';
+import {Text} from '../src/Content';
+import {ToggleButton} from '../src/ToggleButton';
+import {ToggleButtonGroup} from '../src/ToggleButtonGroup';
 
 describe('ToggleButtonGroup', () => {
 
diff --git a/packages/@react-spectrum/s2/test/TreeView.test.tsx b/packages/@react-spectrum/s2/test/TreeView.test.tsx
index de612397a26..5fa62f99c1b 100644
--- a/packages/@react-spectrum/s2/test/TreeView.test.tsx
+++ b/packages/@react-spectrum/s2/test/TreeView.test.tsx
@@ -1,18 +1,14 @@
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {
-  ActionMenu,
-  MenuItem,
-  Text,
-  TreeView,
-  TreeViewItem,
-  TreeViewItemContent
-} from '../src';
+import {ActionMenu} from '../src/ActionMenu';
 import {AriaTreeTests} from '../../../react-aria-components/test/AriaTree.test-util';
 import {DisabledBehavior} from '@react-types/shared';
 import FileTxt from '../s2wf-icons/S2_Icon_FileText_20_N.svg';
 import Folder from '../s2wf-icons/S2_Icon_Folder_20_N.svg';
+import {MenuItem} from '../src/Menu';
 import React, {useState} from 'react';
+import {Text} from '../src/Content';
+import {TreeView, TreeViewItem, TreeViewItemContent} from '../src/TreeView';
 import userEvent from '@testing-library/user-event';
 
 AriaTreeTests({
diff --git a/packages/@react-spectrum/searchfield/index.ts b/packages/@react-spectrum/searchfield/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/searchfield/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/searchfield/package.json b/packages/@react-spectrum/searchfield/package.json
index 2713b47414b..0232e63032b 100644
--- a/packages/@react-spectrum/searchfield/package.json
+++ b/packages/@react-spectrum/searchfield/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,39 +27,26 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/searchfield": "^3.8.12",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/form": "^3.7.22",
-    "@react-spectrum/textfield": "^3.14.5",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/searchfield": "^3.5.19",
     "@react-types/searchfield": "^3.6.8",
     "@react-types/textfield": "^3.12.8",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
     "@react-spectrum/test-utils-internal": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/searchfield/src/index.ts b/packages/@react-spectrum/searchfield/src/index.ts
index 1448f7e0780..a2bf3270a9f 100644
--- a/packages/@react-spectrum/searchfield/src/index.ts
+++ b/packages/@react-spectrum/searchfield/src/index.ts
@@ -12,5 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export {SearchField} from './SearchField';
+export {SearchField} from '@adobe/react-spectrum/SearchField';
+
 export type {SpectrumSearchFieldProps} from '@react-types/searchfield';
diff --git a/packages/@react-spectrum/slider/index.ts b/packages/@react-spectrum/slider/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/slider/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/slider/package.json b/packages/@react-spectrum/slider/package.json
index 3f74f997fe1..7f5f4bcd528 100644
--- a/packages/@react-spectrum/slider/package.json
+++ b/packages/@react-spectrum/slider/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,39 +27,24 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/slider": "^3.8.5",
-    "@react-aria/utils": "^3.33.1",
-    "@react-aria/visually-hidden": "^3.8.31",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/slider": "^3.7.5",
     "@react-types/shared": "^3.33.1",
     "@react-types/slider": "^3.8.4",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/slider/src/index.ts b/packages/@react-spectrum/slider/src/index.ts
index 4f6a9e13265..eddad95cca5 100644
--- a/packages/@react-spectrum/slider/src/index.ts
+++ b/packages/@react-spectrum/slider/src/index.ts
@@ -12,6 +12,7 @@
 
 /// <reference types="css-module-types" />
 
-export {Slider} from './Slider';
-export {RangeSlider} from './RangeSlider';
+export {Slider} from '@adobe/react-spectrum/Slider';
+
+export {RangeSlider} from '@adobe/react-spectrum/RangeSlider';
 export type {SpectrumRangeSliderProps, SpectrumSliderProps} from '@react-types/slider';
diff --git a/packages/@react-spectrum/statuslight/index.ts b/packages/@react-spectrum/statuslight/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/statuslight/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/statuslight/package.json b/packages/@react-spectrum/statuslight/package.json
index ccddef80184..d47ab1431f0 100644
--- a/packages/@react-spectrum/statuslight/package.json
+++ b/packages/@react-spectrum/statuslight/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,33 +27,23 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/shared": "^3.33.1",
     "@react-types/statuslight": "^3.3.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/statuslight/src/index.ts b/packages/@react-spectrum/statuslight/src/index.ts
index 15ddacd3f2a..a334fb8c3fe 100644
--- a/packages/@react-spectrum/statuslight/src/index.ts
+++ b/packages/@react-spectrum/statuslight/src/index.ts
@@ -12,5 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export {StatusLight} from './StatusLight';
+export {StatusLight} from '@adobe/react-spectrum/StatusLight';
+
 export type {SpectrumStatusLightProps} from '@react-types/statuslight';
diff --git a/packages/@react-spectrum/steplist/index.ts b/packages/@react-spectrum/steplist/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/steplist/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/steplist/package.json b/packages/@react-spectrum/steplist/package.json
index f1c53fbe9c2..4264a1b6865 100644
--- a/packages/@react-spectrum/steplist/package.json
+++ b/packages/@react-spectrum/steplist/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,40 +27,24 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/steplist": "3.0.0-alpha.25",
-    "@react-aria/utils": "^3.33.1",
-    "@react-aria/visually-hidden": "^3.8.31",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/steplist": "3.0.0-alpha.21",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/steplist/src/index.ts b/packages/@react-spectrum/steplist/src/index.ts
index aa9f8aff900..7989d3d12a1 100644
--- a/packages/@react-spectrum/steplist/src/index.ts
+++ b/packages/@react-spectrum/steplist/src/index.ts
@@ -12,6 +12,7 @@
 
 /// <reference types="css-module-types" />
 
-export {StepList} from './StepList';
-export {Item} from '@react-stately/collections';
-export type {SpectrumStepListProps} from './StepList';
+export {StepList} from '@adobe/react-spectrum/private/steplist/StepList';
+
+export type {SpectrumStepListProps} from '@adobe/react-spectrum/private/steplist/StepList';
+export {Item} from 'react-stately/Item';
diff --git a/packages/@react-spectrum/story-utils/package.json b/packages/@react-spectrum/story-utils/package.json
index d1094ea32fb..0bf0ef7c119 100644
--- a/packages/@react-spectrum/story-utils/package.json
+++ b/packages/@react-spectrum/story-utils/package.json
@@ -8,14 +8,11 @@
   "module": "dist/module.js",
   "exports": {
     "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
+    "types": "./dist/types/src/index.d.ts",
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
-  "types": "dist/types.d.ts",
+  "types": "./dist/types/src/index.d.ts",
   "source": "src/index.ts",
   "files": [
     "dist",
@@ -25,16 +22,7 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
diff --git a/packages/@react-spectrum/switch/index.ts b/packages/@react-spectrum/switch/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/switch/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/switch/package.json b/packages/@react-spectrum/switch/package.json
index e9509303203..990657f000c 100644
--- a/packages/@react-spectrum/switch/package.json
+++ b/packages/@react-spectrum/switch/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,36 +27,24 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/switch": "^3.7.11",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/toggle": "^3.9.5",
     "@react-types/shared": "^3.33.1",
     "@react-types/switch": "^3.5.17",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/switch/src/index.ts b/packages/@react-spectrum/switch/src/index.ts
index a0b0035a299..5bea010e198 100644
--- a/packages/@react-spectrum/switch/src/index.ts
+++ b/packages/@react-spectrum/switch/src/index.ts
@@ -12,5 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export {Switch} from './Switch';
+export {Switch} from '@adobe/react-spectrum/Switch';
+
 export type {SpectrumSwitchProps} from '@react-types/switch';
diff --git a/packages/@react-spectrum/table/index.ts b/packages/@react-spectrum/table/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-spectrum/table/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/table/package.json b/packages/@react-spectrum/table/package.json
index aca041f2216..cb2dca05b44 100644
--- a/packages/@react-spectrum/table/package.json
+++ b/packages/@react-spectrum/table/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,48 +27,21 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/button": "^3.14.5",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/selection": "^3.27.2",
-    "@react-aria/table": "^3.17.11",
-    "@react-aria/utils": "^3.33.1",
-    "@react-aria/virtualizer": "^4.1.13",
-    "@react-aria/visually-hidden": "^3.8.31",
-    "@react-spectrum/checkbox": "^3.10.7",
-    "@react-spectrum/dnd": "^3.6.5",
-    "@react-spectrum/layout": "^3.6.22",
-    "@react-spectrum/menu": "^3.22.11",
-    "@react-spectrum/progress": "^3.7.23",
-    "@react-spectrum/tooltip": "^3.8.2",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/flags": "^3.1.2",
-    "@react-stately/layout": "^4.6.0",
-    "@react-stately/table": "^3.15.4",
-    "@react-stately/virtualizer": "^4.4.6",
     "@react-types/grid": "^3.3.8",
     "@react-types/shared": "^3.33.1",
     "@react-types/table": "^3.13.6",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
@@ -73,7 +49,6 @@
     "@react-stately/dnd": "^3.1.0"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/table/src/index.ts b/packages/@react-spectrum/table/src/index.ts
index 81e411f8b65..b9dc98b5324 100644
--- a/packages/@react-spectrum/table/src/index.ts
+++ b/packages/@react-spectrum/table/src/index.ts
@@ -12,15 +12,8 @@
 
 /// <reference types="css-module-types" />
 
-export {
-  TableView,
-  TableHeader,
-  TableBody,
-  Column,
-  Section,
-  Row,
-  Cell
-} from './TableView';
+export {TableView, TableHeader, TableBody, Column, Section, Row, Cell} from '@adobe/react-spectrum/TableView';
+
+export type {SpectrumTableProps} from '@adobe/react-spectrum/TableView';
 
 export type {SpectrumColumnProps, TableHeaderProps, TableBodyProps, RowProps, CellProps} from '@react-types/table';
-export type {SpectrumTableProps} from './TableView';
diff --git a/packages/@react-spectrum/tabs/index.ts b/packages/@react-spectrum/tabs/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/tabs/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/tabs/package.json b/packages/@react-spectrum/tabs/package.json
index 9256ffaa823..995774ced98 100644
--- a/packages/@react-spectrum/tabs/package.json
+++ b/packages/@react-spectrum/tabs/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,43 +27,25 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/tabs": "^3.11.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/picker": "^3.16.7",
-    "@react-spectrum/text": "^3.5.25",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/list": "^3.13.4",
-    "@react-stately/tabs": "^3.8.9",
     "@react-types/select": "^3.12.2",
     "@react-types/shared": "^3.33.1",
     "@react-types/tabs": "^3.3.22",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/tabs/src/index.ts b/packages/@react-spectrum/tabs/src/index.ts
index f52aa986edb..f1859e66820 100644
--- a/packages/@react-spectrum/tabs/src/index.ts
+++ b/packages/@react-spectrum/tabs/src/index.ts
@@ -12,6 +12,7 @@
 
 /// <reference types="css-module-types" />
 
-export {TabList, TabPanels, Tabs} from './Tabs';
-export {Item} from '@react-stately/collections';
+export {TabList, TabPanels, Tabs} from '@adobe/react-spectrum/Tabs';
+
+export {Item} from 'react-stately/Item';
 export type {SpectrumTabsProps, SpectrumTabListProps, SpectrumTabPanelsProps} from '@react-types/tabs';
diff --git a/packages/@react-spectrum/tag/index.ts b/packages/@react-spectrum/tag/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/tag/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/tag/package.json b/packages/@react-spectrum/tag/package.json
index be6e61a5c87..291982d542c 100644
--- a/packages/@react-spectrum/tag/package.json
+++ b/packages/@react-spectrum/tag/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,43 +27,23 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/selection": "^3.27.2",
-    "@react-aria/tag": "^3.8.1",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/form": "^3.7.22",
-    "@react-spectrum/label": "^3.16.22",
-    "@react-spectrum/text": "^3.5.25",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/list": "^3.13.4",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/tag/src/index.ts b/packages/@react-spectrum/tag/src/index.ts
index 59f733c31e1..9920fa82d92 100644
--- a/packages/@react-spectrum/tag/src/index.ts
+++ b/packages/@react-spectrum/tag/src/index.ts
@@ -10,6 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-export {TagGroup} from './TagGroup';
-export {Item} from '@react-stately/collections';
-export type {SpectrumTagGroupProps} from './TagGroup';
+export {TagGroup} from '@adobe/react-spectrum/TagGroup';
+
+export type {SpectrumTagGroupProps} from '@adobe/react-spectrum/TagGroup';
+export {Item} from 'react-stately/Item';
diff --git a/packages/@react-spectrum/test-utils/package.json b/packages/@react-spectrum/test-utils/package.json
index 3fcac8279a0..8ea9980012e 100644
--- a/packages/@react-spectrum/test-utils/package.json
+++ b/packages/@react-spectrum/test-utils/package.json
@@ -7,14 +7,11 @@
   "module": "dist/module.js",
   "exports": {
     "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
+    "types": "./dist/types/src/index.d.ts",
     "import": "./dist/import.mjs",
     "require": "./dist/main.js"
   },
-  "types": "dist/types.d.ts",
+  "types": "./dist/types/src/index.d.ts",
   "source": "src/index.ts",
   "files": [
     "dist",
@@ -44,5 +41,8 @@
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-spectrum/text/index.ts b/packages/@react-spectrum/text/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/text/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/text/package.json b/packages/@react-spectrum/text/package.json
index a1389a1abf6..d9e2b7084ad 100644
--- a/packages/@react-spectrum/text/package.json
+++ b/packages/@react-spectrum/text/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,35 +27,25 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/shared": "^3.33.1",
     "@react-types/text": "^3.3.23",
     "@swc/helpers": "^0.5.0",
-    "react-aria-components": "^1.16.0"
+    "react-aria-components": "^1.16.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/text/src/index.ts b/packages/@react-spectrum/text/src/index.ts
index 03b3ef5dc94..7cfdde6335e 100644
--- a/packages/@react-spectrum/text/src/index.ts
+++ b/packages/@react-spectrum/text/src/index.ts
@@ -12,7 +12,8 @@
 
 /// <reference types="css-module-types" />
 
-export {Text} from './Text';
-export {Heading} from './Heading';
-export {Keyboard} from './Keyboard';
+export {Text} from '@adobe/react-spectrum/Text';
+
+export {Heading} from '@adobe/react-spectrum/Heading';
+export {Keyboard} from '@adobe/react-spectrum/Keyboard';
 export type {HeadingProps, KeyboardProps, TextProps} from '@react-types/text';
diff --git a/packages/@react-spectrum/textfield/index.ts b/packages/@react-spectrum/textfield/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/textfield/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/textfield/package.json b/packages/@react-spectrum/textfield/package.json
index 7c35deacc12..2217f41e231 100644
--- a/packages/@react-spectrum/textfield/package.json
+++ b/packages/@react-spectrum/textfield/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,42 +27,26 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/textfield": "^3.18.5",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/form": "^3.7.22",
-    "@react-spectrum/label": "^3.16.22",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/shared": "^3.33.1",
     "@react-types/textfield": "^3.12.8",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
     "@spectrum-icons/workflow": "^4.0.0"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/textfield/src/index.ts b/packages/@react-spectrum/textfield/src/index.ts
index ecc2628bbd7..93420b1adaa 100644
--- a/packages/@react-spectrum/textfield/src/index.ts
+++ b/packages/@react-spectrum/textfield/src/index.ts
@@ -12,7 +12,8 @@
 
 /// <reference types="css-module-types" />
 
-export {TextArea} from './TextArea';
-export {TextField} from './TextField';
-export {TextFieldBase} from './TextFieldBase';
+export {TextArea} from '@adobe/react-spectrum/TextArea';
+
+export {TextField} from '@adobe/react-spectrum/TextField';
+export {TextFieldBase} from '@adobe/react-spectrum/private/textfield/TextFieldBase';
 export type {SpectrumTextFieldProps, SpectrumTextAreaProps} from '@react-types/textfield';
diff --git a/packages/@react-spectrum/theme-dark/index.ts b/packages/@react-spectrum/theme-dark/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/theme-dark/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/theme-dark/package.json b/packages/@react-spectrum/theme-dark/package.json
index 9e8951171b4..25a971e97af 100644
--- a/packages/@react-spectrum/theme-dark/package.json
+++ b/packages/@react-spectrum/theme-dark/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,16 +27,7 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
@@ -41,7 +35,8 @@
   },
   "dependencies": {
     "@react-types/provider": "^3.8.15",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
@@ -50,6 +45,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   }
 }
diff --git a/packages/@react-spectrum/theme-dark/src/index.ts b/packages/@react-spectrum/theme-dark/src/index.ts
index f9ff824d616..33e78c444da 100644
--- a/packages/@react-spectrum/theme-dark/src/index.ts
+++ b/packages/@react-spectrum/theme-dark/src/index.ts
@@ -11,4 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-export {darkTheme as theme} from './darkTheme';
+export {darkTheme as theme} from '@adobe/react-spectrum/darkTheme';
diff --git a/packages/@react-spectrum/theme-default/index.ts b/packages/@react-spectrum/theme-default/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/theme-default/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/theme-default/package.json b/packages/@react-spectrum/theme-default/package.json
index ec51d027265..61941270e46 100644
--- a/packages/@react-spectrum/theme-default/package.json
+++ b/packages/@react-spectrum/theme-default/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,16 +27,7 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
@@ -41,7 +35,8 @@
   },
   "dependencies": {
     "@react-types/provider": "^3.8.15",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
@@ -50,6 +45,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   }
 }
diff --git a/packages/@react-spectrum/theme-default/src/index.ts b/packages/@react-spectrum/theme-default/src/index.ts
index 9e157aefa20..a060277b4c2 100644
--- a/packages/@react-spectrum/theme-default/src/index.ts
+++ b/packages/@react-spectrum/theme-default/src/index.ts
@@ -11,4 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-export {defaultTheme as theme} from './defaultTheme';
+export {defaultTheme as theme} from '@adobe/react-spectrum/defaultTheme';
diff --git a/packages/@react-spectrum/theme-express/index.ts b/packages/@react-spectrum/theme-express/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/theme-express/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/theme-express/package.json b/packages/@react-spectrum/theme-express/package.json
index 4ed2d42e0eb..fd8ea67d210 100644
--- a/packages/@react-spectrum/theme-express/package.json
+++ b/packages/@react-spectrum/theme-express/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,25 +27,16 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-spectrum/theme-default": "^3.5.24",
     "@react-types/provider": "^3.8.15",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
@@ -51,6 +45,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   }
 }
diff --git a/packages/@react-spectrum/theme-express/src/index.ts b/packages/@react-spectrum/theme-express/src/index.ts
index 02916d6214c..b21392658f1 100644
--- a/packages/@react-spectrum/theme-express/src/index.ts
+++ b/packages/@react-spectrum/theme-express/src/index.ts
@@ -11,4 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-export {expressTheme as theme} from './expressTheme';
+export {expressTheme as theme} from '@adobe/react-spectrum/private/theme-express/expressTheme';
diff --git a/packages/@react-spectrum/theme-light/index.ts b/packages/@react-spectrum/theme-light/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/theme-light/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/theme-light/package.json b/packages/@react-spectrum/theme-light/package.json
index c23e55f2555..d1924309f65 100644
--- a/packages/@react-spectrum/theme-light/package.json
+++ b/packages/@react-spectrum/theme-light/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,16 +27,7 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
@@ -41,7 +35,8 @@
   },
   "dependencies": {
     "@react-types/provider": "^3.8.15",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
@@ -50,6 +45,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   }
 }
diff --git a/packages/@react-spectrum/theme-light/src/index.ts b/packages/@react-spectrum/theme-light/src/index.ts
index cef7fefd6f4..c38416ec288 100644
--- a/packages/@react-spectrum/theme-light/src/index.ts
+++ b/packages/@react-spectrum/theme-light/src/index.ts
@@ -11,4 +11,4 @@
  */
 
 /// <reference types="css-module-types" />
-export {lightTheme as theme} from './lightTheme';
+export {lightTheme as theme} from '@adobe/react-spectrum/lightTheme';
diff --git a/packages/@react-spectrum/toast/index.ts b/packages/@react-spectrum/toast/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/toast/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/toast/package.json b/packages/@react-spectrum/toast/package.json
index 4085e24cb99..8b07f048f67 100644
--- a/packages/@react-spectrum/toast/package.json
+++ b/packages/@react-spectrum/toast/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,34 +27,20 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/toast": "^3.0.11",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/button": "^3.17.7",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/toast": "^3.1.3",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
     "@swc/helpers": "^0.5.0",
-    "use-sync-external-store": "^1.6.0"
+    "use-sync-external-store": "^1.6.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
@@ -59,7 +48,6 @@
     "@types/use-sync-external-store": "^0.0.3"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/toast/src/index.ts b/packages/@react-spectrum/toast/src/index.ts
index aec1a02db95..272b646609b 100644
--- a/packages/@react-spectrum/toast/src/index.ts
+++ b/packages/@react-spectrum/toast/src/index.ts
@@ -12,6 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export {ToastContainer, ToastQueue} from './ToastContainer';
+export {ToastContainer, ToastQueue} from '@adobe/react-spectrum/Toast';
 
-export type {SpectrumToastOptions, SpectrumToastContainerProps} from './ToastContainer';
+export type {SpectrumToastOptions, SpectrumToastContainerProps} from '@adobe/react-spectrum/Toast';
diff --git a/packages/@react-spectrum/tooltip/index.ts b/packages/@react-spectrum/tooltip/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/tooltip/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/tooltip/package.json b/packages/@react-spectrum/tooltip/package.json
index acf56e17e0f..d2eececfab6 100644
--- a/packages/@react-spectrum/tooltip/package.json
+++ b/packages/@react-spectrum/tooltip/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,40 +27,26 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/tooltip": "^3.9.2",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/overlays": "^5.9.3",
-    "@react-spectrum/utils": "^3.12.12",
-    "@react-stately/tooltip": "^3.5.11",
     "@react-types/overlays": "^3.9.4",
     "@react-types/shared": "^3.33.1",
     "@react-types/tooltip": "^3.5.2",
     "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/tooltip/src/index.ts b/packages/@react-spectrum/tooltip/src/index.ts
index 3f569454ed2..b724da5f4d1 100644
--- a/packages/@react-spectrum/tooltip/src/index.ts
+++ b/packages/@react-spectrum/tooltip/src/index.ts
@@ -12,6 +12,6 @@
 
 /// <reference types="css-module-types" />
 
-export {Tooltip} from './Tooltip';
-export {TooltipTrigger} from './TooltipTrigger';
+export {Tooltip, TooltipTrigger} from '@adobe/react-spectrum/Tooltip';
+
 export type {SpectrumTooltipProps, SpectrumTooltipTriggerProps} from '@react-types/tooltip';
diff --git a/packages/@react-spectrum/tree/index.ts b/packages/@react-spectrum/tree/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/tree/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/tree/package.json b/packages/@react-spectrum/tree/package.json
index 5633d5d5d16..d15c06c66b9 100644
--- a/packages/@react-spectrum/tree/package.json
+++ b/packages/@react-spectrum/tree/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,36 +27,21 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/button": "^3.14.5",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/tree": "^3.1.7",
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/checkbox": "^3.10.7",
-    "@react-spectrum/text": "^3.5.25",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",
     "@swc/helpers": "^0.5.0",
-    "react-aria-components": "^1.16.0"
+    "react-aria-components": "^1.16.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/tree/src/index.ts b/packages/@react-spectrum/tree/src/index.ts
index 5f79f5d4dea..927bad99e12 100644
--- a/packages/@react-spectrum/tree/src/index.ts
+++ b/packages/@react-spectrum/tree/src/index.ts
@@ -12,6 +12,7 @@
 
 /// <reference types="css-module-types" />
 
-export {TreeViewItem, TreeView, TreeViewItemContent} from './TreeView';
-export {Collection} from 'react-aria-components';
-export type {SpectrumTreeViewProps, SpectrumTreeViewItemProps, SpectrumTreeViewItemContentProps} from './TreeView';
+export {TreeViewItem, TreeView, TreeViewItemContent} from '@adobe/react-spectrum/TreeView';
+
+export type {SpectrumTreeViewProps, SpectrumTreeViewItemProps, SpectrumTreeViewItemContentProps} from '@adobe/react-spectrum/TreeView';
+export {Collection} from 'react-aria/private/collections/CollectionBuilder';
diff --git a/packages/@react-spectrum/utils/index.ts b/packages/@react-spectrum/utils/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/utils/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/utils/package.json b/packages/@react-spectrum/utils/package.json
index 8cd5794f0de..9a02796df2f 100644
--- a/packages/@react-spectrum/utils/package.json
+++ b/packages/@react-spectrum/utils/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -28,12 +31,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/ssr": "^3.9.10",
-    "@react-aria/utils": "^3.33.1",
     "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "clsx": "^2.0.0"
+    "clsx": "^2.0.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -41,5 +43,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-spectrum/utils/src/index.ts b/packages/@react-spectrum/utils/src/index.ts
index c5a044fb2b1..c4b1518de0d 100644
--- a/packages/@react-spectrum/utils/src/index.ts
+++ b/packages/@react-spectrum/utils/src/index.ts
@@ -12,24 +12,16 @@
 
 /// <reference types="css-module-types" />
 
-export type {StyleHandlers} from './styleProps';
-export {shouldKeepSpectrumClassNames, keepSpectrumClassNames, classNames} from './classNames';
-export {getWrappedElement} from './getWrappedElement';
-export {useMediaQuery} from './useMediaQuery';
-export {createDOMRef, createFocusableRef, useDOMRef, useFocusableRef, unwrapDOMRef, useUnwrapDOMRef} from './useDOMRef';
-export {
-  baseStyleProps,
-  viewStyleProps,
-  dimensionValue,
-  responsiveDimensionValue,
-  convertStyleProps,
-  useStyleProps,
-  passthroughStyle,
-  getResponsiveProp
-} from './styleProps';
-export {useSlotProps, cssModuleToSlots, SlotProvider, ClearSlots} from './Slots';
-export {useHasChild} from './useHasChild';
-export {useIsMobileDevice} from './useIsMobileDevice';
-export {useValueEffect} from '@react-aria/utils';
-export {BreakpointProvider, useMatchedBreakpoints, useBreakpoint} from './BreakpointProvider';
-export {useResizeObserver} from '@react-aria/utils';
+export {shouldKeepSpectrumClassNames, keepSpectrumClassNames, classNames} from '@adobe/react-spectrum/private/utils/classNames';
+
+export {getWrappedElement} from '@adobe/react-spectrum/private/utils/getWrappedElement';
+export {useMediaQuery} from '@adobe/react-spectrum/private/utils/useMediaQuery';
+export {createDOMRef, createFocusableRef, useDOMRef, useFocusableRef, unwrapDOMRef, useUnwrapDOMRef} from '@adobe/react-spectrum/private/utils/useDOMRef';
+export {baseStyleProps, viewStyleProps, dimensionValue, responsiveDimensionValue, convertStyleProps, useStyleProps, passthroughStyle, getResponsiveProp} from '@adobe/react-spectrum/private/utils/styleProps';
+export {useSlotProps, cssModuleToSlots, SlotProvider, ClearSlots} from '@adobe/react-spectrum/private/utils/Slots';
+export {useHasChild} from '@adobe/react-spectrum/private/utils/useHasChild';
+export {useIsMobileDevice} from '@adobe/react-spectrum/private/utils/useIsMobileDevice';
+export {BreakpointProvider, useMatchedBreakpoints, useBreakpoint} from '@adobe/react-spectrum/private/utils/BreakpointProvider';
+export type {StyleHandlers} from '@adobe/react-spectrum/private/utils/styleProps';
+export {} from 'react-aria/private/utils/useValueEffect';
+export {} from 'react-aria/private/utils/useResizeObserver';
diff --git a/packages/@react-spectrum/view/index.ts b/packages/@react-spectrum/view/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/view/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/view/package.json b/packages/@react-spectrum/view/package.json
index 2b649e45b18..0ddff9bd112 100644
--- a/packages/@react-spectrum/view/package.json
+++ b/packages/@react-spectrum/view/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,33 +27,23 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/shared": "^3.33.1",
     "@react-types/view": "^3.4.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
   },
   "peerDependencies": {
-    "@react-spectrum/provider": "^3.0.0",
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
diff --git a/packages/@react-spectrum/view/src/index.ts b/packages/@react-spectrum/view/src/index.ts
index 12061ec668f..0714c18eec9 100644
--- a/packages/@react-spectrum/view/src/index.ts
+++ b/packages/@react-spectrum/view/src/index.ts
@@ -10,8 +10,9 @@
  * governing permissions and limitations under the License.
  */
 /// <reference types="css-module-types" />
-export {View} from './View';
-export {Content} from './Content';
-export {Footer} from './Footer';
-export {Header} from './Header';
+export {View} from '@adobe/react-spectrum/View';
+
+export {Content} from '@adobe/react-spectrum/Content';
+export {Footer} from '@adobe/react-spectrum/Footer';
+export {Header} from '@adobe/react-spectrum/Header';
 export type {ContentProps, FooterProps, HeaderProps, ViewProps} from '@react-types/view';
diff --git a/packages/@react-spectrum/well/index.ts b/packages/@react-spectrum/well/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-spectrum/well/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-spectrum/well/package.json b/packages/@react-spectrum/well/package.json
index cd96336a89d..8caa7eb4648 100644
--- a/packages/@react-spectrum/well/package.json
+++ b/packages/@react-spectrum/well/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -24,27 +27,18 @@
     "*.css"
   ],
   "targets": {
-    "main": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    },
-    "module": {
-      "includeNodeModules": [
-        "@adobe/spectrum-css-temp"
-      ]
-    }
+    "types": false
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/utils": "^3.33.1",
-    "@react-spectrum/utils": "^3.12.12",
     "@react-types/shared": "^3.33.1",
     "@react-types/well": "^3.3.23",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-aria": "^3.47.0",
+    "@adobe/react-spectrum": "^3.46.2"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/well/src/index.ts b/packages/@react-spectrum/well/src/index.ts
index febb9015bf6..d1d269b2c38 100644
--- a/packages/@react-spectrum/well/src/index.ts
+++ b/packages/@react-spectrum/well/src/index.ts
@@ -10,5 +10,6 @@
  * governing permissions and limitations under the License.
  */
 /// <reference types="css-module-types" />
-export {Well} from './Well';
+export {Well} from '@adobe/react-spectrum/Well';
+
 export type {SpectrumWellProps} from '@react-types/well';
diff --git a/packages/@react-stately/autocomplete/package.json b/packages/@react-stately/autocomplete/package.json
index 782dfce19ed..7282a5470cf 100644
--- a/packages/@react-stately/autocomplete/package.json
+++ b/packages/@react-stately/autocomplete/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,13 +29,17 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/utils": "^3.11.0",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/autocomplete/src/index.ts b/packages/@react-stately/autocomplete/src/index.ts
index c95279ae2fb..5951a5f6e2b 100644
--- a/packages/@react-stately/autocomplete/src/index.ts
+++ b/packages/@react-stately/autocomplete/src/index.ts
@@ -10,6 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-export {useAutocompleteState} from './useAutocompleteState';
+export {useAutocompleteState} from 'react-stately/private/autocomplete/useAutocompleteState';
 
-export type {AutocompleteProps, AutocompleteStateOptions, AutocompleteState} from './useAutocompleteState';
+export type {AutocompleteProps, AutocompleteStateOptions, AutocompleteState} from 'react-stately/private/autocomplete/useAutocompleteState';
diff --git a/packages/@react-stately/calendar/index.ts b/packages/@react-stately/calendar/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/calendar/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/calendar/package.json b/packages/@react-stately/calendar/package.json
index 360a8f490b4..33942ce2f35 100644
--- a/packages/@react-stately/calendar/package.json
+++ b/packages/@react-stately/calendar/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -27,15 +30,19 @@
   },
   "dependencies": {
     "@internationalized/date": "^3.12.0",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/calendar": "^3.8.3",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/calendar/src/index.ts b/packages/@react-stately/calendar/src/index.ts
index dd50969f385..b833125f679 100644
--- a/packages/@react-stately/calendar/src/index.ts
+++ b/packages/@react-stately/calendar/src/index.ts
@@ -10,9 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-export {useCalendarState} from './useCalendarState';
-export {useRangeCalendarState} from './useRangeCalendarState';
+export {useCalendarState} from 'react-stately/useCalendarState';
 
-export type {CalendarStateOptions} from './useCalendarState';
-export type {RangeCalendarStateOptions} from './useRangeCalendarState';
-export type {CalendarState, RangeCalendarState} from './types'; 
+export {useRangeCalendarState} from 'react-stately/useRangeCalendarState';
+export type {CalendarStateOptions} from 'react-stately/useCalendarState';
+export type {RangeCalendarStateOptions} from 'react-stately/useRangeCalendarState';
+export type {CalendarState, RangeCalendarState} from 'react-stately/private/calendar/types';
diff --git a/packages/@react-stately/checkbox/index.ts b/packages/@react-stately/checkbox/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/checkbox/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/checkbox/package.json b/packages/@react-stately/checkbox/package.json
index 5984aa94d44..45bc87f693b 100644
--- a/packages/@react-stately/checkbox/package.json
+++ b/packages/@react-stately/checkbox/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,16 +29,19 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/form": "^3.2.4",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/checkbox": "^3.10.4",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/checkbox/src/index.ts b/packages/@react-stately/checkbox/src/index.ts
index ab90bff0661..ed61735637e 100644
--- a/packages/@react-stately/checkbox/src/index.ts
+++ b/packages/@react-stately/checkbox/src/index.ts
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export {useCheckboxGroupState} from './useCheckboxGroupState';
+export {useCheckboxGroupState} from 'react-stately/useCheckboxGroupState';
+
+export type {CheckboxGroupState} from 'react-stately/useCheckboxGroupState';
 
 export type {CheckboxGroupProps} from '@react-types/checkbox';
-export type {CheckboxGroupState} from './useCheckboxGroupState';
diff --git a/packages/@react-stately/collections/index.ts b/packages/@react-stately/collections/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/collections/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/collections/package.json b/packages/@react-stately/collections/package.json
index e20c5d68737..43314ad1030 100644
--- a/packages/@react-stately/collections/package.json
+++ b/packages/@react-stately/collections/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -27,12 +30,17 @@
   },
   "dependencies": {
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/collections/src/index.ts b/packages/@react-stately/collections/src/index.ts
index 0a6280ee706..c72bc3dd73a 100644
--- a/packages/@react-stately/collections/src/index.ts
+++ b/packages/@react-stately/collections/src/index.ts
@@ -10,10 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-export type {PartialNode} from './types';
-export {Item} from './Item';
-export {Section} from './Section';
-export {useCollection} from './useCollection';
-export {getItemCount} from './getItemCount';
-export {getChildNodes, getFirstItem, getLastItem, getNthItem, compareNodeOrder} from './getChildNodes';
-export {CollectionBuilder} from './CollectionBuilder';
+export {Item} from 'react-stately/Item';
+
+export {Section} from 'react-stately/Section';
+export {useCollection} from 'react-stately/private/collections/useCollection';
+export {getItemCount} from 'react-stately/private/collections/getItemCount';
+export {getChildNodes, getFirstItem, getLastItem, getNthItem, compareNodeOrder} from 'react-stately/private/collections/getChildNodes';
+export {CollectionBuilder} from 'react-stately/private/collections/CollectionBuilder';
+export type {PartialNode} from 'react-stately/private/collections/types';
diff --git a/packages/@react-stately/color/index.ts b/packages/@react-stately/color/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/color/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/color/package.json b/packages/@react-stately/color/package.json
index 6b76a7b0f9c..1e1b1f1e3ef 100644
--- a/packages/@react-stately/color/package.json
+++ b/packages/@react-stately/color/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -28,18 +31,19 @@
   "dependencies": {
     "@internationalized/number": "^3.6.5",
     "@internationalized/string": "^3.2.7",
-    "@react-stately/form": "^3.2.4",
-    "@react-stately/numberfield": "^3.11.0",
-    "@react-stately/slider": "^3.7.5",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/color": "^3.1.4",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/color/src/index.ts b/packages/@react-stately/color/src/index.ts
index c07be85011e..5c60443250f 100644
--- a/packages/@react-stately/color/src/index.ts
+++ b/packages/@react-stately/color/src/index.ts
@@ -10,20 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-export type {ColorAreaState} from './useColorAreaState';
-export type {ColorSliderState} from './useColorSliderState';
-export type {ColorWheelState} from './useColorWheelState';
-export type {ColorFieldState} from './useColorFieldState';
-export type {ColorChannelFieldProps, ColorChannelFieldState, ColorChannelFieldStateOptions} from './useColorChannelFieldState';
-export type {ColorPickerProps, ColorPickerState} from './useColorPickerState';
+export {parseColor, getColorChannels} from 'react-stately/Color';
 
-export {parseColor, getColorChannels} from './Color';
-export {useColorAreaState} from './useColorAreaState';
-export {useColorSliderState} from './useColorSliderState';
-export {useColorWheelState} from './useColorWheelState';
-export {useColorFieldState} from './useColorFieldState';
-export {useColorChannelFieldState} from './useColorChannelFieldState';
-export {useColorPickerState} from './useColorPickerState';
+export {useColorAreaState} from 'react-stately/useColorAreaState';
+export {useColorSliderState} from 'react-stately/useColorSliderState';
+export {useColorWheelState} from 'react-stately/useColorWheelState';
+export {useColorFieldState, useColorChannelFieldState} from 'react-stately/useColorFieldState';
+export {useColorPickerState} from 'react-stately/useColorPickerState';
+export type {ColorAreaState} from 'react-stately/useColorAreaState';
+export type {ColorSliderState, ColorSliderStateOptions} from 'react-stately/useColorSliderState';
+export type {ColorWheelState} from 'react-stately/useColorWheelState';
+export type {ColorFieldState, ColorChannelFieldProps, ColorChannelFieldState, ColorChannelFieldStateOptions} from 'react-stately/useColorFieldState';
+export type {ColorPickerProps, ColorPickerState} from 'react-stately/useColorPickerState';
 
 export type {Color, ColorChannel, ColorFormat, ColorSpace, ColorAreaProps, ColorFieldProps, ColorWheelProps} from '@react-types/color';
-export type {ColorSliderStateOptions} from './useColorSliderState';
diff --git a/packages/@react-stately/combobox/index.ts b/packages/@react-stately/combobox/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-stately/combobox/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/combobox/package.json b/packages/@react-stately/combobox/package.json
index c20356269c1..bde7b4a8d94 100644
--- a/packages/@react-stately/combobox/package.json
+++ b/packages/@react-stately/combobox/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,19 +29,19 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/form": "^3.2.4",
-    "@react-stately/list": "^3.13.4",
-    "@react-stately/overlays": "^3.6.23",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/combobox": "^3.14.0",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/combobox/src/index.ts b/packages/@react-stately/combobox/src/index.ts
index afc3f8eacf7..68c83433f65 100644
--- a/packages/@react-stately/combobox/src/index.ts
+++ b/packages/@react-stately/combobox/src/index.ts
@@ -10,6 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-export {useComboBoxState} from './useComboBoxState';
+export {useComboBoxState} from 'react-stately/useComboBoxState';
 
-export type {ComboBoxStateOptions, ComboBoxState} from './useComboBoxState';
+export type {ComboBoxStateOptions, ComboBoxState} from 'react-stately/useComboBoxState';
diff --git a/packages/@react-stately/data/index.ts b/packages/@react-stately/data/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-stately/data/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/data/package.json b/packages/@react-stately/data/package.json
index 1f100628f8e..79f1a7f638e 100644
--- a/packages/@react-stately/data/package.json
+++ b/packages/@react-stately/data/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -27,12 +30,17 @@
   },
   "dependencies": {
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/data/src/index.ts b/packages/@react-stately/data/src/index.ts
index d3a141ed5a3..cc53c3e0edf 100644
--- a/packages/@react-stately/data/src/index.ts
+++ b/packages/@react-stately/data/src/index.ts
@@ -10,10 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-export {useAsyncList} from './useAsyncList';
-export {useTreeData} from './useTreeData';
-export {useListData} from './useListData';
+export {useAsyncList} from 'react-stately/useAsyncList';
 
-export type {ListOptions, ListData} from './useListData';
-export type {AsyncListOptions, AsyncListData} from './useAsyncList';
-export type {TreeOptions, TreeData} from './useTreeData';
+export {useTreeData} from 'react-stately/useTreeData';
+export {useListData} from 'react-stately/useListData';
+export type {ListOptions, ListData} from 'react-stately/useListData';
+export type {AsyncListOptions, AsyncListData} from 'react-stately/useAsyncList';
+export type {TreeOptions, TreeData} from 'react-stately/useTreeData';
diff --git a/packages/@react-stately/datepicker/index.ts b/packages/@react-stately/datepicker/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/datepicker/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/datepicker/package.json b/packages/@react-stately/datepicker/package.json
index d831e25fa24..7399a7d9403 100644
--- a/packages/@react-stately/datepicker/package.json
+++ b/packages/@react-stately/datepicker/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -29,17 +32,19 @@
     "@internationalized/date": "^3.12.0",
     "@internationalized/number": "^3.6.5",
     "@internationalized/string": "^3.2.7",
-    "@react-stately/form": "^3.2.4",
-    "@react-stately/overlays": "^3.6.23",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/datepicker": "^3.13.5",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/datepicker/src/index.ts b/packages/@react-stately/datepicker/src/index.ts
index 854fc5cee88..1ab18280c3b 100644
--- a/packages/@react-stately/datepicker/src/index.ts
+++ b/packages/@react-stately/datepicker/src/index.ts
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-export {useDatePickerState} from './useDatePickerState';
-export {useDateFieldState} from './useDateFieldState';
-export {useDateRangePickerState} from './useDateRangePickerState';
-export {useTimeFieldState} from './useTimeFieldState';
+export {useDatePickerState} from 'react-stately/useDatePickerState';
 
-export type {DateFieldStateOptions, DateFieldState, DateSegment, DateSegmentType, DateSegmentType as SegmentType} from './useDateFieldState';
-export type {DatePickerStateOptions, DatePickerState} from './useDatePickerState';
-export type {DateRangePickerStateOptions, DateRangePickerState} from './useDateRangePickerState';
-export type {TimeFieldStateOptions, TimeFieldState} from './useTimeFieldState';
-export type {FormatterOptions} from './utils';
+export {useDateFieldState} from 'react-stately/useDateFieldState';
+export {useDateRangePickerState} from 'react-stately/useDateRangePickerState';
+export {useTimeFieldState} from 'react-stately/useTimeFieldState';
+export type {DateFieldStateOptions, DateFieldState, DateSegment, DateSegmentType, DateSegmentType as SegmentType} from 'react-stately/useDateFieldState';
+export type {DatePickerStateOptions, DatePickerState} from 'react-stately/useDatePickerState';
+export type {DateRangePickerStateOptions, DateRangePickerState} from 'react-stately/useDateRangePickerState';
+export type {TimeFieldStateOptions, TimeFieldState} from 'react-stately/useTimeFieldState';
+export type {FormatterOptions} from 'react-stately/private/datepicker/utils';
diff --git a/packages/@react-stately/disclosure/index.ts b/packages/@react-stately/disclosure/index.ts
deleted file mode 100644
index dc59658a5da..00000000000
--- a/packages/@react-stately/disclosure/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2024 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/disclosure/package.json b/packages/@react-stately/disclosure/package.json
index 8de42b7e985..f96d166aa9a 100644
--- a/packages/@react-stately/disclosure/package.json
+++ b/packages/@react-stately/disclosure/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,14 +29,18 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/utils": "^3.11.0",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/disclosure/src/index.ts b/packages/@react-stately/disclosure/src/index.ts
index 2853a77274a..d016d78b39c 100644
--- a/packages/@react-stately/disclosure/src/index.ts
+++ b/packages/@react-stately/disclosure/src/index.ts
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export {useDisclosureState} from './useDisclosureState';
-export {useDisclosureGroupState} from './useDisclosureGroupState';
+export {useDisclosureState} from 'react-stately/useDisclosureState';
 
-export type {DisclosureState, DisclosureProps} from './useDisclosureState';
-export type {DisclosureGroupState, DisclosureGroupProps} from './useDisclosureGroupState';
+export {useDisclosureGroupState} from 'react-stately/useDisclosureGroupState';
+export type {DisclosureState, DisclosureProps} from 'react-stately/useDisclosureState';
+export type {DisclosureGroupState, DisclosureGroupProps} from 'react-stately/useDisclosureGroupState';
diff --git a/packages/@react-stately/dnd/index.ts b/packages/@react-stately/dnd/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/dnd/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/dnd/package.json b/packages/@react-stately/dnd/package.json
index 4c905624685..ba382076888 100644
--- a/packages/@react-stately/dnd/package.json
+++ b/packages/@react-stately/dnd/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,14 +29,18 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/selection": "^3.20.9",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/dnd/src/index.ts b/packages/@react-stately/dnd/src/index.ts
index b62ea8b31a8..2f64dda106f 100644
--- a/packages/@react-stately/dnd/src/index.ts
+++ b/packages/@react-stately/dnd/src/index.ts
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export type {DraggableCollectionStateOptions, DraggableCollectionState} from './useDraggableCollectionState';
-export type {DroppableCollectionStateOptions, DroppableCollectionState} from './useDroppableCollectionState';
-export {useDraggableCollectionState} from './useDraggableCollectionState';
-export {useDroppableCollectionState} from './useDroppableCollectionState';
+export {useDraggableCollectionState} from 'react-stately/useDraggableCollectionState';
+
+export {useDroppableCollectionState} from 'react-stately/useDroppableCollectionState';
+export type {DraggableCollectionStateOptions, DraggableCollectionState} from 'react-stately/useDraggableCollectionState';
+export type {DroppableCollectionStateOptions, DroppableCollectionState} from 'react-stately/useDroppableCollectionState';
diff --git a/packages/@react-stately/flags/index.ts b/packages/@react-stately/flags/index.ts
deleted file mode 100644
index 7e5b036e91f..00000000000
--- a/packages/@react-stately/flags/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2023 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/flags/package.json b/packages/@react-stately/flags/package.json
index 58716e6d156..ee47683577b 100644
--- a/packages/@react-stately/flags/package.json
+++ b/packages/@react-stately/flags/package.json
@@ -7,13 +7,16 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "source": "src/index.ts",
   "files": [
@@ -26,9 +29,17 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
+  },
+  "peerDependencies": {
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   }
 }
diff --git a/packages/@react-stately/flags/src/index.ts b/packages/@react-stately/flags/src/index.ts
index d7cbfb40991..674d8430db1 100644
--- a/packages/@react-stately/flags/src/index.ts
+++ b/packages/@react-stately/flags/src/index.ts
@@ -10,4 +10,4 @@
  * governing permissions and limitations under the License.
  */
 
-export {enableTableNestedRows, tableNestedRows, enableShadowDOM, shadowDOM} from './flags';
+export {enableTableNestedRows, tableNestedRows, enableShadowDOM, shadowDOM} from 'react-stately/private/flags/flags';
diff --git a/packages/@react-stately/form/index.ts b/packages/@react-stately/form/index.ts
deleted file mode 100644
index 7e5b036e91f..00000000000
--- a/packages/@react-stately/form/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2023 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/form/package.json b/packages/@react-stately/form/package.json
index 184ae8f5b04..4ff1066c5aa 100644
--- a/packages/@react-stately/form/package.json
+++ b/packages/@react-stately/form/package.json
@@ -7,13 +7,16 @@
   "module": "dist/module.js",
   "types": "dist/types.d.ts",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "source": "src/index.ts",
   "files": [
@@ -27,12 +30,17 @@
   },
   "dependencies": {
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/form/src/index.ts b/packages/@react-stately/form/src/index.ts
index 7f7fcc20bd8..472a030be27 100644
--- a/packages/@react-stately/form/src/index.ts
+++ b/packages/@react-stately/form/src/index.ts
@@ -10,5 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-export {FormValidationContext, useFormValidationState, DEFAULT_VALIDATION_RESULT, VALID_VALIDITY_STATE, privateValidationStateProp, mergeValidation} from './useFormValidationState';
-export type {FormValidationState} from './useFormValidationState';
+export {FormValidationContext, useFormValidationState, DEFAULT_VALIDATION_RESULT, VALID_VALIDITY_STATE, privateValidationStateProp, mergeValidation} from 'react-stately/private/form/useFormValidationState';
+
+export type {FormValidationState} from 'react-stately/private/form/useFormValidationState';
diff --git a/packages/@react-stately/grid/index.ts b/packages/@react-stately/grid/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-stately/grid/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/grid/package.json b/packages/@react-stately/grid/package.json
index 833a9164d6e..92a51c84ad5 100644
--- a/packages/@react-stately/grid/package.json
+++ b/packages/@react-stately/grid/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,16 +29,19 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/selection": "^3.20.9",
     "@react-types/grid": "^3.3.8",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/grid/src/index.ts b/packages/@react-stately/grid/src/index.ts
index ed37d6980ed..5b6d828e27a 100644
--- a/packages/@react-stately/grid/src/index.ts
+++ b/packages/@react-stately/grid/src/index.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-export {useGridState} from './useGridState';
-export {GridCollection} from './GridCollection';
+export {useGridState} from 'react-stately/private/grid/useGridState';
 
-export type {GridStateOptions, GridState} from './useGridState';
+export {GridCollection} from 'react-stately/private/grid/GridCollection';
+export type {GridStateOptions, GridState} from 'react-stately/private/grid/useGridState';
diff --git a/packages/@react-stately/layout/index.ts b/packages/@react-stately/layout/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/layout/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/layout/package.json b/packages/@react-stately/layout/package.json
index 7eddfff2388..c4783ac316c 100644
--- a/packages/@react-stately/layout/package.json
+++ b/packages/@react-stately/layout/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,13 +29,11 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/table": "^3.15.4",
-    "@react-stately/virtualizer": "^4.4.6",
     "@react-types/grid": "^3.3.8",
     "@react-types/shared": "^3.33.1",
     "@react-types/table": "^3.13.6",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -40,5 +41,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/layout/src/index.ts b/packages/@react-stately/layout/src/index.ts
index dc04065d7d6..98351724ccd 100644
--- a/packages/@react-stately/layout/src/index.ts
+++ b/packages/@react-stately/layout/src/index.ts
@@ -9,11 +9,12 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export type {GridLayoutOptions} from './GridLayout';
-export type {ListLayoutOptions, LayoutNode} from './ListLayout';
-export type {TableLayoutProps} from './TableLayout';
-export type {WaterfallLayoutOptions} from './WaterfallLayout';
-export {GridLayout} from './GridLayout';
-export {ListLayout} from './ListLayout';
-export {TableLayout} from './TableLayout';
-export {WaterfallLayout} from './WaterfallLayout';
+export {GridLayout} from 'react-stately/private/layout/GridLayout';
+
+export {ListLayout} from 'react-stately/private/layout/ListLayout';
+export {TableLayout} from 'react-stately/private/layout/TableLayout';
+export {WaterfallLayout} from 'react-stately/private/layout/WaterfallLayout';
+export type {GridLayoutOptions} from 'react-stately/private/layout/GridLayout';
+export type {ListLayoutOptions, LayoutNode} from 'react-stately/private/layout/ListLayout';
+export type {TableLayoutProps} from 'react-stately/private/layout/TableLayout';
+export type {WaterfallLayoutOptions} from 'react-stately/private/layout/WaterfallLayout';
diff --git a/packages/@react-stately/list/index.ts b/packages/@react-stately/list/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-stately/list/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/list/package.json b/packages/@react-stately/list/package.json
index 63b94447504..bb52b6411f3 100644
--- a/packages/@react-stately/list/package.json
+++ b/packages/@react-stately/list/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,16 +29,18 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/selection": "^3.20.9",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/list/src/index.ts b/packages/@react-stately/list/src/index.ts
index ddecc9fa2e1..af8b558123d 100644
--- a/packages/@react-stately/list/src/index.ts
+++ b/packages/@react-stately/list/src/index.ts
@@ -10,8 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-export type {ListProps, ListState} from './useListState';
-export type {SingleSelectListProps, SingleSelectListState} from './useSingleSelectListState';
-export {useListState, UNSTABLE_useFilteredListState} from './useListState';
-export {useSingleSelectListState} from './useSingleSelectListState';
-export {ListCollection} from './ListCollection';
+export {useListState, UNSTABLE_useFilteredListState} from 'react-stately/useListState';
+
+export {useSingleSelectListState} from 'react-stately/useSingleSelectListState';
+export {ListCollection} from 'react-stately/private/list/ListCollection';
+export type {ListProps, ListState} from 'react-stately/useListState';
+export type {SingleSelectListProps, SingleSelectListState} from 'react-stately/useSingleSelectListState';
diff --git a/packages/@react-stately/menu/index.ts b/packages/@react-stately/menu/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/menu/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/menu/package.json b/packages/@react-stately/menu/package.json
index 5705bffa7ce..a59d68d6c51 100644
--- a/packages/@react-stately/menu/package.json
+++ b/packages/@react-stately/menu/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,15 +29,19 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/overlays": "^3.6.23",
     "@react-types/menu": "^3.10.7",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/menu/src/index.ts b/packages/@react-stately/menu/src/index.ts
index e440397d8ff..b70182dfa70 100644
--- a/packages/@react-stately/menu/src/index.ts
+++ b/packages/@react-stately/menu/src/index.ts
@@ -10,9 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export {useMenuTriggerState} from './useMenuTriggerState';
-export {useSubmenuTriggerState} from './useSubmenuTriggerState';
+export {useMenuTriggerState, useSubmenuTriggerState} from 'react-stately/useMenuTriggerState';
+
+export type {MenuTriggerState, RootMenuTriggerState, SubmenuTriggerProps, SubmenuTriggerState} from 'react-stately/useMenuTriggerState';
 
 export type {MenuTriggerProps} from '@react-types/menu';
-export type {MenuTriggerState, RootMenuTriggerState} from './useMenuTriggerState';
-export type {SubmenuTriggerProps, SubmenuTriggerState} from './useSubmenuTriggerState';
diff --git a/packages/@react-stately/numberfield/index.ts b/packages/@react-stately/numberfield/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/numberfield/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/numberfield/package.json b/packages/@react-stately/numberfield/package.json
index dd505ac7012..eafdc5d8366 100644
--- a/packages/@react-stately/numberfield/package.json
+++ b/packages/@react-stately/numberfield/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -27,15 +30,18 @@
   },
   "dependencies": {
     "@internationalized/number": "^3.6.5",
-    "@react-stately/form": "^3.2.4",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/numberfield": "^3.8.18",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/numberfield/src/index.ts b/packages/@react-stately/numberfield/src/index.ts
index 8eb92b68f7f..c98c676b140 100644
--- a/packages/@react-stately/numberfield/src/index.ts
+++ b/packages/@react-stately/numberfield/src/index.ts
@@ -10,7 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-export {useNumberFieldState} from './useNumberFieldState';
+export {useNumberFieldState} from 'react-stately/useNumberFieldState';
 
-export type {NumberFieldStateOptions} from './useNumberFieldState';
-export type {NumberFieldState} from './useNumberFieldState';
+export type {NumberFieldStateOptions, NumberFieldState} from 'react-stately/useNumberFieldState';
diff --git a/packages/@react-stately/overlays/index.ts b/packages/@react-stately/overlays/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/overlays/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/overlays/package.json b/packages/@react-stately/overlays/package.json
index f5cec1b33db..12df8a9f61a 100644
--- a/packages/@react-stately/overlays/package.json
+++ b/packages/@react-stately/overlays/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,14 +29,18 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/utils": "^3.11.0",
     "@react-types/overlays": "^3.9.4",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/overlays/src/index.ts b/packages/@react-stately/overlays/src/index.ts
index c53cf8640cb..737baf536bf 100644
--- a/packages/@react-stately/overlays/src/index.ts
+++ b/packages/@react-stately/overlays/src/index.ts
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export {useOverlayTriggerState} from './useOverlayTriggerState';
+export {useOverlayTriggerState} from 'react-stately/useOverlayTriggerState';
+
+export type {OverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 
 export type {OverlayTriggerProps} from '@react-types/overlays';
-export type {OverlayTriggerState} from './useOverlayTriggerState';
diff --git a/packages/@react-stately/radio/index.ts b/packages/@react-stately/radio/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/radio/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/radio/package.json b/packages/@react-stately/radio/package.json
index e14af1b7a07..21506f21413 100644
--- a/packages/@react-stately/radio/package.json
+++ b/packages/@react-stately/radio/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,16 +29,19 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/form": "^3.2.4",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/radio": "^3.9.4",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/radio/src/index.ts b/packages/@react-stately/radio/src/index.ts
index 01ef2f31152..f5f7d1a52bf 100644
--- a/packages/@react-stately/radio/src/index.ts
+++ b/packages/@react-stately/radio/src/index.ts
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export {useRadioGroupState} from './useRadioGroupState';
+export {useRadioGroupState} from 'react-stately/useRadioGroupState';
+
+export type {RadioGroupState} from 'react-stately/useRadioGroupState';
 
 export type {RadioGroupProps} from '@react-types/radio';
-export type {RadioGroupState} from './useRadioGroupState';
diff --git a/packages/@react-stately/searchfield/index.ts b/packages/@react-stately/searchfield/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/searchfield/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/searchfield/package.json b/packages/@react-stately/searchfield/package.json
index 0d7d67b08f3..e8ab6f85563 100644
--- a/packages/@react-stately/searchfield/package.json
+++ b/packages/@react-stately/searchfield/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,14 +29,18 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/utils": "^3.11.0",
     "@react-types/searchfield": "^3.6.8",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/searchfield/src/index.ts b/packages/@react-stately/searchfield/src/index.ts
index a868aa5f4c1..76d503146ee 100644
--- a/packages/@react-stately/searchfield/src/index.ts
+++ b/packages/@react-stately/searchfield/src/index.ts
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export {useSearchFieldState} from './useSearchFieldState';
+export {useSearchFieldState} from 'react-stately/useSearchFieldState';
+
+export type {SearchFieldState} from 'react-stately/useSearchFieldState';
 
 export type {SearchFieldProps} from '@react-types/searchfield';
-export type {SearchFieldState} from './useSearchFieldState';
diff --git a/packages/@react-stately/select/index.ts b/packages/@react-stately/select/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-stately/select/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/select/package.json b/packages/@react-stately/select/package.json
index 628b0165920..c9a1d9faa74 100644
--- a/packages/@react-stately/select/package.json
+++ b/packages/@react-stately/select/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,18 +29,19 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/form": "^3.2.4",
-    "@react-stately/list": "^3.13.4",
-    "@react-stately/overlays": "^3.6.23",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/select": "^3.12.2",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/select/src/index.ts b/packages/@react-stately/select/src/index.ts
index f48fd45e76e..1fb6f7efd71 100644
--- a/packages/@react-stately/select/src/index.ts
+++ b/packages/@react-stately/select/src/index.ts
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export {useSelectState} from './useSelectState';
+export {useSelectState} from 'react-stately/useSelectState';
+
+export type {SelectState, SelectStateOptions} from 'react-stately/useSelectState';
 
 export type {SelectProps} from '@react-types/select';
-export type {SelectState, SelectStateOptions} from './useSelectState';
diff --git a/packages/@react-stately/selection/index.ts b/packages/@react-stately/selection/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/selection/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/selection/package.json b/packages/@react-stately/selection/package.json
index 1da86f116c9..c663781fab9 100644
--- a/packages/@react-stately/selection/package.json
+++ b/packages/@react-stately/selection/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,15 +29,18 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/selection/src/index.ts b/packages/@react-stately/selection/src/index.ts
index d938b1bae33..8ad193ba7c4 100644
--- a/packages/@react-stately/selection/src/index.ts
+++ b/packages/@react-stately/selection/src/index.ts
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export type {MultipleSelectionStateProps} from './useMultipleSelectionState';
-export type {FocusState, SingleSelectionState, MultipleSelectionState, MultipleSelectionManager} from './types';
-export {useMultipleSelectionState} from './useMultipleSelectionState';
-export {SelectionManager} from './SelectionManager';
+export {useMultipleSelectionState} from 'react-stately/useMultipleSelectionState';
+
+export {SelectionManager} from 'react-stately/private/selection/SelectionManager';
+export type {MultipleSelectionStateProps} from 'react-stately/useMultipleSelectionState';
+export type {FocusState, SingleSelectionState, MultipleSelectionState, MultipleSelectionManager} from 'react-stately/private/selection/types';
diff --git a/packages/@react-stately/slider/index.ts b/packages/@react-stately/slider/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-stately/slider/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/slider/package.json b/packages/@react-stately/slider/package.json
index 8421dd5a2e7..2cedf26f192 100644
--- a/packages/@react-stately/slider/package.json
+++ b/packages/@react-stately/slider/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,15 +29,19 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/utils": "^3.11.0",
     "@react-types/shared": "^3.33.1",
     "@react-types/slider": "^3.8.4",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/slider/src/index.ts b/packages/@react-stately/slider/src/index.ts
index b22d4da68a4..45d3dbbe81f 100644
--- a/packages/@react-stately/slider/src/index.ts
+++ b/packages/@react-stately/slider/src/index.ts
@@ -10,7 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-export {useSliderState} from './useSliderState';
+export {useSliderState} from 'react-stately/useSliderState';
 
-export type {SliderStateOptions} from './useSliderState';
-export type {SliderState} from './useSliderState';
+export type {SliderStateOptions, SliderState} from 'react-stately/useSliderState';
diff --git a/packages/@react-stately/steplist/index.ts b/packages/@react-stately/steplist/index.ts
deleted file mode 100644
index 7e5b036e91f..00000000000
--- a/packages/@react-stately/steplist/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2023 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/steplist/package.json b/packages/@react-stately/steplist/package.json
index c6cffa11c9d..4ab51bebee4 100644
--- a/packages/@react-stately/steplist/package.json
+++ b/packages/@react-stately/steplist/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,15 +29,18 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/list": "^3.13.4",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/steplist/src/index.ts b/packages/@react-stately/steplist/src/index.ts
index 00b38324718..86e1ea128ae 100644
--- a/packages/@react-stately/steplist/src/index.ts
+++ b/packages/@react-stately/steplist/src/index.ts
@@ -10,5 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-export {useStepListState} from './useStepListState';
-export type {StepListProps, StepListState} from './useStepListState';
+export {useStepListState} from 'react-stately/private/steplist/useStepListState';
+
+export type {StepListProps, StepListState} from 'react-stately/private/steplist/useStepListState';
diff --git a/packages/@react-stately/table/index.ts b/packages/@react-stately/table/index.ts
deleted file mode 100644
index bbd9b8c2c84..00000000000
--- a/packages/@react-stately/table/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/table/package.json b/packages/@react-stately/table/package.json
index 9cb06ef3885..5f5ba27168a 100644
--- a/packages/@react-stately/table/package.json
+++ b/packages/@react-stately/table/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,20 +29,20 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/flags": "^3.1.2",
-    "@react-stately/grid": "^3.11.9",
-    "@react-stately/selection": "^3.20.9",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/grid": "^3.3.8",
     "@react-types/shared": "^3.33.1",
     "@react-types/table": "^3.13.6",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/table/src/index.ts b/packages/@react-stately/table/src/index.ts
index eb8a04ef4f7..478015f1df9 100644
--- a/packages/@react-stately/table/src/index.ts
+++ b/packages/@react-stately/table/src/index.ts
@@ -10,19 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-export type {TableColumnResizeState, TableColumnResizeStateProps} from './useTableColumnResizeState';
-export type {TableState, CollectionBuilderContext, TableStateProps} from './useTableState';
-export type {TableHeaderProps, TableBodyProps, ColumnProps, RowProps, CellProps} from '@react-types/table';
-export type {TreeGridState, TreeGridStateProps} from './useTreeGridState';
+export {useTableColumnResizeState, useTableState, UNSTABLE_useFilteredTableState} from 'react-stately/useTableState';
 
-export {useTableColumnResizeState} from './useTableColumnResizeState';
-export {useTableState, UNSTABLE_useFilteredTableState} from './useTableState';
-export {TableHeader} from './TableHeader';
-export {TableBody} from './TableBody';
-export {Column} from './Column';
-export {Row} from './Row';
-export {Cell} from './Cell';
-export {Section} from '@react-stately/collections';
-export {TableCollection, buildHeaderRows} from './TableCollection';
-export {TableColumnLayout} from './TableColumnLayout';
-export {UNSTABLE_useTreeGridState} from './useTreeGridState';
+export {TableHeader} from 'react-stately/TableHeader';
+export {TableBody} from 'react-stately/TableBody';
+export {Column} from 'react-stately/Column';
+export {Row} from 'react-stately/Row';
+export {Cell} from 'react-stately/Cell';
+export {TableCollection, buildHeaderRows} from 'react-stately/private/table/TableCollection';
+export {TableColumnLayout} from 'react-stately/private/table/TableColumnLayout';
+export {UNSTABLE_useTreeGridState} from 'react-stately/private/table/useTreeGridState';
+export type {TableColumnResizeState, TableColumnResizeStateProps, TableState, TableStateProps} from 'react-stately/useTableState';
+export type {CollectionBuilderContext} from 'react-stately/private/table/useTableState';
+export type {TreeGridState, TreeGridStateProps} from 'react-stately/private/table/useTreeGridState';
+export type {TableHeaderProps, TableBodyProps, ColumnProps, RowProps, CellProps} from '@react-types/table';
+export {Section} from 'react-stately/private/collections/Section';
diff --git a/packages/@react-stately/tabs/index.ts b/packages/@react-stately/tabs/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/tabs/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/tabs/package.json b/packages/@react-stately/tabs/package.json
index f302773f564..56355c96802 100644
--- a/packages/@react-stately/tabs/package.json
+++ b/packages/@react-stately/tabs/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,15 +29,19 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/list": "^3.13.4",
     "@react-types/shared": "^3.33.1",
     "@react-types/tabs": "^3.3.22",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/tabs/src/index.ts b/packages/@react-stately/tabs/src/index.ts
index f734b83d87d..ba102e7d593 100644
--- a/packages/@react-stately/tabs/src/index.ts
+++ b/packages/@react-stately/tabs/src/index.ts
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export {useTabListState} from './useTabListState';
+export {useTabListState} from 'react-stately/useTabListState';
+
+export type {TabListStateOptions, TabListState} from 'react-stately/useTabListState';
 
 export type {TabListProps} from '@react-types/tabs';
-export type {TabListStateOptions, TabListState} from './useTabListState';
diff --git a/packages/@react-stately/toast/index.ts b/packages/@react-stately/toast/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/toast/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/toast/package.json b/packages/@react-stately/toast/package.json
index ba71a9e1027..7c6f75d7e54 100644
--- a/packages/@react-stately/toast/package.json
+++ b/packages/@react-stately/toast/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -27,15 +30,20 @@
   },
   "dependencies": {
     "@swc/helpers": "^0.5.0",
-    "use-sync-external-store": "^1.6.0"
+    "use-sync-external-store": "^1.6.0",
+    "react-stately": "^3.45.0"
   },
   "devDependencies": {
     "@types/use-sync-external-store": "^0.0.3"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/toast/src/index.ts b/packages/@react-stately/toast/src/index.ts
index d1d6c78a6d4..a9f12a2bfb7 100644
--- a/packages/@react-stately/toast/src/index.ts
+++ b/packages/@react-stately/toast/src/index.ts
@@ -9,6 +9,6 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useToastState, ToastQueue, useToastQueue} from './useToastState';
+export {useToastState, ToastQueue, useToastQueue} from 'react-stately/useToastState';
 
-export type {ToastState, QueuedToast, ToastStateProps, ToastOptions} from './useToastState';
+export type {ToastState, QueuedToast, ToastStateProps, ToastOptions} from 'react-stately/useToastState';
diff --git a/packages/@react-stately/toggle/index.ts b/packages/@react-stately/toggle/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/toggle/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/toggle/package.json b/packages/@react-stately/toggle/package.json
index f51dc6cc4eb..b2ba6014805 100644
--- a/packages/@react-stately/toggle/package.json
+++ b/packages/@react-stately/toggle/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,15 +29,19 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/utils": "^3.11.0",
     "@react-types/checkbox": "^3.10.4",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/toggle/src/index.ts b/packages/@react-stately/toggle/src/index.ts
index 6a061eaec4e..f7a32903bbf 100644
--- a/packages/@react-stately/toggle/src/index.ts
+++ b/packages/@react-stately/toggle/src/index.ts
@@ -10,9 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-export {useToggleState} from './useToggleState';
-export {useToggleGroupState} from './useToggleGroupState';
+export {useToggleState} from 'react-stately/useToggleState';
+
+export {useToggleGroupState} from 'react-stately/useToggleGroupState';
+export type {ToggleState, ToggleStateOptions} from 'react-stately/useToggleState';
+export type {ToggleGroupProps, ToggleGroupState} from 'react-stately/useToggleGroupState';
 
 export type {ToggleProps} from '@react-types/checkbox';
-export type {ToggleState, ToggleStateOptions} from './useToggleState';
-export type {ToggleGroupProps, ToggleGroupState} from './useToggleGroupState';
diff --git a/packages/@react-stately/tooltip/index.ts b/packages/@react-stately/tooltip/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/tooltip/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/tooltip/package.json b/packages/@react-stately/tooltip/package.json
index 4be84a1cc2a..64bf18c2760 100644
--- a/packages/@react-stately/tooltip/package.json
+++ b/packages/@react-stately/tooltip/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,14 +29,18 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/overlays": "^3.6.23",
     "@react-types/tooltip": "^3.5.2",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/tooltip/src/index.ts b/packages/@react-stately/tooltip/src/index.ts
index ecb6d2438d3..25ffaf39666 100644
--- a/packages/@react-stately/tooltip/src/index.ts
+++ b/packages/@react-stately/tooltip/src/index.ts
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-export {useTooltipTriggerState} from './useTooltipTriggerState';
+export {useTooltipTriggerState} from 'react-stately/useTooltipTriggerState';
+
+export type {TooltipTriggerState} from 'react-stately/useTooltipTriggerState';
 
 export type {TooltipTriggerProps} from '@react-types/tooltip';
-export type {TooltipTriggerState} from './useTooltipTriggerState';
diff --git a/packages/@react-stately/tree/index.ts b/packages/@react-stately/tree/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/tree/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/tree/package.json b/packages/@react-stately/tree/package.json
index af1103731bd..b8f83597c11 100644
--- a/packages/@react-stately/tree/package.json
+++ b/packages/@react-stately/tree/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,16 +29,18 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/selection": "^3.20.9",
-    "@react-stately/utils": "^3.11.0",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/tree/src/index.ts b/packages/@react-stately/tree/src/index.ts
index 86a3b84b99c..f7f55adaae2 100644
--- a/packages/@react-stately/tree/src/index.ts
+++ b/packages/@react-stately/tree/src/index.ts
@@ -9,6 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export type {TreeProps, TreeState} from './useTreeState';
-export {useTreeState} from './useTreeState';
-export {TreeCollection} from './TreeCollection';
+export {useTreeState} from 'react-stately/useTreeState';
+
+export {TreeCollection} from 'react-stately/private/tree/TreeCollection';
+export type {TreeProps, TreeState} from 'react-stately/useTreeState';
diff --git a/packages/@react-stately/utils/index.ts b/packages/@react-stately/utils/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/utils/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/utils/package.json b/packages/@react-stately/utils/package.json
index 3dbb8d33868..f4c19868e01 100644
--- a/packages/@react-stately/utils/package.json
+++ b/packages/@react-stately/utils/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -26,12 +29,17 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
+    "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "dependencies": {
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/utils/src/index.ts b/packages/@react-stately/utils/src/index.ts
index ff98cc62647..8312ac95606 100644
--- a/packages/@react-stately/utils/src/index.ts
+++ b/packages/@react-stately/utils/src/index.ts
@@ -9,5 +9,6 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-export {useControlledState} from './useControlledState';
-export {clamp, snapValueToStep, toFixedNumber} from './number';
+export {useControlledState} from 'react-stately/private/utils/useControlledState';
+
+export {clamp, snapValueToStep, toFixedNumber} from 'react-stately/private/utils/number';
diff --git a/packages/@react-stately/virtualizer/index.ts b/packages/@react-stately/virtualizer/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/@react-stately/virtualizer/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/virtualizer/package.json b/packages/@react-stately/virtualizer/package.json
index 090cacaabed..e7f1043cfea 100644
--- a/packages/@react-stately/virtualizer/package.json
+++ b/packages/@react-stately/virtualizer/package.json
@@ -6,13 +6,16 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./src/index.ts",
+      "types": [
+        "./dist/types.d.ts",
+        "./src/index.ts"
+      ],
+      "import": "./dist/import.mjs",
+      "require": "./dist/main.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
@@ -27,7 +30,8 @@
   },
   "dependencies": {
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0"
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -35,5 +39,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "types": false
   }
 }
diff --git a/packages/@react-stately/virtualizer/src/index.ts b/packages/@react-stately/virtualizer/src/index.ts
index ca0097e88f5..68847a42ef4 100644
--- a/packages/@react-stately/virtualizer/src/index.ts
+++ b/packages/@react-stately/virtualizer/src/index.ts
@@ -10,14 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-export type {InvalidationContext} from './types';
-export type {VirtualizerState} from './useVirtualizerState';
-export type {RectCorner} from './Rect';
+export {Layout} from 'react-stately/private/virtualizer/Layout';
 
-export {Layout} from './Layout';
-export {LayoutInfo} from './LayoutInfo';
-export {Point} from './Point';
-export {Rect} from './Rect';
-export {Size} from './Size';
-export {ReusableView} from './ReusableView';
-export {useVirtualizerState} from './useVirtualizerState';
+export {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
+export {Point} from 'react-stately/private/virtualizer/Point';
+export {Rect} from 'react-stately/private/virtualizer/Rect';
+export {Size} from 'react-stately/private/virtualizer/Size';
+export {ReusableView} from 'react-stately/private/virtualizer/ReusableView';
+export {useVirtualizerState} from 'react-stately/private/virtualizer/useVirtualizerState';
+export type {InvalidationContext} from 'react-stately/private/virtualizer/types';
+export type {VirtualizerState} from 'react-stately/private/virtualizer/useVirtualizerState';
+export type {RectCorner} from 'react-stately/private/virtualizer/Rect';
diff --git a/packages/dev/s2-docs/pages/react-aria/Breadcrumbs.mdx b/packages/dev/s2-docs/pages/react-aria/Breadcrumbs.mdx
index 2b27e23a6ae..178ac2cd18b 100644
--- a/packages/dev/s2-docs/pages/react-aria/Breadcrumbs.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/Breadcrumbs.mdx
@@ -3,7 +3,7 @@ export default Layout;
 
 import docs from 'docs:react-aria-components';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/breadcrumbs/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/breadcrumbs/anatomy.svg';
 import {InlineAlert, Heading, Content} from '@react-spectrum/s2';
 
 export const tags = ['navigation'];
diff --git a/packages/dev/s2-docs/pages/react-aria/Calendar.mdx b/packages/dev/s2-docs/pages/react-aria/Calendar.mdx
index 3941ebaa1d4..c7173da5ad4 100644
--- a/packages/dev/s2-docs/pages/react-aria/Calendar.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/Calendar.mdx
@@ -6,7 +6,7 @@ import vanillaDocs from 'docs:vanilla-starter/Calendar';
 import {Calendar as VanillaCalendar} from 'vanilla-starter/Calendar';
 import {Calendar as TailwindCalendar} from 'tailwind-starter/Calendar';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/calendar/docs/calendar-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/calendar/calendar-anatomy.svg';
 
 export const tags = ['date'];
 export const relatedPages = [{'title': 'useCalendar', 'url': 'Calendar/useCalendar.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/Checkbox.mdx b/packages/dev/s2-docs/pages/react-aria/Checkbox.mdx
index 15665960dfc..91b53f426fd 100644
--- a/packages/dev/s2-docs/pages/react-aria/Checkbox.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/Checkbox.mdx
@@ -5,7 +5,7 @@ import docs from 'docs:react-aria-components';
 import {Checkbox as VanillaCheckbox} from 'vanilla-starter/Checkbox';
 import {Checkbox as TailwindCheckbox} from 'tailwind-starter/Checkbox';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/checkbox/docs/checkbox-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/checkbox/checkbox-anatomy.svg';
 
 export const tags = ['input'];
 export const relatedPages = [{'title': 'useCheckbox', 'url': 'Checkbox/useCheckbox.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/CheckboxGroup.mdx b/packages/dev/s2-docs/pages/react-aria/CheckboxGroup.mdx
index 24a483bebaa..f4973569d69 100644
--- a/packages/dev/s2-docs/pages/react-aria/CheckboxGroup.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/CheckboxGroup.mdx
@@ -4,7 +4,7 @@ export default Layout;
 import docs from 'docs:react-aria-components';
 import vanillaDocs from 'docs:vanilla-starter/CheckboxGroup';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/checkbox/docs/checkboxgroup-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/checkbox/checkboxgroup-anatomy.svg';
 import {InlineAlert, Heading, Content} from '@react-spectrum/s2'
 
 export const tags = ['input'];
diff --git a/packages/dev/s2-docs/pages/react-aria/ColorArea.mdx b/packages/dev/s2-docs/pages/react-aria/ColorArea.mdx
index 870240a5fbd..e4fe7c6548b 100644
--- a/packages/dev/s2-docs/pages/react-aria/ColorArea.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/ColorArea.mdx
@@ -5,7 +5,7 @@ import docs from 'docs:react-aria-components';
 import {ColorArea as VanillaColorArea} from 'vanilla-starter/ColorArea';
 import {ColorArea as TailwindColorArea} from 'tailwind-starter/ColorArea';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/color/docs/ColorAreaAnatomy.svg';
+import Anatomy from '/packages/react-aria/docs/color/ColorAreaAnatomy.svg';
 
 export const tags = [];
 export const relatedPages = [{'title': 'useColorArea', 'url': 'ColorArea/useColorArea.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/ColorField.mdx b/packages/dev/s2-docs/pages/react-aria/ColorField.mdx
index 8b647b70c71..6f784772b45 100644
--- a/packages/dev/s2-docs/pages/react-aria/ColorField.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/ColorField.mdx
@@ -6,7 +6,7 @@ import {ColorField as TailwindColorField} from 'tailwind-starter/ColorField';
 import '../../tailwind/tailwind.css';
 import vanillaDocs from 'docs:vanilla-starter/ColorField';
 import docs from 'docs:react-aria-components';
-import Anatomy from '@react-aria/color/docs/ColorFieldAnatomy.svg';
+import Anatomy from '/packages/react-aria/docs/color/ColorFieldAnatomy.svg';
 
 export const tags = ['input'];
 export const relatedPages = [{'title': 'useColorField', 'url': 'ColorField/useColorField.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/ColorSlider.mdx b/packages/dev/s2-docs/pages/react-aria/ColorSlider.mdx
index 6e7026ddfb4..d967b52767c 100644
--- a/packages/dev/s2-docs/pages/react-aria/ColorSlider.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/ColorSlider.mdx
@@ -6,7 +6,7 @@ import vanillaDocs from 'docs:vanilla-starter/ColorSlider';
 import {ColorSlider as VanillaColorSlider} from 'vanilla-starter/ColorSlider';
 import {ColorSlider as TailwindColorSlider} from 'tailwind-starter/ColorSlider';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/color/docs/ColorSliderAnatomy.svg';
+import Anatomy from '/packages/react-aria/docs/color/ColorSliderAnatomy.svg';
 
 export const tags = ['input'];
 export const relatedPages = [{'title': 'useColorSlider', 'url': 'ColorSlider/useColorSlider.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/ColorWheel.mdx b/packages/dev/s2-docs/pages/react-aria/ColorWheel.mdx
index 5ac6cf62245..aada0f8d7ff 100644
--- a/packages/dev/s2-docs/pages/react-aria/ColorWheel.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/ColorWheel.mdx
@@ -5,7 +5,7 @@ import docs from 'docs:react-aria-components';
 import {ColorWheel as VanillaColorWheel} from 'vanilla-starter/ColorWheel';
 import {ColorWheel as TailwindColorWheel} from 'tailwind-starter/ColorWheel';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/color/docs/ColorWheelAnatomy.svg';
+import Anatomy from '/packages/react-aria/docs/color/ColorWheelAnatomy.svg';
 
 export const tags = ['input'];
 export const relatedPages = [{'title': 'useColorWheel', 'url': 'ColorWheel/useColorWheel.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/DateField.mdx b/packages/dev/s2-docs/pages/react-aria/DateField.mdx
index b23b0961f71..d5de6a46475 100644
--- a/packages/dev/s2-docs/pages/react-aria/DateField.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/DateField.mdx
@@ -6,7 +6,7 @@ import vanillaDocs from 'docs:vanilla-starter/DateField';
 import {DateField as VanillaDateField} from 'vanilla-starter/DateField';
 import {DateField as TailwindDateField} from 'tailwind-starter/DateField';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/datepicker/docs/datefield-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/datepicker/datefield-anatomy.svg';
 
 export const tags = ['calendar', 'input'];
 export const relatedPages = [{'title': 'useDateField', 'url': 'DateField/useDateField.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/DatePicker.mdx b/packages/dev/s2-docs/pages/react-aria/DatePicker.mdx
index b23fbfec205..b46ee2f2464 100644
--- a/packages/dev/s2-docs/pages/react-aria/DatePicker.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/DatePicker.mdx
@@ -6,7 +6,7 @@ import vanillaDocs from 'docs:vanilla-starter/DatePicker';
 import {DatePicker as VanillaDatePicker} from 'vanilla-starter/DatePicker';
 import {DatePicker as TailwindDatePicker} from 'tailwind-starter/DatePicker';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/datepicker/docs/datepicker-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/datepicker/datepicker-anatomy.svg';
 
 export const tags = ['calendar', 'input'];
 export const relatedPages = [{'title': 'useDatePicker', 'url': 'DatePicker/useDatePicker.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/DateRangePicker.mdx b/packages/dev/s2-docs/pages/react-aria/DateRangePicker.mdx
index 921220edb46..e9a75d8f029 100644
--- a/packages/dev/s2-docs/pages/react-aria/DateRangePicker.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/DateRangePicker.mdx
@@ -6,7 +6,7 @@ import vanillaDocs from 'docs:vanilla-starter/DateRangePicker';
 import {DateRangePicker as VanillaDateRangePicker} from 'vanilla-starter/DateRangePicker';
 import {DateRangePicker as TailwindDateRangePicker} from 'tailwind-starter/DateRangePicker';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/datepicker/docs/daterangepicker-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/datepicker/daterangepicker-anatomy.svg';
 
 export const tags = ['calendar', 'input'];
 export const relatedPages = [{'title': 'useDateRangePicker', 'url': 'DateRangePicker/useDateRangePicker.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/Meter.mdx b/packages/dev/s2-docs/pages/react-aria/Meter.mdx
index 4c822c03e45..c924ced0d52 100644
--- a/packages/dev/s2-docs/pages/react-aria/Meter.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/Meter.mdx
@@ -6,7 +6,7 @@ import {Meter as VanillaMeter} from 'vanilla-starter/Meter';
 import {ProgressCircle as VanillaProgressCircle} from 'vanilla-starter/ProgressCircle';
 import {Meter as TailwindMeter} from 'tailwind-starter/Meter';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/meter/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/meter/anatomy.svg';
 
 export const tags = ['gauge', 'progress', 'level'];
 export const relatedPages = [{'title': 'useMeter', 'url': 'Meter/useMeter.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/Modal.mdx b/packages/dev/s2-docs/pages/react-aria/Modal.mdx
index 244b54352ca..feb0c630070 100644
--- a/packages/dev/s2-docs/pages/react-aria/Modal.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/Modal.mdx
@@ -4,7 +4,7 @@ export default Layout;
 import docs from 'docs:react-aria-components';
 import vanillaDocs from 'docs:vanilla-starter/Modal';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/overlays/docs/modal-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/overlays/modal-anatomy.svg';
 import {InlineAlert, Heading, Content} from '@react-spectrum/s2'
 
 export const tags = ['dialog', 'popup', 'overlay'];
diff --git a/packages/dev/s2-docs/pages/react-aria/NumberField.mdx b/packages/dev/s2-docs/pages/react-aria/NumberField.mdx
index 2c5bc3ce0a6..27e89a90a5d 100644
--- a/packages/dev/s2-docs/pages/react-aria/NumberField.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/NumberField.mdx
@@ -6,7 +6,7 @@ import vanillaDocs from 'docs:vanilla-starter/NumberField';
 import {NumberField as VanillaNumberField} from 'vanilla-starter/NumberField';
 import {NumberField as TailwindNumberField} from 'tailwind-starter/NumberField';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/numberfield/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/numberfield/anatomy.svg';
 
 export const tags = ['input'];
 export const relatedPages = [{'title': 'useNumberField', 'url': 'NumberField/useNumberField.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/Popover.mdx b/packages/dev/s2-docs/pages/react-aria/Popover.mdx
index 0a58cb5902a..c9b3153c93e 100644
--- a/packages/dev/s2-docs/pages/react-aria/Popover.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/Popover.mdx
@@ -4,7 +4,7 @@ export default Layout;
 import docs from 'docs:react-aria-components';
 import vanillaDocs from 'docs:vanilla-starter/Popover';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/overlays/docs/popover-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/overlays/popover-anatomy.svg';
 import {InlineAlert, Heading, Content} from '@react-spectrum/s2'
 
 export const tags = ['popup', 'overlay'];
diff --git a/packages/dev/s2-docs/pages/react-aria/ProgressBar.mdx b/packages/dev/s2-docs/pages/react-aria/ProgressBar.mdx
index 0c9c7e7a277..8e6450fedd9 100644
--- a/packages/dev/s2-docs/pages/react-aria/ProgressBar.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/ProgressBar.mdx
@@ -8,7 +8,7 @@ import {ProgressBar as VanillaProgressBar} from 'vanilla-starter/ProgressBar';
 import {ProgressCircle as VanillaProgressCircle} from 'vanilla-starter/ProgressCircle';
 import {ProgressBar as TailwindProgressBar} from 'tailwind-starter/ProgressBar';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/progress/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/progress/anatomy.svg';
 
 export const tags = ['loading', 'progress'];
 export const relatedPages = [{'title': 'useProgressBar', 'url': 'ProgressBar/useProgressBar.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/RadioGroup.mdx b/packages/dev/s2-docs/pages/react-aria/RadioGroup.mdx
index a776c47b9a8..696a1d601ff 100644
--- a/packages/dev/s2-docs/pages/react-aria/RadioGroup.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/RadioGroup.mdx
@@ -4,7 +4,7 @@ export default Layout;
 import docs from 'docs:react-aria-components';
 import vanillaDocs from 'docs:vanilla-starter/RadioGroup';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/radio/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/radio/anatomy.svg';
 import {InlineAlert, Heading, Content} from '@react-spectrum/s2'
 
 export const tags = ['input'];
diff --git a/packages/dev/s2-docs/pages/react-aria/RangeCalendar.mdx b/packages/dev/s2-docs/pages/react-aria/RangeCalendar.mdx
index a5cc8075980..b3619afbed7 100644
--- a/packages/dev/s2-docs/pages/react-aria/RangeCalendar.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/RangeCalendar.mdx
@@ -6,7 +6,7 @@ import vanillaDocs from 'docs:vanilla-starter/RangeCalendar';
 import {RangeCalendar as VanillaRangeCalendar} from 'vanilla-starter/RangeCalendar';
 import {RangeCalendar as TailwindRangeCalendar} from 'tailwind-starter/RangeCalendar';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/calendar/docs/rangecalendar-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/calendar/rangecalendar-anatomy.svg';
 
 export const tags = ['calendar'];
 export const relatedPages = [{'title': 'useRangeCalendar', 'url': 'RangeCalendar/useRangeCalendar.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/SearchField.mdx b/packages/dev/s2-docs/pages/react-aria/SearchField.mdx
index 5553bba9b93..27693e23d25 100644
--- a/packages/dev/s2-docs/pages/react-aria/SearchField.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/SearchField.mdx
@@ -6,7 +6,7 @@ import vanillaDocs from 'docs:vanilla-starter/SearchField';
 import {SearchField as VanillaSearchField} from 'vanilla-starter/SearchField';
 import {SearchField as TailwindSearchField} from 'tailwind-starter/SearchField';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/searchfield/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/searchfield/anatomy.svg';
 
 export const tags = ['input'];
 export const relatedPages = [{'title': 'useSearchField', 'url': 'SearchField/useSearchField.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/Slider.mdx b/packages/dev/s2-docs/pages/react-aria/Slider.mdx
index 490b37962d1..2e4e7f5241d 100644
--- a/packages/dev/s2-docs/pages/react-aria/Slider.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/Slider.mdx
@@ -6,7 +6,7 @@ import {Slider as VanillaSlider} from 'vanilla-starter/Slider';
 import {Slider as TailwindSlider} from 'tailwind-starter/Slider';
 import tailwindDocs from 'docs:tailwind-starter/Slider';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/slider/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/slider/anatomy.svg';
 
 export const tags = ['range input', 'track', 'scrubber'];
 export const relatedPages = [{'title': 'useSlider', 'url': 'Slider/useSlider.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/Switch.mdx b/packages/dev/s2-docs/pages/react-aria/Switch.mdx
index 70460859816..d60e239fe64 100644
--- a/packages/dev/s2-docs/pages/react-aria/Switch.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/Switch.mdx
@@ -5,7 +5,7 @@ import docs from 'docs:react-aria-components';
 import {Switch as VanillaSwitch} from 'vanilla-starter/Switch';
 import {Switch as TailwindSwitch} from 'tailwind-starter/Switch';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/switch/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/switch/anatomy.svg';
 
 export const tags = ['toggle', 'input'];
 export const relatedPages = [{'title': 'useSwitch', 'url': 'Switch/useSwitch.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/Tabs.mdx b/packages/dev/s2-docs/pages/react-aria/Tabs.mdx
index 9983109c84c..ccce8ddd69c 100644
--- a/packages/dev/s2-docs/pages/react-aria/Tabs.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/Tabs.mdx
@@ -5,7 +5,7 @@ import docs from 'docs:react-aria-components';
 import {Tabs as VanillaTabs, TabsItem} from 'vanilla-starter/Tabs';
 import vanillaDocs from 'docs:vanilla-starter/Tabs';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/tabs/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/tabs/anatomy.svg';
 import {InlineAlert, Heading, Content} from '@react-spectrum/s2'
 
 export const tags = ['navigation'];
diff --git a/packages/dev/s2-docs/pages/react-aria/TagGroup.mdx b/packages/dev/s2-docs/pages/react-aria/TagGroup.mdx
index 26add9b66f7..c6672369eda 100644
--- a/packages/dev/s2-docs/pages/react-aria/TagGroup.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/TagGroup.mdx
@@ -5,7 +5,7 @@ import docs from 'docs:react-aria-components';
 import {TagGroup as VanillaTagGroup, Tag} from 'vanilla-starter/TagGroup';
 import vanillaDocs from 'docs:vanilla-starter/TagGroup';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/tag/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/tag/anatomy.svg';
 import {InlineAlert, Heading, Content} from '@react-spectrum/s2';
 
 export const tags = ['chips', 'pills'];
diff --git a/packages/dev/s2-docs/pages/react-aria/TextField.mdx b/packages/dev/s2-docs/pages/react-aria/TextField.mdx
index 2641f48bbe3..0f0e96379dc 100644
--- a/packages/dev/s2-docs/pages/react-aria/TextField.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/TextField.mdx
@@ -6,7 +6,7 @@ import vanillaDocs from 'docs:vanilla-starter/TextField';
 import {TextField as VanillaTextField} from 'vanilla-starter/TextField';
 import {TextField as TailwindTextField} from 'tailwind-starter/TextField';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/textfield/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/textfield/anatomy.svg';
 
 export const tags = ['input'];
 export const relatedPages = [{'title': 'useTextField', 'url': 'TextField/useTextField.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/TimeField.mdx b/packages/dev/s2-docs/pages/react-aria/TimeField.mdx
index 942497d8fb8..e325b0aa28a 100644
--- a/packages/dev/s2-docs/pages/react-aria/TimeField.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/TimeField.mdx
@@ -6,7 +6,7 @@ import vanillaDocs from 'docs:vanilla-starter/TimeField';
 import {TimeField as VanillaTimeField} from 'vanilla-starter/TimeField';
 import {TimeField as TailwindTimeField} from 'tailwind-starter/TimeField';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/datepicker/docs/timefield-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/datepicker/timefield-anatomy.svg';
 
 export const tags = ['date', 'input'];
 export const relatedPages = [{'title': 'useTimeField', 'url': 'TimeField/useTimeField.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/Toast.mdx b/packages/dev/s2-docs/pages/react-aria/Toast.mdx
index 7ed9fa9c048..117fe6340b7 100644
--- a/packages/dev/s2-docs/pages/react-aria/Toast.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/Toast.mdx
@@ -4,7 +4,7 @@ export default Layout;
 import docs from 'docs:react-aria-components';
 import toastDocs from 'docs:./ExampleToast';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/toast/docs/toast-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/toast/toast-anatomy.svg';
 import {InlineAlert, Heading, Content} from '@react-spectrum/s2';
 
 export const tags = ['notifications'];
diff --git a/packages/dev/s2-docs/pages/react-aria/ToggleButtonGroup.mdx b/packages/dev/s2-docs/pages/react-aria/ToggleButtonGroup.mdx
index 4ed5bb2747b..d4d488141e3 100644
--- a/packages/dev/s2-docs/pages/react-aria/ToggleButtonGroup.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/ToggleButtonGroup.mdx
@@ -3,7 +3,7 @@ export default Layout;
 
 import docs from 'docs:react-aria-components';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/button/docs/ToggleButtonGroupAnatomy.svg';
+import Anatomy from '/packages/react-aria/docs/button/ToggleButtonGroupAnatomy.svg';
 
 export const tags = ['toggle', 'btn'];
 export const relatedPages = [{'title': 'useToggleButtonGroup', 'url': 'ToggleButtonGroup/useToggleButtonGroup.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/Toolbar.mdx b/packages/dev/s2-docs/pages/react-aria/Toolbar.mdx
index ab7aec77eca..6c14dd27f5b 100644
--- a/packages/dev/s2-docs/pages/react-aria/Toolbar.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/Toolbar.mdx
@@ -3,7 +3,7 @@ export default Layout;
 
 import docs from 'docs:react-aria-components';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/toolbar/docs/toolbar-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/toolbar/toolbar-anatomy.svg';
 
 export const tags = ['group'];
 export const relatedPages = [{'title': 'useToolbar', 'url': 'Toolbar/useToolbar.html'}];
diff --git a/packages/dev/s2-docs/pages/react-aria/Tooltip.mdx b/packages/dev/s2-docs/pages/react-aria/Tooltip.mdx
index 78a5e1c208c..d83839832b9 100644
--- a/packages/dev/s2-docs/pages/react-aria/Tooltip.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/Tooltip.mdx
@@ -4,7 +4,7 @@ export default Layout;
 import docs from 'docs:react-aria-components';
 import vanillaDocs from 'docs:vanilla-starter/Tooltip';
 import '../../tailwind/tailwind.css';
-import Anatomy from '@react-aria/tooltip/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/tooltip/anatomy.svg';
 import {InlineAlert, Heading, Content} from '@react-spectrum/s2'
 
 export const tags = ['hint', 'popup', 'info'];
diff --git a/packages/dev/s2-docs/pages/react-aria/blog/drag-and-drop.mdx b/packages/dev/s2-docs/pages/react-aria/blog/drag-and-drop.mdx
index 24f4e3bac53..d4d3a7199c3 100644
--- a/packages/dev/s2-docs/pages/react-aria/blog/drag-and-drop.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/blog/drag-and-drop.mdx
@@ -7,10 +7,10 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License. */}
 
-import Anatomy from '@react-aria/dnd/docs/Anatomy.svg';
-import BetweenDropPosition from '@react-aria/dnd/docs/BetweenDropPosition.svg';
-import OnDropPosition from '@react-aria/dnd/docs/OnDropPosition.svg';
-import RootDropPosition from '@react-aria/dnd/docs/RootDropPosition.svg';
+import Anatomy from '/packages/react-aria/docs/dnd/Anatomy.svg';
+import BetweenDropPosition from '/packages/react-aria/docs/dnd/BetweenDropPosition.svg';
+import OnDropPosition from '/packages/react-aria/docs/dnd/OnDropPosition.svg';
+import RootDropPosition from '/packages/react-aria/docs/dnd/RootDropPosition.svg';
 import heroVideo from 'url:../../../../docs/pages/assets/dnd.mp4';
 import dndKeyboard from 'url:../../../../docs/pages/assets/dnd-keyboard.mp4';
 import dndMobile from 'url:../../../../docs/pages/assets/dnd-mobile.mp4';
diff --git a/packages/dev/s2-docs/pages/react-aria/dnd.mdx b/packages/dev/s2-docs/pages/react-aria/dnd.mdx
index d01a8b2c0ba..9291b48bef6 100644
--- a/packages/dev/s2-docs/pages/react-aria/dnd.mdx
+++ b/packages/dev/s2-docs/pages/react-aria/dnd.mdx
@@ -2,12 +2,12 @@ import {Layout} from '../../src/Layout';
 export default Layout;
 
 import docs from 'docs:react-aria-components';
-import DropOperation from '@react-aria/dnd/docs/DropOperation.svg';
-import BetweenDropPosition from '@react-aria/dnd/docs/BetweenDropPosition.svg';
-import OnDropPosition from '@react-aria/dnd/docs/OnDropPosition.svg';
-import RootDropPosition from '@react-aria/dnd/docs/RootDropPosition.svg';
-import Anatomy from '@react-aria/dnd/docs/Anatomy.svg';
-import DragAffordance from '@react-aria/dnd/docs/DragAffordance.svg';
+import DropOperation from '/packages/react-aria/docs/dnd/DropOperation.svg';
+import BetweenDropPosition from '/packages/react-aria/docs/dnd/BetweenDropPosition.svg';
+import OnDropPosition from '/packages/react-aria/docs/dnd/OnDropPosition.svg';
+import RootDropPosition from '/packages/react-aria/docs/dnd/RootDropPosition.svg';
+import Anatomy from '/packages/react-aria/docs/dnd/Anatomy.svg';
+import DragAffordance from '/packages/react-aria/docs/dnd/DragAffordance.svg';
 import {GroupedPropTable} from '../../src/PropTable';
 import {PokemonListBox} from './PokemonListBox';
 import {PokemonGridList} from './PokemonGridList';
diff --git a/packages/dev/s2-docs/src/ColorSearchView.tsx b/packages/dev/s2-docs/src/ColorSearchView.tsx
index cfac63ad930..2032ddb1d2a 100644
--- a/packages/dev/s2-docs/src/ColorSearchView.tsx
+++ b/packages/dev/s2-docs/src/ColorSearchView.tsx
@@ -7,7 +7,7 @@ import {colorSwatch, getColorScale} from './color.macro' with {type: 'macro'};
 import {focusRing, iconStyle, style} from '@react-spectrum/s2/style' with {type: 'macro'};
 import {Header, ListBox, ListBoxItem, ListBoxSection} from 'react-aria-components';
 import {InfoMessage} from './colorSearchData';
-// eslint-disable-next-line monorepo/no-internal-import
+ 
 import NoSearchResults from '@react-spectrum/s2/illustrations/linear/NoSearchResults';
 import React, {useCallback, useEffect, useRef, useState} from 'react';
 import Similar from '@react-spectrum/s2/icons/Similar';
diff --git a/packages/dev/s2-docs/src/Error.tsx b/packages/dev/s2-docs/src/Error.tsx
index 86a66910670..e75f0a55471 100644
--- a/packages/dev/s2-docs/src/Error.tsx
+++ b/packages/dev/s2-docs/src/Error.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-// eslint-disable-next-line monorepo/no-internal-import
+ 
 import BrowserError from '@react-spectrum/s2/illustrations/linear/BrowserError';
 import {Content, Heading, IllustratedMessage} from '@react-spectrum/s2';
 
diff --git a/packages/dev/s2-docs/src/IconSearchView.tsx b/packages/dev/s2-docs/src/IconSearchView.tsx
index 0feb90e1a24..b31062067a9 100644
--- a/packages/dev/s2-docs/src/IconSearchView.tsx
+++ b/packages/dev/s2-docs/src/IconSearchView.tsx
@@ -10,7 +10,7 @@ import {iconAliases} from './iconAliases.js';
 // @ts-ignore
 import icons from '/packages/@react-spectrum/s2/s2wf-icons/*.svg';
 import {InfoMessage} from './colorSearchData';
-// eslint-disable-next-line monorepo/no-internal-import
+ 
 import NoSearchResults from '@react-spectrum/s2/illustrations/linear/NoSearchResults';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 
diff --git a/packages/dev/s2-docs/src/IllustrationCards.tsx b/packages/dev/s2-docs/src/IllustrationCards.tsx
index 1ecb7a5423e..5f9b34d7ae0 100644
--- a/packages/dev/s2-docs/src/IllustrationCards.tsx
+++ b/packages/dev/s2-docs/src/IllustrationCards.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import {Autocomplete, GridLayout, ListBox, ListBoxItem, Size, useFilter, Virtualizer} from 'react-aria-components';
-// eslint-disable-next-line monorepo/no-internal-import
+ 
 import Checkmark from '@react-spectrum/s2/illustrations/gradient/generic1/Checkmark';
 import {Content, Heading, IllustratedMessage, Link, pressScale, ProgressCircle, Radio, RadioGroup, SearchField, SegmentedControl, SegmentedControlItem, Text, ToastQueue} from '@react-spectrum/s2';
 import {focusRing, style} from '@react-spectrum/s2/style' with {type: 'macro'};
@@ -9,7 +9,7 @@ import {focusRing, style} from '@react-spectrum/s2/style' with {type: 'macro'};
 import Gradient from '@react-spectrum/s2/icons/Gradient';
 import {illustrationAliases} from './illustrationAliases.js'; 
 import {InfoMessage} from './colorSearchData';
-// eslint-disable-next-line monorepo/no-internal-import
+ 
 import NoSearchResults from '@react-spectrum/s2/illustrations/linear/NoSearchResults';
 import Polygon4 from '@react-spectrum/s2/icons/Polygon4';
 import React, {Suspense, use, useCallback, useEffect, useRef, useState} from 'react';
diff --git a/packages/dev/s2-docs/src/TypographySearchView.tsx b/packages/dev/s2-docs/src/TypographySearchView.tsx
index 5024023a61c..8dc44824d9d 100644
--- a/packages/dev/s2-docs/src/TypographySearchView.tsx
+++ b/packages/dev/s2-docs/src/TypographySearchView.tsx
@@ -6,7 +6,7 @@ import Edit from '@react-spectrum/s2/icons/Edit';
 import {FieldInputContext, Header, Input, InputRenderProps, Key, ListBox, ListBoxItem, ListBoxSection, OverlayTriggerStateContext, TextField} from 'react-aria-components';
 import {focusRing, style} from '@react-spectrum/s2/style' with {type: 'macro'};
 import {InfoMessage} from './colorSearchData';
-// eslint-disable-next-line monorepo/no-internal-import
+ 
 import NoSearchResults from '@react-spectrum/s2/illustrations/linear/NoSearchResults';
 import React, {useMemo, useRef, useState} from 'react';
 
diff --git a/packages/dev/s2-docs/src/searchUtils.tsx b/packages/dev/s2-docs/src/searchUtils.tsx
index da97af7e5da..3ddde819cfd 100644
--- a/packages/dev/s2-docs/src/searchUtils.tsx
+++ b/packages/dev/s2-docs/src/searchUtils.tsx
@@ -10,7 +10,7 @@ import {Key} from 'react-aria-components';
 
 import {type Library, TAB_DEFS} from './constants';
 // @ts-ignore
-// eslint-disable-next-line monorepo/no-internal-import
+ 
 import NoSearchResults from '@react-spectrum/s2/illustrations/linear/NoSearchResults';
 import {Page, TocNode} from '@parcel/rsc';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
diff --git a/packages/react-aria-components/docs/Breadcrumbs.mdx b/packages/react-aria-components/docs/Breadcrumbs.mdx
index 24a23239611..6154ba0cd6b 100644
--- a/packages/react-aria-components/docs/Breadcrumbs.mdx
+++ b/packages/react-aria-components/docs/Breadcrumbs.mdx
@@ -15,7 +15,7 @@ import typesDocs from 'docs:@react-types/shared/src/events.d.ts';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/breadcrumbs/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/breadcrumbs/anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/Button.mdx b/packages/react-aria-components/docs/Button.mdx
index 0e001d3b205..a101cacb5b1 100644
--- a/packages/react-aria-components/docs/Button.mdx
+++ b/packages/react-aria-components/docs/Button.mdx
@@ -15,7 +15,7 @@ import typesDocs from 'docs:@react-types/shared/src/events.d.ts';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/datepicker/docs/daterangepicker-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/datepicker/daterangepicker-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleList} from '@react-spectrum/docs/src/ExampleList';
diff --git a/packages/react-aria-components/docs/Calendar.mdx b/packages/react-aria-components/docs/Calendar.mdx
index 86f66cf9b94..8828d99a0b4 100644
--- a/packages/react-aria-components/docs/Calendar.mdx
+++ b/packages/react-aria-components/docs/Calendar.mdx
@@ -17,7 +17,7 @@ import statelyDocs from 'docs:@react-stately/calendar';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/calendar/docs/calendar-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/calendar/calendar-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/Checkbox.mdx b/packages/react-aria-components/docs/Checkbox.mdx
index 9761329d7ac..a8c39641f5e 100644
--- a/packages/react-aria-components/docs/Checkbox.mdx
+++ b/packages/react-aria-components/docs/Checkbox.mdx
@@ -15,7 +15,7 @@ import typesDocs from 'docs:@react-types/shared/src/events.d.ts';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/checkbox/docs/checkbox-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/checkbox/checkbox-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/CheckboxGroup.mdx b/packages/react-aria-components/docs/CheckboxGroup.mdx
index 188c967763e..6e9fb654250 100644
--- a/packages/react-aria-components/docs/CheckboxGroup.mdx
+++ b/packages/react-aria-components/docs/CheckboxGroup.mdx
@@ -16,7 +16,7 @@ import typesDocs from 'docs:@react-types/shared/src/events.d.ts';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable, VersionBadge, ClassAPI} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/checkbox/docs/checkboxgroup-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/checkbox/checkboxgroup-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/ColorArea.mdx b/packages/react-aria-components/docs/ColorArea.mdx
index 2581796bade..51ed143bcb2 100644
--- a/packages/react-aria-components/docs/ColorArea.mdx
+++ b/packages/react-aria-components/docs/ColorArea.mdx
@@ -15,7 +15,7 @@ import statelyDocs from 'docs:@react-stately/color';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/color/docs/ColorAreaAnatomy.svg';
+import Anatomy from '/packages/react-aria/docs/color/ColorAreaAnatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleList} from '@react-spectrum/docs/src/ExampleList';
diff --git a/packages/react-aria-components/docs/ColorField.mdx b/packages/react-aria-components/docs/ColorField.mdx
index 92769f392c2..a9879e0887e 100644
--- a/packages/react-aria-components/docs/ColorField.mdx
+++ b/packages/react-aria-components/docs/ColorField.mdx
@@ -15,7 +15,7 @@ import statelyDocs from 'docs:@react-stately/color';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/color/docs/ColorFieldAnatomy.svg';
+import Anatomy from '/packages/react-aria/docs/color/ColorFieldAnatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleList} from '@react-spectrum/docs/src/ExampleList';
diff --git a/packages/react-aria-components/docs/ColorSlider.mdx b/packages/react-aria-components/docs/ColorSlider.mdx
index 7b3b1b01fb2..122dd7b0a81 100644
--- a/packages/react-aria-components/docs/ColorSlider.mdx
+++ b/packages/react-aria-components/docs/ColorSlider.mdx
@@ -15,7 +15,7 @@ import statelyDocs from 'docs:@react-stately/color';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/color/docs/ColorSliderAnatomy.svg';
+import Anatomy from '/packages/react-aria/docs/color/ColorSliderAnatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleList} from '@react-spectrum/docs/src/ExampleList';
diff --git a/packages/react-aria-components/docs/ColorWheel.mdx b/packages/react-aria-components/docs/ColorWheel.mdx
index 2250e6ba937..cc1813b6784 100644
--- a/packages/react-aria-components/docs/ColorWheel.mdx
+++ b/packages/react-aria-components/docs/ColorWheel.mdx
@@ -15,7 +15,7 @@ import statelyDocs from 'docs:@react-stately/color';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/color/docs/ColorWheelAnatomy.svg';
+import Anatomy from '/packages/react-aria/docs/color/ColorWheelAnatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleList} from '@react-spectrum/docs/src/ExampleList';
diff --git a/packages/react-aria-components/docs/DateField.mdx b/packages/react-aria-components/docs/DateField.mdx
index d23c93617c8..d0b58649428 100644
--- a/packages/react-aria-components/docs/DateField.mdx
+++ b/packages/react-aria-components/docs/DateField.mdx
@@ -16,7 +16,7 @@ import statelyDocs from 'docs:@react-stately/datepicker';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/datepicker/docs/datefield-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/datepicker/datefield-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/DatePicker.mdx b/packages/react-aria-components/docs/DatePicker.mdx
index f58b67e3bda..883d303e7d2 100644
--- a/packages/react-aria-components/docs/DatePicker.mdx
+++ b/packages/react-aria-components/docs/DatePicker.mdx
@@ -16,7 +16,7 @@ import statelyDocs from 'docs:@react-stately/datepicker';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/datepicker/docs/datepicker-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/datepicker/datepicker-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/DateRangePicker.mdx b/packages/react-aria-components/docs/DateRangePicker.mdx
index 086debace01..e8171a2bed8 100644
--- a/packages/react-aria-components/docs/DateRangePicker.mdx
+++ b/packages/react-aria-components/docs/DateRangePicker.mdx
@@ -16,7 +16,7 @@ import statelyDocs from 'docs:@react-stately/datepicker';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/datepicker/docs/daterangepicker-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/datepicker/daterangepicker-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/Dialog.mdx b/packages/react-aria-components/docs/Dialog.mdx
index 9d8e500b38b..d04054e7359 100644
--- a/packages/react-aria-components/docs/Dialog.mdx
+++ b/packages/react-aria-components/docs/Dialog.mdx
@@ -16,7 +16,7 @@ import overlayStatelyDocs from 'docs:@react-stately/overlays';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable, VersionBadge, ClassAPI} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/dialog/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/dialog/anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/DropZone.mdx b/packages/react-aria-components/docs/DropZone.mdx
index aced23a864f..ce0851a8f56 100644
--- a/packages/react-aria-components/docs/DropZone.mdx
+++ b/packages/react-aria-components/docs/DropZone.mdx
@@ -15,7 +15,7 @@ import typesDocs from 'docs:@react-types/shared/src/events.d.ts';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/datepicker/docs/daterangepicker-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/datepicker/daterangepicker-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/FileTrigger.mdx b/packages/react-aria-components/docs/FileTrigger.mdx
index 4a0275497e8..ae0dda0eef8 100644
--- a/packages/react-aria-components/docs/FileTrigger.mdx
+++ b/packages/react-aria-components/docs/FileTrigger.mdx
@@ -15,7 +15,7 @@ import typesDocs from 'docs:@react-types/shared/src/events.d.ts';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/datepicker/docs/daterangepicker-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/datepicker/daterangepicker-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/Link.mdx b/packages/react-aria-components/docs/Link.mdx
index f3cf4f03c07..9a912757c5e 100644
--- a/packages/react-aria-components/docs/Link.mdx
+++ b/packages/react-aria-components/docs/Link.mdx
@@ -15,7 +15,7 @@ import typesDocs from 'docs:@react-types/shared/src/events.d.ts';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/datepicker/docs/daterangepicker-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/datepicker/daterangepicker-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/Meter.mdx b/packages/react-aria-components/docs/Meter.mdx
index e4c00a553e7..ab5e2a7d8b5 100644
--- a/packages/react-aria-components/docs/Meter.mdx
+++ b/packages/react-aria-components/docs/Meter.mdx
@@ -14,7 +14,7 @@ import docs from 'docs:react-aria-components';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/meter/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/meter/anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/Modal.mdx b/packages/react-aria-components/docs/Modal.mdx
index ef3f090acca..b8fb7400ebf 100644
--- a/packages/react-aria-components/docs/Modal.mdx
+++ b/packages/react-aria-components/docs/Modal.mdx
@@ -15,7 +15,7 @@ import typesDocs from 'docs:@react-types/overlays';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/overlays/docs/modal-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/overlays/modal-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/NumberField.mdx b/packages/react-aria-components/docs/NumberField.mdx
index ed8eaa5fca8..32fada8d411 100644
--- a/packages/react-aria-components/docs/NumberField.mdx
+++ b/packages/react-aria-components/docs/NumberField.mdx
@@ -15,7 +15,7 @@ import statelyDocs from 'docs:@react-stately/numberfield';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/numberfield/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/numberfield/anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/Popover.mdx b/packages/react-aria-components/docs/Popover.mdx
index 453ce476735..c335d2055c3 100644
--- a/packages/react-aria-components/docs/Popover.mdx
+++ b/packages/react-aria-components/docs/Popover.mdx
@@ -15,7 +15,7 @@ import typesDocs from 'docs:@react-types/overlays';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/overlays/docs/popover-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/overlays/popover-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/ProgressBar.mdx b/packages/react-aria-components/docs/ProgressBar.mdx
index ace853d4482..a1c92ce776f 100644
--- a/packages/react-aria-components/docs/ProgressBar.mdx
+++ b/packages/react-aria-components/docs/ProgressBar.mdx
@@ -14,7 +14,7 @@ import docs from 'docs:react-aria-components';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/progress/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/progress/anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/RadioGroup.mdx b/packages/react-aria-components/docs/RadioGroup.mdx
index d922a56252b..922ea1bd9ac 100644
--- a/packages/react-aria-components/docs/RadioGroup.mdx
+++ b/packages/react-aria-components/docs/RadioGroup.mdx
@@ -16,7 +16,7 @@ import typesDocs from 'docs:@react-types/shared/src/events.d.ts';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable, VersionBadge, ClassAPI} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/radio/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/radio/anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/RangeCalendar.mdx b/packages/react-aria-components/docs/RangeCalendar.mdx
index a5a67361e6d..08bbd0cb5ba 100644
--- a/packages/react-aria-components/docs/RangeCalendar.mdx
+++ b/packages/react-aria-components/docs/RangeCalendar.mdx
@@ -16,7 +16,7 @@ import statelyDocs from 'docs:@react-stately/calendar';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/calendar/docs/rangecalendar-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/calendar/rangecalendar-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/SearchField.mdx b/packages/react-aria-components/docs/SearchField.mdx
index f484ceadd40..89d5caffdff 100644
--- a/packages/react-aria-components/docs/SearchField.mdx
+++ b/packages/react-aria-components/docs/SearchField.mdx
@@ -15,7 +15,7 @@ import statelyDocs from 'docs:@react-stately/searchfield';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/searchfield/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/searchfield/anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/Slider.mdx b/packages/react-aria-components/docs/Slider.mdx
index 2f84e3efc6e..2bc66269d9d 100644
--- a/packages/react-aria-components/docs/Slider.mdx
+++ b/packages/react-aria-components/docs/Slider.mdx
@@ -15,7 +15,7 @@ import statelyDocs from 'docs:@react-stately/slider';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/slider/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/slider/anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleList} from '@react-spectrum/docs/src/ExampleList';
diff --git a/packages/react-aria-components/docs/Switch.mdx b/packages/react-aria-components/docs/Switch.mdx
index 028fbef3f53..cb79582b410 100644
--- a/packages/react-aria-components/docs/Switch.mdx
+++ b/packages/react-aria-components/docs/Switch.mdx
@@ -15,7 +15,7 @@ import typesDocs from 'docs:@react-types/shared/src/events.d.ts';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/switch/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/switch/anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/Tabs.mdx b/packages/react-aria-components/docs/Tabs.mdx
index 45807c1d514..32226da769e 100644
--- a/packages/react-aria-components/docs/Tabs.mdx
+++ b/packages/react-aria-components/docs/Tabs.mdx
@@ -15,7 +15,7 @@ import statelyDocs from 'docs:@react-stately/tabs';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable, ClassAPI, VersionBadge} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/tabs/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/tabs/anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {Keyboard} from '@react-spectrum/text';
diff --git a/packages/react-aria-components/docs/TagGroup.mdx b/packages/react-aria-components/docs/TagGroup.mdx
index 8be420f143b..62e741d8c9c 100644
--- a/packages/react-aria-components/docs/TagGroup.mdx
+++ b/packages/react-aria-components/docs/TagGroup.mdx
@@ -15,7 +15,7 @@ import statelyDocs from 'docs:@react-stately/list';
 import {PropTable, HeaderInfo, PageDescription, StateTable, ContextTable, TypeLink} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/tag/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/tag/anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
 import Button from '@react-spectrum/docs/pages/assets/component-illustrations/ActionButton.svg';
diff --git a/packages/react-aria-components/docs/TextField.mdx b/packages/react-aria-components/docs/TextField.mdx
index 0e2b1a1ef82..482aa759c27 100644
--- a/packages/react-aria-components/docs/TextField.mdx
+++ b/packages/react-aria-components/docs/TextField.mdx
@@ -14,7 +14,7 @@ import docs from 'docs:react-aria-components';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/textfield/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/textfield/anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/TimeField.mdx b/packages/react-aria-components/docs/TimeField.mdx
index c1be455550f..d63aaa0a3d8 100644
--- a/packages/react-aria-components/docs/TimeField.mdx
+++ b/packages/react-aria-components/docs/TimeField.mdx
@@ -16,7 +16,7 @@ import statelyDocs from 'docs:@react-stately/datepicker';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/datepicker/docs/timefield-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/datepicker/timefield-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/Toast.mdx b/packages/react-aria-components/docs/Toast.mdx
index 5da7451da69..010f8f7b02f 100644
--- a/packages/react-aria-components/docs/Toast.mdx
+++ b/packages/react-aria-components/docs/Toast.mdx
@@ -17,7 +17,7 @@ import packageData from 'react-aria-components/package.json';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
 import {StarterKits} from '@react-spectrum/docs/src/StarterKits';
-import Anatomy from '@react-aria/toast/docs/toast-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/toast/toast-anatomy.svg';
 import {Keyboard} from '@react-spectrum/text';
 import {InlineAlert, Content, Heading} from '@adobe/react-spectrum';
 
diff --git a/packages/react-aria-components/docs/ToggleButton.mdx b/packages/react-aria-components/docs/ToggleButton.mdx
index 451d638713b..7bbd07417f0 100644
--- a/packages/react-aria-components/docs/ToggleButton.mdx
+++ b/packages/react-aria-components/docs/ToggleButton.mdx
@@ -15,7 +15,7 @@ import typesDocs from 'docs:@react-types/shared/src/events.d.ts';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable, ContextTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/datepicker/docs/daterangepicker-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/datepicker/daterangepicker-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/docs/ToggleButtonGroup.mdx b/packages/react-aria-components/docs/ToggleButtonGroup.mdx
index 9cb1d335d30..b1c8395afbd 100644
--- a/packages/react-aria-components/docs/ToggleButtonGroup.mdx
+++ b/packages/react-aria-components/docs/ToggleButtonGroup.mdx
@@ -22,7 +22,7 @@ import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
 import {Keyboard} from '@react-spectrum/text';
 import {StarterKits} from '@react-spectrum/docs/src/StarterKits';
 import ToggleButton from '@react-spectrum/docs/pages/assets/component-illustrations/ToggleButton.svg';
-import Anatomy from '@react-aria/button/docs/ToggleButtonGroupAnatomy.svg';
+import Anatomy from '/packages/react-aria/docs/button/ToggleButtonGroupAnatomy.svg';
 
 ---
 category: Buttons
diff --git a/packages/react-aria-components/docs/Toolbar.mdx b/packages/react-aria-components/docs/Toolbar.mdx
index fce41a1acff..e16a4d7b27d 100644
--- a/packages/react-aria-components/docs/Toolbar.mdx
+++ b/packages/react-aria-components/docs/Toolbar.mdx
@@ -15,7 +15,7 @@ import typesDocs from 'docs:@react-types/shared/src/events.d.ts';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, ContextTable, StateTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/toolbar/docs/toolbar-anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/toolbar/toolbar-anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {StarterKits} from '@react-spectrum/docs/src/StarterKits';
 
diff --git a/packages/react-aria-components/docs/Tooltip.mdx b/packages/react-aria-components/docs/Tooltip.mdx
index 2d45e2ac5c0..a96c7ad4355 100644
--- a/packages/react-aria-components/docs/Tooltip.mdx
+++ b/packages/react-aria-components/docs/Tooltip.mdx
@@ -15,7 +15,7 @@ import statelyDocs from 'docs:@react-stately/tooltip';
 import {PropTable, HeaderInfo, TypeLink, PageDescription, StateTable} from '@react-spectrum/docs';
 import styles from '@react-spectrum/docs/src/docs.css';
 import packageData from 'react-aria-components/package.json';
-import Anatomy from '@react-aria/tooltip/docs/anatomy.svg';
+import Anatomy from '/packages/react-aria/docs/tooltip/anatomy.svg';
 import ChevronRight from '@spectrum-icons/workflow/ChevronRight';
 import {Divider} from '@react-spectrum/divider';
 import {ExampleCard} from '@react-spectrum/docs/src/ExampleCard';
diff --git a/packages/react-aria-components/exports/Autocomplete.ts b/packages/react-aria-components/exports/Autocomplete.ts
new file mode 100644
index 00000000000..40a1319a2c0
--- /dev/null
+++ b/packages/react-aria-components/exports/Autocomplete.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Autocomplete, AutocompleteContext, AutocompleteStateContext, SelectableCollectionContext, FieldInputContext} from '../src/Autocomplete';
+
+export type {AutocompleteProps, SelectableCollectionContextValue} from '../src/Autocomplete';
diff --git a/packages/react-aria-components/exports/Breadcrumbs.ts b/packages/react-aria-components/exports/Breadcrumbs.ts
new file mode 100644
index 00000000000..d6acd9bf691
--- /dev/null
+++ b/packages/react-aria-components/exports/Breadcrumbs.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Breadcrumbs, BreadcrumbsContext, Breadcrumb} from '../src/Breadcrumbs';
+export type {BreadcrumbsProps, BreadcrumbProps, BreadcrumbRenderProps} from '../src/Breadcrumbs';
diff --git a/packages/react-aria-components/exports/Button.ts b/packages/react-aria-components/exports/Button.ts
new file mode 100644
index 00000000000..c04096a9eda
--- /dev/null
+++ b/packages/react-aria-components/exports/Button.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Button, ButtonContext} from '../src/Button';
+export type {ButtonProps, ButtonRenderProps} from '../src/Button';
diff --git a/packages/react-aria-components/exports/Calendar.ts b/packages/react-aria-components/exports/Calendar.ts
new file mode 100644
index 00000000000..c794fa85d05
--- /dev/null
+++ b/packages/react-aria-components/exports/Calendar.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Calendar, CalendarGrid, CalendarGridHeader, CalendarGridBody, CalendarHeaderCell, CalendarCell, RangeCalendar, CalendarContext, RangeCalendarContext, CalendarStateContext, RangeCalendarStateContext} from '../src/Calendar';
+export type {CalendarCellProps, CalendarProps, CalendarRenderProps, CalendarGridProps, CalendarGridHeaderProps, CalendarGridBodyProps, CalendarHeaderCellProps, CalendarCellRenderProps, RangeCalendarProps, RangeCalendarRenderProps} from '../src/Calendar';
diff --git a/packages/react-aria-components/exports/Checkbox.ts b/packages/react-aria-components/exports/Checkbox.ts
new file mode 100644
index 00000000000..a1b57dfc67d
--- /dev/null
+++ b/packages/react-aria-components/exports/Checkbox.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Checkbox, CheckboxGroup, CheckboxContext, CheckboxGroupContext, CheckboxGroupStateContext} from '../src/Checkbox';
+export type {CheckboxGroupProps, CheckboxGroupRenderProps, CheckboxRenderProps, CheckboxProps} from '../src/Checkbox';
diff --git a/packages/react-aria-components/exports/Collection.ts b/packages/react-aria-components/exports/Collection.ts
new file mode 100644
index 00000000000..40a74ce216a
--- /dev/null
+++ b/packages/react-aria-components/exports/Collection.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Section, CollectionRendererContext, DefaultCollectionRenderer} from '../src/Collection';
+export type {SectionProps, CollectionRenderer} from '../src/Collection';
diff --git a/packages/react-aria-components/exports/ColorArea.ts b/packages/react-aria-components/exports/ColorArea.ts
new file mode 100644
index 00000000000..56d04d65fab
--- /dev/null
+++ b/packages/react-aria-components/exports/ColorArea.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {ColorArea, ColorAreaContext, ColorAreaStateContext} from '../src/ColorArea';
+export type {ColorAreaProps, ColorAreaRenderProps} from '../src/ColorArea';
diff --git a/packages/react-aria-components/exports/ColorField.ts b/packages/react-aria-components/exports/ColorField.ts
new file mode 100644
index 00000000000..dd9d68b24e0
--- /dev/null
+++ b/packages/react-aria-components/exports/ColorField.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {ColorField, ColorFieldContext, ColorFieldStateContext} from '../src/ColorField';
+export type {ColorFieldProps, ColorFieldRenderProps} from '../src/ColorField';
diff --git a/packages/react-aria-components/exports/ColorPicker.ts b/packages/react-aria-components/exports/ColorPicker.ts
new file mode 100644
index 00000000000..86400de509c
--- /dev/null
+++ b/packages/react-aria-components/exports/ColorPicker.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {ColorPicker, ColorPickerContext, ColorPickerStateContext} from '../src/ColorPicker';
+export type {ColorPickerProps, ColorPickerRenderProps} from '../src/ColorPicker';
diff --git a/packages/react-aria-components/exports/ColorSlider.ts b/packages/react-aria-components/exports/ColorSlider.ts
new file mode 100644
index 00000000000..130f71938a3
--- /dev/null
+++ b/packages/react-aria-components/exports/ColorSlider.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {ColorSlider, ColorSliderContext, ColorSliderStateContext} from '../src/ColorSlider';
+export type {ColorSliderProps, ColorSliderRenderProps} from '../src/ColorSlider';
diff --git a/packages/react-aria-components/exports/ColorSwatch.ts b/packages/react-aria-components/exports/ColorSwatch.ts
new file mode 100644
index 00000000000..81f3941946f
--- /dev/null
+++ b/packages/react-aria-components/exports/ColorSwatch.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {ColorSwatch, ColorSwatchContext} from '../src/ColorSwatch';
+export type {ColorSwatchProps, ColorSwatchRenderProps} from '../src/ColorSwatch';
diff --git a/packages/react-aria-components/exports/ColorSwatchPicker.ts b/packages/react-aria-components/exports/ColorSwatchPicker.ts
new file mode 100644
index 00000000000..456b16925bb
--- /dev/null
+++ b/packages/react-aria-components/exports/ColorSwatchPicker.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {ColorSwatchPicker, ColorSwatchPickerItem, ColorSwatchPickerContext} from '../src/ColorSwatchPicker';
+export type {ColorSwatchPickerProps, ColorSwatchPickerRenderProps, ColorSwatchPickerItemProps, ColorSwatchPickerItemRenderProps} from '../src/ColorSwatchPicker';
diff --git a/packages/react-aria-components/exports/ColorThumb.ts b/packages/react-aria-components/exports/ColorThumb.ts
new file mode 100644
index 00000000000..c3aeaaa818f
--- /dev/null
+++ b/packages/react-aria-components/exports/ColorThumb.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {ColorThumb} from '../src/ColorThumb';
+export type {ColorThumbProps, ColorThumbRenderProps} from '../src/ColorThumb';
diff --git a/packages/react-aria-components/exports/ColorWheel.ts b/packages/react-aria-components/exports/ColorWheel.ts
new file mode 100644
index 00000000000..46c747cbeb9
--- /dev/null
+++ b/packages/react-aria-components/exports/ColorWheel.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {ColorWheel, ColorWheelContext, ColorWheelTrack, ColorWheelTrackContext, ColorWheelStateContext} from '../src/ColorWheel';
+export type {ColorWheelProps, ColorWheelRenderProps, ColorWheelTrackProps, ColorWheelTrackRenderProps} from '../src/ColorWheel';
diff --git a/packages/react-aria-components/exports/ComboBox.ts b/packages/react-aria-components/exports/ComboBox.ts
new file mode 100644
index 00000000000..b13095a7c69
--- /dev/null
+++ b/packages/react-aria-components/exports/ComboBox.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {ComboBox, ComboBoxValue, ComboBoxContext, ComboBoxStateContext, ComboBoxValueContext} from '../src/ComboBox';
+export type {ComboBoxProps, ComboBoxRenderProps, ComboBoxValueProps, ComboBoxValueRenderProps} from '../src/ComboBox';
diff --git a/packages/react-aria-components/exports/DateField.ts b/packages/react-aria-components/exports/DateField.ts
new file mode 100644
index 00000000000..9325724b4b8
--- /dev/null
+++ b/packages/react-aria-components/exports/DateField.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {DateField, DateInput, DateSegment, TimeField, DateFieldContext, TimeFieldContext, DateFieldStateContext, TimeFieldStateContext} from '../src/DateField';
+export type {DateFieldProps, DateFieldRenderProps, DateInputProps, DateInputRenderProps, DateSegmentProps, DateSegmentRenderProps, TimeFieldProps} from '../src/DateField';
diff --git a/packages/react-aria-components/exports/DatePicker.ts b/packages/react-aria-components/exports/DatePicker.ts
new file mode 100644
index 00000000000..1cd79efdbe8
--- /dev/null
+++ b/packages/react-aria-components/exports/DatePicker.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {DatePicker, DateRangePicker, DatePickerContext, DateRangePickerContext, DatePickerStateContext, DateRangePickerStateContext} from '../src/DatePicker';
+export type {DatePickerProps, DatePickerRenderProps, DateRangePickerProps, DateRangePickerRenderProps} from '../src/DatePicker';
diff --git a/packages/react-aria-components/exports/Dialog.ts b/packages/react-aria-components/exports/Dialog.ts
new file mode 100644
index 00000000000..ef51c2f06d3
--- /dev/null
+++ b/packages/react-aria-components/exports/Dialog.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {DialogTrigger, Dialog, DialogContext, OverlayTriggerStateContext} from '../src/Dialog';
+export type {DialogProps, DialogTriggerProps, DialogRenderProps} from '../src/Dialog';
diff --git a/packages/react-aria-components/exports/Disclosure.ts b/packages/react-aria-components/exports/Disclosure.ts
new file mode 100644
index 00000000000..e600ca39ea6
--- /dev/null
+++ b/packages/react-aria-components/exports/Disclosure.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Disclosure, DisclosureGroup, DisclosureGroupStateContext, DisclosurePanel, DisclosureStateContext, DisclosureContext} from '../src/Disclosure';
+export type {DisclosureProps, DisclosureRenderProps, DisclosurePanelProps, DisclosurePanelRenderProps, DisclosureGroupProps, DisclosureGroupRenderProps} from '../src/Disclosure';
diff --git a/packages/react-aria-components/exports/DropZone.ts b/packages/react-aria-components/exports/DropZone.ts
new file mode 100644
index 00000000000..954400dcb84
--- /dev/null
+++ b/packages/react-aria-components/exports/DropZone.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {DropZone, DropZoneContext} from '../src/DropZone';
+export type {DropZoneProps, DropZoneRenderProps} from '../src/DropZone';
diff --git a/packages/react-aria-components/exports/FieldError.ts b/packages/react-aria-components/exports/FieldError.ts
new file mode 100644
index 00000000000..9a03d55ad71
--- /dev/null
+++ b/packages/react-aria-components/exports/FieldError.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {FieldError, FieldErrorContext} from '../src/FieldError';
+export type {FieldErrorProps, FieldErrorRenderProps} from '../src/FieldError';
diff --git a/packages/react-aria-components/exports/FileTrigger.ts b/packages/react-aria-components/exports/FileTrigger.ts
new file mode 100644
index 00000000000..aec499148f4
--- /dev/null
+++ b/packages/react-aria-components/exports/FileTrigger.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {FileTrigger} from '../src/FileTrigger';
+export type {FileTriggerProps} from '../src/FileTrigger';
diff --git a/packages/react-aria-components/exports/Form.ts b/packages/react-aria-components/exports/Form.ts
new file mode 100644
index 00000000000..f355a808e81
--- /dev/null
+++ b/packages/react-aria-components/exports/Form.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Form, FormContext} from '../src/Form';
+export type {FormProps} from '../src/Form';
diff --git a/packages/react-aria-components/exports/GridList.ts b/packages/react-aria-components/exports/GridList.ts
new file mode 100644
index 00000000000..a7379eb50ad
--- /dev/null
+++ b/packages/react-aria-components/exports/GridList.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {GridListLoadMoreItem, GridList, GridListItem, GridListContext, GridListHeader, GridListHeaderContext, GridListSection} from '../src/GridList';
+export type {GridListProps, GridListRenderProps, GridListItemProps, GridListItemRenderProps, GridListLoadMoreItemProps, GridListSectionProps} from '../src/GridList';
diff --git a/packages/react-aria-components/exports/Group.ts b/packages/react-aria-components/exports/Group.ts
new file mode 100644
index 00000000000..65613e14047
--- /dev/null
+++ b/packages/react-aria-components/exports/Group.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Group, GroupContext} from '../src/Group';
+export type {GroupProps, GroupRenderProps} from '../src/Group';
diff --git a/packages/react-aria-components/exports/Header.ts b/packages/react-aria-components/exports/Header.ts
new file mode 100644
index 00000000000..cff0fd6bd29
--- /dev/null
+++ b/packages/react-aria-components/exports/Header.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Header, HeaderContext} from '../src/Header';
+export type {HeaderProps} from '../src/Header';
diff --git a/packages/react-aria-components/exports/Heading.ts b/packages/react-aria-components/exports/Heading.ts
new file mode 100644
index 00000000000..6cb26a7920a
--- /dev/null
+++ b/packages/react-aria-components/exports/Heading.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Heading, HeadingContext} from '../src/Heading';
+export type {HeadingProps} from '../src/Heading';
diff --git a/packages/react-aria-components/exports/Input.ts b/packages/react-aria-components/exports/Input.ts
new file mode 100644
index 00000000000..af1de838924
--- /dev/null
+++ b/packages/react-aria-components/exports/Input.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Input, InputContext} from '../src/Input';
+export type {InputProps, InputRenderProps} from '../src/Input';
diff --git a/packages/react-aria-components/exports/Keyboard.ts b/packages/react-aria-components/exports/Keyboard.ts
new file mode 100644
index 00000000000..4ba145644fc
--- /dev/null
+++ b/packages/react-aria-components/exports/Keyboard.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Keyboard, KeyboardContext} from '../src/Keyboard';
diff --git a/packages/react-aria-components/exports/Label.ts b/packages/react-aria-components/exports/Label.ts
new file mode 100644
index 00000000000..cb32c269d60
--- /dev/null
+++ b/packages/react-aria-components/exports/Label.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Label, LabelContext} from '../src/Label';
+export type {LabelProps} from '../src/Label';
diff --git a/packages/react-aria-components/exports/Link.ts b/packages/react-aria-components/exports/Link.ts
new file mode 100644
index 00000000000..5ed9586da11
--- /dev/null
+++ b/packages/react-aria-components/exports/Link.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Link, LinkContext} from '../src/Link';
+export type {LinkProps, LinkRenderProps} from '../src/Link';
diff --git a/packages/react-aria-components/exports/ListBox.ts b/packages/react-aria-components/exports/ListBox.ts
new file mode 100644
index 00000000000..98076596d3b
--- /dev/null
+++ b/packages/react-aria-components/exports/ListBox.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {ListBoxLoadMoreItem, ListBox, ListBoxItem, ListBoxSection, ListBoxContext, ListStateContext} from '../src/ListBox';
+export type {ListBoxProps, ListBoxRenderProps, ListBoxItemProps, ListBoxItemRenderProps, ListBoxSectionProps, ListBoxLoadMoreItemProps} from '../src/ListBox';
diff --git a/packages/react-aria-components/exports/Menu.ts b/packages/react-aria-components/exports/Menu.ts
new file mode 100644
index 00000000000..bed5e905f6c
--- /dev/null
+++ b/packages/react-aria-components/exports/Menu.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Menu, MenuItem, MenuTrigger, MenuSection, MenuContext, MenuStateContext, RootMenuTriggerStateContext, SubmenuTrigger} from '../src/Menu';
+export type {MenuProps, MenuItemProps, MenuItemRenderProps, MenuTriggerProps, SubmenuTriggerProps, MenuSectionProps} from '../src/Menu';
diff --git a/packages/react-aria-components/exports/Meter.ts b/packages/react-aria-components/exports/Meter.ts
new file mode 100644
index 00000000000..1ccd9b74fb3
--- /dev/null
+++ b/packages/react-aria-components/exports/Meter.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Meter, MeterContext} from '../src/Meter';
+export type {MeterProps, MeterRenderProps} from '../src/Meter';
diff --git a/packages/react-aria-components/exports/Modal.ts b/packages/react-aria-components/exports/Modal.ts
new file mode 100644
index 00000000000..4a54f96983e
--- /dev/null
+++ b/packages/react-aria-components/exports/Modal.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Modal, ModalOverlay, ModalContext} from '../src/Modal';
+export type {ModalOverlayProps, ModalRenderProps} from '../src/Modal';
diff --git a/packages/react-aria-components/exports/NumberField.ts b/packages/react-aria-components/exports/NumberField.ts
new file mode 100644
index 00000000000..228cb4c3d79
--- /dev/null
+++ b/packages/react-aria-components/exports/NumberField.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {NumberField, NumberFieldContext, NumberFieldStateContext} from '../src/NumberField';
+export type {NumberFieldProps, NumberFieldRenderProps} from '../src/NumberField';
diff --git a/packages/react-aria-components/exports/OverlayArrow.ts b/packages/react-aria-components/exports/OverlayArrow.ts
new file mode 100644
index 00000000000..4a66c6e5a4f
--- /dev/null
+++ b/packages/react-aria-components/exports/OverlayArrow.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {OverlayArrow} from '../src/OverlayArrow';
+export type {OverlayArrowProps, OverlayArrowRenderProps} from '../src/OverlayArrow';
diff --git a/packages/react-aria-components/exports/Popover.ts b/packages/react-aria-components/exports/Popover.ts
new file mode 100644
index 00000000000..0ea467d64f0
--- /dev/null
+++ b/packages/react-aria-components/exports/Popover.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Popover, PopoverContext} from '../src/Popover';
+export type {PopoverProps, PopoverRenderProps} from '../src/Popover';
diff --git a/packages/react-aria-components/exports/ProgressBar.ts b/packages/react-aria-components/exports/ProgressBar.ts
new file mode 100644
index 00000000000..e802036a24b
--- /dev/null
+++ b/packages/react-aria-components/exports/ProgressBar.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {ProgressBar, ProgressBarContext} from '../src/ProgressBar';
+export type {ProgressBarProps, ProgressBarRenderProps} from '../src/ProgressBar';
diff --git a/packages/react-aria-components/exports/RadioGroup.ts b/packages/react-aria-components/exports/RadioGroup.ts
new file mode 100644
index 00000000000..943127e5f0e
--- /dev/null
+++ b/packages/react-aria-components/exports/RadioGroup.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {RadioGroup, Radio, RadioGroupContext, RadioContext, RadioGroupStateContext} from '../src/RadioGroup';
+export type {RadioGroupProps, RadioGroupRenderProps, RadioProps, RadioRenderProps} from '../src/RadioGroup';
diff --git a/packages/react-aria-components/exports/SearchField.ts b/packages/react-aria-components/exports/SearchField.ts
new file mode 100644
index 00000000000..dc7c968b797
--- /dev/null
+++ b/packages/react-aria-components/exports/SearchField.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {SearchField, SearchFieldContext} from '../src/SearchField';
+export type {SearchFieldProps, SearchFieldRenderProps} from '../src/SearchField';
diff --git a/packages/react-aria-components/exports/Select.ts b/packages/react-aria-components/exports/Select.ts
new file mode 100644
index 00000000000..0f2797d78dd
--- /dev/null
+++ b/packages/react-aria-components/exports/Select.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Select, SelectValue, SelectContext, SelectValueContext, SelectStateContext} from '../src/Select';
+export type {SelectProps, SelectValueProps, SelectValueRenderProps, SelectRenderProps} from '../src/Select';
diff --git a/packages/react-aria-components/exports/SelectionIndicator.ts b/packages/react-aria-components/exports/SelectionIndicator.ts
new file mode 100644
index 00000000000..28e57acc717
--- /dev/null
+++ b/packages/react-aria-components/exports/SelectionIndicator.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {SelectionIndicator, SelectionIndicatorContext} from '../src/SelectionIndicator';
+export type {SelectionIndicatorProps} from '../src/SelectionIndicator';
diff --git a/packages/react-aria-components/exports/Separator.ts b/packages/react-aria-components/exports/Separator.ts
new file mode 100644
index 00000000000..67af8b4f5dd
--- /dev/null
+++ b/packages/react-aria-components/exports/Separator.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Separator, SeparatorContext} from '../src/Separator';
+export type {SeparatorProps} from '../src/Separator';
diff --git a/packages/react-aria-components/exports/SharedElementTransition.ts b/packages/react-aria-components/exports/SharedElementTransition.ts
new file mode 100644
index 00000000000..62d6b05072d
--- /dev/null
+++ b/packages/react-aria-components/exports/SharedElementTransition.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {SharedElementTransition, SharedElement} from '../src/SharedElementTransition';
+export type {SharedElementTransitionProps, SharedElementProps, SharedElementRenderProps} from '../src/SharedElementTransition';
diff --git a/packages/react-aria-components/exports/Slider.ts b/packages/react-aria-components/exports/Slider.ts
new file mode 100644
index 00000000000..9a3cfecf7e8
--- /dev/null
+++ b/packages/react-aria-components/exports/Slider.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Slider, SliderOutput, SliderTrack, SliderThumb, SliderContext, SliderOutputContext, SliderTrackContext, SliderStateContext} from '../src/Slider';
+export type {SliderOutputProps, SliderProps, SliderRenderProps, SliderThumbProps, SliderTrackProps, SliderTrackRenderProps, SliderThumbRenderProps} from '../src/Slider';
diff --git a/packages/react-aria-components/exports/Switch.ts b/packages/react-aria-components/exports/Switch.ts
new file mode 100644
index 00000000000..6879dd843cb
--- /dev/null
+++ b/packages/react-aria-components/exports/Switch.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Switch, SwitchContext} from '../src/Switch';
+export type {SwitchProps, SwitchRenderProps} from '../src/Switch';
diff --git a/packages/react-aria-components/exports/Table.ts b/packages/react-aria-components/exports/Table.ts
new file mode 100644
index 00000000000..c749765b6aa
--- /dev/null
+++ b/packages/react-aria-components/exports/Table.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {TableLoadMoreItem, Table, Row, Cell, Column, ColumnResizer, TableHeader, TableBody, TableContext, ResizableTableContainer, useTableOptions, TableStateContext, TableColumnResizeStateContext, TableLayout} from '../src/Table';
+export type {TableProps, TableRenderProps, TableHeaderProps, TableBodyProps, TableBodyRenderProps, ResizableTableContainerProps, ColumnProps, ColumnRenderProps, ColumnResizerProps, ColumnResizerRenderProps, RowProps, RowRenderProps, CellProps, CellRenderProps, TableLoadMoreItemProps} from '../src/Table';
diff --git a/packages/react-aria-components/exports/Tabs.ts b/packages/react-aria-components/exports/Tabs.ts
new file mode 100644
index 00000000000..ee00d9e7758
--- /dev/null
+++ b/packages/react-aria-components/exports/Tabs.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Tabs, TabList, TabPanels, TabPanel, Tab, TabsContext, TabListStateContext} from '../src/Tabs';
+export type {TabListProps, TabListRenderProps, TabPanelsProps, TabPanelProps, TabPanelRenderProps, TabProps, TabsProps, TabRenderProps, TabsRenderProps} from '../src/Tabs';
diff --git a/packages/react-aria-components/exports/TagGroup.ts b/packages/react-aria-components/exports/TagGroup.ts
new file mode 100644
index 00000000000..cc831745be0
--- /dev/null
+++ b/packages/react-aria-components/exports/TagGroup.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {TagGroup, TagGroupContext, TagList, TagListContext, Tag} from '../src/TagGroup';
+export type {TagGroupProps, TagListProps, TagListRenderProps, TagProps, TagRenderProps} from '../src/TagGroup';
diff --git a/packages/react-aria-components/exports/Text.ts b/packages/react-aria-components/exports/Text.ts
new file mode 100644
index 00000000000..d0b13d8ec99
--- /dev/null
+++ b/packages/react-aria-components/exports/Text.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Text, TextContext} from '../src/Text';
+export type {TextProps} from '../src/Text';
diff --git a/packages/react-aria-components/exports/TextArea.ts b/packages/react-aria-components/exports/TextArea.ts
new file mode 100644
index 00000000000..3ddee7c147c
--- /dev/null
+++ b/packages/react-aria-components/exports/TextArea.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {TextArea, TextAreaContext} from '../src/TextArea';
+export type {TextAreaProps} from '../src/TextArea';
diff --git a/packages/react-aria-components/exports/TextField.ts b/packages/react-aria-components/exports/TextField.ts
new file mode 100644
index 00000000000..491e6048282
--- /dev/null
+++ b/packages/react-aria-components/exports/TextField.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {TextField, TextFieldContext} from '../src/TextField';
+export type {TextFieldProps, TextFieldRenderProps} from '../src/TextField';
diff --git a/packages/react-aria-components/exports/Toast.ts b/packages/react-aria-components/exports/Toast.ts
new file mode 100644
index 00000000000..ef5642e0837
--- /dev/null
+++ b/packages/react-aria-components/exports/Toast.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {UNSTABLE_Toast, UNSTABLE_ToastList, UNSTABLE_ToastRegion, UNSTABLE_ToastContent, UNSTABLE_ToastStateContext} from '../src/Toast';
+export type {ToastRegionProps, ToastListProps, ToastRegionRenderProps, ToastProps, ToastRenderProps} from '../src/Toast';
diff --git a/packages/react-aria-components/exports/ToggleButton.ts b/packages/react-aria-components/exports/ToggleButton.ts
new file mode 100644
index 00000000000..3a6720b049e
--- /dev/null
+++ b/packages/react-aria-components/exports/ToggleButton.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {ToggleButton, ToggleButtonContext} from '../src/ToggleButton';
+export type {ToggleButtonProps, ToggleButtonRenderProps} from '../src/ToggleButton';
diff --git a/packages/react-aria-components/exports/ToggleButtonGroup.ts b/packages/react-aria-components/exports/ToggleButtonGroup.ts
new file mode 100644
index 00000000000..f0a84746c69
--- /dev/null
+++ b/packages/react-aria-components/exports/ToggleButtonGroup.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {ToggleButtonGroup, ToggleButtonGroupContext, ToggleGroupStateContext} from '../src/ToggleButtonGroup';
+export type {ToggleButtonGroupProps, ToggleButtonGroupRenderProps} from '../src/ToggleButtonGroup';
diff --git a/packages/react-aria-components/exports/Toolbar.ts b/packages/react-aria-components/exports/Toolbar.ts
new file mode 100644
index 00000000000..8e103419532
--- /dev/null
+++ b/packages/react-aria-components/exports/Toolbar.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Toolbar, ToolbarContext} from '../src/Toolbar';
+export type {ToolbarProps, ToolbarRenderProps} from '../src/Toolbar';
diff --git a/packages/react-aria-components/exports/Tooltip.ts b/packages/react-aria-components/exports/Tooltip.ts
new file mode 100644
index 00000000000..d494a7df3f8
--- /dev/null
+++ b/packages/react-aria-components/exports/Tooltip.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {TooltipTrigger, Tooltip, TooltipTriggerStateContext, TooltipContext} from '../src/Tooltip';
+export type {TooltipProps, TooltipRenderProps, TooltipTriggerComponentProps} from '../src/Tooltip';
diff --git a/packages/react-aria-components/exports/Tree.ts b/packages/react-aria-components/exports/Tree.ts
new file mode 100644
index 00000000000..fade9aa236d
--- /dev/null
+++ b/packages/react-aria-components/exports/Tree.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {TreeLoadMoreItem, Tree, TreeItem, TreeContext, TreeItemContent, TreeHeader, TreeSection, TreeStateContext} from '../src/Tree';
+export type {TreeProps, TreeRenderProps, TreeEmptyStateRenderProps, TreeItemProps, TreeItemRenderProps, TreeItemContentProps, TreeItemContentRenderProps, TreeLoadMoreItemProps, TreeLoadMoreItemRenderProps} from '../src/Tree';
diff --git a/packages/react-aria-components/exports/Virtualizer.ts b/packages/react-aria-components/exports/Virtualizer.ts
new file mode 100644
index 00000000000..8df28bcd67e
--- /dev/null
+++ b/packages/react-aria-components/exports/Virtualizer.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {Virtualizer} from '../src/Virtualizer';
+export type {VirtualizerProps} from '../src/Virtualizer';
diff --git a/packages/react-aria-components/src/index.ts b/packages/react-aria-components/exports/index.ts
similarity index 73%
rename from packages/react-aria-components/src/index.ts
rename to packages/react-aria-components/exports/index.ts
index 732138dd69e..7558a655870 100644
--- a/packages/react-aria-components/src/index.ts
+++ b/packages/react-aria-components/exports/index.ts
@@ -43,7 +43,7 @@ export {Header, HeaderContext} from './Header';
 export {Heading, HeadingContext} from './Heading';
 export {Input, InputContext} from './Input';
 export {Section, CollectionRendererContext, DefaultCollectionRenderer} from './Collection';
-export {Collection, createLeafComponent, createBranchComponent, CollectionBuilder} from '@react-aria/collections';
+export {Collection, createLeafComponent, createBranchComponent, CollectionBuilder} from 'react-aria/private/collections/CollectionBuilder';
 export {Keyboard, KeyboardContext} from './Keyboard';
 export {Label, LabelContext} from './Label';
 export {Link, LinkContext} from './Link';
@@ -75,13 +75,33 @@ export {ToggleButtonGroup, ToggleButtonGroupContext, ToggleGroupStateContext} fr
 export {Toolbar, ToolbarContext} from './Toolbar';
 export {TooltipTrigger, Tooltip, TooltipTriggerStateContext, TooltipContext} from './Tooltip';
 export {TreeLoadMoreItem, Tree, TreeItem, TreeContext, TreeItemContent, TreeHeader, TreeSection, TreeStateContext} from './Tree';
-export {useDrag, useDrop} from '@react-aria/dnd';
+export {useDrag} from 'react-aria/useDrag';
+export {useDrop} from 'react-aria/useDrop';
 export {useDragAndDrop, DropIndicator, DropIndicatorContext, DragAndDropContext} from './useDragAndDrop';
 export {Virtualizer} from './Virtualizer';
-export {DIRECTORY_DRAG_TYPE, isDirectoryDropItem, isFileDropItem, isTextDropItem, SSRProvider, RouterProvider, I18nProvider, isRTL, useLocale, useFilter, Pressable, Focusable, VisuallyHidden} from 'react-aria';
-export {FormValidationContext, parseColor, getColorChannels, ToastQueue as UNSTABLE_ToastQueue, useListData, useTreeData, useAsyncList} from 'react-stately';
-export {ListLayout, GridLayout, WaterfallLayout} from '@react-stately/layout';
-export {Layout, LayoutInfo, Size, Rect, Point} from '@react-stately/virtualizer';
+export {DIRECTORY_DRAG_TYPE, isDirectoryDropItem, isFileDropItem, isTextDropItem} from 'react-aria/private/dnd/utils';
+export {SSRProvider} from 'react-aria/SSRProvider';
+export {RouterProvider} from 'react-aria/private/utils/openLink';
+export {I18nProvider, useLocale} from 'react-aria/I18nProvider';
+export {isRTL} from 'react-aria/private/i18n/utils';
+export {useFilter} from 'react-aria/useFilter';
+export {Pressable} from 'react-aria/private/interactions/Pressable';
+export {Focusable} from 'react-aria/private/interactions/useFocusable';
+export {VisuallyHidden} from 'react-aria/VisuallyHidden';
+export {FormValidationContext} from 'react-stately/private/form/useFormValidationState';
+export {parseColor, getColorChannels} from 'react-stately/Color';
+export {ToastQueue as UNSTABLE_ToastQueue} from 'react-stately/useToastState';
+export {useListData} from 'react-stately/useListData';
+export {useTreeData} from 'react-stately/useTreeData';
+export {useAsyncList} from 'react-stately/useAsyncList';
+export {ListLayout} from 'react-stately/private/layout/ListLayout';
+export {GridLayout} from 'react-stately/private/layout/GridLayout';
+export {WaterfallLayout} from 'react-stately/private/layout/WaterfallLayout';
+export {Layout} from 'react-stately/private/virtualizer/Layout';
+export {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
+export {Size} from 'react-stately/private/virtualizer/Size';
+export {Rect} from 'react-stately/private/virtualizer/Rect';
+export {Point} from 'react-stately/private/virtualizer/Point';
 
 export type {AutocompleteProps, SelectableCollectionContextValue} from './Autocomplete';
 export type {BreadcrumbsProps, BreadcrumbProps, BreadcrumbRenderProps} from './Breadcrumbs';
@@ -141,14 +161,49 @@ export type {ToggleButtonGroupProps, ToggleButtonGroupRenderProps} from './Toggl
 export type {ToolbarProps, ToolbarRenderProps} from './Toolbar';
 export type {TooltipProps, TooltipRenderProps, TooltipTriggerComponentProps} from './Tooltip';
 export type {TreeProps, TreeRenderProps, TreeEmptyStateRenderProps, TreeItemProps, TreeItemRenderProps, TreeItemContentProps, TreeItemContentRenderProps, TreeLoadMoreItemProps, TreeLoadMoreItemRenderProps} from './Tree';
-export type {DragOptions, DragResult} from '@react-aria/dnd';
+export type {DragOptions, DragResult} from 'react-aria/useDrag';
 export type {DragAndDropHooks, DragAndDropOptions, DropIndicatorProps, DropIndicatorRenderProps} from './useDragAndDrop';
 export type {ContextValue, RenderProps, SlotProps, StyleRenderProps} from './utils';
 export type {VirtualizerProps} from './Virtualizer';
 
-export type {DateValue, DateRange, TimeValue} from 'react-aria';
-export type {DirectoryDropItem, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem, PressEvent} from 'react-aria';
-export type {CalendarState, CheckboxGroupState, Color, ColorAreaState, ColorFieldState, ColorFormat, ColorPickerState, ColorSliderState, ColorSpace, ColorWheelState, ComboBoxState, DateFieldState, DatePickerState, DateRangePickerState, DisclosureState, DisclosureGroupState, Key, ListState, NumberFieldState, OverlayTriggerState, QueuedToast, RadioGroupState, RangeCalendarState, RootMenuTriggerState, SearchFieldState, Selection, SelectState, SliderState, SortDescriptor, SortDirection, SelectionMode, TableState, TabListState, TimeFieldState, ToastOptions, ToastState, ToggleGroupState, ToggleState, TooltipTriggerState, TreeState, ListData, TreeData, AsyncListData} from 'react-stately';
-export type {AutocompleteState} from '@react-stately/autocomplete';
-export type {ListLayoutOptions, GridLayoutOptions, WaterfallLayoutOptions} from '@react-stately/layout';
+export type {DateValue, DateRange, TimeValue} from '@react-types/datepicker';
+export type {DirectoryDropItem, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem, PressEvent} from '@react-types/shared';
+export type {CalendarState, RangeCalendarState} from 'react-stately/private/calendar/types';
+export type {CheckboxGroupState} from 'react-stately/useCheckboxGroupState';
+export type {Color, ColorFormat, ColorSpace} from '@react-types/color';
+export type {ColorAreaState} from 'react-stately/useColorAreaState';
+export type {ColorFieldState} from 'react-stately/useColorFieldState';
+export type {ColorPickerState} from 'react-stately/useColorPickerState';
+export type {ColorSliderState} from 'react-stately/useColorSliderState';
+export type {ColorWheelState} from 'react-stately/useColorWheelState';
+export type {ComboBoxState} from 'react-stately/useComboBoxState';
+export type {DateFieldState} from 'react-stately/useDateFieldState';
+export type {DatePickerState} from 'react-stately/useDatePickerState';
+export type {DateRangePickerState} from 'react-stately/useDateRangePickerState';
+export type {DisclosureState} from 'react-stately/useDisclosureState';
+export type {DisclosureGroupState} from 'react-stately/useDisclosureGroupState';
+export type {Key, Selection, SortDescriptor, SortDirection, SelectionMode} from '@react-types/shared';
+export type {ListState} from 'react-stately/useListState';
+export type {NumberFieldState} from 'react-stately/useNumberFieldState';
+export type {OverlayTriggerState} from 'react-stately/useOverlayTriggerState';
+export type {QueuedToast, ToastOptions, ToastState} from 'react-stately/useToastState';
+export type {RadioGroupState} from 'react-stately/useRadioGroupState';
+export type {RootMenuTriggerState} from 'react-stately/useMenuTriggerState';
+export type {SearchFieldState} from 'react-stately/useSearchFieldState';
+export type {SelectState} from 'react-stately/useSelectState';
+export type {SliderState} from 'react-stately/useSliderState';
+export type {TableState} from 'react-stately/useTableState';
+export type {TabListState} from 'react-stately/useTabListState';
+export type {TimeFieldState} from 'react-stately/useTimeFieldState';
+export type {ToggleGroupState} from 'react-stately/useToggleGroupState';
+export type {ToggleState} from 'react-stately/useToggleState';
+export type {TooltipTriggerState} from 'react-stately/useTooltipTriggerState';
+export type {TreeState} from 'react-stately/useTreeState';
+export type {ListData} from 'react-stately/useListData';
+export type {TreeData} from 'react-stately/useTreeData';
+export type {AsyncListData} from 'react-stately/useAsyncList';
+export type {AutocompleteState} from 'react-stately/private/autocomplete/useAutocompleteState';
+export type {ListLayoutOptions} from 'react-stately/private/layout/ListLayout';
+export type {GridLayoutOptions} from 'react-stately/private/layout/GridLayout';
+export type {WaterfallLayoutOptions} from 'react-stately/private/layout/WaterfallLayout';
 export type {RangeValue, ValidationResult, RouterConfig} from '@react-types/shared';
diff --git a/packages/react-aria-components/exports/useDragAndDrop.ts b/packages/react-aria-components/exports/useDragAndDrop.ts
new file mode 100644
index 00000000000..dc7919919ba
--- /dev/null
+++ b/packages/react-aria-components/exports/useDragAndDrop.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {useDragAndDrop, DropIndicator, DropIndicatorContext, DragAndDropContext} from '../src/useDragAndDrop';
+export type {DragAndDropHooks, DragAndDropOptions, DropIndicatorProps, DropIndicatorRenderProps} from '../src/useDragAndDrop';
diff --git a/packages/react-aria-components/exports/utils.ts b/packages/react-aria-components/exports/utils.ts
new file mode 100644
index 00000000000..9d2edec412c
--- /dev/null
+++ b/packages/react-aria-components/exports/utils.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+// Mark as a client only package. This will cause a build time error if you try
+// to import it from a React Server Component in a framework like Next.js.
+import 'client-only';
+
+export {composeRenderProps, DEFAULT_SLOT, Provider, useContextProps, useRenderProps, useSlottedContext} from '../src/utils';
+export type {ContextValue, RenderProps, SlotProps, StyleRenderProps} from '../src/utils';
diff --git a/packages/react-aria-components/index.ts b/packages/react-aria-components/index.ts
deleted file mode 100644
index 4e9931530d8..00000000000
--- a/packages/react-aria-components/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2022 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/react-aria-components/package.json b/packages/react-aria-components/package.json
index 8322cba5da9..4b73f123230 100644
--- a/packages/react-aria-components/package.json
+++ b/packages/react-aria-components/package.json
@@ -3,19 +3,16 @@
   "version": "1.16.0",
   "description": "A library of styleable components built using React Aria",
   "license": "Apache-2.0",
-  "main": "dist/main.js",
-  "module": "dist/module.js",
-  "types": "dist/types.d.ts",
-  "source": "src/index.ts",
+  "main": "./dist/exports/index.cjs",
+  "module": "./dist/exports/index.mjs",
+  "types": "./dist/types/exports/index.ts",
+  "source": "exports/index.ts",
   "exports": {
     ".": {
-      "source": "./src/index.ts",
-      "types": [
-        "./dist/types.d.ts",
-        "./src/index.ts"
-      ],
-      "import": "./dist/import.mjs",
-      "require": "./dist/main.js"
+      "source": "./exports/index.ts",
+      "types": "./dist/types/exports/index.ts",
+      "import": "./dist/exports/index.mjs",
+      "require": "./dist/exports/index.cjs"
     },
     "./i18n": {
       "types": "./i18n/index.d.ts",
@@ -26,7 +23,15 @@
       "types": "./i18n/lang.d.ts",
       "import": "./i18n/*.mjs",
       "require": "./i18n/*.js"
-    }
+    },
+    "./package.json": "./package.json",
+    "./*": {
+      "source": "./exports/*.ts",
+      "types": "./dist/types/exports/*.d.ts",
+      "import": "./dist/exports/*.mjs",
+      "require": "./dist/exports/*.cjs"
+    },
+    "./private/*": null
   },
   "files": [
     "dist",
@@ -43,28 +48,32 @@
   "dependencies": {
     "@internationalized/date": "^3.12.0",
     "@internationalized/string": "^3.2.7",
-    "@react-aria/autocomplete": "3.0.0-rc.6",
-    "@react-aria/collections": "^3.0.3",
-    "@react-aria/dnd": "^3.11.6",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/live-announcer": "^3.4.4",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/ssr": "^3.9.10",
-    "@react-aria/textfield": "^3.18.5",
-    "@react-aria/toolbar": "3.0.0-beta.24",
-    "@react-aria/utils": "^3.33.1",
-    "@react-aria/virtualizer": "^4.1.13",
-    "@react-stately/autocomplete": "3.0.0-beta.4",
-    "@react-stately/layout": "^4.6.0",
-    "@react-stately/selection": "^3.20.9",
-    "@react-stately/table": "^3.15.4",
-    "@react-stately/utils": "^3.11.0",
-    "@react-stately/virtualizer": "^4.4.6",
+    "@react-types/breadcrumbs": "^3.7.19",
+    "@react-types/button": "^3.15.1",
+    "@react-types/calendar": "^3.8.3",
+    "@react-types/checkbox": "^3.10.4",
+    "@react-types/color": "^3.1.4",
+    "@react-types/combobox": "^3.14.0",
+    "@react-types/datepicker": "^3.13.5",
+    "@react-types/dialog": "^3.5.24",
     "@react-types/form": "^3.7.18",
     "@react-types/grid": "^3.3.8",
+    "@react-types/listbox": "^3.7.6",
+    "@react-types/menu": "^3.10.7",
+    "@react-types/meter": "^3.4.15",
+    "@react-types/numberfield": "^3.8.18",
+    "@react-types/overlays": "^3.9.4",
+    "@react-types/progress": "^3.5.18",
+    "@react-types/radio": "^3.9.4",
+    "@react-types/searchfield": "^3.6.8",
+    "@react-types/select": "^3.12.2",
     "@react-types/shared": "^3.33.1",
+    "@react-types/slider": "^3.8.4",
+    "@react-types/switch": "^3.5.17",
     "@react-types/table": "^3.13.6",
+    "@react-types/tabs": "^3.3.22",
+    "@react-types/textfield": "^3.12.8",
+    "@react-types/tooltip": "^3.5.2",
     "@swc/helpers": "^0.5.0",
     "client-only": "^0.0.1",
     "react-aria": "^3.47.0",
@@ -80,5 +89,24 @@
   },
   "devDependencies": {
     "@tailwindcss/postcss": "^4.0.0"
+  },
+  "targets": {
+    "main": false,
+    "module": false,
+    "types": false,
+    "exports-module": {
+      "source": "exports/*.ts",
+      "distDir": "dist",
+      "isLibrary": true,
+      "outputFormat": "esmodule",
+      "includeNodeModules": false
+    },
+    "exports-main": {
+      "source": "exports/*.ts",
+      "distDir": "dist",
+      "isLibrary": true,
+      "outputFormat": "commonjs",
+      "includeNodeModules": false
+    }
   }
 }
diff --git a/packages/react-aria-components/src/Autocomplete.tsx b/packages/react-aria-components/src/Autocomplete.tsx
index d315676016d..efdabe3260c 100644
--- a/packages/react-aria-components/src/Autocomplete.tsx
+++ b/packages/react-aria-components/src/Autocomplete.tsx
@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaAutocompleteProps, useAutocomplete} from '@react-aria/autocomplete';
+import {AriaAutocompleteProps, useAutocomplete} from 'react-aria/private/autocomplete/useAutocomplete';
 import {AriaLabelingProps, DOMProps, FocusableElement, FocusEvents, KeyboardEvents, Node, ValueBase} from '@react-types/shared';
-import {AriaTextFieldProps} from 'react-aria';
-import {AutocompleteState, useAutocompleteState} from '@react-stately/autocomplete';
+import {AriaTextFieldProps} from '@react-types/textfield';
+import {AutocompleteState, useAutocompleteState} from 'react-stately/private/autocomplete/useAutocompleteState';
 import {ContextValue, Provider, removeDataAttributes, SlotProps, SlottedContextValue, useSlottedContext} from './utils';
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, JSX, useRef} from 'react';
 
 export interface AutocompleteProps<T = object> extends AriaAutocompleteProps<T>, SlotProps {}
diff --git a/packages/react-aria-components/src/Breadcrumbs.tsx b/packages/react-aria-components/src/Breadcrumbs.tsx
index de2ae2a0883..915e2c32466 100644
--- a/packages/react-aria-components/src/Breadcrumbs.tsx
+++ b/packages/react-aria-components/src/Breadcrumbs.tsx
@@ -9,7 +9,8 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {AriaBreadcrumbsProps, useBreadcrumbs} from 'react-aria';
+import {AriaBreadcrumbsProps} from '@react-types/breadcrumbs';
+
 import {AriaLabelingProps, forwardRefType, GlobalDOMAttributes, Key} from '@react-types/shared';
 import {
   ClassNameOrFunction,
@@ -23,12 +24,15 @@ import {
   useRenderProps,
   useSlottedContext
 } from './utils';
-import {Collection, CollectionBuilder, CollectionNode, createLeafComponent} from '@react-aria/collections';
+import {Collection, CollectionBuilder, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder';
+import {CollectionNode} from 'react-aria/private/collections/BaseCollection';
 import {CollectionProps, CollectionRendererContext} from './Collection';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {LinkContext} from './Link';
-import {Node} from 'react-stately';
+import {mergeProps} from 'react-aria/mergeProps';
+import {Node} from '@react-types/shared';
 import React, {createContext, ForwardedRef, forwardRef, useContext} from 'react';
+import {useBreadcrumbs} from 'react-aria/useBreadcrumbs';
 
 export interface BreadcrumbsProps<T> extends Omit<CollectionProps<T>, 'disabledKeys'>, AriaBreadcrumbsProps, StyleProps, SlotProps, AriaLabelingProps, DOMRenderProps<'ol', undefined>, GlobalDOMAttributes<HTMLOListElement> {
   /**
diff --git a/packages/react-aria-components/src/Button.tsx b/packages/react-aria-components/src/Button.tsx
index 33887f318f0..837db1b6a2b 100644
--- a/packages/react-aria-components/src/Button.tsx
+++ b/packages/react-aria-components/src/Button.tsx
@@ -10,16 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {announce} from '@react-aria/live-announcer';
-import {
-  AriaButtonProps,
-  HoverEvents,
-  mergeProps,
-  useButton,
-  useFocusRing,
-  useHover,
-  useId
-} from 'react-aria';
+import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
+
+import {AriaButtonProps} from '@react-types/button';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -29,11 +22,17 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {createHideableComponent} from '@react-aria/collections';
-import {filterDOMProps} from '@react-aria/utils';
+import {createHideableComponent} from 'react-aria/private/collections/Hidden';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {GlobalDOMAttributes} from '@react-types/shared';
+import {HoverEvents} from '@react-types/shared';
+import {mergeProps} from 'react-aria/mergeProps';
 import {ProgressBarContext} from './ProgressBar';
 import React, {createContext, ForwardedRef, useEffect, useRef} from 'react';
+import {useButton} from 'react-aria/useButton';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useId} from 'react-aria/useId';
 
 export interface ButtonRenderProps {
   /**
diff --git a/packages/react-aria-components/src/Calendar.tsx b/packages/react-aria-components/src/Calendar.tsx
index c6dff74b9f5..fe25af63be3 100644
--- a/packages/react-aria-components/src/Calendar.tsx
+++ b/packages/react-aria-components/src/Calendar.tsx
@@ -9,23 +9,11 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {
-  AriaCalendarProps,
-  AriaRangeCalendarProps,
-  DateValue,
-  mergeProps,
-  useCalendar,
-  useCalendarCell,
-  useCalendarGrid,
-  useFocusRing,
-  useHover,
-  useLocale,
-  useRangeCalendar,
-  VisuallyHidden
-} from 'react-aria';
+import {AriaCalendarProps, AriaRangeCalendarProps} from '@react-types/calendar';
+
 import {ButtonContext} from './Button';
 import {CalendarDate, CalendarIdentifier, createCalendar, DateDuration, endOfMonth, Calendar as ICalendar, isSameDay, isSameMonth, isToday} from '@internationalized/date';
-import {CalendarState, RangeCalendarState, useCalendarState, useRangeCalendarState} from 'react-stately';
+import {CalendarState, RangeCalendarState} from 'react-stately/private/calendar/types';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -40,11 +28,21 @@ import {
   useRenderProps,
   useSlottedContext
 } from './utils';
+import {DateValue} from '@react-types/datepicker';
 import {DOMAttributes, FocusableElement, forwardRefType, GlobalDOMAttributes, HoverEvents} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {HeadingContext} from './Heading';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef, ReactElement, useContext, useRef} from 'react';
 import {TextContext} from './Text';
+import {useCalendar, useCalendarCell, useCalendarGrid} from 'react-aria/useCalendar';
+import {useCalendarState} from 'react-stately/useCalendarState';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useRangeCalendar} from 'react-aria/useRangeCalendar';
+import {useRangeCalendarState} from 'react-stately/useRangeCalendarState';
+import {VisuallyHidden} from 'react-aria/VisuallyHidden';
 
 export interface CalendarRenderProps {
   /**
diff --git a/packages/react-aria-components/src/Checkbox.tsx b/packages/react-aria-components/src/Checkbox.tsx
index 04cc86d45eb..f6be6d59f25 100644
--- a/packages/react-aria-components/src/Checkbox.tsx
+++ b/packages/react-aria-components/src/Checkbox.tsx
@@ -9,8 +9,9 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {AriaCheckboxGroupProps, AriaCheckboxProps, HoverEvents, mergeProps, useCheckbox, useCheckboxGroup, useCheckboxGroupItem, useFocusRing, useHover, VisuallyHidden} from 'react-aria';
-import {CheckboxGroupState, useCheckboxGroupState, useToggleState} from 'react-stately';
+import {AriaCheckboxGroupProps, AriaCheckboxProps} from '@react-types/checkbox';
+
+import {CheckboxGroupState, useCheckboxGroupState} from 'react-stately/useCheckboxGroupState';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -26,12 +27,22 @@ import {
   useSlottedContext
 } from './utils';
 import {FieldErrorContext} from './FieldError';
-import {filterDOMProps, mergeRefs, useObjectRef} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FormContext} from './Form';
 import {forwardRefType, GlobalDOMAttributes, RefObject} from '@react-types/shared';
+import {HoverEvents} from '@react-types/shared';
 import {LabelContext} from './Label';
+import {mergeProps} from 'react-aria/mergeProps';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
 import React, {createContext, ForwardedRef, forwardRef, useContext, useMemo} from 'react';
 import {TextContext} from './Text';
+import {useCheckbox} from 'react-aria/useCheckbox';
+import {useCheckboxGroup, useCheckboxGroupItem} from 'react-aria/useCheckboxGroup';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useToggleState} from 'react-stately/useToggleState';
+import {VisuallyHidden} from 'react-aria/VisuallyHidden';
 
 export interface CheckboxGroupProps extends Omit<AriaCheckboxGroupProps, 'children' | 'label' | 'description' | 'errorMessage' | 'validationState' | 'validationBehavior'>, RACValidation, RenderProps<CheckboxGroupRenderProps, 'div'>, SlotProps, GlobalDOMAttributes<HTMLDivElement> {
   /**
diff --git a/packages/react-aria-components/src/Collection.tsx b/packages/react-aria-components/src/Collection.tsx
index 70f4d8266c3..c7aec03bca0 100644
--- a/packages/react-aria-components/src/Collection.tsx
+++ b/packages/react-aria-components/src/Collection.tsx
@@ -10,10 +10,19 @@
  * governing permissions and limitations under the License.
  */
 import {CollectionBase, DropTargetDelegate, GlobalDOMAttributes, ItemDropTarget, Key, LayoutDelegate, RefObject} from '@react-types/shared';
-import {createBranchComponent, useCachedChildren} from '@react-aria/collections';
-import {Collection as ICollection, Node, SelectionBehavior, SelectionMode, SectionProps as SharedSectionProps} from 'react-stately';
+import {createBranchComponent} from 'react-aria/private/collections/CollectionBuilder';
+import {
+  Collection as ICollection,
+  Node,
+  SelectionBehavior,
+  SelectionMode,
+  SectionProps as SharedSectionProps
+} from '@react-types/shared';
+
 import React, {cloneElement, createContext, ForwardedRef, HTMLAttributes, isValidElement, JSX, ReactElement, ReactNode, useContext, useMemo} from 'react';
+
 import {StyleProps} from './utils';
+import {useCachedChildren} from 'react-aria/private/collections/useCachedChildren';
 
 export interface CollectionProps<T> extends Omit<CollectionBase<T>, 'children'> {
   /** The contents of the collection. */
diff --git a/packages/react-aria-components/src/ColorArea.tsx b/packages/react-aria-components/src/ColorArea.tsx
index 9f7fd1affb9..81714f73d22 100644
--- a/packages/react-aria-components/src/ColorArea.tsx
+++ b/packages/react-aria-components/src/ColorArea.tsx
@@ -1,4 +1,4 @@
-import {AriaColorAreaProps, useColorArea} from 'react-aria';
+import {AriaColorAreaProps} from '@react-types/color';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -9,11 +9,13 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {ColorAreaState, useColorAreaState} from 'react-stately';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
+import {ColorAreaState, useColorAreaState} from 'react-stately/useColorAreaState';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {GlobalDOMAttributes} from '@react-types/shared';
 import {InternalColorThumbContext} from './ColorThumb';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef, useRef} from 'react';
+import {useColorArea} from 'react-aria/useColorArea';
 
 export interface ColorAreaRenderProps {
   /**
diff --git a/packages/react-aria-components/src/ColorField.tsx b/packages/react-aria-components/src/ColorField.tsx
index 4cd01fe88fe..48242af5438 100644
--- a/packages/react-aria-components/src/ColorField.tsx
+++ b/packages/react-aria-components/src/ColorField.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaColorFieldProps, useColorChannelField, useColorField, useLocale} from 'react-aria';
+import {AriaColorFieldProps} from '@react-types/color';
+
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -24,15 +25,18 @@ import {
   useRenderProps,
   useSlot
 } from './utils';
-import {ColorChannel, ColorFieldState, ColorSpace, useColorChannelFieldState, useColorFieldState} from 'react-stately';
+import {ColorChannel, ColorSpace} from '@react-types/color';
+import {ColorFieldState, useColorChannelFieldState, useColorFieldState} from 'react-stately/useColorFieldState';
 import {FieldErrorContext} from './FieldError';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {GlobalDOMAttributes, InputDOMProps, ValidationResult} from '@react-types/shared';
 import {GroupContext} from './Group';
 import {InputContext} from './Input';
 import {LabelContext} from './Label';
 import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, InputHTMLAttributes, LabelHTMLAttributes, Ref, useRef} from 'react';
 import {TextContext} from './Text';
+import {useColorChannelField, useColorField} from 'react-aria/useColorField';
+import {useLocale} from 'react-aria/I18nProvider';
 
 export interface ColorFieldRenderProps {
   /**
diff --git a/packages/react-aria-components/src/ColorPicker.tsx b/packages/react-aria-components/src/ColorPicker.tsx
index ea136aeff11..51cc624e22b 100644
--- a/packages/react-aria-components/src/ColorPicker.tsx
+++ b/packages/react-aria-components/src/ColorPicker.tsx
@@ -11,14 +11,21 @@
  */
 
 import {ChildrenOrFunction, Provider, SlotProps, SlottedContextValue, useRenderProps, useSlottedContext} from './utils';
-import {Color, ColorPickerState, ColorPickerProps as StatelyColorPickerProps, useColorPickerState} from 'react-stately';
+import {Color} from '@react-types/color';
+
 import {ColorAreaContext} from './ColorArea';
+
 import {ColorFieldContext} from './ColorField';
+import {
+  ColorPickerState,
+  ColorPickerProps as StatelyColorPickerProps,
+  useColorPickerState
+} from 'react-stately/useColorPickerState';
 import {ColorSliderContext} from './ColorSlider';
 import {ColorSwatchContext} from './ColorSwatch';
 import {ColorSwatchPickerContext} from './ColorSwatchPicker';
 import {ColorWheelContext} from './ColorWheel';
-import {mergeProps} from 'react-aria';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, JSX} from 'react';
 
 export interface ColorPickerRenderProps {
diff --git a/packages/react-aria-components/src/ColorSlider.tsx b/packages/react-aria-components/src/ColorSlider.tsx
index 9eb56878e20..ed95075ce2e 100644
--- a/packages/react-aria-components/src/ColorSlider.tsx
+++ b/packages/react-aria-components/src/ColorSlider.tsx
@@ -1,4 +1,4 @@
-import {AriaColorSliderProps, Orientation, useColorSlider, useLocale} from 'react-aria';
+import {AriaColorSliderProps} from '@react-types/color';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -10,13 +10,16 @@ import {
   useRenderProps,
   useSlot
 } from './utils';
-import {ColorSliderState, useColorSliderState} from 'react-stately';
-import {filterDOMProps} from '@react-aria/utils';
+import {ColorSliderState, useColorSliderState} from 'react-stately/useColorSliderState';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {GlobalDOMAttributes} from '@react-types/shared';
 import {InternalColorThumbContext} from './ColorThumb';
 import {LabelContext} from './Label';
+import {Orientation} from '@react-types/shared';
 import React, {createContext, ForwardedRef, forwardRef} from 'react';
 import {SliderOutputContext, SliderStateContext, SliderTrackContext} from './Slider';
+import {useColorSlider} from 'react-aria/useColorSlider';
+import {useLocale} from 'react-aria/I18nProvider';
 
 export interface ColorSliderRenderProps {
   /**
diff --git a/packages/react-aria-components/src/ColorSwatch.tsx b/packages/react-aria-components/src/ColorSwatch.tsx
index 4d3f17eb129..8c25faff84f 100644
--- a/packages/react-aria-components/src/ColorSwatch.tsx
+++ b/packages/react-aria-components/src/ColorSwatch.tsx
@@ -1,4 +1,4 @@
-import {AriaColorSwatchProps, useColorSwatch} from 'react-aria';
+import {AriaColorSwatchProps, useColorSwatch} from 'react-aria/useColorSwatch';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -8,9 +8,10 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {Color} from 'react-stately';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
+import {Color} from '@react-types/color';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {GlobalDOMAttributes} from '@react-types/shared';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef} from 'react';
 
 export interface ColorSwatchRenderProps {
diff --git a/packages/react-aria-components/src/ColorSwatchPicker.tsx b/packages/react-aria-components/src/ColorSwatchPicker.tsx
index c3460299e9e..db3ede73506 100644
--- a/packages/react-aria-components/src/ColorSwatchPicker.tsx
+++ b/packages/react-aria-components/src/ColorSwatchPicker.tsx
@@ -7,14 +7,17 @@ import {
   StyleRenderProps,
   useContextProps
 } from './utils';
-import {Color, parseColor, useColorPickerState} from 'react-stately';
+import {Color} from '@react-types/color';
 import {ColorSwatchContext} from './ColorSwatch';
-import {filterDOMProps} from '@react-aria/utils';
-// @ts-ignore
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import intlMessages from '../intl/*.json';
 import {ListBox, ListBoxItem, ListBoxItemRenderProps, ListBoxRenderProps} from './ListBox';
+// @ts-ignore
+import {parseColor} from 'react-stately/Color';
 import React, {createContext, ForwardedRef, forwardRef, ReactNode, useContext, useEffect, useMemo} from 'react';
-import {useLocale, useLocalizedStringFormatter} from 'react-aria';
+import {useColorPickerState} from 'react-stately/useColorPickerState';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 
 export interface ColorSwatchPickerRenderProps extends Omit<ListBoxRenderProps, 'isDropTarget'> {}
 export interface ColorSwatchPickerProps extends ValueBase<string | Color, Color>, AriaLabelingProps, StyleRenderProps<ColorSwatchPickerRenderProps>, GlobalDOMAttributes<HTMLDivElement> {
diff --git a/packages/react-aria-components/src/ColorThumb.tsx b/packages/react-aria-components/src/ColorThumb.tsx
index 19871efcf66..00fcacd5187 100644
--- a/packages/react-aria-components/src/ColorThumb.tsx
+++ b/packages/react-aria-components/src/ColorThumb.tsx
@@ -1,9 +1,11 @@
 import {ClassNameOrFunction, dom, RenderProps, useRenderProps} from './utils';
-import {Color} from 'react-stately';
-import {filterDOMProps} from '@react-aria/utils';
+import {Color} from '@react-types/color';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {GlobalDOMAttributes, HoverEvents, RefObject} from '@react-types/shared';
-import {mergeProps, useFocusRing, useHover} from 'react-aria';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, InputHTMLAttributes, useContext} from 'react';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
 
 interface ColorState {
   getDisplayColor(): Color,
diff --git a/packages/react-aria-components/src/ColorWheel.tsx b/packages/react-aria-components/src/ColorWheel.tsx
index 6afbaf9cecb..96bb774ea54 100644
--- a/packages/react-aria-components/src/ColorWheel.tsx
+++ b/packages/react-aria-components/src/ColorWheel.tsx
@@ -1,4 +1,4 @@
-import {AriaColorWheelOptions, useColorWheel} from 'react-aria';
+import {AriaColorWheelOptions, useColorWheel} from 'react-aria/useColorWheel';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -10,8 +10,8 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {ColorWheelState, useColorWheelState} from 'react-stately';
-import {filterDOMProps} from '@react-aria/utils';
+import {ColorWheelState, useColorWheelState} from 'react-stately/useColorWheelState';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {GlobalDOMAttributes} from '@react-types/shared';
 import {InternalColorThumbContext} from './ColorThumb';
 import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, useContext, useRef} from 'react';
diff --git a/packages/react-aria-components/src/ComboBox.tsx b/packages/react-aria-components/src/ComboBox.tsx
index 36e3be2bb50..dd2dda7f1c3 100644
--- a/packages/react-aria-components/src/ComboBox.tsx
+++ b/packages/react-aria-components/src/ComboBox.tsx
@@ -9,7 +9,8 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {AriaComboBoxProps, useComboBox, useFilter, useListFormatter} from 'react-aria';
+import {AriaComboBoxProps} from '@react-types/combobox';
+
 import {ButtonContext} from './Button';
 import {
   ClassNameOrFunction,
@@ -25,10 +26,12 @@ import {
   useSlot,
   useSlottedContext
 } from './utils';
-import {Collection, ComboBoxState, Node, useComboBoxState} from 'react-stately';
-import {CollectionBuilder, createHideableComponent} from '@react-aria/collections';
+import {Collection, Node} from '@react-types/shared';
+import {CollectionBuilder} from 'react-aria/private/collections/CollectionBuilder';
+import {ComboBoxState, useComboBoxState} from 'react-stately/useComboBoxState';
+import {createHideableComponent} from 'react-aria/private/collections/Hidden';
 import {FieldErrorContext} from './FieldError';
-import {filterDOMProps, useResizeObserver} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FormContext} from './Form';
 import {forwardRefType, GlobalDOMAttributes, Key, RefObject} from '@react-types/shared';
 import {GroupContext} from './Group';
@@ -39,6 +42,10 @@ import {OverlayTriggerStateContext} from './Dialog';
 import {PopoverContext} from './Popover';
 import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, ReactElement, ReactNode, useCallback, useContext, useMemo, useRef, useState} from 'react';
 import {TextContext} from './Text';
+import {useComboBox} from 'react-aria/useComboBox';
+import {useFilter} from 'react-aria/useFilter';
+import {useListFormatter} from 'react-aria/useListFormatter';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
 
 type SelectionMode = 'single' | 'multiple';
 
diff --git a/packages/react-aria-components/src/DateField.tsx b/packages/react-aria-components/src/DateField.tsx
index 27721b1f525..ad8794e293a 100644
--- a/packages/react-aria-components/src/DateField.tsx
+++ b/packages/react-aria-components/src/DateField.tsx
@@ -9,7 +9,8 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {AriaDateFieldProps, AriaTimeFieldProps, DateValue, HoverEvents, mergeProps, TimeValue, useDateField, useDateSegment, useFocusRing, useHover, useLocale, useTimeField} from 'react-aria';
+import {AriaDateFieldProps, AriaTimeFieldProps, DateValue, TimeValue} from '@react-types/datepicker';
+
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -26,17 +27,32 @@ import {
   useSlottedContext
 } from './utils';
 import {createCalendar} from '@internationalized/date';
-import {DateFieldState, DateSegmentType, DateSegment as IDateSegment, TimeFieldState, useDateFieldState, useTimeFieldState} from 'react-stately';
+import {
+  DateFieldState,
+  DateSegmentType,
+  DateSegment as IDateSegment,
+  useDateFieldState
+} from 'react-stately/useDateFieldState';
 import {FieldErrorContext} from './FieldError';
-import {filterDOMProps, useObjectRef} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FormContext} from './Form';
 import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared';
 import {Group, GroupContext} from './Group';
+
 import {HiddenDateInput} from './HiddenDateInput';
+
+import {HoverEvents} from '@react-types/shared';
 import {Input, InputContext} from './Input';
 import {LabelContext} from './Label';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {cloneElement, createContext, ForwardedRef, forwardRef, JSX, ReactElement, useContext, useRef} from 'react';
 import {TextContext} from './Text';
+import {TimeFieldState, useTimeFieldState} from 'react-stately/useTimeFieldState';
+import {useDateField, useDateSegment, useTimeField} from 'react-aria/useDateField';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useObjectRef} from 'react-aria/useObjectRef';
 
 export interface DateFieldRenderProps {
   /**
diff --git a/packages/react-aria-components/src/DatePicker.tsx b/packages/react-aria-components/src/DatePicker.tsx
index 944dd7c3899..02c13b52969 100644
--- a/packages/react-aria-components/src/DatePicker.tsx
+++ b/packages/react-aria-components/src/DatePicker.tsx
@@ -9,7 +9,8 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {AriaDatePickerProps, AriaDateRangePickerProps, DateValue, useDatePicker, useDateRangePicker, useFocusRing} from 'react-aria';
+import {AriaDatePickerProps, AriaDateRangePickerProps, DateValue} from '@react-types/datepicker';
+
 import {ButtonContext} from './Button';
 import {CalendarContext, RangeCalendarContext} from './Calendar';
 import {
@@ -27,18 +28,24 @@ import {
   useSlottedContext
 } from './utils';
 import {DateFieldContext} from './DateField';
-import {DatePickerState, DatePickerStateOptions, DateRangePickerState, DateRangePickerStateOptions, useDatePickerState, useDateRangePickerState} from 'react-stately';
+import {DatePickerState, DatePickerStateOptions, useDatePickerState} from 'react-stately/useDatePickerState';
+import {DateRangePickerState, DateRangePickerStateOptions, useDateRangePickerState} from 'react-stately/useDateRangePickerState';
 import {DialogContext, OverlayTriggerStateContext} from './Dialog';
 import {FieldErrorContext} from './FieldError';
-import {filterDOMProps, mergeProps, useResizeObserver} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FormContext} from './Form';
 import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared';
 import {GroupContext} from './Group';
 import {HiddenDateInput} from './HiddenDateInput';
 import {LabelContext} from './Label';
+import {mergeProps} from 'react-aria/mergeProps';
 import {PopoverContext} from './Popover';
 import React, {createContext, ForwardedRef, forwardRef, useCallback, useRef, useState} from 'react';
 import {TextContext} from './Text';
+import {useDatePicker} from 'react-aria/useDatePicker';
+import {useDateRangePicker} from 'react-aria/useDateRangePicker';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
 
 export interface DatePickerRenderProps {
   /**
diff --git a/packages/react-aria-components/src/Dialog.tsx b/packages/react-aria-components/src/Dialog.tsx
index 0131c52b4d7..7b62d935d4c 100644
--- a/packages/react-aria-components/src/Dialog.tsx
+++ b/packages/react-aria-components/src/Dialog.tsx
@@ -9,17 +9,25 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {AriaDialogProps, useDialog, useId, useOverlayTrigger} from 'react-aria';
+import {AriaDialogProps} from '@react-types/dialog';
+
 import {ButtonContext} from './Button';
 import {ContextValue, DEFAULT_SLOT, dom, DOMRenderProps, Provider, SlotProps, StyleProps, useContextProps, useRenderProps} from './utils';
-import {filterDOMProps, mergeProps, useResizeObserver} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared';
 import {HeadingContext} from './Heading';
-import {OverlayTriggerProps, OverlayTriggerState, useMenuTriggerState} from 'react-stately';
+import {mergeProps} from 'react-aria/mergeProps';
+import {OverlayTriggerProps} from '@react-types/overlays';
+import {OverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 import {PopoverContext} from './Popover';
-import {PressResponder} from '@react-aria/interactions';
+import {PressResponder} from 'react-aria/private/interactions/PressResponder';
 import React, {createContext, ForwardedRef, forwardRef, JSX, ReactNode, useCallback, useContext, useRef, useState} from 'react';
 import {RootMenuTriggerStateContext} from './Menu';
+import {useDialog} from 'react-aria/useDialog';
+import {useId} from 'react-aria/useId';
+import {useMenuTriggerState} from 'react-stately/useMenuTriggerState';
+import {useOverlayTrigger} from 'react-aria/useOverlayTrigger';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
 
 export interface DialogTriggerProps extends OverlayTriggerProps {
   children: ReactNode
diff --git a/packages/react-aria-components/src/Disclosure.tsx b/packages/react-aria-components/src/Disclosure.tsx
index a56b75d537a..6bb7c0fb832 100644
--- a/packages/react-aria-components/src/Disclosure.tsx
+++ b/packages/react-aria-components/src/Disclosure.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaDisclosureProps, LabelAriaProps, useDisclosure, useFocusRing} from 'react-aria';
+import {AriaDisclosureProps, useDisclosure} from 'react-aria/useDisclosure';
+
 import {ButtonContext} from './Button';
 import {
   ClassNameOrFunction,
@@ -23,10 +24,22 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {DisclosureGroupState, DisclosureState, DisclosureGroupProps as StatelyDisclosureGroupProps, useDisclosureGroupState, useDisclosureState} from 'react-stately';
+import {
+  DisclosureGroupState,
+  DisclosureGroupProps as StatelyDisclosureGroupProps,
+  useDisclosureGroupState
+} from 'react-stately/useDisclosureGroupState';
+import {DisclosureState, useDisclosureState} from 'react-stately/useDisclosureState';
+
 import {DOMProps, forwardRefType, GlobalDOMAttributes, Key} from '@react-types/shared';
-import {filterDOMProps, mergeProps, mergeRefs, useId} from '@react-aria/utils';
+
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {LabelAriaProps} from 'react-aria/useLabel';
+import {mergeProps} from 'react-aria/mergeProps';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
 import React, {createContext, DOMAttributes, ForwardedRef, forwardRef, ReactNode, useContext} from 'react';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useId} from 'react-aria/useId';
 
 export interface DisclosureGroupProps extends StatelyDisclosureGroupProps, RenderProps<DisclosureGroupRenderProps>, DOMProps, GlobalDOMAttributes<HTMLDivElement> {
   /**
diff --git a/packages/react-aria-components/src/DragAndDrop.tsx b/packages/react-aria-components/src/DragAndDrop.tsx
index 08726a78251..4173462693b 100644
--- a/packages/react-aria-components/src/DragAndDrop.tsx
+++ b/packages/react-aria-components/src/DragAndDrop.tsx
@@ -9,10 +9,14 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import type {DropIndicatorProps as AriaDropIndicatorProps, ItemDropTarget, Key} from 'react-aria';
+import type {DropIndicatorProps as AriaDropIndicatorProps} from 'react-aria/useDroppableCollection';
+
 import type {ClassNameOrFunction, RenderProps} from './utils';
 import type {DragAndDropHooks} from './useDragAndDrop';
-import type {DraggableCollectionState, DroppableCollectionState, MultipleSelectionManager} from 'react-stately';
+import type {DraggableCollectionState} from 'react-stately/useDraggableCollectionState';
+import type {DroppableCollectionState} from 'react-stately/useDroppableCollectionState';
+import type {ItemDropTarget, Key} from '@react-types/shared';
+import type {MultipleSelectionManager} from 'react-stately/private/selection/types';
 import React, {createContext, ForwardedRef, forwardRef, JSX, ReactNode, useCallback, useContext, useMemo} from 'react';
 
 export interface DragAndDropContextValue {
diff --git a/packages/react-aria-components/src/DropZone.tsx b/packages/react-aria-components/src/DropZone.tsx
index dc32b11c422..72be7b2f8e5 100644
--- a/packages/react-aria-components/src/DropZone.tsx
+++ b/packages/react-aria-components/src/DropZone.tsx
@@ -21,12 +21,24 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {DropOptions, mergeProps, useButton, useClipboard, useDrop, useFocusRing, useHover, useLocalizedStringFormatter, VisuallyHidden} from 'react-aria';
-import {filterDOMProps, getEventTarget, isFocusable, nodeContains, useLabels, useObjectRef, useSlotId} from '@react-aria/utils';
-// @ts-ignore
+import {DropOptions, useDrop} from 'react-aria/useDrop';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {getEventTarget, nodeContains} from 'react-aria/private/utils/shadowdom/DOMFunctions';
 import intlMessages from '../intl/*.json';
+import {isFocusable} from 'react-aria/private/utils/isFocusable';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef, useRef} from 'react';
 import {TextContext} from './Text';
+import {useButton} from 'react-aria/useButton';
+import {useClipboard} from 'react-aria/useClipboard';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useLabels} from 'react-aria/private/utils/useLabels';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+// @ts-ignore
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useSlotId} from 'react-aria/private/utils/useId';
+import {VisuallyHidden} from 'react-aria/VisuallyHidden';
 
 export interface DropZoneRenderProps {
   /**
diff --git a/packages/react-aria-components/src/FieldError.tsx b/packages/react-aria-components/src/FieldError.tsx
index ca8331db63b..4a04f6e1e97 100644
--- a/packages/react-aria-components/src/FieldError.tsx
+++ b/packages/react-aria-components/src/FieldError.tsx
@@ -12,7 +12,7 @@
 
 import {ClassNameOrFunction, RenderProps, useRenderProps} from './utils';
 import {DOMProps, GlobalDOMAttributes, ValidationResult} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import React, {createContext, ForwardedRef, forwardRef, useContext} from 'react';
 import {Text} from './Text';
 
diff --git a/packages/react-aria-components/src/FileTrigger.tsx b/packages/react-aria-components/src/FileTrigger.tsx
index 3ddbfcb09f7..73bd2b3148f 100644
--- a/packages/react-aria-components/src/FileTrigger.tsx
+++ b/packages/react-aria-components/src/FileTrigger.tsx
@@ -10,11 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {filterDOMProps, getEventTarget, useObjectRef} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+
+import {getEventTarget} from 'react-aria/private/utils/shadowdom/DOMFunctions';
 import {GlobalDOMAttributes} from '@react-types/shared';
 import {Input} from './Input';
-import {PressResponder} from '@react-aria/interactions';
+import {PressResponder} from 'react-aria/private/interactions/PressResponder';
 import React, {ForwardedRef, forwardRef, ReactNode} from 'react';
+import {useObjectRef} from 'react-aria/useObjectRef';
 
 export interface FileTriggerProps extends GlobalDOMAttributes<HTMLInputElement> {
   /**
diff --git a/packages/react-aria-components/src/Form.tsx b/packages/react-aria-components/src/Form.tsx
index 4b0061b5081..92c7eca8509 100644
--- a/packages/react-aria-components/src/Form.tsx
+++ b/packages/react-aria-components/src/Form.tsx
@@ -11,7 +11,7 @@
  */
 
 import {ContextValue, dom, DOMProps, DOMRenderProps, useContextProps} from './utils';
-import {FormValidationContext} from 'react-stately';
+import {FormValidationContext} from 'react-stately/private/form/useFormValidationState';
 import {GlobalDOMAttributes} from '@react-types/shared';
 import React, {createContext, ForwardedRef, forwardRef} from 'react';
 import {FormProps as SharedFormProps} from '@react-types/form';
diff --git a/packages/react-aria-components/src/GridList.tsx b/packages/react-aria-components/src/GridList.tsx
index e5edf92289a..cd3d7eeeb2a 100644
--- a/packages/react-aria-components/src/GridList.tsx
+++ b/packages/react-aria-components/src/GridList.tsx
@@ -9,7 +9,14 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {AriaGridListProps, DraggableItemResult, DragPreviewRenderer, DropIndicatorAria, DroppableCollectionResult, FocusScope, ListKeyboardDelegate, mergeProps, useCollator, useFocusRing, useGridList, useGridListItem, useGridListSection, useGridListSelectionCheckbox, useHover, useLocale, useVisuallyHidden} from 'react-aria';
+import {
+  AriaGridListProps,
+  useGridList,
+  useGridListItem,
+  useGridListSection,
+  useGridListSelectionCheckbox
+} from 'react-aria/useGridList';
+
 import {ButtonContext} from './Button';
 import {CheckboxContext} from './Checkbox';
 import {
@@ -27,19 +34,37 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {Collection, CollectionBuilder, createBranchComponent, createLeafComponent, HeaderNode, ItemNode, LoaderNode, SectionNode} from '@react-aria/collections';
+import {Collection, CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder';
 import {CollectionProps, CollectionRendererContext, DefaultCollectionRenderer, ItemRenderProps, SectionProps} from './Collection';
 import {DragAndDropContext, DropIndicatorContext, DropIndicatorProps, useDndPersistedKeys, useRenderDropIndicator} from './DragAndDrop';
 import {DragAndDropHooks} from './useDragAndDrop';
-import {DraggableCollectionState, DroppableCollectionState, Collection as ICollection, ListState, Node, SelectionBehavior, UNSTABLE_useFilteredListState, useListState} from 'react-stately';
+import {DraggableCollectionState} from 'react-stately/useDraggableCollectionState';
+import {DraggableItemResult} from 'react-aria/useDraggableCollection';
+import {DragPreviewRenderer} from '@react-types/shared';
+import {DropIndicatorAria, DroppableCollectionResult} from 'react-aria/useDroppableCollection';
+import {DroppableCollectionState} from 'react-stately/useDroppableCollectionState';
 import {FieldInputContext, SelectableCollectionContext, SelectableCollectionContextValue} from './Autocomplete';
-import {filterDOMProps, inertValue, LoadMoreSentinelProps, useLoadMoreSentinel, useObjectRef} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {FocusScope} from 'react-aria/FocusScope';
 import {forwardRefType, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, PressEvents, RefObject} from '@react-types/shared';
+import {HeaderNode, ItemNode, LoaderNode, SectionNode} from 'react-aria/private/collections/BaseCollection';
+import {Collection as ICollection, Node, SelectionBehavior} from '@react-types/shared';
+import {inertValue} from 'react-aria/private/utils/inertValue';
+import {ListKeyboardDelegate} from 'react-aria/ListKeyboardDelegate';
+import {ListState, UNSTABLE_useFilteredListState, useListState} from 'react-stately/useListState';
 import {ListStateContext} from './ListBox';
+import {LoadMoreSentinelProps, useLoadMoreSentinel} from 'react-aria/private/utils/useLoadMoreSentinel';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, JSX, ReactNode, useContext, useEffect, useMemo, useRef} from 'react';
 import {SelectionIndicatorContext} from './SelectionIndicator';
 import {SharedElementTransition} from './SharedElementTransition';
 import {TextContext} from './Text';
+import {useCollator} from 'react-aria/useCollator';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useVisuallyHidden} from 'react-aria/VisuallyHidden';
 
 export interface GridListRenderProps {
   /**
diff --git a/packages/react-aria-components/src/Group.tsx b/packages/react-aria-components/src/Group.tsx
index 5b7944601cf..a7af6a8cc3d 100644
--- a/packages/react-aria-components/src/Group.tsx
+++ b/packages/react-aria-components/src/Group.tsx
@@ -20,8 +20,10 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {HoverProps, mergeProps, useFocusRing, useHover} from 'react-aria';
+import {HoverProps, useHover} from 'react-aria/useHover';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes} from 'react';
+import {useFocusRing} from 'react-aria/useFocusRing';
 
 export interface GroupRenderProps {
   /**
diff --git a/packages/react-aria-components/src/Header.tsx b/packages/react-aria-components/src/Header.tsx
index 7165dbe12fe..1e241119322 100644
--- a/packages/react-aria-components/src/Header.tsx
+++ b/packages/react-aria-components/src/Header.tsx
@@ -11,7 +11,8 @@
  */
 
 import {ContextValue, dom, DOMRenderProps, useContextProps} from './utils';
-import {createLeafComponent, HeaderNode} from '@react-aria/collections';
+import {createLeafComponent} from 'react-aria/private/collections/CollectionBuilder';
+import {HeaderNode} from 'react-aria/private/collections/BaseCollection';
 import React, {createContext, ForwardedRef, HTMLAttributes} from 'react';
 
 export interface HeaderProps extends HTMLAttributes<HTMLElement>, DOMRenderProps<'header', undefined> {}
diff --git a/packages/react-aria-components/src/HiddenDateInput.tsx b/packages/react-aria-components/src/HiddenDateInput.tsx
index b6962a3a7c0..7ff12c02502 100644
--- a/packages/react-aria-components/src/HiddenDateInput.tsx
+++ b/packages/react-aria-components/src/HiddenDateInput.tsx
@@ -12,10 +12,11 @@
 
 
 import {CalendarDate, CalendarDateTime, parseDate, parseDateTime, toCalendarDate, toCalendarDateTime, toLocalTimeZone} from '@internationalized/date';
-import {DateFieldState, DatePickerState, DateSegmentType} from 'react-stately';
-import {getEventTarget} from '@react-aria/utils';
+import {DateFieldState, DateSegmentType} from 'react-stately/useDateFieldState';
+import {DatePickerState} from 'react-stately/useDatePickerState';
+import {getEventTarget} from 'react-aria/private/utils/shadowdom/DOMFunctions';
 import React, {ReactNode} from 'react';
-import {useVisuallyHidden} from 'react-aria';
+import {useVisuallyHidden} from 'react-aria/VisuallyHidden';
 
 interface AriaHiddenDateInputProps {
   /**
diff --git a/packages/react-aria-components/src/Input.tsx b/packages/react-aria-components/src/Input.tsx
index 97cae53ad4c..8c70a382415 100644
--- a/packages/react-aria-components/src/Input.tsx
+++ b/packages/react-aria-components/src/Input.tsx
@@ -18,9 +18,12 @@ import {
  useContextProps,
  useRenderProps
 } from './utils';
-import {createHideableComponent} from '@react-aria/collections';
-import {HoverEvents, mergeProps, useFocusRing, useHover} from 'react-aria';
+import {createHideableComponent} from 'react-aria/private/collections/Hidden';
+import {HoverEvents} from '@react-types/shared';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, InputHTMLAttributes} from 'react';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
 
 export interface InputRenderProps {
   /**
diff --git a/packages/react-aria-components/src/Label.tsx b/packages/react-aria-components/src/Label.tsx
index 70c22c63b2d..7b432a4a8c2 100644
--- a/packages/react-aria-components/src/Label.tsx
+++ b/packages/react-aria-components/src/Label.tsx
@@ -11,7 +11,7 @@
  */
 
 import {ContextValue, dom, DOMRenderProps, useContextProps} from './utils';
-import {createHideableComponent} from '@react-aria/collections';
+import {createHideableComponent} from 'react-aria/private/collections/Hidden';
 import React, {createContext, ForwardedRef, LabelHTMLAttributes} from 'react';
 
 export interface LabelProps extends LabelHTMLAttributes<HTMLLabelElement>, DOMRenderProps<'label', undefined> {
diff --git a/packages/react-aria-components/src/Link.tsx b/packages/react-aria-components/src/Link.tsx
index 74abcdac665..67e8019cecc 100644
--- a/packages/react-aria-components/src/Link.tsx
+++ b/packages/react-aria-components/src/Link.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaLinkOptions, HoverEvents, mergeProps, useFocusRing, useHover, useLink} from 'react-aria';
+import {AriaLinkOptions, useLink} from 'react-aria/useLink';
+
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -22,8 +23,12 @@ import {
   useRenderProps
 } from './utils';
 import {DOMProps, forwardRefType, GlobalDOMAttributes} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {HoverEvents} from '@react-types/shared';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef} from 'react';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
 
 export interface LinkProps extends Omit<AriaLinkOptions, 'elementType'>, HoverEvents, Omit<RenderProps<LinkRenderProps>, 'render'>, PossibleLinkDOMRenderProps<'span', LinkRenderProps>, SlotProps, DOMProps, Omit<GlobalDOMAttributes<HTMLAnchorElement>, 'onClick'> {
  /**
diff --git a/packages/react-aria-components/src/ListBox.tsx b/packages/react-aria-components/src/ListBox.tsx
index a178f4f0c44..1d0a2fcb665 100644
--- a/packages/react-aria-components/src/ListBox.tsx
+++ b/packages/react-aria-components/src/ListBox.tsx
@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaListBoxOptions, AriaListBoxProps, DraggableItemResult, DragPreviewRenderer, DroppableCollectionResult, DroppableItemResult, FocusScope, ListKeyboardDelegate, mergeProps, useCollator, useFocus, useFocusRing, useHover, useKeyboard, useListBox, useListBoxSection, useLocale, useOption} from 'react-aria';
+import {AriaListBoxOptions, useListBox, useListBoxSection, useOption} from 'react-aria/useListBox';
+
+import {AriaListBoxProps} from '@react-types/listbox';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -27,20 +29,39 @@ import {
   useRenderProps,
   useSlot
 } from './utils';
-import {Collection, CollectionBuilder, createBranchComponent, createLeafComponent, ItemNode, LoaderNode, SectionNode} from '@react-aria/collections';
+import {Collection, CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder';
 import {CollectionProps, CollectionRendererContext, ItemRenderProps, SectionContext, SectionProps} from './Collection';
 import {DragAndDropContext, DropIndicatorContext, DropIndicatorProps, useDndPersistedKeys, useRenderDropIndicator} from './DragAndDrop';
 import {DragAndDropHooks} from './useDragAndDrop';
-import {DraggableCollectionState, DroppableCollectionState, ListState, Node, Orientation, SelectionBehavior, UNSTABLE_useFilteredListState, useListState} from 'react-stately';
-import {filterDOMProps, inertValue, LoadMoreSentinelProps, useLoadMoreSentinel, useObjectRef} from '@react-aria/utils';
+import {DraggableCollectionState} from 'react-stately/useDraggableCollectionState';
+import {DraggableItemResult} from 'react-aria/useDraggableCollection';
+import {DragPreviewRenderer} from '@react-types/shared';
+import {DroppableCollectionResult, DroppableItemResult} from 'react-aria/useDroppableCollection';
+import {DroppableCollectionState} from 'react-stately/useDroppableCollectionState';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FocusEvents, forwardRefType, GlobalDOMAttributes, HoverEvents, Key, KeyboardEvents, LinkDOMProps, PressEvents, RefObject} from '@react-types/shared';
+import {FocusScope} from 'react-aria/FocusScope';
 import {HeaderContext} from './Header';
+import {inertValue} from 'react-aria/private/utils/inertValue';
+import {ItemNode, LoaderNode, SectionNode} from 'react-aria/private/collections/BaseCollection';
+import {ListKeyboardDelegate} from 'react-aria/ListKeyboardDelegate';
+import {ListState, UNSTABLE_useFilteredListState, useListState} from 'react-stately/useListState';
+import {LoadMoreSentinelProps, useLoadMoreSentinel} from 'react-aria/private/utils/useLoadMoreSentinel';
+import {mergeProps} from 'react-aria/mergeProps';
+import {Node, Orientation, SelectionBehavior} from '@react-types/shared';
 import React, {createContext, ForwardedRef, forwardRef, JSX, ReactNode, useContext, useEffect, useMemo, useRef} from 'react';
 import {SelectableCollectionContext, SelectableCollectionContextValue} from './Autocomplete';
 import {SelectionIndicatorContext} from './SelectionIndicator';
 import {SeparatorContext} from './Separator';
 import {SharedElementTransition} from './SharedElementTransition';
 import {TextContext} from './Text';
+import {useCollator} from 'react-aria/useCollator';
+import {useFocus} from 'react-aria/useFocus';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useKeyboard} from 'react-aria/useKeyboard';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useObjectRef} from 'react-aria/useObjectRef';
 
 export interface ListBoxRenderProps {
   /**
diff --git a/packages/react-aria-components/src/Menu.tsx b/packages/react-aria-components/src/Menu.tsx
index de0be7d58e6..a7ec5607e0b 100644
--- a/packages/react-aria-components/src/Menu.tsx
+++ b/packages/react-aria-components/src/Menu.tsx
@@ -10,9 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaMenuProps, FocusScope, mergeProps, useHover, useMenu, useMenuItem, useMenuSection, useMenuTrigger, useSubmenuTrigger} from 'react-aria';
-import {BaseCollection, Collection, CollectionBuilder, CollectionNode, createBranchComponent, createLeafComponent, ItemNode, SectionNode} from '@react-aria/collections';
-import {MenuTriggerProps as BaseMenuTriggerProps, Collection as ICollection, Node, RootMenuTriggerState, TreeState, useMenuTriggerState, useSubmenuTriggerState, useTreeState} from 'react-stately';
+import {AriaMenuProps} from '@react-types/menu';
+
+import {BaseCollection, CollectionNode, ItemNode, SectionNode} from 'react-aria/private/collections/BaseCollection';
+import {MenuTriggerProps as BaseMenuTriggerProps} from '@react-types/menu';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -29,16 +30,20 @@ import {
   useSlot,
   useSlottedContext
 } from './utils';
+import {Collection, CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder';
 import {CollectionProps, CollectionRendererContext, ItemRenderProps, SectionContext, SectionProps, usePersistedKeys} from './Collection';
 import {FieldInputContext, SelectableCollectionContext, SelectableCollectionContextValue} from './Autocomplete';
-import {filterDOMProps, useObjectRef, useResizeObserver} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FocusEvents, FocusStrategy, forwardRefType, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, MultipleSelection, PressEvents} from '@react-types/shared';
+import {FocusScope} from 'react-aria/FocusScope';
 import {HeaderContext} from './Header';
+import {Collection as ICollection, Node} from '@react-types/shared';
 import {KeyboardContext} from './Keyboard';
-import {MultipleSelectionState, SelectionManager, useMultipleSelectionState} from '@react-stately/selection';
+import {mergeProps} from 'react-aria/mergeProps';
+import {MultipleSelectionState} from 'react-stately/private/selection/types';
 import {OverlayTriggerStateContext} from './Dialog';
 import {PopoverContext} from './Popover';
-import {PressResponder} from '@react-aria/interactions';
+import {PressResponder} from 'react-aria/private/interactions/PressResponder';
 import React, {
   createContext,
   ForwardedRef,
@@ -53,10 +58,18 @@ import React, {
   useRef,
   useState
 } from 'react';
+import {RootMenuTriggerState, useMenuTriggerState, useSubmenuTriggerState} from 'react-stately/useMenuTriggerState';
 import {SelectionIndicatorContext} from './SelectionIndicator';
+import {SelectionManager} from 'react-stately/private/selection/SelectionManager';
 import {SeparatorContext} from './Separator';
 import {SharedElementTransition} from './SharedElementTransition';
 import {TextContext} from './Text';
+import {TreeState, useTreeState} from 'react-stately/useTreeState';
+import {useHover} from 'react-aria/useHover';
+import {useMenu, useMenuItem, useMenuSection, useMenuTrigger, useSubmenuTrigger} from 'react-aria/useMenu';
+import {useMultipleSelectionState} from 'react-stately/useMultipleSelectionState';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
 
 export const MenuContext = createContext<ContextValue<MenuProps<any>, HTMLDivElement>>(null);
 export const MenuStateContext = createContext<TreeState<any> | null>(null);
diff --git a/packages/react-aria-components/src/Meter.tsx b/packages/react-aria-components/src/Meter.tsx
index 2d2999dcaca..cb6b9ec0942 100644
--- a/packages/react-aria-components/src/Meter.tsx
+++ b/packages/react-aria-components/src/Meter.tsx
@@ -10,8 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaMeterProps, useMeter} from 'react-aria';
-import {clamp} from '@react-stately/utils';
+import {AriaMeterProps} from '@react-types/meter';
+
+import {clamp} from 'react-stately/private/utils/number';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -22,10 +23,12 @@ import {
   useRenderProps,
   useSlot
 } from './utils';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared';
 import {LabelContext} from './Label';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef} from 'react';
+import {useMeter} from 'react-aria/useMeter';
 
 export interface MeterProps extends Omit<AriaMeterProps, 'label'>, RenderProps<MeterRenderProps>, SlotProps, GlobalDOMAttributes<HTMLDivElement> {
   /**
diff --git a/packages/react-aria-components/src/Modal.tsx b/packages/react-aria-components/src/Modal.tsx
index e5954ce7d33..5502f6c2259 100644
--- a/packages/react-aria-components/src/Modal.tsx
+++ b/packages/react-aria-components/src/Modal.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaModalOverlayProps, DismissButton, Overlay, useIsSSR, useModalOverlay} from 'react-aria';
+import {AriaModalOverlayProps, useModalOverlay} from 'react-aria/useModalOverlay';
+
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -21,11 +22,20 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
+import {DismissButton, Overlay} from 'react-aria/Overlay';
 import {DOMAttributes, forwardRefType, GlobalDOMAttributes, RefObject} from '@react-types/shared';
-import {filterDOMProps, isScrollable, mergeProps, mergeRefs, useEnterAnimation, useExitAnimation, useObjectRef, useViewportSize} from '@react-aria/utils';
-import {OverlayTriggerProps, OverlayTriggerState, useOverlayTriggerState} from 'react-stately';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {isScrollable} from 'react-aria/private/utils/isScrollable';
+import {mergeProps} from 'react-aria/mergeProps';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
+import {OverlayTriggerProps} from '@react-types/overlays';
+import {OverlayTriggerState, useOverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 import {OverlayTriggerStateContext} from './Dialog';
 import React, {createContext, ForwardedRef, forwardRef, useContext, useMemo, useRef} from 'react';
+import {useEnterAnimation, useExitAnimation} from 'react-aria/private/utils/animation';
+import {useIsSSR} from 'react-aria/SSRProvider';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useViewportSize} from 'react-aria/private/utils/useViewportSize';
 
 export interface ModalOverlayProps extends AriaModalOverlayProps, OverlayTriggerProps, RenderProps<ModalRenderProps>, SlotProps, GlobalDOMAttributes<HTMLDivElement> {
   /**
diff --git a/packages/react-aria-components/src/NumberField.tsx b/packages/react-aria-components/src/NumberField.tsx
index d63df474bfa..9edc1096854 100644
--- a/packages/react-aria-components/src/NumberField.tsx
+++ b/packages/react-aria-components/src/NumberField.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaNumberFieldProps, useLocale, useNumberField} from 'react-aria';
+import {AriaNumberFieldProps} from '@react-types/numberfield';
+
 import {ButtonContext} from './Button';
 import {
   ClassNameOrFunction,
@@ -27,15 +28,17 @@ import {
   useSlottedContext
 } from './utils';
 import {FieldErrorContext} from './FieldError';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FormContext} from './Form';
 import {forwardRefType, GlobalDOMAttributes, InputDOMProps} from '@react-types/shared';
 import {GroupContext} from './Group';
 import {InputContext} from './Input';
 import {LabelContext} from './Label';
-import {NumberFieldState, useNumberFieldState} from 'react-stately';
+import {NumberFieldState, useNumberFieldState} from 'react-stately/useNumberFieldState';
 import React, {createContext, ForwardedRef, forwardRef, useRef} from 'react';
 import {TextContext} from './Text';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useNumberField} from 'react-aria/useNumberField';
 
 export interface NumberFieldRenderProps {
   /**
diff --git a/packages/react-aria-components/src/OverlayArrow.tsx b/packages/react-aria-components/src/OverlayArrow.tsx
index 3715169817c..764ba98378d 100644
--- a/packages/react-aria-components/src/OverlayArrow.tsx
+++ b/packages/react-aria-components/src/OverlayArrow.tsx
@@ -19,8 +19,8 @@ import {
   useRenderProps
 } from './utils';
 import {DOMProps, forwardRefType} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
-import {PlacementAxis} from 'react-aria';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {PlacementAxis} from '@react-types/overlays';
 import React, {createContext, CSSProperties, ForwardedRef, forwardRef, HTMLAttributes} from 'react';
 
 interface OverlayArrowContextValue extends OverlayArrowProps {
diff --git a/packages/react-aria-components/src/Popover.tsx b/packages/react-aria-components/src/Popover.tsx
index 63c4c1c46a5..c02b5ad2aa0 100644
--- a/packages/react-aria-components/src/Popover.tsx
+++ b/packages/react-aria-components/src/Popover.tsx
@@ -11,7 +11,7 @@
  */
 
 import {AriaLabelingProps, forwardRefType, GlobalDOMAttributes, RefObject} from '@react-types/shared';
-import {AriaPopoverProps, DismissButton, Overlay, PlacementAxis, PositionProps, useLocale, usePopover} from 'react-aria';
+import {AriaPopoverProps, usePopover} from 'react-aria/usePopover';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -21,13 +21,22 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {filterDOMProps, isFocusWithin, mergeProps, useEnterAnimation, useExitAnimation, useLayoutEffect} from '@react-aria/utils';
-import {focusSafely, getInteractionModality} from '@react-aria/interactions';
+import {DismissButton, Overlay} from 'react-aria/Overlay';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {focusSafely} from 'react-aria/private/interactions/focusSafely';
+import {getInteractionModality} from 'react-aria/private/interactions/useFocusVisible';
+import {isFocusWithin} from 'react-aria/private/utils/shadowdom/DOMFunctions';
+import {mergeProps} from 'react-aria/mergeProps';
 import {OverlayArrowContext} from './OverlayArrow';
-import {OverlayTriggerProps, OverlayTriggerState, useOverlayTriggerState} from 'react-stately';
+import {OverlayTriggerProps} from '@react-types/overlays';
+import {OverlayTriggerState, useOverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 import {OverlayTriggerStateContext} from './Dialog';
+import {PlacementAxis, PositionProps} from '@react-types/overlays';
 import React, {Context, createContext, ForwardedRef, forwardRef, useContext, useEffect, useMemo, useRef, useState} from 'react';
-import {useIsHidden} from '@react-aria/collections';
+import {useEnterAnimation, useExitAnimation} from 'react-aria/private/utils/animation';
+import {useIsHidden} from 'react-aria/private/collections/Hidden';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useLocale} from 'react-aria/I18nProvider';
 
 export interface PopoverProps extends Omit<PositionProps, 'isOpen'>, Omit<AriaPopoverProps, 'popoverRef' | 'triggerRef' | 'groupRef' | 'offset' | 'arrowSize'>, OverlayTriggerProps, RenderProps<PopoverRenderProps>, SlotProps, AriaLabelingProps, GlobalDOMAttributes<HTMLDivElement> {
   /**
diff --git a/packages/react-aria-components/src/ProgressBar.tsx b/packages/react-aria-components/src/ProgressBar.tsx
index 1599f3cb6bc..9792f3f5d06 100644
--- a/packages/react-aria-components/src/ProgressBar.tsx
+++ b/packages/react-aria-components/src/ProgressBar.tsx
@@ -10,8 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaProgressBarProps, useProgressBar} from 'react-aria';
-import {clamp} from '@react-stately/utils';
+import {AriaProgressBarProps} from '@react-types/progress';
+
+import {clamp} from 'react-stately/private/utils/number';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -22,10 +23,12 @@ import {
   useRenderProps,
   useSlot
 } from './utils';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {GlobalDOMAttributes} from '@react-types/shared';
 import {LabelContext} from './Label';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef} from 'react';
+import {useProgressBar} from 'react-aria/useProgressBar';
 
 export interface ProgressBarProps extends Omit<AriaProgressBarProps, 'label'>, RenderProps<ProgressBarRenderProps>, SlotProps, GlobalDOMAttributes<HTMLDivElement> {
   /**
diff --git a/packages/react-aria-components/src/RadioGroup.tsx b/packages/react-aria-components/src/RadioGroup.tsx
index 2ddf845e4a0..f6c7808d58f 100644
--- a/packages/react-aria-components/src/RadioGroup.tsx
+++ b/packages/react-aria-components/src/RadioGroup.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaRadioGroupProps, AriaRadioProps, HoverEvents, Orientation, useFocusRing, useHover, useRadio, useRadioGroup, VisuallyHidden} from 'react-aria';
+import {AriaRadioGroupProps, AriaRadioProps} from '@react-types/radio';
+
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -26,15 +27,23 @@ import {
   useSlottedContext
 } from './utils';
 import {FieldErrorContext} from './FieldError';
-import {filterDOMProps, mergeProps, mergeRefs, useObjectRef} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FormContext} from './Form';
 import {forwardRefType, GlobalDOMAttributes, RefObject} from '@react-types/shared';
+import {HoverEvents, Orientation} from '@react-types/shared';
 import {LabelContext} from './Label';
-import {RadioGroupState, useRadioGroupState} from 'react-stately';
+import {mergeProps} from 'react-aria/mergeProps';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
+import {RadioGroupState, useRadioGroupState} from 'react-stately/useRadioGroupState';
 import React, {createContext, ForwardedRef, forwardRef, useMemo} from 'react';
 import {SelectionIndicatorContext} from './SelectionIndicator';
 import {SharedElementTransition} from './SharedElementTransition';
 import {TextContext} from './Text';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useRadio, useRadioGroup} from 'react-aria/useRadioGroup';
+import {VisuallyHidden} from 'react-aria/VisuallyHidden';
 
 export interface RadioGroupProps extends Omit<AriaRadioGroupProps, 'children' | 'label' | 'description' | 'errorMessage' | 'validationState' | 'validationBehavior'>, RACValidation, RenderProps<RadioGroupRenderProps>, SlotProps, GlobalDOMAttributes<HTMLDivElement> {
   /**
diff --git a/packages/react-aria-components/src/SearchField.tsx b/packages/react-aria-components/src/SearchField.tsx
index 1eec81d8a7d..29d1aacde05 100644
--- a/packages/react-aria-components/src/SearchField.tsx
+++ b/packages/react-aria-components/src/SearchField.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaSearchFieldProps, useSearchField} from 'react-aria';
+import {AriaSearchFieldProps} from '@react-types/searchfield';
+
 import {ButtonContext} from './Button';
 import {
   ClassNameOrFunction,
@@ -26,18 +27,19 @@ import {
   useSlot,
   useSlottedContext
 } from './utils';
-import {createHideableComponent} from '@react-aria/collections';
+import {createHideableComponent} from 'react-aria/private/collections/Hidden';
 import {FieldErrorContext} from './FieldError';
 import {FieldInputContext} from './Autocomplete';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FormContext} from './Form';
 import {GlobalDOMAttributes} from '@react-types/shared';
 import {GroupContext} from './Group';
 import {InputContext} from './Input';
 import {LabelContext} from './Label';
 import React, {createContext, ForwardedRef, useRef} from 'react';
-import {SearchFieldState, useSearchFieldState} from 'react-stately';
+import {SearchFieldState, useSearchFieldState} from 'react-stately/useSearchFieldState';
 import {TextContext} from './Text';
+import {useSearchField} from 'react-aria/useSearchField';
 
 export interface SearchFieldRenderProps {
   /**
diff --git a/packages/react-aria-components/src/Select.tsx b/packages/react-aria-components/src/Select.tsx
index 3d4e3e311bb..d4e0074ebb5 100644
--- a/packages/react-aria-components/src/Select.tsx
+++ b/packages/react-aria-components/src/Select.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaSelectProps, HiddenSelect, useFocusRing, useListFormatter, useLocalizedStringFormatter, useSelect} from 'react-aria';
+import {AriaSelectProps} from '@react-types/select';
+
 import {ButtonContext} from './Button';
 import {
   ClassNameOrFunction,
@@ -26,21 +27,29 @@ import {
   useSlot,
   useSlottedContext
 } from './utils';
-import {Collection, Node, SelectState, useSelectState} from 'react-stately';
-import {CollectionBuilder, createHideableComponent} from '@react-aria/collections';
+import {Collection, Node} from '@react-types/shared';
+import {CollectionBuilder} from 'react-aria/private/collections/CollectionBuilder';
+import {createHideableComponent} from 'react-aria/private/collections/Hidden';
 import {FieldErrorContext} from './FieldError';
-import {filterDOMProps, mergeProps, useResizeObserver} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FormContext} from './Form';
 import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared';
-// @ts-ignore
+import {HiddenSelect, useSelect} from 'react-aria/useSelect';
 import intlMessages from '../intl/*.json';
 import {ItemRenderProps} from './Collection';
 import {LabelContext} from './Label';
 import {ListBoxContext, ListStateContext} from './ListBox';
+import {mergeProps} from 'react-aria/mergeProps';
 import {OverlayTriggerStateContext} from './Dialog';
+// @ts-ignore
 import {PopoverContext} from './Popover';
 import React, {createContext, ForwardedRef, forwardRef, Fragment, HTMLAttributes, ReactNode, useCallback, useContext, useMemo, useRef, useState} from 'react';
+import {SelectState, useSelectState} from 'react-stately/useSelectState';
 import {TextContext} from './Text';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useListFormatter} from 'react-aria/useListFormatter';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
 
 type SelectionMode = 'single' | 'multiple';
 
diff --git a/packages/react-aria-components/src/Separator.tsx b/packages/react-aria-components/src/Separator.tsx
index 045d77b5e77..ffefdffd1ee 100644
--- a/packages/react-aria-components/src/Separator.tsx
+++ b/packages/react-aria-components/src/Separator.tsx
@@ -10,11 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {SeparatorProps as AriaSeparatorProps, useSeparator} from 'react-aria';
-import {BaseCollection, CollectionNode, createLeafComponent} from '@react-aria/collections';
+import {SeparatorProps as AriaSeparatorProps, useSeparator} from 'react-aria/useSeparator';
+
+import {BaseCollection, CollectionNode} from 'react-aria/private/collections/BaseCollection';
 import {ContextValue, dom, DOMRenderProps, SlotProps, StyleProps, useContextProps} from './utils';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
+import {createLeafComponent} from 'react-aria/private/collections/CollectionBuilder';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {GlobalDOMAttributes} from '@react-types/shared';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef} from 'react';
 
 export interface SeparatorProps extends AriaSeparatorProps, StyleProps, SlotProps, DOMRenderProps<'hr' | 'div', undefined>, GlobalDOMAttributes<HTMLElement> {
diff --git a/packages/react-aria-components/src/SharedElementTransition.tsx b/packages/react-aria-components/src/SharedElementTransition.tsx
index a2bbfde3f87..895fa8a3587 100644
--- a/packages/react-aria-components/src/SharedElementTransition.tsx
+++ b/packages/react-aria-components/src/SharedElementTransition.tsx
@@ -13,8 +13,8 @@
 import {dom, RenderProps, useRenderProps} from './utils';
 import {flushSync} from 'react-dom';
 import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, ReactNode, RefObject, useContext, useRef, useState} from 'react';
-import {useLayoutEffect} from '@react-aria/utils';
-import {useObjectRef} from 'react-aria';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useObjectRef} from 'react-aria/useObjectRef';
 
 interface Snapshot {
   rect: DOMRect,
diff --git a/packages/react-aria-components/src/Slider.tsx b/packages/react-aria-components/src/Slider.tsx
index 2026db62d0c..0391221a7c3 100644
--- a/packages/react-aria-components/src/Slider.tsx
+++ b/packages/react-aria-components/src/Slider.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaSliderProps, AriaSliderThumbProps, HoverEvents, mergeProps, Orientation, useFocusRing, useHover, useNumberFormatter, useSlider, useSliderThumb, VisuallyHidden} from 'react-aria';
+import {AriaSliderProps, AriaSliderThumbProps} from '@react-types/slider';
+
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -23,11 +24,18 @@ import {
   useSlot,
   useSlottedContext
 } from './utils';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {forwardRefType, GlobalDOMAttributes, RefObject} from '@react-types/shared';
+import {HoverEvents, Orientation} from '@react-types/shared';
 import {LabelContext} from './Label';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, OutputHTMLAttributes, useContext, useRef} from 'react';
-import {SliderState, useSliderState} from 'react-stately';
+import {SliderState, useSliderState} from 'react-stately/useSliderState';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useNumberFormatter} from 'react-aria/useNumberFormatter';
+import {useSlider, useSliderThumb} from 'react-aria/useSlider';
+import {VisuallyHidden} from 'react-aria/VisuallyHidden';
 
 export interface SliderProps<T = number | number[]> extends Omit<AriaSliderProps<T>, 'label'>, RenderProps<SliderRenderProps>, SlotProps, GlobalDOMAttributes<HTMLDivElement> {
   /**
diff --git a/packages/react-aria-components/src/Switch.tsx b/packages/react-aria-components/src/Switch.tsx
index b61104cc9ca..d0c1226a56e 100644
--- a/packages/react-aria-components/src/Switch.tsx
+++ b/packages/react-aria-components/src/Switch.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaSwitchProps, HoverEvents, mergeProps, useFocusRing, useHover, useSwitch, VisuallyHidden} from 'react-aria';
+import {AriaSwitchProps} from '@react-types/switch';
+
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -21,10 +22,18 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {filterDOMProps, mergeRefs, useObjectRef} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {forwardRefType, GlobalDOMAttributes, RefObject} from '@react-types/shared';
+import {HoverEvents} from '@react-types/shared';
+import {mergeProps} from 'react-aria/mergeProps';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
 import React, {createContext, ForwardedRef, forwardRef} from 'react';
-import {ToggleState, useToggleState} from 'react-stately';
+import {ToggleState, useToggleState} from 'react-stately/useToggleState';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useSwitch} from 'react-aria/useSwitch';
+import {VisuallyHidden} from 'react-aria/VisuallyHidden';
 
 export interface SwitchProps extends Omit<AriaSwitchProps, 'children'>, HoverEvents, RenderProps<SwitchRenderProps, 'label'>, SlotProps, Omit<GlobalDOMAttributes<HTMLLabelElement>, 'onClick'> {
  /**
diff --git a/packages/react-aria-components/src/Table.tsx b/packages/react-aria-components/src/Table.tsx
index b0dc061feac..51c0dca623c 100644
--- a/packages/react-aria-components/src/Table.tsx
+++ b/packages/react-aria-components/src/Table.tsx
@@ -1,6 +1,6 @@
 import {AriaLabelingProps, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, PressEvents, RefObject} from '@react-types/shared';
-import {BaseCollection, Collection, CollectionBuilder, CollectionNode, createBranchComponent, createLeafComponent, FilterableNode, LoaderNode, useCachedChildren} from '@react-aria/collections';
-import {buildHeaderRows, TableColumnResizeState} from '@react-stately/table';
+import {BaseCollection, CollectionNode, FilterableNode, LoaderNode} from 'react-aria/private/collections/BaseCollection';
+import {buildHeaderRows} from 'react-stately/private/table/TableCollection';
 import {ButtonContext} from './Button';
 import {CheckboxContext} from './Checkbox';
 import {
@@ -18,23 +18,68 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
+import {Collection, CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder';
 import {CollectionProps, CollectionRendererContext, DefaultCollectionRenderer, ItemRenderProps} from './Collection';
 import {ColumnSize, ColumnStaticSize, TableCollection as ITableCollection, TableProps as SharedTableProps} from '@react-types/table';
-import {DisabledBehavior, DraggableCollectionState, DroppableCollectionState, MultipleSelectionState, Node, SelectionBehavior, SelectionMode, SortDirection, TableState, UNSTABLE_useFilteredTableState, useMultipleSelectionState, useTableColumnResizeState, useTableState} from 'react-stately';
+import {DisabledBehavior, Node, SelectionBehavior, SelectionMode, SortDirection} from '@react-types/shared';
 import {DragAndDropContext, DropIndicatorContext, DropIndicatorProps, useDndPersistedKeys, useRenderDropIndicator} from './DragAndDrop';
 import {DragAndDropHooks} from './useDragAndDrop';
-import {DraggableItemResult, DragPreviewRenderer, DropIndicatorAria, DroppableCollectionResult, FocusScope, ListKeyboardDelegate, mergeProps, useFocusRing, useHover, useLocale, useLocalizedStringFormatter, useTable, useTableCell, useTableColumnHeader, useTableColumnResize, useTableHeaderRow, useTableRow, useTableRowGroup, useTableSelectAllCheckbox, useTableSelectionCheckbox, useVisuallyHidden} from 'react-aria';
+import {DraggableCollectionState} from 'react-stately/useDraggableCollectionState';
+import {DraggableItemResult} from 'react-aria/useDraggableCollection';
+import {DragPreviewRenderer} from '@react-types/shared';
+
+import {DropIndicatorAria, DroppableCollectionResult} from 'react-aria/useDroppableCollection';
+
+import {DroppableCollectionState} from 'react-stately/useDroppableCollectionState';
 import {FieldInputContext, SelectableCollectionContext, SelectableCollectionContextValue} from './Autocomplete';
-import {filterDOMProps, inertValue, isScrollable, LoadMoreSentinelProps, mergeRefs, useLayoutEffect, useLoadMoreSentinel, useObjectRef, useResizeObserver} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {FocusScope} from 'react-aria/FocusScope';
 import {GridNode} from '@react-types/grid';
-// @ts-ignore
+import {inertValue} from 'react-aria/private/utils/inertValue';
 import intlMessages from '../intl/*.json';
+import {isScrollable} from 'react-aria/private/utils/isScrollable';
+import {ListKeyboardDelegate} from 'react-aria/ListKeyboardDelegate';
+import {LoadMoreSentinelProps, useLoadMoreSentinel} from 'react-aria/private/utils/useLoadMoreSentinel';
+import {mergeProps} from 'react-aria/mergeProps';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
+import {MultipleSelectionState} from 'react-stately/private/selection/types';
+
 import React, {createContext, ForwardedRef, forwardRef, JSX, ReactElement, ReactNode, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
+
 import ReactDOM from 'react-dom';
 import {SelectionIndicatorContext} from './SelectionIndicator';
 import {SharedElementTransition} from './SharedElementTransition';
+import {TableColumnResizeState} from 'react-stately/useTableState';
+import {
+  TableState,
+  UNSTABLE_useFilteredTableState,
+  useTableColumnResizeState,
+  useTableState
+} from 'react-stately/useTableState';
 import {TreeDropTargetDelegate} from './TreeDropTargetDelegate';
-import {useControlledState} from '@react-stately/utils';
+import {useCachedChildren} from 'react-aria/private/collections/useCachedChildren';
+import {useControlledState} from 'react-stately/private/utils/useControlledState';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+// @ts-ignore
+import {useLocale} from 'react-aria/I18nProvider';
+import {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
+import {useMultipleSelectionState} from 'react-stately/useMultipleSelectionState';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useResizeObserver} from 'react-aria/private/utils/useResizeObserver';
+import {
+  useTable,
+  useTableCell,
+  useTableColumnHeader,
+  useTableColumnResize,
+  useTableHeaderRow,
+  useTableRow,
+  useTableRowGroup,
+  useTableSelectAllCheckbox,
+  useTableSelectionCheckbox
+} from 'react-aria/useTable';
+import {useVisuallyHidden} from 'react-aria/VisuallyHidden';
 
 export {TableLayout} from './TableLayout';
 
diff --git a/packages/react-aria-components/src/TableLayout.ts b/packages/react-aria-components/src/TableLayout.ts
index 4f6ca4399d9..4f320e5e815 100644
--- a/packages/react-aria-components/src/TableLayout.ts
+++ b/packages/react-aria-components/src/TableLayout.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {TableLayout as BaseTableLayout, TableLayoutProps} from '@react-stately/layout';
+import {TableLayout as BaseTableLayout, TableLayoutProps} from 'react-stately/private/layout/TableLayout';
 import {LayoutOptionsDelegate} from './Virtualizer';
 import {TableColumnResizeStateContext} from './Table';
 import {useContext, useMemo} from 'react';
diff --git a/packages/react-aria-components/src/Tabs.tsx b/packages/react-aria-components/src/Tabs.tsx
index 7e56c2394c1..d2c8359ed6b 100644
--- a/packages/react-aria-components/src/Tabs.tsx
+++ b/packages/react-aria-components/src/Tabs.tsx
@@ -11,15 +11,27 @@
  */
 
 import {AriaLabelingProps, FocusEvents, forwardRefType, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, PressEvents, RefObject} from '@react-types/shared';
-import {AriaTabListProps, AriaTabPanelProps, mergeProps, Orientation, useFocusRing, useHover, useTab, useTabList, useTabPanel} from 'react-aria';
+import {AriaTabListProps, AriaTabPanelProps} from '@react-types/tabs';
 import {ClassNameOrFunction, ContextValue, dom, DOMRenderProps, PossibleLinkDOMRenderProps, Provider, RenderProps, SlotProps, StyleProps, StyleRenderProps, useContextProps, useRenderProps, useSlottedContext} from './utils';
-import {Collection, CollectionBuilder, CollectionNode, createHideableComponent, createLeafComponent} from '@react-aria/collections';
+import {Collection, CollectionBuilder, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder';
+import {CollectionNode} from 'react-aria/private/collections/BaseCollection';
 import {CollectionProps, CollectionRendererContext, DefaultCollectionRenderer, usePersistedKeys} from './Collection';
-import {filterDOMProps, inertValue, useEnterAnimation, useExitAnimation, useLayoutEffect, useObjectRef} from '@react-aria/utils';
-import {Collection as ICollection, Node, TabListState, useTabListState} from 'react-stately';
+import {createHideableComponent} from 'react-aria/private/collections/Hidden';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {Collection as ICollection, Node} from '@react-types/shared';
+import {inertValue} from 'react-aria/private/utils/inertValue';
+import {mergeProps} from 'react-aria/mergeProps';
+import {Orientation} from '@react-types/shared';
 import React, {createContext, ForwardedRef, forwardRef, JSX, useContext, useMemo, useRef, useState} from 'react';
 import {SelectionIndicatorContext} from './SelectionIndicator';
 import {SharedElementTransition} from './SharedElementTransition';
+import {TabListState, useTabListState} from 'react-stately/useTabListState';
+import {useEnterAnimation, useExitAnimation} from 'react-aria/private/utils/animation';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useTab, useTabList, useTabPanel} from 'react-aria/useTabList';
 
 export interface TabsProps extends Omit<AriaTabListProps<any>, 'items' | 'children'>, RenderProps<TabsRenderProps>, SlotProps, GlobalDOMAttributes<HTMLDivElement> {
   /**
diff --git a/packages/react-aria-components/src/TagGroup.tsx b/packages/react-aria-components/src/TagGroup.tsx
index 05639b093a7..b3885890387 100644
--- a/packages/react-aria-components/src/TagGroup.tsx
+++ b/packages/react-aria-components/src/TagGroup.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaTagGroupProps, useFocusRing, useHover, useTag, useTagGroup} from 'react-aria';
+import {AriaTagGroupProps, useTag, useTagGroup} from 'react-aria/useTagGroup';
+
 import {ButtonContext} from './Button';
 import {
   ClassNameOrFunction,
@@ -26,18 +27,24 @@ import {
   useRenderProps,
   useSlot
 } from './utils';
-import {Collection, CollectionBuilder, createLeafComponent, ItemNode} from '@react-aria/collections';
+import {Collection, CollectionBuilder, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder';
 import {CollectionProps, CollectionRendererContext, DefaultCollectionRenderer, ItemRenderProps, usePersistedKeys} from './Collection';
-import {filterDOMProps, mergeProps, useObjectRef} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FocusEvents, forwardRefType, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, PressEvents, RefObject} from '@react-types/shared';
+import {ItemNode} from 'react-aria/private/collections/BaseCollection';
 import {LabelContext} from './Label';
-import {ListState, Node, UNSTABLE_useFilteredListState, useListState} from 'react-stately';
+import {ListState, UNSTABLE_useFilteredListState, useListState} from 'react-stately/useListState';
 import {ListStateContext} from './ListBox';
+import {mergeProps} from 'react-aria/mergeProps';
+import {Node} from '@react-types/shared';
 import React, {createContext, ForwardedRef, forwardRef, JSX, ReactNode, useContext, useEffect, useRef} from 'react';
 import {SelectableCollectionContext, SelectableCollectionContextValue} from './Autocomplete';
 import {SelectionIndicatorContext} from './SelectionIndicator';
 import {SharedElementTransition} from './SharedElementTransition';
 import {TextContext} from './Text';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useObjectRef} from 'react-aria/useObjectRef';
 
 export interface TagGroupProps extends Omit<AriaTagGroupProps<unknown>, 'children' | 'items' | 'label' | 'description' | 'errorMessage' | 'keyboardDelegate'>, DOMProps, SlotProps, DOMRenderProps<'div', undefined>, GlobalDOMAttributes<HTMLDivElement> {
   /**
diff --git a/packages/react-aria-components/src/TextArea.tsx b/packages/react-aria-components/src/TextArea.tsx
index c0ac27fded5..2323e9acfdb 100644
--- a/packages/react-aria-components/src/TextArea.tsx
+++ b/packages/react-aria-components/src/TextArea.tsx
@@ -6,9 +6,12 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {HoverEvents, mergeProps, useFocusRing, useHover} from 'react-aria';
+import {HoverEvents} from '@react-types/shared';
 import {InputRenderProps} from './Input';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef, TextareaHTMLAttributes} from 'react';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
 
 export interface TextAreaProps extends Omit<TextareaHTMLAttributes<HTMLTextAreaElement>, 'className' | 'style'>, HoverEvents, StyleRenderProps<InputRenderProps, 'textarea'> {
   /**
diff --git a/packages/react-aria-components/src/TextField.tsx b/packages/react-aria-components/src/TextField.tsx
index 82b73f4bb8b..67838bba6a7 100644
--- a/packages/react-aria-components/src/TextField.tsx
+++ b/packages/react-aria-components/src/TextField.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaTextFieldProps, useTextField} from 'react-aria';
+import {AriaTextFieldProps} from '@react-types/textfield';
+
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -26,10 +27,10 @@ import {
   useSlot,
   useSlottedContext
 } from './utils';
-import {createHideableComponent} from '@react-aria/collections';
+import {createHideableComponent} from 'react-aria/private/collections/Hidden';
 import {FieldErrorContext} from './FieldError';
 import {FieldInputContext} from './Autocomplete';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {FormContext} from './Form';
 import {GlobalDOMAttributes} from '@react-types/shared';
 import {GroupContext} from './Group';
@@ -38,6 +39,7 @@ import {LabelContext} from './Label';
 import React, {createContext, ForwardedRef, useCallback, useRef, useState} from 'react';
 import {TextAreaContext} from './TextArea';
 import {TextContext} from './Text';
+import {useTextField} from 'react-aria/useTextField';
 
 export interface TextFieldRenderProps {
   /**
diff --git a/packages/react-aria-components/src/Toast.tsx b/packages/react-aria-components/src/Toast.tsx
index 8fc3fe75b9e..c919b7497c5 100644
--- a/packages/react-aria-components/src/Toast.tsx
+++ b/packages/react-aria-components/src/Toast.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaToastProps, AriaToastRegionProps, mergeProps, useFocusRing, useHover, useLocale, useToast, useToastRegion} from 'react-aria';
+import {AriaToastProps, AriaToastRegionProps, useToast, useToastRegion} from 'react-aria/useToast';
+
 import {ButtonContext} from './Button';
 import {
   ClassNameOrFunction,
@@ -25,13 +26,18 @@ import {
   useRenderProps
 } from './utils';
 import {createPortal} from 'react-dom';
-import {filterDOMProps, useObjectRef} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {forwardRefType, GlobalDOMAttributes} from '@react-types/shared';
-import {QueuedToast, ToastQueue, ToastState, useToastQueue} from 'react-stately';
+import {mergeProps} from 'react-aria/mergeProps';
+import {QueuedToast, ToastQueue, ToastState, useToastQueue} from 'react-stately/useToastState';
 import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, JSX, ReactElement, ReactNode, useContext} from 'react';
 import {TextContext} from './Text';
-import {useIsSSR} from '@react-aria/ssr';
-import {useUNSAFE_PortalContext} from '@react-aria/overlays';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useIsSSR} from 'react-aria/SSRProvider';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useUNSAFE_PortalContext} from 'react-aria/PortalProvider';
 
 const ToastStateContext = createContext<ToastState<any> | null>(null);
 
diff --git a/packages/react-aria-components/src/ToggleButton.tsx b/packages/react-aria-components/src/ToggleButton.tsx
index 2f3f2fcfbb0..3ab15ed8141 100644
--- a/packages/react-aria-components/src/ToggleButton.tsx
+++ b/packages/react-aria-components/src/ToggleButton.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaToggleButtonProps, HoverEvents, mergeProps, useFocusRing, useHover, useToggleButton, useToggleButtonGroupItem} from 'react-aria';
+import {AriaToggleButtonProps} from '@react-types/button';
+
 import {ButtonRenderProps} from './Button';
 import {
   ClassNameOrFunction,
@@ -21,12 +22,18 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {forwardRefType, GlobalDOMAttributes, Key} from '@react-types/shared';
+import {HoverEvents} from '@react-types/shared';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef, useContext} from 'react';
 import {SelectionIndicatorContext} from './SelectionIndicator';
 import {ToggleGroupStateContext} from './ToggleButtonGroup';
-import {ToggleState, useToggleState} from 'react-stately';
+import {ToggleState, useToggleState} from 'react-stately/useToggleState';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useHover} from 'react-aria/useHover';
+import {useToggleButton} from 'react-aria/useToggleButton';
+import {useToggleButtonGroupItem} from 'react-aria/useToggleButtonGroup';
 
 export interface ToggleButtonRenderProps extends Omit<ButtonRenderProps, 'isPending'> {
   /**
diff --git a/packages/react-aria-components/src/ToggleButtonGroup.tsx b/packages/react-aria-components/src/ToggleButtonGroup.tsx
index 4ab077af164..7866d20fd1e 100644
--- a/packages/react-aria-components/src/ToggleButtonGroup.tsx
+++ b/packages/react-aria-components/src/ToggleButtonGroup.tsx
@@ -9,7 +9,8 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {AriaToggleButtonGroupProps, useToggleButtonGroup} from 'react-aria';
+import {AriaToggleButtonGroupProps, useToggleButtonGroup} from 'react-aria/useToggleButtonGroup';
+
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -19,11 +20,12 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {forwardRefType, GlobalDOMAttributes, Orientation} from '@react-types/shared';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef} from 'react';
 import {SharedElementTransition} from './SharedElementTransition';
-import {ToggleGroupState, useToggleGroupState} from 'react-stately';
+import {ToggleGroupState, useToggleGroupState} from 'react-stately/useToggleGroupState';
 
 export interface ToggleButtonGroupRenderProps {
   /**
diff --git a/packages/react-aria-components/src/Toolbar.tsx b/packages/react-aria-components/src/Toolbar.tsx
index 00e107edce1..50b7a474660 100644
--- a/packages/react-aria-components/src/Toolbar.tsx
+++ b/packages/react-aria-components/src/Toolbar.tsx
@@ -10,7 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaToolbarProps, useToolbar} from '@react-aria/toolbar';
+import {AriaToolbarProps, useToolbar} from 'react-aria/private/toolbar/useToolbar';
+
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -20,8 +21,9 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
 import {forwardRefType, GlobalDOMAttributes, Orientation} from '@react-types/shared';
+import {mergeProps} from 'react-aria/mergeProps';
 import React, {createContext, ForwardedRef, forwardRef} from 'react';
 
 export interface ToolbarRenderProps {
diff --git a/packages/react-aria-components/src/Tooltip.tsx b/packages/react-aria-components/src/Tooltip.tsx
index d2e88cf800b..2f0525b7297 100644
--- a/packages/react-aria-components/src/Tooltip.tsx
+++ b/packages/react-aria-components/src/Tooltip.tsx
@@ -11,7 +11,7 @@
  */
 
 import {AriaLabelingProps, FocusableElement, forwardRefType, GlobalDOMAttributes, RefObject} from '@react-types/shared';
-import {AriaPositionProps, mergeProps, OverlayContainer, Placement, PlacementAxis, PositionProps, useOverlayPosition, useTooltip, useTooltipTrigger} from 'react-aria';
+import {AriaPositionProps, useOverlayPosition} from 'react-aria/private/overlays/useOverlayPosition';
 import {
   ClassNameOrFunction,
   ContextValue,
@@ -21,11 +21,18 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
-import {filterDOMProps, useEnterAnimation, useExitAnimation} from '@react-aria/utils';
-import {FocusableProvider} from '@react-aria/focus';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {FocusableProvider} from 'react-aria/private/interactions/useFocusable';
+import {mergeProps} from 'react-aria/mergeProps';
 import {OverlayArrowContext} from './OverlayArrow';
-import {OverlayTriggerProps, TooltipTriggerProps, TooltipTriggerState, useTooltipTriggerState} from 'react-stately';
+import {OverlayContainer} from 'react-aria/private/overlays/useModal';
+import {OverlayTriggerProps} from '@react-types/overlays';
+import {Placement, PlacementAxis, PositionProps} from '@react-types/overlays';
 import React, {createContext, CSSProperties, ForwardedRef, forwardRef, JSX, ReactNode, useContext, useRef} from 'react';
+import {TooltipTriggerProps} from '@react-types/tooltip';
+import {TooltipTriggerState, useTooltipTriggerState} from 'react-stately/useTooltipTriggerState';
+import {useEnterAnimation, useExitAnimation} from 'react-aria/private/utils/animation';
+import {useTooltip, useTooltipTrigger} from 'react-aria/useTooltipTrigger';
 
 export interface TooltipTriggerComponentProps extends TooltipTriggerProps {
   children: ReactNode
diff --git a/packages/react-aria-components/src/Tree.tsx b/packages/react-aria-components/src/Tree.tsx
index 7f496078c9c..9313b79b97c 100644
--- a/packages/react-aria-components/src/Tree.tsx
+++ b/packages/react-aria-components/src/Tree.tsx
@@ -10,8 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaTreeItemOptions, AriaTreeProps, DraggableItemResult, DropIndicatorAria, DropIndicatorProps, DroppableCollectionResult, FocusScope, ListKeyboardDelegate, mergeProps, useCollator, useFocusRing,  useGridListSection, useGridListSelectionCheckbox, useHover, useId, useLocale, useTree, useTreeItem, useVisuallyHidden} from 'react-aria';
-import {BaseCollection, Collection, CollectionBuilder, CollectionNode, createBranchComponent, createLeafComponent, LoaderNode, SectionNode, useCachedChildren} from '@react-aria/collections';
+import {AriaTreeItemOptions, useTreeItem} from 'react-aria/private/tree/useTreeItem';
+
+import {AriaTreeProps, useTree} from 'react-aria/private/tree/useTree';
+import {BaseCollection, CollectionNode, LoaderNode, SectionNode} from 'react-aria/private/collections/BaseCollection';
 import {ButtonContext} from './Button';
 import {CheckboxContext} from './Checkbox';
 import {
@@ -28,18 +30,38 @@ import {
   useContextProps,
   useRenderProps
 } from './utils';
+import {Collection, CollectionBuilder, createBranchComponent, createLeafComponent} from 'react-aria/private/collections/CollectionBuilder';
 import {CollectionProps, CollectionRendererContext, DefaultCollectionRenderer, ItemRenderProps, SectionProps} from './Collection';
 import {DisabledBehavior, DragPreviewRenderer, Expandable, forwardRefType, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, MultipleSelection, PressEvents, RefObject, SelectionMode} from '@react-types/shared';
 import {DragAndDropContext, DropIndicatorContext, useDndPersistedKeys, useRenderDropIndicator} from './DragAndDrop';
 import {DragAndDropHooks} from './useDragAndDrop';
-import {DraggableCollectionState, DroppableCollectionState, Node, SelectionBehavior, TreeState, useTreeState} from 'react-stately';
-import {filterDOMProps, inertValue, LoadMoreSentinelProps, useLoadMoreSentinel, useObjectRef} from '@react-aria/utils';
+import {DraggableCollectionState} from 'react-stately/useDraggableCollectionState';
+import {DraggableItemResult} from 'react-aria/useDraggableCollection';
+import {DropIndicatorAria, DropIndicatorProps, DroppableCollectionResult} from 'react-aria/useDroppableCollection';
+import {DroppableCollectionState} from 'react-stately/useDroppableCollectionState';
+import {filterDOMProps} from 'react-aria/private/utils/filterDOMProps';
+import {FocusScope} from 'react-aria/FocusScope';
 import {GridListHeader, GridListHeaderContext, GridListHeaderInnerContext, GridListHeaderProps} from './GridList';
+import {inertValue} from 'react-aria/private/utils/inertValue';
+import {ListKeyboardDelegate} from 'react-aria/ListKeyboardDelegate';
+import {LoadMoreSentinelProps, useLoadMoreSentinel} from 'react-aria/private/utils/useLoadMoreSentinel';
+import {mergeProps} from 'react-aria/mergeProps';
+import {Node, SelectionBehavior} from '@react-types/shared';
 import React, {createContext, ForwardedRef, forwardRef, JSX, ReactNode, useContext, useEffect, useMemo, useRef, useState} from 'react';
 import {SelectionIndicatorContext} from './SelectionIndicator';
 import {SharedElementTransition} from './SharedElementTransition';
 import {TreeDropTargetDelegate} from './TreeDropTargetDelegate';
-import {useControlledState} from '@react-stately/utils';
+import {TreeState, useTreeState} from 'react-stately/useTreeState';
+import {useCachedChildren} from 'react-aria/private/collections/useCachedChildren';
+import {useCollator} from 'react-aria/useCollator';
+import {useControlledState} from 'react-stately/private/utils/useControlledState';
+import {useFocusRing} from 'react-aria/useFocusRing';
+import {useGridListSection, useGridListSelectionCheckbox} from 'react-aria/useGridList';
+import {useHover} from 'react-aria/useHover';
+import {useId} from 'react-aria/useId';
+import {useLocale} from 'react-aria/I18nProvider';
+import {useObjectRef} from 'react-aria/useObjectRef';
+import {useVisuallyHidden} from 'react-aria/VisuallyHidden';
 
 class TreeCollection<T> extends BaseCollection<T> {
   private expandedKeys: Set<Key> = new Set();
@@ -708,92 +730,90 @@ export const TreeItem = /*#__PURE__*/ createBranchComponent(TreeItemNode, <T ext
   delete DOMProps.id;
   delete DOMProps.onClick;
 
-  return (
-    <>
-      {dropIndicator && !dropIndicator.isHidden && (
-      <div
-        role="row"
-        aria-level={rowProps['aria-level']}
-        aria-expanded={rowProps['aria-expanded']}
-        aria-label={dropIndicator.dropIndicatorProps['aria-label']}>
-        <div role="gridcell" aria-colindex={1} style={{display: 'contents'}}>
-          <div role="button" {...visuallyHiddenProps} {...dropIndicator.dropIndicatorProps} ref={dropIndicatorRef} />
-          {rowProps['aria-expanded'] != null ? (
-            // Button to allow touch screen reader users to expand the item while dragging.
-            <div
-              role="button"
-              {...visuallyHiddenProps}
-              id={activateButtonId}
-              aria-label={expandButtonProps['aria-label']}
-              aria-labelledby={`${activateButtonId} ${rowProps.id}`}
-              tabIndex={-1}
-              ref={activateButtonRef} />
-          ) : null}
-        </div>
+  return (<>
+    {dropIndicator && !dropIndicator.isHidden && (
+    <div
+      role="row"
+      aria-level={rowProps['aria-level']}
+      aria-expanded={rowProps['aria-expanded']}
+      aria-label={dropIndicator.dropIndicatorProps['aria-label']}>
+      <div role="gridcell" aria-colindex={1} style={{display: 'contents'}}>
+        <div role="button" {...visuallyHiddenProps} {...dropIndicator.dropIndicatorProps} ref={dropIndicatorRef} />
+        {rowProps['aria-expanded'] != null ? (
+          // Button to allow touch screen reader users to expand the item while dragging.
+          (<div
+            role="button"
+            {...visuallyHiddenProps}
+            id={activateButtonId}
+            aria-label={expandButtonProps['aria-label']}
+            aria-labelledby={`${activateButtonId} ${rowProps.id}`}
+            tabIndex={-1}
+            ref={activateButtonRef} />)
+        ) : null}
       </div>
-    )}
-      <dom.div
-        {...mergeProps(
-          DOMProps,
-          rowProps,
-          focusProps,
-          hoverProps,
-          focusWithinProps,
-          draggableItem?.dragProps
-        )}
-        {...renderProps}
-        ref={ref}
-      // TODO: missing selectionBehavior, hasAction and allowsSelection data attribute equivalents (available in renderProps). Do we want those?
-        data-expanded={(hasChildItems && isExpanded) || undefined}
-        data-has-child-items={hasChildItems || undefined}
-        data-level={level}
-        data-selected={states.isSelected || undefined}
-        data-disabled={states.isDisabled || undefined}
-        data-hovered={isHovered || undefined}
-        data-focused={states.isFocused || undefined}
-        data-focus-visible={isFocusVisible || undefined}
-        data-pressed={states.isPressed || undefined}
-        data-selection-mode={state.selectionManager.selectionMode === 'none' ? undefined : state.selectionManager.selectionMode}
-        data-allows-dragging={!!dragState || undefined}
-        data-dragging={isDragging || undefined}
-        data-drop-target={isDropTarget || undefined}>
-        <div {...gridCellProps} style={{display: 'contents'}}>
-          <Provider
-            values={[
-              [CheckboxContext, {
-                slots: {
-                  selection: checkboxProps
-                }
-              }],
-            // TODO: support description in the tree row
-            // TODO: don't think I need to pass isExpanded to the button here since it can be sourced from the renderProps? Might be worthwhile passing it down?
-              [ButtonContext, {
-                slots: {
-                  [DEFAULT_SLOT]: {},
-                  chevron: {
-                    ...expandButtonProps,
-                    ref: expandButtonRef
-                  },
-                  drag: {
-                    ...draggableItem?.dragButtonProps,
-                    ref: dragButtonRef,
-                    style: {
-                      pointerEvents: 'none'
-                    }
+    </div>
+  )}
+    <dom.div
+      {...mergeProps(
+        DOMProps,
+        rowProps,
+        focusProps,
+        hoverProps,
+        focusWithinProps,
+        draggableItem?.dragProps
+      )}
+      {...renderProps}
+      ref={ref}
+    // TODO: missing selectionBehavior, hasAction and allowsSelection data attribute equivalents (available in renderProps). Do we want those?
+      data-expanded={(hasChildItems && isExpanded) || undefined}
+      data-has-child-items={hasChildItems || undefined}
+      data-level={level}
+      data-selected={states.isSelected || undefined}
+      data-disabled={states.isDisabled || undefined}
+      data-hovered={isHovered || undefined}
+      data-focused={states.isFocused || undefined}
+      data-focus-visible={isFocusVisible || undefined}
+      data-pressed={states.isPressed || undefined}
+      data-selection-mode={state.selectionManager.selectionMode === 'none' ? undefined : state.selectionManager.selectionMode}
+      data-allows-dragging={!!dragState || undefined}
+      data-dragging={isDragging || undefined}
+      data-drop-target={isDropTarget || undefined}>
+      <div {...gridCellProps} style={{display: 'contents'}}>
+        <Provider
+          values={[
+            [CheckboxContext, {
+              slots: {
+                selection: checkboxProps
+              }
+            }],
+          // TODO: support description in the tree row
+          // TODO: don't think I need to pass isExpanded to the button here since it can be sourced from the renderProps? Might be worthwhile passing it down?
+            [ButtonContext, {
+              slots: {
+                [DEFAULT_SLOT]: {},
+                chevron: {
+                  ...expandButtonProps,
+                  ref: expandButtonRef
+                },
+                drag: {
+                  ...draggableItem?.dragButtonProps,
+                  ref: dragButtonRef,
+                  style: {
+                    pointerEvents: 'none'
                   }
                 }
-              }],
-              [TreeItemContentContext, {
-                ...renderPropValues
-              }],
-            [SelectionIndicatorContext, {isSelected: states.isSelected}]
-            ]}>
-            {children}
-          </Provider>
-        </div>
-      </dom.div>
-    </>
-  );
+              }
+            }],
+            [TreeItemContentContext, {
+              ...renderPropValues
+            }],
+          [SelectionIndicatorContext, {isSelected: states.isSelected}]
+          ]}>
+          {children}
+        </Provider>
+      </div>
+    </dom.div>
+  </>);
 });
 
 export interface TreeLoadMoreItemRenderProps {
diff --git a/packages/react-aria-components/src/Virtualizer.tsx b/packages/react-aria-components/src/Virtualizer.tsx
index 1a38e8adbf1..16a02297c53 100644
--- a/packages/react-aria-components/src/Virtualizer.tsx
+++ b/packages/react-aria-components/src/Virtualizer.tsx
@@ -12,9 +12,12 @@
 
 import {CollectionBranchProps, CollectionRenderer, CollectionRendererContext, CollectionRootProps, renderAfterDropIndicators} from './Collection';
 import {DropTargetDelegate, ItemDropTarget, Node} from '@react-types/shared';
-import {Layout, ReusableView, useVirtualizerState, VirtualizerState} from '@react-stately/virtualizer';
+import {Layout} from 'react-stately/private/virtualizer/Layout';
 import React, {createContext, JSX, ReactNode, useContext, useMemo} from 'react';
-import {useScrollView, VirtualizerItem} from '@react-aria/virtualizer';
+import {ReusableView} from 'react-stately/private/virtualizer/ReusableView';
+import {useScrollView} from 'react-aria/private/virtualizer/ScrollView';
+import {useVirtualizerState, VirtualizerState} from 'react-stately/private/virtualizer/useVirtualizerState';
+import {VirtualizerItem} from 'react-aria/private/virtualizer/VirtualizerItem';
 
 type View = ReusableView<Node<unknown>, ReactNode>;
 
diff --git a/packages/react-aria-components/src/useDragAndDrop.tsx b/packages/react-aria-components/src/useDragAndDrop.tsx
index eb9ed06c294..94b3a8ce2f8 100644
--- a/packages/react-aria-components/src/useDragAndDrop.tsx
+++ b/packages/react-aria-components/src/useDragAndDrop.tsx
@@ -12,36 +12,43 @@
 
 import {
   DropIndicatorProps as AriaDropIndicatorProps,
-  DraggableCollectionOptions,
-  DraggableItemProps,
-  DraggableItemResult,
-  DragItem,
-  DragPreview,
   DropIndicatorAria,
   DroppableCollectionOptions,
   DroppableCollectionResult,
   DroppableItemOptions,
   DroppableItemResult,
-  DropTarget,
-  DropTargetDelegate,
-  ListDropTargetDelegate,
-  useDraggableCollection,
-  useDraggableItem,
   useDropIndicator,
   useDroppableCollection,
   useDroppableItem
-} from 'react-aria';
+} from 'react-aria/useDroppableCollection';
+
+import {
+  DraggableCollectionOptions,
+  DraggableItemProps,
+  DraggableItemResult,
+  useDraggableCollection,
+  useDraggableItem
+} from 'react-aria/useDraggableCollection';
+
 import {DraggableCollectionProps, DroppableCollectionProps, Key, RefObject} from '@react-types/shared';
 import {
   DraggableCollectionState,
   DraggableCollectionStateOptions,
+  useDraggableCollectionState
+} from 'react-stately/useDraggableCollectionState';
+import {DragItem, DropTarget, DropTargetDelegate} from '@react-types/shared';
+import {DragPreview} from 'react-aria/DragPreview';
+
+import {
   DroppableCollectionState,
   DroppableCollectionStateOptions,
-  useDraggableCollectionState,
   useDroppableCollectionState
-} from 'react-stately';
-import {isVirtualDragging} from '@react-aria/dnd';
+} from 'react-stately/useDroppableCollectionState';
+
+import {isVirtualDragging} from 'react-aria/private/dnd/DragManager';
+
 import {JSX, useMemo} from 'react';
+import {ListDropTargetDelegate} from 'react-aria/ListDropTargetDelegate';
 
 export {DropIndicator, DropIndicatorContext, DragAndDropContext} from './DragAndDrop';
 export type {DropIndicatorProps, DropIndicatorRenderProps} from './DragAndDrop';
diff --git a/packages/react-aria-components/src/utils.tsx b/packages/react-aria-components/src/utils.tsx
index d2743dd3a5a..9dfff7dd2f9 100644
--- a/packages/react-aria-components/src/utils.tsx
+++ b/packages/react-aria-components/src/utils.tsx
@@ -11,8 +11,11 @@
  */
 
 import {AriaLabelingProps, RefObject,  DOMProps as SharedDOMProps} from '@react-types/shared';
-import {mergeProps, mergeRefs, useLayoutEffect, useObjectRef} from '@react-aria/utils';
+import {mergeProps} from 'react-aria/mergeProps';
+import {mergeRefs} from 'react-aria/private/utils/mergeRefs';
 import React, {AllHTMLAttributes, AnchorHTMLAttributes, Context, CSSProperties, DetailedHTMLProps, ForwardedRef, forwardRef, JSX, ReactElement, ReactNode, RefCallback, useCallback, useContext, useMemo, useRef, useState} from 'react';
+import {useLayoutEffect} from 'react-aria/private/utils/useLayoutEffect';
+import {useObjectRef} from 'react-aria/useObjectRef';
 
 export const DEFAULT_SLOT = Symbol('default');
 
@@ -284,7 +287,7 @@ export interface DOMRenderProps<E extends keyof React.JSX.IntrinsicElements, T>
 }
 
 // Makes `href` required in AnchorHTMLAttributes
-type LinkWithRequiredHref = Required<Pick<AnchorHTMLAttributes<HTMLAnchorElement>, 'href'>> & Omit<AnchorHTMLAttributes<HTMLAnchorElement>, 'href'>; 
+type LinkWithRequiredHref = Required<Pick<AnchorHTMLAttributes<HTMLAnchorElement>, 'href'>> & Omit<AnchorHTMLAttributes<HTMLAnchorElement>, 'href'>;
 
 // Same as DOMRenderProps but specific for the case where the element could be a 'a' or 'div' element.
 export interface PossibleLinkDOMRenderProps<Fallback extends keyof React.JSX.IntrinsicElements, T> {
diff --git a/packages/react-aria-components/stories/Autocomplete.stories.tsx b/packages/react-aria-components/stories/Autocomplete.stories.tsx
index 5bc6de445fe..416a62f72bd 100644
--- a/packages/react-aria-components/stories/Autocomplete.stories.tsx
+++ b/packages/react-aria-components/stories/Autocomplete.stories.tsx
@@ -11,18 +11,43 @@
  */
 
 import {action} from 'storybook/actions';
-import {Autocomplete, Button, Cell, Collection, Column, DialogTrigger, GridList, GridListHeader, GridListSection, Header, Input, Keyboard, Label, ListBox, ListBoxSection, ListLayout, Menu, MenuItem, MenuSection, MenuTrigger, OverlayArrow, Popover, Row, SearchField, Select, SelectValue, Separator, SubmenuTrigger, Table, TableBody, TableHeader, TableLayout, TagGroup, TagList, Text, TextArea, TextField, Tooltip, TooltipTrigger, Virtualizer} from 'react-aria-components';
+import {Autocomplete} from '../src/Autocomplete';
+import {Button} from '../src/Button';
+import {Cell, Column, Row, Table, TableBody, TableHeader, TableLayout} from '../src/Table';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {DialogTrigger} from '../src/Dialog';
+import {GridList, GridListHeader, GridListSection} from '../src/GridList';
+import {Header} from '../src/Header';
+import {Input} from '../src/Input';
+import {Keyboard} from '../src/Keyboard';
+import {Label} from '../src/Label';
+import {ListBox, ListBoxSection} from '../src/ListBox';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
 import {LoadingSpinner, MyListBoxItem, MyMenuItem} from './utils';
+import {Menu, MenuItem, MenuSection, MenuTrigger, SubmenuTrigger} from '../src/Menu';
 import {Meta, StoryObj} from '@storybook/react';
 import {MyCheckbox} from './Table.stories';
 import {MyGridListItem} from './GridList.stories';
 import {MyListBoxLoaderIndicator} from './ListBox.stories';
 import {MyTag} from './TagGroup.stories';
 import {Node} from '@react-types/shared';
+import {OverlayArrow} from '../src/OverlayArrow';
+import {Popover} from '../src/Popover';
 import React, {useState} from 'react';
+import {SearchField} from '../src/SearchField';
+import {Select, SelectValue} from '../src/Select';
+import {Separator} from '../src/Separator';
 import styles from '../example/index.css';
-import {useAsyncList, useListData, useTreeData} from 'react-stately';
-import {useFilter} from 'react-aria';
+import {TagGroup, TagList} from '../src/TagGroup';
+import {Text} from '../src/Text';
+import {TextArea} from '../src/TextArea';
+import {TextField} from '../src/TextField';
+import {Tooltip, TooltipTrigger} from '../src/Tooltip';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useFilter} from 'react-aria/useFilter';
+import {useListData} from 'react-stately/useListData';
+import {useTreeData} from 'react-stately/useTreeData';
+import {Virtualizer} from '../src/Virtualizer';
 import './styles.css';
 
 export default {
@@ -1243,4 +1268,4 @@ export function AutocompleteGrid() {
       </div>
     </AutocompleteWrapper>
   );
-};
+}
diff --git a/packages/react-aria-components/stories/Breadcrumbs.stories.tsx b/packages/react-aria-components/stories/Breadcrumbs.stories.tsx
index a89d7e1d642..d9e0e19cb05 100644
--- a/packages/react-aria-components/stories/Breadcrumbs.stories.tsx
+++ b/packages/react-aria-components/stories/Breadcrumbs.stories.tsx
@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {Breadcrumb, Breadcrumbs, Link} from 'react-aria-components';
+import {Breadcrumb, Breadcrumbs} from '../src/Breadcrumbs';
+
+import {Link} from '../src/Link';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 import './styles.css';
diff --git a/packages/react-aria-components/stories/Button.stories.tsx b/packages/react-aria-components/stories/Button.stories.tsx
index 1c75275562e..a3e7df7b98b 100644
--- a/packages/react-aria-components/stories/Button.stories.tsx
+++ b/packages/react-aria-components/stories/Button.stories.tsx
@@ -11,12 +11,15 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button, ProgressBar, Text, Tooltip, TooltipTrigger} from 'react-aria-components';
-import {mergeProps} from '@react-aria/utils';
+import {Button} from '../src/Button';
+import {mergeProps} from 'react-aria/mergeProps';
 import {Meta, StoryObj} from '@storybook/react';
+import {ProgressBar} from '../src/ProgressBar';
 import React, {useEffect, useRef, useState} from 'react';
 import * as styles from './button-ripple.css';
 import * as styles2 from './button-pending.css';
+import {Text} from '../src/Text';
+import {Tooltip, TooltipTrigger} from '../src/Tooltip';
 import './styles.css';
 
 export default {
diff --git a/packages/react-aria-components/stories/Calendar.stories.tsx b/packages/react-aria-components/stories/Calendar.stories.tsx
index 4b8b44f484b..172f15e7d8a 100644
--- a/packages/react-aria-components/stories/Calendar.stories.tsx
+++ b/packages/react-aria-components/stories/Calendar.stories.tsx
@@ -10,19 +10,21 @@
  * governing permissions and limitations under the License.
  */
 
+import {Button} from '../src/Button';
+
 import {
-  Button,
   Calendar,
   CalendarCell,
   CalendarGrid,
   CalendarProps,
   CalendarStateContext,
-  DateValue,
-  Heading,
-  I18nProvider,
   RangeCalendar
-} from 'react-aria-components';
+} from '../src/Calendar';
+
 import {CalendarDate, parseDate} from '@internationalized/date';
+import {DateValue} from '@react-types/datepicker';
+import {Heading} from '../src/Heading';
+import {I18nProvider} from 'react-aria/I18nProvider';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {useContext} from 'react';
 import './styles.css';
@@ -116,7 +118,7 @@ function CalendarMultiMonthExample(args) {
       </Calendar>
     </>
   );
-};
+}
 
 export const CalendarMultiMonth: CalendarStory = {
   render: (args) => <CalendarMultiMonthExample {...args} />,
diff --git a/packages/react-aria-components/stories/Checkbox.stories.tsx b/packages/react-aria-components/stories/Checkbox.stories.tsx
index f69cce428c8..09265696602 100644
--- a/packages/react-aria-components/stories/Checkbox.stories.tsx
+++ b/packages/react-aria-components/stories/Checkbox.stories.tsx
@@ -1,5 +1,5 @@
 import {action} from 'storybook/actions';
-import {Checkbox} from 'react-aria-components';
+import {Checkbox} from '../src/Checkbox';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 import './styles.css';
diff --git a/packages/react-aria-components/stories/CheckboxGroup.stories.tsx b/packages/react-aria-components/stories/CheckboxGroup.stories.tsx
index 65146a03420..110add598b0 100644
--- a/packages/react-aria-components/stories/CheckboxGroup.stories.tsx
+++ b/packages/react-aria-components/stories/CheckboxGroup.stories.tsx
@@ -1,4 +1,8 @@
-import {Button, Checkbox, CheckboxGroup, FieldError, Form, Label} from 'react-aria-components';
+import {Button} from '../src/Button';
+import {Checkbox, CheckboxGroup} from '../src/Checkbox';
+import {FieldError} from '../src/FieldError';
+import {Form} from '../src/Form';
+import {Label} from '../src/Label';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 import './styles.css';
diff --git a/packages/react-aria-components/stories/ColorArea.stories.tsx b/packages/react-aria-components/stories/ColorArea.stories.tsx
index 0aa6953646c..8be8a0d2494 100644
--- a/packages/react-aria-components/stories/ColorArea.stories.tsx
+++ b/packages/react-aria-components/stories/ColorArea.stories.tsx
@@ -10,10 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorArea, ColorAreaProps, ColorThumb} from '../src';
+import {ColorArea, ColorAreaProps} from '../src/ColorArea';
+
 import {ColorSliderExampleRender} from './ColorSlider.stories';
+import {ColorThumb} from '../src/ColorThumb';
 import {Meta, StoryObj} from '@storybook/react';
-import {parseColor} from 'react-stately';
+import {parseColor} from 'react-stately/Color';
 import React, {JSX, useState} from 'react';
 import './styles.css';
 
diff --git a/packages/react-aria-components/stories/ColorField.stories.tsx b/packages/react-aria-components/stories/ColorField.stories.tsx
index 9bd747e12ee..342f03e0a5b 100644
--- a/packages/react-aria-components/stories/ColorField.stories.tsx
+++ b/packages/react-aria-components/stories/ColorField.stories.tsx
@@ -10,7 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorField, ColorFieldProps, FieldError, Input, Label} from 'react-aria-components';
+import {ColorField, ColorFieldProps} from '../src/ColorField';
+
+import {FieldError} from '../src/FieldError';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
 import './styles.css';
@@ -30,7 +34,6 @@ export default {
   component: ColorField
 } as Meta<typeof ColorField>;
 
-;
 export type ColorFieldStory = StoryObj<(props: ColorFieldProps & {label: string}) => ReturnType<typeof ColorField>>;
 
 export const ColorFieldExample: ColorFieldStory = {
diff --git a/packages/react-aria-components/stories/ColorPicker.stories.tsx b/packages/react-aria-components/stories/ColorPicker.stories.tsx
index 7a2deda7698..a37e9d5ab02 100644
--- a/packages/react-aria-components/stories/ColorPicker.stories.tsx
+++ b/packages/react-aria-components/stories/ColorPicker.stories.tsx
@@ -10,13 +10,21 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, ColorSpace, ColorSwatchPicker, ColorSwatchPickerItem, Dialog, DialogTrigger, getColorChannels, Input, Label, Popover} from '../src';
+import {Button} from '../src/Button';
+
 import {ColorAreaExampleRender} from './ColorArea.stories';
 import {ColorField} from '../src/ColorField';
 import {ColorPicker} from '../src/ColorPicker';
 import {ColorSliderExampleRender} from './ColorSlider.stories';
+import {ColorSpace} from '@react-types/color';
 import {ColorSwatchExampleRender} from './ColorSwatch.stories';
+import {ColorSwatchPicker, ColorSwatchPickerItem} from '../src/ColorSwatchPicker';
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {getColorChannels} from 'react-stately/Color';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
 import {Meta, StoryObj} from '@storybook/react';
+import {Popover} from '../src/Popover';
 import React, {useState} from 'react';
 import './styles.css';
 
diff --git a/packages/react-aria-components/stories/ColorSlider.stories.tsx b/packages/react-aria-components/stories/ColorSlider.stories.tsx
index c19c283b3c2..421a196dda5 100644
--- a/packages/react-aria-components/stories/ColorSlider.stories.tsx
+++ b/packages/react-aria-components/stories/ColorSlider.stories.tsx
@@ -10,9 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorSlider, ColorSliderProps, ColorThumb, Label, SliderOutput, SliderTrack} from '../src';
+import {ColorSlider, ColorSliderProps} from '../src/ColorSlider';
+
+import {ColorThumb} from '../src/ColorThumb';
+import {Label} from '../src/Label';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
+import {SliderOutput, SliderTrack} from '../src/Slider';
 import './styles.css';
 
 export default {
diff --git a/packages/react-aria-components/stories/ColorWheel.stories.tsx b/packages/react-aria-components/stories/ColorWheel.stories.tsx
index ddd7c363710..25a4b1ef54e 100644
--- a/packages/react-aria-components/stories/ColorWheel.stories.tsx
+++ b/packages/react-aria-components/stories/ColorWheel.stories.tsx
@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorThumb, ColorWheel, ColorWheelTrack} from '../src';
+import {ColorThumb} from '../src/ColorThumb';
+
+import {ColorWheel, ColorWheelTrack} from '../src/ColorWheel';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import './styles.css';
diff --git a/packages/react-aria-components/stories/ComboBox.stories.tsx b/packages/react-aria-components/stories/ComboBox.stories.tsx
index 9c256300c77..1455964dfb6 100644
--- a/packages/react-aria-components/stories/ComboBox.stories.tsx
+++ b/packages/react-aria-components/stories/ComboBox.stories.tsx
@@ -10,14 +10,24 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Collection, ComboBox, ComboBoxProps, ComboBoxStateContext, Input, Label, ListBox, ListLayout, Popover, useFilter, Virtualizer} from 'react-aria-components';
+import {Button} from '../src/Button';
+
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {ComboBox, ComboBoxProps, ComboBoxStateContext} from '../src/ComboBox';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
+import {ListBox} from '../src/ListBox';
 import {ListBoxLoadMoreItem} from '../src/ListBox';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
 import {LoadingSpinner, MyListBoxItem} from './utils';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
+import {Popover} from '../src/Popover';
 import React, {JSX, useMemo, useState} from 'react';
 import styles from '../example/index.css';
 import {Tag, TagGroup} from 'vanilla-starter/TagGroup';
-import {useAsyncList} from 'react-stately';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useFilter} from 'react-aria/useFilter';
+import {Virtualizer} from '../src/Virtualizer';
 import './styles.css';
 
 export default {
diff --git a/packages/react-aria-components/stories/ComboBoxReproductions.stories.tsx b/packages/react-aria-components/stories/ComboBoxReproductions.stories.tsx
index aed40b26e98..373e74ba207 100644
--- a/packages/react-aria-components/stories/ComboBoxReproductions.stories.tsx
+++ b/packages/react-aria-components/stories/ComboBoxReproductions.stories.tsx
@@ -10,8 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, ComboBox, Input, Label, ListBox, ListBoxItem, Popover} from 'react-aria-components';
+import {Button} from '../src/Button';
+
+import {ComboBox} from '../src/ComboBox';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
+import {ListBox, ListBoxItem} from '../src/ListBox';
 import {Meta, StoryFn} from '@storybook/react';
+import {Popover} from '../src/Popover';
 import React from 'react';
 import './combobox-reproductions.css';
 import './styles.css';
diff --git a/packages/react-aria-components/stories/DateField.stories.tsx b/packages/react-aria-components/stories/DateField.stories.tsx
index 6cb6b6f4e0b..eac8d6cde07 100644
--- a/packages/react-aria-components/stories/DateField.stories.tsx
+++ b/packages/react-aria-components/stories/DateField.stories.tsx
@@ -11,12 +11,18 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button, DateField, DateInput, DateSegment, FieldError, Form, Input, Label, TextField} from 'react-aria-components';
+import {Button} from '../src/Button';
 import clsx from 'clsx';
+import {DateField, DateInput, DateSegment} from '../src/DateField';
+import {FieldError} from '../src/FieldError';
+import {Form} from '../src/Form';
 import {fromAbsolute, getLocalTimeZone, parseAbsoluteToLocal} from '@internationalized/date';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import styles from '../example/index.css';
+import {TextField} from '../src/TextField';
 import './styles.css';
 
 export default {
diff --git a/packages/react-aria-components/stories/DatePicker.stories.tsx b/packages/react-aria-components/stories/DatePicker.stories.tsx
index 3e76edc909d..f2674f42260 100644
--- a/packages/react-aria-components/stories/DatePicker.stories.tsx
+++ b/packages/react-aria-components/stories/DatePicker.stories.tsx
@@ -11,12 +11,23 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button, Calendar, CalendarCell, CalendarGrid, DateInput, DatePicker, DateRangePicker, DateSegment, Dialog, Form, Group, Heading, Input, Label, Popover, RangeCalendar, TextField} from 'react-aria-components';
+import {Button} from '../src/Button';
+import {Calendar, CalendarCell, CalendarGrid, RangeCalendar} from '../src/Calendar';
 import clsx from 'clsx';
+import {DateInput, DateSegment} from '../src/DateField';
+import {DatePicker, DateRangePicker} from '../src/DatePicker';
+import {Dialog} from '../src/Dialog';
+import {Form} from '../src/Form';
+import {Group} from '../src/Group';
+import {Heading} from '../src/Heading';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
 import {Meta, StoryFn} from '@storybook/react';
 import {parseAbsoluteToLocal} from '@internationalized/date';
+import {Popover} from '../src/Popover';
 import React from 'react';
 import styles from '../example/index.css';
+import {TextField} from '../src/TextField';
 import './styles.css';
 
 export default {
diff --git a/packages/react-aria-components/stories/Disclosure.stories.tsx b/packages/react-aria-components/stories/Disclosure.stories.tsx
index 5a5444452f6..8b41a8c7ec5 100644
--- a/packages/react-aria-components/stories/Disclosure.stories.tsx
+++ b/packages/react-aria-components/stories/Disclosure.stories.tsx
@@ -10,8 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Heading} from 'react-aria-components';
+import {Button} from '../src/Button';
+
 import {Disclosure, DisclosurePanel} from '../src/Disclosure';
+import {Heading} from '../src/Heading';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import './styles.css';
diff --git a/packages/react-aria-components/stories/DisclosureGroup.stories.tsx b/packages/react-aria-components/stories/DisclosureGroup.stories.tsx
index 5d4a19b3ee1..193bee487a3 100644
--- a/packages/react-aria-components/stories/DisclosureGroup.stories.tsx
+++ b/packages/react-aria-components/stories/DisclosureGroup.stories.tsx
@@ -10,12 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Heading} from 'react-aria-components';
+import {Button} from '../src/Button';
+
 import {
   Disclosure,
   DisclosureGroup,
   DisclosurePanel
 } from '../src/Disclosure';
+import {Heading} from '../src/Heading';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import './styles.css';
diff --git a/packages/react-aria-components/stories/Dropzone.stories.tsx b/packages/react-aria-components/stories/Dropzone.stories.tsx
index b8d0e80321f..8a8c2fc0bf9 100644
--- a/packages/react-aria-components/stories/Dropzone.stories.tsx
+++ b/packages/react-aria-components/stories/Dropzone.stories.tsx
@@ -11,12 +11,20 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button, DropZone, FileTrigger, Link, Text, useDrag} from 'react-aria-components';
-import {classNames} from '@react-spectrum/utils';
-import {FocusRing, mergeProps, useButton, useClipboard} from 'react-aria';
+import {Button} from '../src/Button';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
+import {DropZone} from '../src/DropZone';
+import {FileTrigger} from '../src/FileTrigger';
+import {FocusRing} from 'react-aria/FocusRing';
+import {Link} from '../src/Link';
+import {mergeProps} from 'react-aria/mergeProps';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
 import React, {useRef} from 'react';
 import styles from '../example/index.css';
+import {Text} from '../src/Text';
+import {useButton} from 'react-aria/useButton';
+import {useClipboard} from 'react-aria/useClipboard';
+import {useDrag} from 'react-aria/useDrag';
 import './styles.css';
 
 export default {
diff --git a/packages/react-aria-components/stories/FileTrigger.stories.tsx b/packages/react-aria-components/stories/FileTrigger.stories.tsx
index 8beaff7fe4a..37ffd3c153e 100644
--- a/packages/react-aria-components/stories/FileTrigger.stories.tsx
+++ b/packages/react-aria-components/stories/FileTrigger.stories.tsx
@@ -11,7 +11,9 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button, FileTrigger, Link} from 'react-aria-components';
+import {Button} from '../src/Button';
+import {FileTrigger} from '../src/FileTrigger';
+import {Link} from '../src/Link';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import './styles.css';
diff --git a/packages/react-aria-components/stories/Form.stories.tsx b/packages/react-aria-components/stories/Form.stories.tsx
index fffcb9cc3c2..7531f0995ca 100644
--- a/packages/react-aria-components/stories/Form.stories.tsx
+++ b/packages/react-aria-components/stories/Form.stories.tsx
@@ -11,9 +11,16 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button, Form, Input, Label, ListBox, ListBoxItem, Popover, Select, SelectValue, TextField} from 'react-aria-components';
+import {Button} from '../src/Button';
+import {Form} from '../src/Form';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
+import {ListBox, ListBoxItem} from '../src/ListBox';
 import {Meta, StoryFn} from '@storybook/react';
+import {Popover} from '../src/Popover';
 import React from 'react';
+import {Select, SelectValue} from '../src/Select';
+import {TextField} from '../src/TextField';
 import './styles.css';
 
 export default {
diff --git a/packages/react-aria-components/stories/GridList.stories.tsx b/packages/react-aria-components/stories/GridList.stories.tsx
index 75addc2c794..6371620d332 100644
--- a/packages/react-aria-components/stories/GridList.stories.tsx
+++ b/packages/react-aria-components/stories/GridList.stories.tsx
@@ -11,45 +11,42 @@
  */
 
 import {action} from 'storybook/actions';
+import {Button} from '../src/Button';
+import {Checkbox, CheckboxProps} from '../src/Checkbox';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {DropIndicator, useDragAndDrop} from '../src/useDragAndDrop';
+
+import {GridLayout} from 'react-stately/private/layout/GridLayout';
+
 import {
-  Button,
-  Checkbox,
-  CheckboxProps,
-  Collection,
-  Dialog,
-  DialogTrigger,
-  DropIndicator,
-  GridLayout,
   GridList,
   GridListHeader,
   GridListItem,
   GridListItemProps,
   GridListLoadMoreItem,
   GridListProps,
-  GridListSection,
-  Heading,
-  ListLayout,
-  Modal,
-  ModalOverlay,
-  ModalOverlayProps,
-  Popover,
-  Size,
-  Tag,
-  TagGroup,
-  TagList,
-  Text,
-  useDragAndDrop,
-  Virtualizer,
-  WaterfallLayout
-} from 'react-aria-components';
-import {classNames} from '@react-spectrum/utils';
-import {Key, useAsyncList, useListData} from 'react-stately';
+  GridListSection
+} from '../src/GridList';
+import {Heading} from '../src/Heading';
+import {Key} from '@react-types/shared';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
 import {LoadingSpinner} from './utils';
+import {LoadingState} from '@react-types/shared';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
+import {Modal, ModalOverlay, ModalOverlayProps} from '../src/Modal';
+import {Popover} from '../src/Popover';
 import React, {JSX, useState} from 'react';
+import {Size} from 'react-stately/private/virtualizer/Size';
 import styles from '../example/index.css';
+import {Tag, TagGroup, TagList} from '../src/TagGroup';
+import {Text} from '../src/Text';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useListData} from 'react-stately/useListData';
+import {Virtualizer} from '../src/Virtualizer';
+import {WaterfallLayout} from 'react-stately/private/layout/WaterfallLayout';
 import './styles.css';
-import {LoadingState} from '@react-types/shared';
 
 export default {
   title: 'React Aria Components/GridList',
@@ -489,7 +486,7 @@ function AsyncGridListVirtualizedRender(props: {delay: number}): JSX.Element {
       </GridList>
     </Virtualizer>
   );
-};
+}
 
 export let AsyncGridListVirtualized: StoryObj<typeof AsyncGridListVirtualizedRender> = {
   render: (args) => <AsyncGridListVirtualizedRender {...args} />,
diff --git a/packages/react-aria-components/stories/Link.stories.tsx b/packages/react-aria-components/stories/Link.stories.tsx
index c02a8dbc699..58180a4c4e5 100644
--- a/packages/react-aria-components/stories/Link.stories.tsx
+++ b/packages/react-aria-components/stories/Link.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Link} from 'react-aria-components';
+import {Link} from '../src/Link';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import './styles.css';
diff --git a/packages/react-aria-components/stories/ListBox.stories.tsx b/packages/react-aria-components/stories/ListBox.stories.tsx
index 8566f284bdd..f0673a51ed2 100644
--- a/packages/react-aria-components/stories/ListBox.stories.tsx
+++ b/packages/react-aria-components/stories/ListBox.stories.tsx
@@ -11,15 +11,26 @@
  */
 
 import {action} from 'storybook/actions';
-import {Collection, DragAndDropHooks, DropIndicator, GridLayout, Header, isTextDropItem, ListBox, ListBoxItem, ListBoxProps, ListBoxSection, ListLayout, Separator, Text, useDragAndDrop, Virtualizer, WaterfallLayout} from 'react-aria-components';
-import {ListBoxLoadMoreItem} from '../';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {DragAndDropHooks, DropIndicator, useDragAndDrop} from '../src/useDragAndDrop';
+import {GridLayout} from 'react-stately/private/layout/GridLayout';
+import {Header} from '../src/Header';
+import {isTextDropItem} from 'react-aria/private/dnd/utils';
+import {ListBox, ListBoxItem, ListBoxProps, ListBoxSection} from '../src/ListBox';
+import {ListBoxLoadMoreItem} from '../src/ListBox';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
 import {LoadingSpinner, MyListBoxItem} from './utils';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
 import React, {JSX, useState} from 'react';
-import {Size} from '@react-stately/virtualizer';
+import {Separator} from '../src/Separator';
+import {Size} from 'react-stately/private/virtualizer/Size';
 import styles from '../example/index.css';
+import {Text} from '../src/Text';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useListData} from 'react-stately/useListData';
+import {Virtualizer} from '../src/Virtualizer';
+import {WaterfallLayout} from 'react-stately/private/layout/WaterfallLayout';
 import './styles.css';
-import {useAsyncList, useListData} from 'react-stately';
 
 export default {
   title: 'React Aria Components/ListBox',
@@ -668,7 +679,7 @@ function AsyncListBoxRender(args: {delay: number, orientation: 'horizontal' | 'v
       <MyListBoxLoaderIndicator orientation={args.orientation} isLoading={list.loadingState === 'loadingMore'} onLoadMore={list.loadMore} />
     </ListBox>
   );
-};
+}
 
 export const AsyncListBox: StoryObj<typeof AsyncListBoxRender> = {
   render: (args) => <AsyncListBoxRender {...args} />,
diff --git a/packages/react-aria-components/stories/Menu.stories.tsx b/packages/react-aria-components/stories/Menu.stories.tsx
index f9d8d75b0b1..6462adb0169 100644
--- a/packages/react-aria-components/stories/Menu.stories.tsx
+++ b/packages/react-aria-components/stories/Menu.stories.tsx
@@ -11,13 +11,35 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button, Header, Heading, Input, Keyboard, Label, ListLayout, Menu, MenuItem, MenuItemProps, MenuSection, MenuTrigger, Popover, Separator, SubmenuTrigger, SubmenuTriggerProps, Text, TextField, Virtualizer} from 'react-aria-components';
-import {classNames} from '@react-spectrum/utils';
-import {mergeProps} from 'react-aria';
+import {Button} from '../src/Button';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
+import {Header} from '../src/Header';
+import {Heading} from '../src/Heading';
+import {Input} from '../src/Input';
+import {Keyboard} from '../src/Keyboard';
+import {Label} from '../src/Label';
+
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
+
+import {
+  Menu,
+  MenuItem,
+  MenuItemProps,
+  MenuSection,
+  MenuTrigger,
+  SubmenuTrigger,
+  SubmenuTriggerProps
+} from '../src/Menu';
+import {mergeProps} from 'react-aria/mergeProps';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
 import {MyMenuItem} from './utils';
+import {Popover} from '../src/Popover';
 import React, {createContext, JSX, ReactElement, useContext} from 'react';
+import {Separator} from '../src/Separator';
 import styles from '../example/index.css';
+import {Text} from '../src/Text';
+import {TextField} from '../src/TextField';
+import {Virtualizer} from '../src/Virtualizer';
 import './styles.css';
 
 export default {
diff --git a/packages/react-aria-components/stories/Meter.stories.tsx b/packages/react-aria-components/stories/Meter.stories.tsx
index b4b8e7193b8..f9e2c0810af 100644
--- a/packages/react-aria-components/stories/Meter.stories.tsx
+++ b/packages/react-aria-components/stories/Meter.stories.tsx
@@ -10,8 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {Label, Meter} from 'react-aria-components';
+import {Label} from '../src/Label';
+
 import {Meta, StoryFn} from '@storybook/react';
+import {Meter} from '../src/Meter';
 import React from 'react';
 import './styles.css';
 
diff --git a/packages/react-aria-components/stories/Modal.stories.tsx b/packages/react-aria-components/stories/Modal.stories.tsx
index 00193de3407..0bb9dd808df 100644
--- a/packages/react-aria-components/stories/Modal.stories.tsx
+++ b/packages/react-aria-components/stories/Modal.stories.tsx
@@ -10,13 +10,23 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, ComboBox, Dialog, DialogTrigger, Heading, Input, Label, ListBox, Modal, ModalOverlay, Popover, TextField} from 'react-aria-components';
-import {Meta, StoryFn} from '@storybook/react';
-import React from 'react';
-import './styles.css';
+import {Button} from '../src/Button';
+
+import {ComboBox} from '../src/ComboBox';
 import {DateRangePickerExample} from './DatePicker.stories';
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {Heading} from '../src/Heading';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
+import {ListBox} from '../src/ListBox';
+import {Meta, StoryFn} from '@storybook/react';
+import {Modal, ModalOverlay} from '../src/Modal';
 import {MyListBoxItem} from './utils';
+import {Popover} from '../src/Popover';
+import React from 'react';
 import styles from '../example/index.css';
+import {TextField} from '../src/TextField';
+import './styles.css';
 
 
 export default {
diff --git a/packages/react-aria-components/stories/NumberField.stories.tsx b/packages/react-aria-components/stories/NumberField.stories.tsx
index 93d0a94ce62..fcab4ef1134 100644
--- a/packages/react-aria-components/stories/NumberField.stories.tsx
+++ b/packages/react-aria-components/stories/NumberField.stories.tsx
@@ -10,8 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, FieldError, Group, Input, Label, NumberField, NumberFieldProps} from 'react-aria-components';
+import {Button} from '../src/Button';
+
+import {FieldError} from '../src/FieldError';
+import {Group} from '../src/Group';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
 import {Meta, StoryObj} from '@storybook/react';
+import {NumberField, NumberFieldProps} from '../src/NumberField';
 import React, {useState} from 'react';
 import './styles.css';
 
diff --git a/packages/react-aria-components/stories/Popover.stories.tsx b/packages/react-aria-components/stories/Popover.stories.tsx
index 74850fe79e8..40bb543b5f4 100644
--- a/packages/react-aria-components/stories/Popover.stories.tsx
+++ b/packages/react-aria-components/stories/Popover.stories.tsx
@@ -10,8 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Dialog, DialogTrigger, Heading, OverlayArrow, Popover} from 'react-aria-components';
+import {Button} from '../src/Button';
+
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {Heading} from '../src/Heading';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
+import {OverlayArrow} from '../src/OverlayArrow';
+import {Popover} from '../src/Popover';
 import React, {JSX, useEffect, useRef, useState} from 'react';
 import styles from './styles.css';
 
diff --git a/packages/react-aria-components/stories/ProgressBar.stories.tsx b/packages/react-aria-components/stories/ProgressBar.stories.tsx
index 771e1a5caa7..2477155175f 100644
--- a/packages/react-aria-components/stories/ProgressBar.stories.tsx
+++ b/packages/react-aria-components/stories/ProgressBar.stories.tsx
@@ -10,8 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {Label, ProgressBar} from 'react-aria-components';
+import {Label} from '../src/Label';
+
 import {Meta, StoryFn} from '@storybook/react';
+import {ProgressBar} from '../src/ProgressBar';
 import React from 'react';
 import './styles.css';
 
diff --git a/packages/react-aria-components/stories/RadioGroup.stories.tsx b/packages/react-aria-components/stories/RadioGroup.stories.tsx
index 8238c6f6749..dc9b3049e33 100644
--- a/packages/react-aria-components/stories/RadioGroup.stories.tsx
+++ b/packages/react-aria-components/stories/RadioGroup.stories.tsx
@@ -11,8 +11,14 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button, Dialog, DialogTrigger, FieldError, Form, Label, Modal, ModalOverlay, Radio, RadioGroup} from 'react-aria-components';
+import {Button} from '../src/Button';
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {FieldError} from '../src/FieldError';
+import {Form} from '../src/Form';
+import {Label} from '../src/Label';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
+import {Modal, ModalOverlay} from '../src/Modal';
+import {Radio, RadioGroup} from '../src/RadioGroup';
 import React, {useState} from 'react';
 import styles from '../example/index.css';
 import './styles.css';
diff --git a/packages/react-aria-components/stories/SearchField.stories.tsx b/packages/react-aria-components/stories/SearchField.stories.tsx
index 716b99c5acf..7bb51e259d9 100644
--- a/packages/react-aria-components/stories/SearchField.stories.tsx
+++ b/packages/react-aria-components/stories/SearchField.stories.tsx
@@ -10,10 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Input, Label, SearchField} from 'react-aria-components';
-import {classNames} from '@react-spectrum/utils';
+import {Button} from '../src/Button';
+
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
+import {SearchField} from '../src/SearchField';
 import styles from '../example/index.css';
 import './styles.css';
 
diff --git a/packages/react-aria-components/stories/Select.stories.tsx b/packages/react-aria-components/stories/Select.stories.tsx
index c71374de62e..9bb655ad82f 100644
--- a/packages/react-aria-components/stories/Select.stories.tsx
+++ b/packages/react-aria-components/stories/Select.stories.tsx
@@ -10,14 +10,27 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Collection, FieldError, Form, Input, Label, ListBox, ListLayout, OverlayArrow, Popover, Select, SelectValue, TextField, Virtualizer} from 'react-aria-components';
+import {Button} from '../src/Button';
+
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {FieldError} from '../src/FieldError';
+import {Form} from '../src/Form';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
+import {ListBox} from '../src/ListBox';
 import {ListBoxLoadMoreItem} from '../src/ListBox';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
 import {LoadingSpinner, MyListBoxItem} from './utils';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
+import {OverlayArrow} from '../src/OverlayArrow';
+import {Popover} from '../src/Popover';
 import React, {JSX} from 'react';
+import {Select, SelectValue} from '../src/Select';
 import styles from '../example/index.css';
 import {Tag, TagGroup} from 'vanilla-starter/TagGroup';
-import {useAsyncList} from 'react-stately';
+import {TextField} from '../src/TextField';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {Virtualizer} from '../src/Virtualizer';
 import './styles.css';
 
 export default {
@@ -282,7 +295,7 @@ function AsyncVirtualizedCollectionRenderSelectRender(args: {delay: number}): JS
       </Virtualizer>
     </Select>
   );
-};
+}
 
 export const AsyncVirtualizedCollectionRenderSelect: StoryObj<typeof AsyncVirtualizedCollectionRenderSelectRender> = {
   render: (args) => <AsyncVirtualizedCollectionRenderSelectRender {...args} />,
diff --git a/packages/react-aria-components/stories/Slider.stories.tsx b/packages/react-aria-components/stories/Slider.stories.tsx
index c862b775574..c569dbe8e25 100644
--- a/packages/react-aria-components/stories/Slider.stories.tsx
+++ b/packages/react-aria-components/stories/Slider.stories.tsx
@@ -10,9 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {Label, Slider, SliderOutput, SliderThumb, SliderTrack} from 'react-aria-components';
+import {Label} from '../src/Label';
+
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
+import {Slider, SliderOutput, SliderThumb, SliderTrack} from '../src/Slider';
 import styles from '../example/index.css';
 import './styles.css';
 
diff --git a/packages/react-aria-components/stories/Switch.stories.tsx b/packages/react-aria-components/stories/Switch.stories.tsx
index ff4374ac552..6c1884c729a 100644
--- a/packages/react-aria-components/stories/Switch.stories.tsx
+++ b/packages/react-aria-components/stories/Switch.stories.tsx
@@ -10,11 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import styles from '../example/index.css';
-import {Switch} from 'react-aria-components';
+import {Switch} from '../src/Switch';
 import './styles.css';
 
 export default {
diff --git a/packages/react-aria-components/stories/Table.stories.tsx b/packages/react-aria-components/stories/Table.stories.tsx
index 34c9651f8d8..c2adff124d7 100644
--- a/packages/react-aria-components/stories/Table.stories.tsx
+++ b/packages/react-aria-components/stories/Table.stories.tsx
@@ -11,14 +11,39 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button, Cell, Checkbox, CheckboxProps, Collection, Column, ColumnProps, ColumnResizer, Dialog, DialogTrigger, DropIndicator, Heading, Menu, MenuTrigger, Modal, ModalOverlay, Popover, ResizableTableContainer, Row, Table, TableBody, TableHeader, TableLayout, useDragAndDrop, Virtualizer} from 'react-aria-components';
+import {Button} from '../src/Button';
+
+import {
+  Cell,
+  Column,
+  ColumnProps,
+  ColumnResizer,
+  ResizableTableContainer,
+  Row,
+  Table,
+  TableBody,
+  TableHeader,
+  TableLayout
+} from '../src/Table';
+
 import {CellProps, TableLoadMoreItem} from '../src/Table';
-import {isTextDropItem} from 'react-aria';
+import {Checkbox, CheckboxProps} from '../src/Checkbox';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {DropIndicator, useDragAndDrop} from '../src/useDragAndDrop';
+import {Heading} from '../src/Heading';
+import {isTextDropItem} from 'react-aria/private/dnd/utils';
 import {LoadingSpinner, MyMenuItem} from './utils';
+import {Menu, MenuTrigger} from '../src/Menu';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
+import {Modal, ModalOverlay} from '../src/Modal';
+import {Popover} from '../src/Popover';
 import React, {JSX, startTransition, Suspense, useState} from 'react';
-import {Selection, useAsyncList, useListData} from 'react-stately';
+import {Selection} from '@react-types/shared';
 import styles from '../example/index.css';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useListData} from 'react-stately/useListData';
+import {Virtualizer} from '../src/Virtualizer';
 import './styles.css';
 
 export default {
@@ -474,7 +499,7 @@ function DndTableRender(props: DndTableProps): JSX.Element {
       </TableBody>
     </Table>
   );
-};
+}
 
 export const DndTable: StoryFn<typeof DndTableRender> = (props) => {
   return (
@@ -517,7 +542,7 @@ function DndTableExampleRender(props: DndTableExampleProps): JSX.Element {
         isDisabled={props.isDisabledSecondTable} />
     </div>
   );
-};
+}
 
 export const DndTableExample: StoryFn<typeof DndTableExampleRender> = (props) => {
   return <DndTableExampleRender {...props} />;
@@ -631,9 +656,9 @@ const MyTableLoadingIndicator = (props) => {
     // These styles will make the load more spinner sticky. A user would know if their table is virtualized and thus could control this styling if they wanted to
     // TODO: this doesn't work because the virtualizer wrapper around the table body has overflow: hidden. Perhaps could change this by extending the table layout and
     // making the layoutInfo for the table body have allowOverflow
-    <TableLoadMoreItem style={{height: 30, width: tableWidth}} {...otherProps}>
+    (<TableLoadMoreItem style={{height: 30, width: tableWidth}} {...otherProps}>
       <LoadingSpinner style={{height: 20, position: 'unset'}} />
-    </TableLoadMoreItem>
+    </TableLoadMoreItem>)
   );
 };
 
diff --git a/packages/react-aria-components/stories/Tabs.stories.tsx b/packages/react-aria-components/stories/Tabs.stories.tsx
index ab298d29521..5fc0e28a955 100644
--- a/packages/react-aria-components/stories/Tabs.stories.tsx
+++ b/packages/react-aria-components/stories/Tabs.stories.tsx
@@ -10,11 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, OverlayArrow, Tab, TabList, TabPanel, TabProps, Tabs, Tooltip, TooltipTrigger} from 'react-aria-components';
+import {Button} from '../src/Button';
+
 import {Meta, StoryFn} from '@storybook/react';
-import {Orientation} from 'react-aria';
+import {Orientation} from '@react-types/shared';
+import {OverlayArrow} from '../src/OverlayArrow';
 import React, {useState} from 'react';
-import {RouterProvider} from '@react-aria/utils';
+import {RouterProvider} from 'react-aria/private/utils/openLink';
+import {Tab, TabList, TabPanel, TabProps, Tabs} from '../src/Tabs';
+import {Tooltip, TooltipTrigger} from '../src/Tooltip';
 import './styles.css';
 
 export default {
diff --git a/packages/react-aria-components/stories/TagGroup.stories.tsx b/packages/react-aria-components/stories/TagGroup.stories.tsx
index 892baa17856..474337d9beb 100644
--- a/packages/react-aria-components/stories/TagGroup.stories.tsx
+++ b/packages/react-aria-components/stories/TagGroup.stories.tsx
@@ -11,9 +11,13 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button, Label, OverlayArrow, Tag, TagGroup, TagGroupProps, TagList, TagProps, Tooltip, TooltipTrigger} from 'react-aria-components';
+import {Button} from '../src/Button';
+import {Label} from '../src/Label';
 import {Meta, StoryObj} from '@storybook/react';
+import {OverlayArrow} from '../src/OverlayArrow';
 import React from 'react';
+import {Tag, TagGroup, TagGroupProps, TagList, TagProps} from '../src/TagGroup';
+import {Tooltip, TooltipTrigger} from '../src/Tooltip';
 import './styles.css';
 
 const meta: Meta<typeof TagGroup> = {
diff --git a/packages/react-aria-components/stories/TextField.stories.tsx b/packages/react-aria-components/stories/TextField.stories.tsx
index 3d56f10e81e..e2a225417b6 100644
--- a/packages/react-aria-components/stories/TextField.stories.tsx
+++ b/packages/react-aria-components/stories/TextField.stories.tsx
@@ -10,11 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, FieldError, Form, Input, Label, TextField} from 'react-aria-components';
-import {classNames} from '@react-spectrum/utils';
+import {Button} from '../src/Button';
+
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
+import {FieldError} from '../src/FieldError';
+import {Form} from '../src/Form';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import styles from '../example/index.css';
+import {TextField} from '../src/TextField';
 import './styles.css';
 
 export default {
diff --git a/packages/react-aria-components/stories/TimeField.stories.tsx b/packages/react-aria-components/stories/TimeField.stories.tsx
index 593f94660ff..bf6917294e2 100644
--- a/packages/react-aria-components/stories/TimeField.stories.tsx
+++ b/packages/react-aria-components/stories/TimeField.stories.tsx
@@ -11,7 +11,8 @@
  */
 
 import clsx from 'clsx';
-import {DateInput, DateSegment, Label, TimeField} from 'react-aria-components';
+import {DateInput, DateSegment, TimeField} from '../src/DateField';
+import {Label} from '../src/Label';
 import {Meta, StoryFn} from '@storybook/react';
 import React from 'react';
 import styles from '../example/index.css';
diff --git a/packages/react-aria-components/stories/ToggleButton.stories.tsx b/packages/react-aria-components/stories/ToggleButton.stories.tsx
index 75994a0210a..d05c1c3874d 100644
--- a/packages/react-aria-components/stories/ToggleButton.stories.tsx
+++ b/packages/react-aria-components/stories/ToggleButton.stories.tsx
@@ -11,11 +11,11 @@
  */
 
 import {action} from 'storybook/actions';
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
 import {Meta, StoryFn} from '@storybook/react';
 import React, {useState} from 'react';
 import styles from '../example/index.css';
-import {ToggleButton} from 'react-aria-components';
+import {ToggleButton} from '../src/ToggleButton';
 import './styles.css';
 
 export default {
diff --git a/packages/react-aria-components/stories/Toolbar.stories.tsx b/packages/react-aria-components/stories/Toolbar.stories.tsx
index 16c28536a5a..f5b65921df0 100644
--- a/packages/react-aria-components/stories/Toolbar.stories.tsx
+++ b/packages/react-aria-components/stories/Toolbar.stories.tsx
@@ -10,13 +10,24 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, Checkbox, Group, Label, Link, ListBox, Popover, Select, SelectValue, Separator, ToggleButton, Toolbar, ToolbarProps} from 'react-aria-components';
-import {classNames} from '@react-spectrum/utils';
+import {Button} from '../src/Button';
+
+import {Checkbox} from '../src/Checkbox';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
+import {Group} from '../src/Group';
+import {Label} from '../src/Label';
+import {Link} from '../src/Link';
+import {ListBox} from '../src/ListBox';
 import {Meta, StoryObj} from '@storybook/react';
 import {MyListBoxItem} from './utils';
-import {Orientation} from 'react-stately';
+import {Orientation} from '@react-types/shared';
+import {Popover} from '../src/Popover';
 import React from 'react';
+import {Select, SelectValue} from '../src/Select';
+import {Separator} from '../src/Separator';
 import styles from '../example/index.css';
+import {ToggleButton} from '../src/ToggleButton';
+import {Toolbar, ToolbarProps} from '../src/Toolbar';
 import './styles.css';
 
 export default {
diff --git a/packages/react-aria-components/stories/Tooltip.stories.tsx b/packages/react-aria-components/stories/Tooltip.stories.tsx
index ebdd45e08b9..b71a38ccd69 100644
--- a/packages/react-aria-components/stories/Tooltip.stories.tsx
+++ b/packages/react-aria-components/stories/Tooltip.stories.tsx
@@ -10,10 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {Button, OverlayArrow, Tooltip, TooltipTrigger} from 'react-aria-components';
+import {Button} from '../src/Button';
+
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
+import {OverlayArrow} from '../src/OverlayArrow';
 import React, {JSX} from 'react';
 import styles from './styles.css';
+import {Tooltip, TooltipTrigger} from '../src/Tooltip';
 
 export default {
   title: 'React Aria Components/Tooltip',
diff --git a/packages/react-aria-components/stories/Tree.stories.tsx b/packages/react-aria-components/stories/Tree.stories.tsx
index afd5fe163f6..e631efc19a4 100644
--- a/packages/react-aria-components/stories/Tree.stories.tsx
+++ b/packages/react-aria-components/stories/Tree.stories.tsx
@@ -11,14 +11,37 @@
  */
 
 import {action} from 'storybook/actions';
-import {Button, Checkbox, CheckboxProps, Collection, DroppableCollectionReorderEvent, isTextDropItem, Key, ListLayout, Menu, MenuTrigger, Popover, Text, Tree, TreeHeader, TreeItem, TreeItemContent, TreeItemProps, TreeProps, TreeSection, useDragAndDrop, Virtualizer} from 'react-aria-components';
-import {classNames} from '@react-spectrum/utils';
+import {Button} from '../src/Button';
+import {Checkbox, CheckboxProps} from '../src/Checkbox';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {DroppableCollectionReorderEvent, Key} from '@react-types/shared';
+import {isTextDropItem} from 'react-aria/private/dnd/utils';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
+import {Menu, MenuTrigger} from '../src/Menu';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
+
 import {MyMenuItem} from './utils';
+
+import {Popover} from '../src/Popover';
 import React, {JSX, ReactNode, useCallback, useState} from 'react';
 import styles from '../example/index.css';
+import {Text} from '../src/Text';
+import {
+  Tree,
+  TreeHeader,
+  TreeItem,
+  TreeItemContent,
+  TreeItemProps,
+  TreeProps,
+  TreeSection
+} from '../src/Tree';
 import {TreeLoadMoreItem} from '../src/Tree';
-import {useAsyncList, useListData, useTreeData} from '@react-stately/data';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useDragAndDrop} from '../src/useDragAndDrop';
+import {useListData} from 'react-stately/useListData';
+import {useTreeData} from 'react-stately/useTreeData';
+import {Virtualizer} from '../src/Virtualizer';
 import './styles.css';
 
 export default {
diff --git a/packages/react-aria-components/stories/animations.stories.tsx b/packages/react-aria-components/stories/animations.stories.tsx
index b08fa420cda..45fb89189b8 100644
--- a/packages/react-aria-components/stories/animations.stories.tsx
+++ b/packages/react-aria-components/stories/animations.stories.tsx
@@ -1,12 +1,8 @@
 
-import {
-  Button,
-  Dialog,
-  DialogTrigger,
-  Heading,
-  Modal,
-  ModalOverlay
-} from 'react-aria-components';
+import {Button} from '../src/Button';
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {Heading} from '../src/Heading';
+import {Modal, ModalOverlay} from '../src/Modal';
 import React from 'react';
 import styles from './styles.css';
 
diff --git a/packages/react-aria-components/stories/utils.tsx b/packages/react-aria-components/stories/utils.tsx
index d5a7439afa9..7a13297df64 100644
--- a/packages/react-aria-components/stories/utils.tsx
+++ b/packages/react-aria-components/stories/utils.tsx
@@ -1,5 +1,7 @@
-import {classNames} from '@react-spectrum/utils';
-import {ListBoxItem, ListBoxItemProps, MenuItem, MenuItemProps, ProgressBar} from 'react-aria-components';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
+import {ListBoxItem, ListBoxItemProps} from '../src/ListBox';
+import {MenuItem, MenuItemProps} from '../src/Menu';
+import {ProgressBar} from '../src/ProgressBar';
 import React, {JSX} from 'react';
 import styles from '../example/index.css';
 
diff --git a/packages/react-aria-components/test/Autocomplete.test.tsx b/packages/react-aria-components/test/Autocomplete.test.tsx
index e30cee9a5f1..0f4c067a222 100644
--- a/packages/react-aria-components/test/Autocomplete.test.tsx
+++ b/packages/react-aria-components/test/Autocomplete.test.tsx
@@ -13,10 +13,30 @@
 import './installPointerEvent';
 import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
 import {AriaAutocompleteTests} from './AriaAutocomplete.test-util';
-import {Autocomplete, Breadcrumb, Breadcrumbs, Button, Cell, Collection, Column, Dialog, DialogTrigger, GridList, GridListItem, Header, Input, Label, ListBox, ListBoxItem, ListBoxLoadMoreItem, ListBoxSection, Menu, MenuItem, MenuSection, Popover, Row, SearchField, Select, SelectValue, Separator, SubmenuTrigger, Tab, Table, TableBody, TableHeader, TabList, TabPanel, Tabs, Tag, TagGroup, TagList, Text, TextField, Tree, TreeItem, TreeItemContent} from '..';
+import {Autocomplete} from '../src/Autocomplete';
+import {Breadcrumb, Breadcrumbs} from '../src/Breadcrumbs';
+import {Button} from '../src/Button';
+import {Cell, Column, Row, Table, TableBody, TableHeader} from '../src/Table';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {GridList, GridListItem} from '../src/GridList';
+import {Header} from '../src/Header';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
+import {ListBox, ListBoxItem, ListBoxLoadMoreItem, ListBoxSection} from '../src/ListBox';
+import {Menu, MenuItem, MenuSection, SubmenuTrigger} from '../src/Menu';
+import {Popover} from '../src/Popover';
 import React, {ReactNode, useState} from 'react';
-import {useAsyncList} from 'react-stately';
-import {useFilter} from '@react-aria/i18n';
+import {SearchField} from '../src/SearchField';
+import {Select, SelectValue} from '../src/Select';
+import {Separator} from '../src/Separator';
+import {Tab, TabList, TabPanel, Tabs} from '../src/Tabs';
+import {Tag, TagGroup, TagList} from '../src/TagGroup';
+import {Text} from '../src/Text';
+import {TextField} from '../src/TextField';
+import {Tree, TreeItem, TreeItemContent} from '../src/Tree';
+import {useAsyncList} from 'react-stately/useAsyncList';
+import {useFilter} from 'react-aria/useFilter';
 import userEvent from '@testing-library/user-event';
 
 interface AutocompleteItem {
diff --git a/packages/react-aria-components/test/Breadcrumbs.test.js b/packages/react-aria-components/test/Breadcrumbs.test.js
index 4c4cc513f2e..575c8d56926 100644
--- a/packages/react-aria-components/test/Breadcrumbs.test.js
+++ b/packages/react-aria-components/test/Breadcrumbs.test.js
@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {Breadcrumb, Breadcrumbs, BreadcrumbsContext, Link} from 'react-aria-components';
+import {Breadcrumb, Breadcrumbs, BreadcrumbsContext} from '../src/Breadcrumbs';
+
+import {Link} from '../src/Link';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/react-aria-components/test/Button.test.js b/packages/react-aria-components/test/Button.test.js
index cc5daf4dfdd..5496bd695ae 100644
--- a/packages/react-aria-components/test/Button.test.js
+++ b/packages/react-aria-components/test/Button.test.js
@@ -11,8 +11,13 @@
  */
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Button, ButtonContext, Dialog, DialogTrigger, Heading, Modal, ProgressBar, Text} from '../';
+import {Button, ButtonContext} from '../src/Button';
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {Heading} from '../src/Heading';
+import {Modal} from '../src/Modal';
+import {ProgressBar} from '../src/ProgressBar';
 import React, {useState} from 'react';
+import {Text} from '../src/Text';
 import userEvent from '@testing-library/user-event';
 
 describe('Button', () => {
@@ -348,7 +353,7 @@ describe('Button', () => {
       let [pending, setPending] = useState(false);
       return (
         // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
-        <form
+        (<form
           onSubmit={(e) => {
             // forms are submitted implicitly on keydown, so we need to wait to set pending until after to set pending
             props.onSubmit(e);
@@ -379,7 +384,7 @@ describe('Button', () => {
               </>
             )}
           </Button>
-        </form>
+        </form>)
       );
     }
     render(
diff --git a/packages/react-aria-components/test/Calendar.test.js b/packages/react-aria-components/test/Calendar.test.js
index d5b67877557..470965baf2c 100644
--- a/packages/react-aria-components/test/Calendar.test.js
+++ b/packages/react-aria-components/test/Calendar.test.js
@@ -11,8 +11,21 @@
  */
 
 import {act, fireEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Button, ButtonContext, Calendar, CalendarCell, CalendarContext, CalendarGrid, CalendarGridBody, CalendarGridHeader, CalendarHeaderCell, CalendarStateContext, Heading} from 'react-aria-components';
+import {Button, ButtonContext} from '../src/Button';
+
+import {
+  Calendar,
+  CalendarCell,
+  CalendarContext,
+  CalendarGrid,
+  CalendarGridBody,
+  CalendarGridHeader,
+  CalendarHeaderCell,
+  CalendarStateContext
+} from '../src/Calendar';
+
 import {CalendarDate, getLocalTimeZone, startOfMonth, startOfWeek, today} from '@internationalized/date';
+import {Heading} from '../src/Heading';
 import React, {useContext} from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-aria-components/test/Checkbox.test.js b/packages/react-aria-components/test/Checkbox.test.js
index 63915cbdef0..35abb978759 100644
--- a/packages/react-aria-components/test/Checkbox.test.js
+++ b/packages/react-aria-components/test/Checkbox.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Checkbox, CheckboxContext} from '../';
+import {Checkbox, CheckboxContext} from '../src/Checkbox';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/react-aria-components/test/CheckboxGroup.test.js b/packages/react-aria-components/test/CheckboxGroup.test.js
index 08e7f32a2d1..15772d39ed6 100644
--- a/packages/react-aria-components/test/CheckboxGroup.test.js
+++ b/packages/react-aria-components/test/CheckboxGroup.test.js
@@ -11,8 +11,11 @@
  */
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Checkbox, CheckboxGroup, CheckboxGroupContext, FieldError, Label, Text} from '../';
+import {Checkbox, CheckboxGroup, CheckboxGroupContext} from '../src/Checkbox';
+import {FieldError} from '../src/FieldError';
+import {Label} from '../src/Label';
 import React from 'react';
+import {Text} from '../src/Text';
 import userEvent from '@testing-library/user-event';
 
 let TestCheckboxGroup = ({groupProps, checkboxProps}) => (
diff --git a/packages/react-aria-components/test/ColorArea.test.js b/packages/react-aria-components/test/ColorArea.test.js
index fea07c1b127..1d5ddc0bbf8 100644
--- a/packages/react-aria-components/test/ColorArea.test.js
+++ b/packages/react-aria-components/test/ColorArea.test.js
@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorArea, ColorAreaContext, ColorThumb} from '../';
+import {ColorArea, ColorAreaContext} from '../src/ColorArea';
+
+import {ColorThumb} from '../src/ColorThumb';
 import {fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/react-aria-components/test/ColorField.test.js b/packages/react-aria-components/test/ColorField.test.js
index 64cfae5555d..40e28129f0c 100644
--- a/packages/react-aria-components/test/ColorField.test.js
+++ b/packages/react-aria-components/test/ColorField.test.js
@@ -11,8 +11,13 @@
  */
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {ColorField, ColorFieldContext, FieldError, Input, Label, parseColor, Text} from '../';
+import {ColorField, ColorFieldContext} from '../src/ColorField';
+import {FieldError} from '../src/FieldError';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
+import {parseColor} from 'react-stately/Color';
 import React from 'react';
+import {Text} from '../src/Text';
 import userEvent from '@testing-library/user-event';
 
 let TestColorField = (props) => (
diff --git a/packages/react-aria-components/test/ColorPicker.test.js b/packages/react-aria-components/test/ColorPicker.test.js
index 1d4cf2a18e1..beac6f805f8 100644
--- a/packages/react-aria-components/test/ColorPicker.test.js
+++ b/packages/react-aria-components/test/ColorPicker.test.js
@@ -11,8 +11,15 @@
  */
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {ColorArea, ColorField, ColorPicker, ColorSlider, ColorSwatch, ColorThumb, Input, SliderTrack} from '../src';
+import {ColorArea} from '../src/ColorArea';
+import {ColorField} from '../src/ColorField';
+import {ColorPicker} from '../src/ColorPicker';
+import {ColorSlider} from '../src/ColorSlider';
+import {ColorSwatch} from '../src/ColorSwatch';
+import {ColorThumb} from '../src/ColorThumb';
+import {Input} from '../src/Input';
 import React from 'react';
+import {SliderTrack} from '../src/Slider';
 import userEvent from '@testing-library/user-event';
 
 describe('ColorPicker', function () {
diff --git a/packages/react-aria-components/test/ColorSlider.test.js b/packages/react-aria-components/test/ColorSlider.test.js
index cdafe86cc7d..5b6e84420d2 100644
--- a/packages/react-aria-components/test/ColorSlider.test.js
+++ b/packages/react-aria-components/test/ColorSlider.test.js
@@ -10,9 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorSlider, ColorSliderContext, ColorThumb, Label, SliderOutput, SliderTrack} from '../';
+import {ColorSlider, ColorSliderContext} from '../src/ColorSlider';
+
+import {ColorThumb} from '../src/ColorThumb';
 import {fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
+import {Label} from '../src/Label';
 import React from 'react';
+import {SliderOutput, SliderTrack} from '../src/Slider';
 import userEvent from '@testing-library/user-event';
 
 let TestColorSlider = ({sliderProps, thumbProps, trackProps, outputProps}) => (
diff --git a/packages/react-aria-components/test/ColorSwatch.test.js b/packages/react-aria-components/test/ColorSwatch.test.js
index 2ec3354334e..bad4c1b4668 100644
--- a/packages/react-aria-components/test/ColorSwatch.test.js
+++ b/packages/react-aria-components/test/ColorSwatch.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorSwatch, ColorSwatchContext} from '../';
+import {ColorSwatch, ColorSwatchContext} from '../src/ColorSwatch';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/react-aria-components/test/ColorSwatchPicker.test.js b/packages/react-aria-components/test/ColorSwatchPicker.test.js
index 277e892ec57..ee800430758 100644
--- a/packages/react-aria-components/test/ColorSwatchPicker.test.js
+++ b/packages/react-aria-components/test/ColorSwatchPicker.test.js
@@ -10,7 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorSwatch, ColorSwatchPicker, ColorSwatchPickerItem, parseColor} from '../src';
+import {ColorSwatch} from '../src/ColorSwatch';
+
+import {ColorSwatchPicker, ColorSwatchPickerItem} from '../src/ColorSwatchPicker';
+import {parseColor} from 'react-stately/Color';
 import {pointerMap, render, within} from '@react-spectrum/test-utils-internal';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/react-aria-components/test/ColorWheel.test.js b/packages/react-aria-components/test/ColorWheel.test.js
index f5ae2a78bfb..d79a0e97e96 100644
--- a/packages/react-aria-components/test/ColorWheel.test.js
+++ b/packages/react-aria-components/test/ColorWheel.test.js
@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {ColorThumb, ColorWheel, ColorWheelContext} from '../';
+import {ColorThumb} from '../src/ColorThumb';
+
+import {ColorWheel, ColorWheelContext} from '../src/ColorWheel';
 import {fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/react-aria-components/test/ComboBox.test.js b/packages/react-aria-components/test/ComboBox.test.js
index f84db0b02e9..e67c5f99634 100644
--- a/packages/react-aria-components/test/ComboBox.test.js
+++ b/packages/react-aria-components/test/ComboBox.test.js
@@ -11,11 +11,22 @@
  */
 
 import {act} from '@testing-library/react';
-import {Button, ComboBox, ComboBoxContext, ComboBoxValue, FieldError, Form, Header, Input, Label, ListBox, ListBoxItem, ListBoxLoadMoreItem, ListBoxSection, ListLayout, Popover, Text, Virtualizer} from '../';
+import {Button} from '../src/Button';
+import {ComboBox, ComboBoxContext, ComboBoxValue} from '../src/ComboBox';
+import {FieldError} from '../src/FieldError';
 import {fireEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
+import {Form} from '../src/Form';
+import {Header} from '../src/Header';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
+import {ListBox, ListBoxItem, ListBoxLoadMoreItem, ListBoxSection} from '../src/ListBox';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
+import {Popover} from '../src/Popover';
 import React, {useState} from 'react';
+import {Text} from '../src/Text';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
+import {Virtualizer} from '../src/Virtualizer';
 
 let renderEmptyState = () => {
   return  (
diff --git a/packages/react-aria-components/test/DateField.test.js b/packages/react-aria-components/test/DateField.test.js
index f4dce014307..ee37826279b 100644
--- a/packages/react-aria-components/test/DateField.test.js
+++ b/packages/react-aria-components/test/DateField.test.js
@@ -12,8 +12,12 @@
 
 import {act, installPointerEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
 import {CalendarDate} from '@internationalized/date';
-import {DateField, DateFieldContext, DateInput, DateSegment, FieldError, I18nProvider, Label, Text} from '../';
+import {DateField, DateFieldContext, DateInput, DateSegment} from '../src/DateField';
+import {FieldError} from '../src/FieldError';
+import {I18nProvider} from 'react-aria/I18nProvider';
+import {Label} from '../src/Label';
 import React from 'react';
+import {Text} from '../src/Text';
 import userEvent from '@testing-library/user-event';
 
 describe('DateField', () => {
diff --git a/packages/react-aria-components/test/DatePicker.test.js b/packages/react-aria-components/test/DatePicker.test.js
index 80b0b15e2b5..5182c99221d 100644
--- a/packages/react-aria-components/test/DatePicker.test.js
+++ b/packages/react-aria-components/test/DatePicker.test.js
@@ -11,9 +11,19 @@
  */
 
 import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Button, Calendar, CalendarCell, CalendarGrid, DateInput, DatePicker, DatePickerContext, DateSegment, Dialog, FieldError, Group, Heading, Label, Popover, Text} from 'react-aria-components';
+import {Button} from '../src/Button';
+import {Calendar, CalendarCell, CalendarGrid} from '../src/Calendar';
 import {CalendarDate} from '@internationalized/date';
+import {DateInput, DateSegment} from '../src/DateField';
+import {DatePicker, DatePickerContext} from '../src/DatePicker';
+import {Dialog} from '../src/Dialog';
+import {FieldError} from '../src/FieldError';
+import {Group} from '../src/Group';
+import {Heading} from '../src/Heading';
+import {Label} from '../src/Label';
+import {Popover} from '../src/Popover';
 import React from 'react';
+import {Text} from '../src/Text';
 import userEvent from '@testing-library/user-event';
 
 let TestDatePicker = (props) => (
diff --git a/packages/react-aria-components/test/DateRangePicker.test.js b/packages/react-aria-components/test/DateRangePicker.test.js
index 50c05e0af3c..91ccb3746f7 100644
--- a/packages/react-aria-components/test/DateRangePicker.test.js
+++ b/packages/react-aria-components/test/DateRangePicker.test.js
@@ -11,25 +11,19 @@
  */
 
 import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {
-  Button,
-  CalendarCell,
-  CalendarGrid,
-  DateInput,
-  DateRangePicker,
-  DateRangePickerContext,
-  DateSegment,
-  Dialog,
-  FieldError,
-  Group,
-  Heading,
-  Label,
-  Popover,
-  RangeCalendar,
-  Text
-} from 'react-aria-components';
+import {Button} from '../src/Button';
+import {CalendarCell, CalendarGrid, RangeCalendar} from '../src/Calendar';
 import {CalendarDate} from '@internationalized/date';
+import {DateInput, DateSegment} from '../src/DateField';
+import {DateRangePicker, DateRangePickerContext} from '../src/DatePicker';
+import {Dialog} from '../src/Dialog';
+import {FieldError} from '../src/FieldError';
+import {Group} from '../src/Group';
+import {Heading} from '../src/Heading';
+import {Label} from '../src/Label';
+import {Popover} from '../src/Popover';
 import React from 'react';
+import {Text} from '../src/Text';
 import userEvent from '@testing-library/user-event';
 
 let TestDateRangePicker = (props) => (
diff --git a/packages/react-aria-components/test/Dialog.test.js b/packages/react-aria-components/test/Dialog.test.js
index b9c57dc9940..69375f92fd3 100644
--- a/packages/react-aria-components/test/Dialog.test.js
+++ b/packages/react-aria-components/test/Dialog.test.js
@@ -11,26 +11,20 @@
  */
 
 import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {
-  Button,
-  Dialog,
-  DialogTrigger,
-  Heading,
-  Input,
-  Label,
-  Menu,
-  MenuItem,
-  MenuTrigger,
-  Modal,
-  ModalOverlay,
-  OverlayArrow,
-  Popover,
-  TextField
-} from '../';
+import {Button} from '../src/Button';
 import {composeStories} from '@storybook/react';
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {Heading} from '../src/Heading';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
+import {Menu, MenuItem, MenuTrigger} from '../src/Menu';
+import {Modal, ModalOverlay} from '../src/Modal';
+import {OverlayArrow} from '../src/OverlayArrow';
+import {Popover} from '../src/Popover';
 import React, {useRef} from 'react';
 import * as stories from '../stories/Modal.stories';
-import {UNSAFE_PortalProvider} from '@react-aria/overlays';
+import {TextField} from '../src/TextField';
+import {UNSAFE_PortalProvider} from 'react-aria/PortalProvider';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-aria-components/test/Disclosure.test.js b/packages/react-aria-components/test/Disclosure.test.js
index f4d9e96e950..073f8ce7866 100644
--- a/packages/react-aria-components/test/Disclosure.test.js
+++ b/packages/react-aria-components/test/Disclosure.test.js
@@ -10,17 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  Button,
-  Disclosure,
-  DisclosureGroup,
-  DisclosurePanel,
-  Heading,
-  Menu,
-  MenuItem,
-  MenuTrigger,
-  Popover
-} from 'react-aria-components';
+import {Button} from '../src/Button';
+
+import {Disclosure, DisclosureGroup, DisclosurePanel} from '../src/Disclosure';
+import {Heading} from '../src/Heading';
+import {Menu, MenuItem, MenuTrigger} from '../src/Menu';
+import {Popover} from '../src/Popover';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/react-aria-components/test/DropZone.test.js b/packages/react-aria-components/test/DropZone.test.js
index c7bea0b5525..46a5c3885a7 100644
--- a/packages/react-aria-components/test/DropZone.test.js
+++ b/packages/react-aria-components/test/DropZone.test.js
@@ -11,10 +11,14 @@
  */
 
 import {act, fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Button, DropZone, DropZoneContext, FileTrigger, Link, Text} from '../';
-import {ClipboardEvent, DataTransfer, DataTransferItem, DragEvent} from '@react-aria/dnd/test/mocks';
-import {Draggable} from '@react-aria/dnd/test/examples';
+import {Button} from '../src/Button';
+import {ClipboardEvent, DataTransfer, DataTransferItem, DragEvent} from 'react-aria/test/dnd/mocks';
+import {Draggable} from 'react-aria/test/dnd/examples';
+import {DropZone, DropZoneContext} from '../src/DropZone';
+import {FileTrigger} from '../src/FileTrigger';
+import {Link} from '../src/Link';
 import React from 'react';
+import {Text} from '../src/Text';
 import userEvent from '@testing-library/user-event';
 
 describe('DropZone', () => {
diff --git a/packages/react-aria-components/test/FileTrigger.test.js b/packages/react-aria-components/test/FileTrigger.test.js
index 0e2fb63a583..35a0054db85 100644
--- a/packages/react-aria-components/test/FileTrigger.test.js
+++ b/packages/react-aria-components/test/FileTrigger.test.js
@@ -9,7 +9,10 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {Button, FileTrigger, Link} from '../';
+import {Button} from '../src/Button';
+
+import {FileTrigger} from '../src/FileTrigger';
+import {Link} from '../src/Link';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/react-aria-components/test/Form.test.js b/packages/react-aria-components/test/Form.test.js
index b2b931f2e11..bc8d01d9bf0 100644
--- a/packages/react-aria-components/test/Form.test.js
+++ b/packages/react-aria-components/test/Form.test.js
@@ -11,8 +11,13 @@
  */
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Button, FieldError, Form, Input, Label, TextField} from '../';
+import {Button} from '../src/Button';
+import {FieldError} from '../src/FieldError';
+import {Form} from '../src/Form';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
 import React from 'react';
+import {TextField} from '../src/TextField';
 import userEvent from '@testing-library/user-event';
 
 describe('Form', () => {
diff --git a/packages/react-aria-components/test/GridList.test.js b/packages/react-aria-components/test/GridList.test.js
index 515536d0e90..fa89f660864 100644
--- a/packages/react-aria-components/test/GridList.test.js
+++ b/packages/react-aria-components/test/GridList.test.js
@@ -11,33 +11,23 @@
  */
 
 import {act, fireEvent, mockClickDefault, pointerMap, render, setupIntersectionObserverMock, within} from '@react-spectrum/test-utils-internal';
-import {
-  Button,
-  Checkbox,
-  Collection,
-  Dialog,
-  DialogTrigger,
-  DropIndicator,
-  GridList,
-  GridListContext,
-  GridListHeader,
-  GridListItem,
-  GridListSection,
-  Label,
-  ListLayout,
-  Modal,
-  RouterProvider,
-  Tag,
-  TagGroup,
-  TagList,
-  useDragAndDrop,
-  Virtualizer
-} from '../';
-import {getFocusableTreeWalker} from '@react-aria/focus';
+import {Button} from '../src/Button';
+import {Checkbox} from '../src/Checkbox';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {DropIndicator, useDragAndDrop} from '../src/useDragAndDrop';
+import {getFocusableTreeWalker} from 'react-aria/private/focus/FocusScope';
+import {GridList, GridListContext, GridListHeader, GridListItem, GridListSection} from '../src/GridList';
 import {GridListLoadMoreItem} from '../src/GridList';
 import {installPointerEvent, User} from '@react-aria/test-utils';
+import {Label} from '../src/Label';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
+import {Modal} from '../src/Modal';
 import React from 'react';
+import {RouterProvider} from 'react-aria/private/utils/openLink';
+import {Tag, TagGroup, TagList} from '../src/TagGroup';
 import userEvent from '@testing-library/user-event';
+import {Virtualizer} from '../src/Virtualizer';
 
 let TestGridList = ({listBoxProps, itemProps}) => (
   <GridList aria-label="Test" {...listBoxProps}>
diff --git a/packages/react-aria-components/test/Group.test.tsx b/packages/react-aria-components/test/Group.test.tsx
index 7e28e6ece49..5adffca2dd3 100644
--- a/packages/react-aria-components/test/Group.test.tsx
+++ b/packages/react-aria-components/test/Group.test.tsx
@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {Group, GroupContext} from '..';
+import {Group, GroupContext} from '../src/Group';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/react-aria-components/test/HiddenDateInput.test.js b/packages/react-aria-components/test/HiddenDateInput.test.js
index 1c593a65fc1..d359a49d750 100644
--- a/packages/react-aria-components/test/HiddenDateInput.test.js
+++ b/packages/react-aria-components/test/HiddenDateInput.test.js
@@ -14,8 +14,8 @@ import {createCalendar, parseDate} from '@internationalized/date';
 import {HiddenDateInput} from '../src/HiddenDateInput';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {useDateFieldState} from 'react-stately';
-import {useLocale} from 'react-aria';
+import {useDateFieldState} from 'react-stately/useDateFieldState';
+import {useLocale} from 'react-aria/I18nProvider';
 import userEvent from '@testing-library/user-event';
 
 const HiddenDateInputExample = (props) => {
diff --git a/packages/react-aria-components/test/Link.test.js b/packages/react-aria-components/test/Link.test.js
index 6aff4f36f3d..4fa5605f5c1 100644
--- a/packages/react-aria-components/test/Link.test.js
+++ b/packages/react-aria-components/test/Link.test.js
@@ -10,9 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {Link, LinkContext, RouterProvider} from '../';
+import {Link, LinkContext} from '../src/Link';
+
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
+import {RouterProvider} from 'react-aria/private/utils/openLink';
 import userEvent from '@testing-library/user-event';
 
 describe('Link', () => {
diff --git a/packages/react-aria-components/test/ListBox.test.js b/packages/react-aria-components/test/ListBox.test.js
index 18703102af0..fd5c89b1fcd 100644
--- a/packages/react-aria-components/test/ListBox.test.js
+++ b/packages/react-aria-components/test/ListBox.test.js
@@ -11,28 +11,22 @@
  */
 
 import {act, fireEvent, installPointerEvent, mockClickDefault, pointerMap, render, setupIntersectionObserverMock, within} from '@react-spectrum/test-utils-internal';
-import {
-  Button,
-  Collection,
-  Dialog,
-  DialogTrigger,
-  DropIndicator,
-  Header, Heading,
-  ListBox,
-  ListBoxContext,
-  ListBoxItem,
-  ListBoxSection,
-  ListLayout,
-  Modal,
-  Text,
-  useDragAndDrop,
-  Virtualizer
-} from '../';
-import {DataTransfer, DragEvent} from '@react-aria/dnd/test/mocks';
+import {Button} from '../src/Button';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {DataTransfer, DragEvent} from 'react-aria/test/dnd/mocks';
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {DropIndicator, useDragAndDrop} from '../src/useDragAndDrop';
+import {Header} from '../src/Header';
+import {Heading} from '../src/Heading';
+import {ListBox, ListBoxContext, ListBoxItem, ListBoxSection} from '../src/ListBox';
 import {ListBoxLoadMoreItem} from '../src/ListBox';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
+import {Modal} from '../src/Modal';
 import React, {useEffect, useState} from 'react';
+import {Text} from '../src/Text';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
+import {Virtualizer} from '../src/Virtualizer';
 
 let TestListBox = ({listBoxProps, itemProps}) => (
   <ListBox aria-label="Test" {...listBoxProps}>
diff --git a/packages/react-aria-components/test/Menu.test.tsx b/packages/react-aria-components/test/Menu.test.tsx
index 95ad7f94b31..64568aa00dc 100644
--- a/packages/react-aria-components/test/Menu.test.tsx
+++ b/packages/react-aria-components/test/Menu.test.tsx
@@ -12,10 +12,22 @@
 
 import {act, fireEvent, mockClickDefault, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
 import {AriaMenuTests} from './AriaMenu.test-util';
-import {Button, Collection, Header, Heading, Input, Keyboard, Label, Menu, MenuContext, MenuItem, MenuSection, MenuTrigger, Popover, Pressable, Separator, SubmenuTrigger, Text, TextField} from '..';
+import {Button} from '../src/Button';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {Header} from '../src/Header';
+import {Heading} from '../src/Heading';
+import {Input} from '../src/Input';
+import {Keyboard} from '../src/Keyboard';
+import {Label} from '../src/Label';
+import {Menu, MenuContext, MenuItem, MenuSection, MenuTrigger, SubmenuTrigger} from '../src/Menu';
+import {Popover} from '../src/Popover';
+import {Pressable} from 'react-aria/private/interactions/Pressable';
 import React, {useState} from 'react';
 import {Selection, SelectionMode} from '@react-types/shared';
-import {UNSAFE_PortalProvider} from '@react-aria/overlays';
+import {Separator} from '../src/Separator';
+import {Text} from '../src/Text';
+import {TextField} from '../src/TextField';
+import {UNSAFE_PortalProvider} from 'react-aria/PortalProvider';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-aria-components/test/Meter.test.js b/packages/react-aria-components/test/Meter.test.js
index 5eb4fb69128..0243c8655ba 100644
--- a/packages/react-aria-components/test/Meter.test.js
+++ b/packages/react-aria-components/test/Meter.test.js
@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {Label, Meter, MeterContext} from 'react-aria-components';
+import {Label} from '../src/Label';
+
+import {Meter, MeterContext} from '../src/Meter';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/react-aria-components/test/NumberField.test.js b/packages/react-aria-components/test/NumberField.test.js
index ae7fb7c4130..00008e5248f 100644
--- a/packages/react-aria-components/test/NumberField.test.js
+++ b/packages/react-aria-components/test/NumberField.test.js
@@ -10,11 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
+jest.mock('react-aria/src/live-announcer/LiveAnnouncer');
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {announce} from '@react-aria/live-announcer';
-import {Button, FieldError, Group, Input, Label, NumberField, NumberFieldContext, Text} from '../';
+import {announce} from 'react-aria/private/live-announcer/LiveAnnouncer';
+import {Button} from '../src/Button';
+import {FieldError} from '../src/FieldError';
+import {Group} from '../src/Group';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
+import {NumberField, NumberFieldContext} from '../src/NumberField';
 import React from 'react';
+import {Text} from '../src/Text';
 import userEvent from '@testing-library/user-event';
 
 let TestNumberField = (props) => (
diff --git a/packages/react-aria-components/test/Popover.test.js b/packages/react-aria-components/test/Popover.test.js
index 2d8e288a65c..8947b9f7047 100644
--- a/packages/react-aria-components/test/Popover.test.js
+++ b/packages/react-aria-components/test/Popover.test.js
@@ -11,9 +11,13 @@
  */
 
 import {act, fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Button, Dialog, DialogTrigger, OverlayArrow, Popover, Pressable} from '../';
+import {Button} from '../src/Button';
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {OverlayArrow} from '../src/OverlayArrow';
+import {Popover} from '../src/Popover';
+import {Pressable} from 'react-aria/private/interactions/Pressable';
 import React, {useRef} from 'react';
-import {UNSAFE_PortalProvider} from '@react-aria/overlays';
+import {UNSAFE_PortalProvider} from 'react-aria/PortalProvider';
 import userEvent from '@testing-library/user-event';
 
 let TestPopover = (props) => (
diff --git a/packages/react-aria-components/test/ProgressBar.test.js b/packages/react-aria-components/test/ProgressBar.test.js
index 4935c9fb5fc..19a234cc24e 100644
--- a/packages/react-aria-components/test/ProgressBar.test.js
+++ b/packages/react-aria-components/test/ProgressBar.test.js
@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {Label, ProgressBar, ProgressBarContext} from 'react-aria-components';
+import {Label} from '../src/Label';
+
+import {ProgressBar, ProgressBarContext} from '../src/ProgressBar';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/react-aria-components/test/RadioGroup.test.js b/packages/react-aria-components/test/RadioGroup.test.js
index c5cd907013b..79af6b917d1 100644
--- a/packages/react-aria-components/test/RadioGroup.test.js
+++ b/packages/react-aria-components/test/RadioGroup.test.js
@@ -11,8 +11,14 @@
  */
 
 import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Button, Dialog, DialogTrigger, FieldError, Label, Modal, Radio, RadioContext, RadioGroup, RadioGroupContext, Text} from '../';
+import {Button} from '../src/Button';
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {FieldError} from '../src/FieldError';
+import {Label} from '../src/Label';
+import {Modal} from '../src/Modal';
+import {Radio, RadioContext, RadioGroup, RadioGroupContext} from '../src/RadioGroup';
 import React from 'react';
+import {Text} from '../src/Text';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-aria-components/test/RangeCalendar.test.tsx b/packages/react-aria-components/test/RangeCalendar.test.tsx
index 61c258f6b11..1b96aa026b5 100644
--- a/packages/react-aria-components/test/RangeCalendar.test.tsx
+++ b/packages/react-aria-components/test/RangeCalendar.test.tsx
@@ -11,9 +11,21 @@
  */
 
 import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Button, CalendarCell, CalendarGrid, CalendarGridBody, CalendarGridHeader, CalendarHeaderCell, Heading, RangeCalendar, RangeCalendarContext} from 'react-aria-components';
+import {Button} from '../src/Button';
+
+import {
+  CalendarCell,
+  CalendarGrid,
+  CalendarGridBody,
+  CalendarGridHeader,
+  CalendarHeaderCell,
+  RangeCalendar,
+  RangeCalendarContext
+} from '../src/Calendar';
+
 import {CalendarDate, getLocalTimeZone, startOfMonth, startOfWeek, today} from '@internationalized/date';
 import {DateValue} from '@react-types/calendar';
+import {Heading} from '../src/Heading';
 import {RangeValue} from '@react-types/shared';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/react-aria-components/test/SearchField.test.js b/packages/react-aria-components/test/SearchField.test.js
index 7d9f1c55796..b448aa1115c 100644
--- a/packages/react-aria-components/test/SearchField.test.js
+++ b/packages/react-aria-components/test/SearchField.test.js
@@ -11,8 +11,13 @@
  */
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Button, FieldError, Input, Label, SearchField, SearchFieldContext, Text} from '../';
+import {Button} from '../src/Button';
+import {FieldError} from '../src/FieldError';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
 import React from 'react';
+import {SearchField, SearchFieldContext} from '../src/SearchField';
+import {Text} from '../src/Text';
 import userEvent from '@testing-library/user-event';
 
 let TestSearchField = (props) => (
diff --git a/packages/react-aria-components/test/Select.test.js b/packages/react-aria-components/test/Select.test.js
index 78dea4fccc1..d3b49fdcca6 100644
--- a/packages/react-aria-components/test/Select.test.js
+++ b/packages/react-aria-components/test/Select.test.js
@@ -11,8 +11,15 @@
  */
 
 import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Button, FieldError, Form, Label, ListBox, ListBoxItem, ListBoxLoadMoreItem, Popover, Select, SelectContext, SelectStateContext, SelectValue, Text} from '../';
+import {Button} from '../src/Button';
+import {FieldError} from '../src/FieldError';
+import {Form} from '../src/Form';
+import {Label} from '../src/Label';
+import {ListBox, ListBoxItem, ListBoxLoadMoreItem} from '../src/ListBox';
+import {Popover} from '../src/Popover';
 import React, {useEffect, useRef, useState} from 'react';
+import {Select, SelectContext, SelectStateContext, SelectValue} from '../src/Select';
+import {Text} from '../src/Text';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-aria-components/test/Separator.test.js b/packages/react-aria-components/test/Separator.test.js
index bc01cd6258d..805441c25f9 100644
--- a/packages/react-aria-components/test/Separator.test.js
+++ b/packages/react-aria-components/test/Separator.test.js
@@ -12,7 +12,7 @@
 
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
-import {Separator, SeparatorContext} from '../';
+import {Separator, SeparatorContext} from '../src/Separator';
 
 describe('Separator', () => {
   it('should render a separator with default class', () => {
diff --git a/packages/react-aria-components/test/Slider.test.js b/packages/react-aria-components/test/Slider.test.js
index 210ae4056a0..f40136e56bd 100644
--- a/packages/react-aria-components/test/Slider.test.js
+++ b/packages/react-aria-components/test/Slider.test.js
@@ -11,8 +11,9 @@
  */
 
 import {fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Label, Slider, SliderContext, SliderOutput, SliderThumb, SliderTrack} from '../';
+import {Label} from '../src/Label';
 import React, {useState} from 'react';
+import {Slider, SliderContext, SliderOutput, SliderThumb, SliderTrack} from '../src/Slider';
 import userEvent from '@testing-library/user-event';
 
 let TestSlider = ({sliderProps, thumbProps, trackProps, outputProps}) => (
diff --git a/packages/react-aria-components/test/Switch.test.js b/packages/react-aria-components/test/Switch.test.js
index 17a6d94bc96..2b1d21f5985 100644
--- a/packages/react-aria-components/test/Switch.test.js
+++ b/packages/react-aria-components/test/Switch.test.js
@@ -12,7 +12,7 @@
 
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {Switch, SwitchContext} from '../';
+import {Switch, SwitchContext} from '../src/Switch';
 import userEvent from '@testing-library/user-event';
 
 describe('Switch', () => {
diff --git a/packages/react-aria-components/test/Table.test.js b/packages/react-aria-components/test/Table.test.js
index a5415e4068d..776bd05d3e0 100644
--- a/packages/react-aria-components/test/Table.test.js
+++ b/packages/react-aria-components/test/Table.test.js
@@ -11,15 +11,38 @@
  */
 
 import {act, fireEvent, installPointerEvent, mockClickDefault, pointerMap, render, setupIntersectionObserverMock, triggerLongPress, within} from '@react-spectrum/test-utils-internal';
-import {Button, Cell, Checkbox, Collection, Column, ColumnResizer, Dialog, DialogTrigger, DropIndicator, Label, Modal, ResizableTableContainer, Row, Table, TableBody, TableHeader, TableLayout, TableLoadMoreItem, Tag, TagGroup, TagList, useDragAndDrop, useTableOptions, Virtualizer} from '../';
+import {Button} from '../src/Button';
+
+import {
+  Cell,
+  Column,
+  ColumnResizer,
+  ResizableTableContainer,
+  Row,
+  Table,
+  TableBody,
+  TableHeader,
+  TableLayout,
+  TableLoadMoreItem,
+  useTableOptions
+} from '../src/Table';
+
+import {Checkbox} from '../src/Checkbox';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
 import {composeStories} from '@storybook/react';
-import {DataTransfer, DragEvent} from '@react-aria/dnd/test/mocks';
+import {DataTransfer, DragEvent} from 'react-aria/test/dnd/mocks';
+import {Dialog, DialogTrigger} from '../src/Dialog';
+import {DropIndicator, useDragAndDrop} from '../src/useDragAndDrop';
+import {Label} from '../src/Label';
+import {Modal} from '../src/Modal';
 import React, {useMemo, useState} from 'react';
-import {resizingTests} from '@react-aria/table/test/tableResizingTests.tsx';
-import {setInteractionModality} from '@react-aria/interactions';
+import {resizingTests} from 'react-aria/test/table/tableResizingTests.tsx';
+import {setInteractionModality} from 'react-aria/private/interactions/useFocusVisible';
 import * as stories from '../stories/Table.stories';
+import {Tag, TagGroup, TagList} from '../src/TagGroup';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
+import {Virtualizer} from '../src/Virtualizer';
 
 let {
   RenderEmptyStateStory: EmptyLoadingTable,
diff --git a/packages/react-aria-components/test/Tabs.test.js b/packages/react-aria-components/test/Tabs.test.js
index bc18c2d1ee7..b9ccea0e328 100644
--- a/packages/react-aria-components/test/Tabs.test.js
+++ b/packages/react-aria-components/test/Tabs.test.js
@@ -11,9 +11,11 @@
  */
 
 import {act, fireEvent, pointerMap, render, waitFor, within} from '@react-spectrum/test-utils-internal';
-import {Button, Tab, TabList, TabPanel, TabPanels, Tabs, Tooltip, TooltipTrigger} from '../';
+import {Button} from '../src/Button';
 import React, {useState} from 'react';
+import {Tab, TabList, TabPanel, TabPanels, Tabs} from '../src/Tabs';
 import {TabsExample} from '../stories/Tabs.stories';
+import {Tooltip, TooltipTrigger} from '../src/Tooltip';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-aria-components/test/TagGroup.test.js b/packages/react-aria-components/test/TagGroup.test.js
index 37201eb6bf2..9a2c4deca3b 100644
--- a/packages/react-aria-components/test/TagGroup.test.js
+++ b/packages/react-aria-components/test/TagGroup.test.js
@@ -11,9 +11,14 @@
  */
 
 import {act, fireEvent, mockClickDefault, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Button, Label, RouterProvider, Tag, TagGroup, TagList, Text, Tooltip, TooltipTrigger} from '../';
+import {Button} from '../src/Button';
+import {Label} from '../src/Label';
 import React from 'react';
-import {useListData} from '@react-stately/data';
+import {RouterProvider} from 'react-aria/private/utils/openLink';
+import {Tag, TagGroup, TagList} from '../src/TagGroup';
+import {Text} from '../src/Text';
+import {Tooltip, TooltipTrigger} from '../src/Tooltip';
+import {useListData} from 'react-stately/useListData';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-aria-components/test/TextField.test.js b/packages/react-aria-components/test/TextField.test.js
index ab25eeacbe1..006539026d1 100644
--- a/packages/react-aria-components/test/TextField.test.js
+++ b/packages/react-aria-components/test/TextField.test.js
@@ -11,8 +11,13 @@
  */
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {FieldError, Input, Label, Text, TextArea, TextField, TextFieldContext} from '../';
+import {FieldError} from '../src/FieldError';
+import {Input} from '../src/Input';
+import {Label} from '../src/Label';
 import React from 'react';
+import {Text} from '../src/Text';
+import {TextArea} from '../src/TextArea';
+import {TextField, TextFieldContext} from '../src/TextField';
 import userEvent from '@testing-library/user-event';
 
 let TestTextField = (props) => (
diff --git a/packages/react-aria-components/test/TimeField.test.js b/packages/react-aria-components/test/TimeField.test.js
index 0b937f755d5..46202fc200a 100644
--- a/packages/react-aria-components/test/TimeField.test.js
+++ b/packages/react-aria-components/test/TimeField.test.js
@@ -11,8 +11,11 @@
  */
 
 import {act, installPointerEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {DateInput, DateSegment, FieldError, Label, Text, TimeField, TimeFieldContext} from '../';
+import {DateInput, DateSegment, TimeField, TimeFieldContext} from '../src/DateField';
+import {FieldError} from '../src/FieldError';
+import {Label} from '../src/Label';
 import React from 'react';
+import {Text} from '../src/Text';
 import {Time} from '@internationalized/date';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-aria-components/test/Toast.test.js b/packages/react-aria-components/test/Toast.test.js
index d0e63d0746a..0d1b3d5f38f 100644
--- a/packages/react-aria-components/test/Toast.test.js
+++ b/packages/react-aria-components/test/Toast.test.js
@@ -11,9 +11,18 @@
  */
 
 import {act, installPointerEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Button, Text, UNSTABLE_Toast as Toast, UNSTABLE_ToastContent as ToastContent, UNSTABLE_ToastQueue as ToastQueue, UNSTABLE_ToastRegion as ToastRegion} from 'react-aria-components';
+import {Button} from '../src/Button';
 import React, {useRef} from 'react';
-import {UNSAFE_PortalProvider} from '@react-aria/overlays';
+
+import {Text} from '../src/Text';
+
+import {
+  UNSTABLE_Toast as Toast,
+  UNSTABLE_ToastContent as ToastContent,
+  UNSTABLE_ToastRegion as ToastRegion
+} from '../src/Toast';
+import {ToastQueue} from 'react-stately/useToastState';
+import {UNSAFE_PortalProvider} from 'react-aria/PortalProvider';
 import userEvent from '@testing-library/user-event';
 
 function Example(options) {
diff --git a/packages/react-aria-components/test/ToggleButton.test.js b/packages/react-aria-components/test/ToggleButton.test.js
index 2a36dee6535..f50c70e094f 100644
--- a/packages/react-aria-components/test/ToggleButton.test.js
+++ b/packages/react-aria-components/test/ToggleButton.test.js
@@ -12,7 +12,7 @@
 
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {ToggleButton, ToggleButtonContext} from '../';
+import {ToggleButton, ToggleButtonContext} from '../src/ToggleButton';
 import userEvent from '@testing-library/user-event';
 
 describe('ToggleButton', () => {
diff --git a/packages/react-aria-components/test/ToggleButtonGroup.test.js b/packages/react-aria-components/test/ToggleButtonGroup.test.js
index a266457b146..1306db771d5 100644
--- a/packages/react-aria-components/test/ToggleButtonGroup.test.js
+++ b/packages/react-aria-components/test/ToggleButtonGroup.test.js
@@ -12,7 +12,8 @@
 
 import {installPointerEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {ToggleButton, ToggleButtonGroup} from '../';
+import {ToggleButton} from '../src/ToggleButton';
+import {ToggleButtonGroup} from '../src/ToggleButtonGroup';
 import userEvent from '@testing-library/user-event';
 
 function renderGroup(props) {
diff --git a/packages/react-aria-components/test/Toolbar.test.tsx b/packages/react-aria-components/test/Toolbar.test.tsx
index 69f7607d843..a7ef50e0c7d 100644
--- a/packages/react-aria-components/test/Toolbar.test.tsx
+++ b/packages/react-aria-components/test/Toolbar.test.tsx
@@ -11,13 +11,15 @@
  */
 
 import {act, fireEvent, render, screen} from '@testing-library/react';
-import {Button, Text, Toolbar, ToolbarContext} from '../';
+import {Button} from '../src/Button';
 import {composeStory} from '@storybook/react';
-import {I18nProvider} from '@react-aria/i18n';
-
+import {I18nProvider} from 'react-aria/I18nProvider';
 import Meta, {ToolbarExample as ToolbarExampleStory} from '../stories/Toolbar.stories';
 import {pointerMap} from '@react-spectrum/test-utils-internal';
+
 import React, {createRef} from 'react';
+import {Text} from '../src/Text';
+import {Toolbar, ToolbarContext} from '../src/Toolbar';
 import userEvent from '@testing-library/user-event';
 
 const ToolbarExample = composeStory(ToolbarExampleStory, Meta);
diff --git a/packages/react-aria-components/test/Tooltip.test.js b/packages/react-aria-components/test/Tooltip.test.js
index 01c6cffe26c..9e4f189e6d3 100644
--- a/packages/react-aria-components/test/Tooltip.test.js
+++ b/packages/react-aria-components/test/Tooltip.test.js
@@ -11,9 +11,13 @@
  */
 
 import {act, fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Button, Focusable, OverlayArrow, Pressable, Tooltip, TooltipTrigger} from 'react-aria-components';
+import {Button} from '../src/Button';
+import {Focusable} from 'react-aria/private/interactions/useFocusable';
+import {OverlayArrow} from '../src/OverlayArrow';
+import {Pressable} from 'react-aria/private/interactions/Pressable';
 import React, {useRef} from 'react';
-import {UNSAFE_PortalProvider} from '@react-aria/overlays';
+import {Tooltip, TooltipTrigger} from '../src/Tooltip';
+import {UNSAFE_PortalProvider} from 'react-aria/PortalProvider';
 import userEvent from '@testing-library/user-event';
 
 function TestTooltip(props) {
diff --git a/packages/react-aria-components/test/Tree.test.tsx b/packages/react-aria-components/test/Tree.test.tsx
index 9f5c483ffec..4290b53d6ef 100644
--- a/packages/react-aria-components/test/Tree.test.tsx
+++ b/packages/react-aria-components/test/Tree.test.tsx
@@ -12,15 +12,22 @@
 
 import {act, fireEvent, mockClickDefault, pointerMap, render, setupIntersectionObserverMock, within} from '@react-spectrum/test-utils-internal';
 import {AriaTreeTests} from './AriaTree.test-util';
-import {Button, Checkbox, Collection, DropIndicator, ListLayout, Text, Tree, TreeHeader, TreeItem, TreeItemContent, TreeLoadMoreItem, TreeSection, useDragAndDrop, Virtualizer} from '../';
+import {Button} from '../src/Button';
+import {Checkbox} from '../src/Checkbox';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
 import {composeStories} from '@storybook/react';
 // @ts-ignore
-import {DataTransfer, DragEvent} from '@react-aria/dnd/test/mocks';
+import {DataTransfer, DragEvent} from 'react-aria/test/dnd/mocks';
+import {DropIndicator, useDragAndDrop} from '../src/useDragAndDrop';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
 import React from 'react';
 import * as stories from '../stories/Tree.stories';
+import {Text} from '../src/Text';
+import {Tree, TreeHeader, TreeItem, TreeItemContent, TreeLoadMoreItem, TreeSection} from '../src/Tree';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
-import {useTreeData} from 'react-stately';
+import {useTreeData} from 'react-stately/useTreeData';
+import {Virtualizer} from '../src/Virtualizer';
 
 let {
   EmptyTreeStaticStory: EmptyLoadingTree,
diff --git a/packages/react-aria-components/test/Treeble.test.js b/packages/react-aria-components/test/Treeble.test.js
index e84dd0e07af..5a4a68c36f9 100644
--- a/packages/react-aria-components/test/Treeble.test.js
+++ b/packages/react-aria-components/test/Treeble.test.js
@@ -11,10 +11,15 @@
  */
 
 import {act, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {Cell as AriaCell, Button, Collection, Column, composeRenderProps, Row, Table, TableBody, TableHeader, useDragAndDrop, useTreeData} from '../src';
+import {Cell as AriaCell, Column, Row, Table, TableBody, TableHeader} from '../src/Table';
+import {Button} from '../src/Button';
+import {Collection} from 'react-aria/private/collections/CollectionBuilder';
+import {composeRenderProps} from '../src/utils';
 import React from 'react';
+import {useDragAndDrop} from '../src/useDragAndDrop';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
+import {useTreeData} from 'react-stately/useTreeData';
 
 export function Cell(props) {
   return (
diff --git a/packages/react-aria-components/test/VirtualizedMenu.test.tsx b/packages/react-aria-components/test/VirtualizedMenu.test.tsx
index 37579b9f142..d85a36c42d1 100644
--- a/packages/react-aria-components/test/VirtualizedMenu.test.tsx
+++ b/packages/react-aria-components/test/VirtualizedMenu.test.tsx
@@ -11,10 +11,14 @@
  */
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Button, ListLayout, Menu, MenuItem, MenuTrigger, Popover, Virtualizer} from '..';
+import {Button} from '../src/Button';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
+import {Menu, MenuItem, MenuTrigger} from '../src/Menu';
+import {Popover} from '../src/Popover';
 import React from 'react';
 import {User} from '@react-aria/test-utils';
 import userEvent from '@testing-library/user-event';
+import {Virtualizer} from '../src/Virtualizer';
 
 let items = Array.from({length: 50}, (_, index) => {
   // Return the object structure for each element
diff --git a/packages/react-aria-components/test/types.tsx b/packages/react-aria-components/test/types.tsx
index 16a46f9e01b..1209a125778 100644
--- a/packages/react-aria-components/test/types.tsx
+++ b/packages/react-aria-components/test/types.tsx
@@ -15,7 +15,7 @@
 // This file is intended to test the TypeScript types of the components.
 
 import React from 'react';
-import * as RAC from '../';
+import * as RAC from 'react-aria-components';
 
 // Small version of framer motion's types for testing forwardRef compatibility.
 interface MotionProps {
diff --git a/packages/@react-aria/autocomplete/docs/anatomy.svg b/packages/react-aria/docs/autocomplete/anatomy.svg
similarity index 100%
rename from packages/@react-aria/autocomplete/docs/anatomy.svg
rename to packages/react-aria/docs/autocomplete/anatomy.svg
diff --git a/packages/@react-aria/autocomplete/docs/useAutocomplete.mdx b/packages/react-aria/docs/autocomplete/useAutocomplete.mdx
similarity index 100%
rename from packages/@react-aria/autocomplete/docs/useAutocomplete.mdx
rename to packages/react-aria/docs/autocomplete/useAutocomplete.mdx
diff --git a/packages/@react-aria/breadcrumbs/docs/anatomy.svg b/packages/react-aria/docs/breadcrumbs/anatomy.svg
similarity index 100%
rename from packages/@react-aria/breadcrumbs/docs/anatomy.svg
rename to packages/react-aria/docs/breadcrumbs/anatomy.svg
diff --git a/packages/@react-aria/breadcrumbs/docs/useBreadcrumbs.mdx b/packages/react-aria/docs/breadcrumbs/useBreadcrumbs.mdx
similarity index 100%
rename from packages/@react-aria/breadcrumbs/docs/useBreadcrumbs.mdx
rename to packages/react-aria/docs/breadcrumbs/useBreadcrumbs.mdx
diff --git a/packages/@react-aria/button/docs/ToggleButtonGroupAnatomy.svg b/packages/react-aria/docs/button/ToggleButtonGroupAnatomy.svg
similarity index 100%
rename from packages/@react-aria/button/docs/ToggleButtonGroupAnatomy.svg
rename to packages/react-aria/docs/button/ToggleButtonGroupAnatomy.svg
diff --git a/packages/@react-aria/button/docs/useButton.mdx b/packages/react-aria/docs/button/useButton.mdx
similarity index 100%
rename from packages/@react-aria/button/docs/useButton.mdx
rename to packages/react-aria/docs/button/useButton.mdx
diff --git a/packages/@react-aria/button/docs/useToggleButton.mdx b/packages/react-aria/docs/button/useToggleButton.mdx
similarity index 100%
rename from packages/@react-aria/button/docs/useToggleButton.mdx
rename to packages/react-aria/docs/button/useToggleButton.mdx
diff --git a/packages/@react-aria/button/docs/useToggleButtonGroup.mdx b/packages/react-aria/docs/button/useToggleButtonGroup.mdx
similarity index 100%
rename from packages/@react-aria/button/docs/useToggleButtonGroup.mdx
rename to packages/react-aria/docs/button/useToggleButtonGroup.mdx
diff --git a/packages/@react-aria/calendar/docs/calendar-anatomy.svg b/packages/react-aria/docs/calendar/calendar-anatomy.svg
similarity index 100%
rename from packages/@react-aria/calendar/docs/calendar-anatomy.svg
rename to packages/react-aria/docs/calendar/calendar-anatomy.svg
diff --git a/packages/@react-aria/calendar/docs/calendar-tailwind.png b/packages/react-aria/docs/calendar/calendar-tailwind.png
similarity index 100%
rename from packages/@react-aria/calendar/docs/calendar-tailwind.png
rename to packages/react-aria/docs/calendar/calendar-tailwind.png
diff --git a/packages/@react-aria/calendar/docs/css-modules.png b/packages/react-aria/docs/calendar/css-modules.png
similarity index 100%
rename from packages/@react-aria/calendar/docs/css-modules.png
rename to packages/react-aria/docs/calendar/css-modules.png
diff --git a/packages/@react-aria/calendar/docs/rangecalendar-anatomy.svg b/packages/react-aria/docs/calendar/rangecalendar-anatomy.svg
similarity index 100%
rename from packages/@react-aria/calendar/docs/rangecalendar-anatomy.svg
rename to packages/react-aria/docs/calendar/rangecalendar-anatomy.svg
diff --git a/packages/@react-aria/calendar/docs/styled-components.png b/packages/react-aria/docs/calendar/styled-components.png
similarity index 100%
rename from packages/@react-aria/calendar/docs/styled-components.png
rename to packages/react-aria/docs/calendar/styled-components.png
diff --git a/packages/@react-aria/calendar/docs/tailwind.png b/packages/react-aria/docs/calendar/tailwind.png
similarity index 100%
rename from packages/@react-aria/calendar/docs/tailwind.png
rename to packages/react-aria/docs/calendar/tailwind.png
diff --git a/packages/@react-aria/calendar/docs/useCalendar.mdx b/packages/react-aria/docs/calendar/useCalendar.mdx
similarity index 100%
rename from packages/@react-aria/calendar/docs/useCalendar.mdx
rename to packages/react-aria/docs/calendar/useCalendar.mdx
diff --git a/packages/@react-aria/calendar/docs/useRangeCalendar.mdx b/packages/react-aria/docs/calendar/useRangeCalendar.mdx
similarity index 100%
rename from packages/@react-aria/calendar/docs/useRangeCalendar.mdx
rename to packages/react-aria/docs/calendar/useRangeCalendar.mdx
diff --git a/packages/@react-aria/checkbox/docs/buttongroup-example.png b/packages/react-aria/docs/checkbox/buttongroup-example.png
similarity index 100%
rename from packages/@react-aria/checkbox/docs/buttongroup-example.png
rename to packages/react-aria/docs/checkbox/buttongroup-example.png
diff --git a/packages/@react-aria/checkbox/docs/checkbox-anatomy.svg b/packages/react-aria/docs/checkbox/checkbox-anatomy.svg
similarity index 100%
rename from packages/@react-aria/checkbox/docs/checkbox-anatomy.svg
rename to packages/react-aria/docs/checkbox/checkbox-anatomy.svg
diff --git a/packages/@react-aria/checkbox/docs/checkboxgroup-anatomy.svg b/packages/react-aria/docs/checkbox/checkboxgroup-anatomy.svg
similarity index 100%
rename from packages/@react-aria/checkbox/docs/checkboxgroup-anatomy.svg
rename to packages/react-aria/docs/checkbox/checkboxgroup-anatomy.svg
diff --git a/packages/@react-aria/checkbox/docs/tailwind-example.png b/packages/react-aria/docs/checkbox/tailwind-example.png
similarity index 100%
rename from packages/@react-aria/checkbox/docs/tailwind-example.png
rename to packages/react-aria/docs/checkbox/tailwind-example.png
diff --git a/packages/@react-aria/checkbox/docs/useCheckbox.mdx b/packages/react-aria/docs/checkbox/useCheckbox.mdx
similarity index 100%
rename from packages/@react-aria/checkbox/docs/useCheckbox.mdx
rename to packages/react-aria/docs/checkbox/useCheckbox.mdx
diff --git a/packages/@react-aria/checkbox/docs/useCheckboxGroup.mdx b/packages/react-aria/docs/checkbox/useCheckboxGroup.mdx
similarity index 100%
rename from packages/@react-aria/checkbox/docs/useCheckboxGroup.mdx
rename to packages/react-aria/docs/checkbox/useCheckboxGroup.mdx
diff --git a/packages/@react-aria/color/docs/ColorAreaAnatomy.svg b/packages/react-aria/docs/color/ColorAreaAnatomy.svg
similarity index 100%
rename from packages/@react-aria/color/docs/ColorAreaAnatomy.svg
rename to packages/react-aria/docs/color/ColorAreaAnatomy.svg
diff --git a/packages/@react-aria/color/docs/ColorFieldAnatomy.svg b/packages/react-aria/docs/color/ColorFieldAnatomy.svg
similarity index 100%
rename from packages/@react-aria/color/docs/ColorFieldAnatomy.svg
rename to packages/react-aria/docs/color/ColorFieldAnatomy.svg
diff --git a/packages/@react-aria/color/docs/ColorSliderAnatomy.svg b/packages/react-aria/docs/color/ColorSliderAnatomy.svg
similarity index 100%
rename from packages/@react-aria/color/docs/ColorSliderAnatomy.svg
rename to packages/react-aria/docs/color/ColorSliderAnatomy.svg
diff --git a/packages/@react-aria/color/docs/ColorWheelAnatomy.svg b/packages/react-aria/docs/color/ColorWheelAnatomy.svg
similarity index 100%
rename from packages/@react-aria/color/docs/ColorWheelAnatomy.svg
rename to packages/react-aria/docs/color/ColorWheelAnatomy.svg
diff --git a/packages/@react-aria/color/docs/useColorArea.mdx b/packages/react-aria/docs/color/useColorArea.mdx
similarity index 100%
rename from packages/@react-aria/color/docs/useColorArea.mdx
rename to packages/react-aria/docs/color/useColorArea.mdx
diff --git a/packages/@react-aria/color/docs/useColorField.mdx b/packages/react-aria/docs/color/useColorField.mdx
similarity index 100%
rename from packages/@react-aria/color/docs/useColorField.mdx
rename to packages/react-aria/docs/color/useColorField.mdx
diff --git a/packages/@react-aria/color/docs/useColorSlider.mdx b/packages/react-aria/docs/color/useColorSlider.mdx
similarity index 100%
rename from packages/@react-aria/color/docs/useColorSlider.mdx
rename to packages/react-aria/docs/color/useColorSlider.mdx
diff --git a/packages/@react-aria/color/docs/useColorSwatch.mdx b/packages/react-aria/docs/color/useColorSwatch.mdx
similarity index 100%
rename from packages/@react-aria/color/docs/useColorSwatch.mdx
rename to packages/react-aria/docs/color/useColorSwatch.mdx
diff --git a/packages/@react-aria/color/docs/useColorWheel.mdx b/packages/react-aria/docs/color/useColorWheel.mdx
similarity index 100%
rename from packages/@react-aria/color/docs/useColorWheel.mdx
rename to packages/react-aria/docs/color/useColorWheel.mdx
diff --git a/packages/@react-aria/combobox/docs/anatomy.svg b/packages/react-aria/docs/combobox/anatomy.svg
similarity index 100%
rename from packages/@react-aria/combobox/docs/anatomy.svg
rename to packages/react-aria/docs/combobox/anatomy.svg
diff --git a/packages/@react-aria/combobox/docs/chakra.png b/packages/react-aria/docs/combobox/chakra.png
similarity index 100%
rename from packages/@react-aria/combobox/docs/chakra.png
rename to packages/react-aria/docs/combobox/chakra.png
diff --git a/packages/@react-aria/combobox/docs/example.png b/packages/react-aria/docs/combobox/example.png
similarity index 100%
rename from packages/@react-aria/combobox/docs/example.png
rename to packages/react-aria/docs/combobox/example.png
diff --git a/packages/@react-aria/combobox/docs/material.png b/packages/react-aria/docs/combobox/material.png
similarity index 100%
rename from packages/@react-aria/combobox/docs/material.png
rename to packages/react-aria/docs/combobox/material.png
diff --git a/packages/@react-aria/combobox/docs/search.png b/packages/react-aria/docs/combobox/search.png
similarity index 100%
rename from packages/@react-aria/combobox/docs/search.png
rename to packages/react-aria/docs/combobox/search.png
diff --git a/packages/@react-aria/combobox/docs/styled-components.png b/packages/react-aria/docs/combobox/styled-components.png
similarity index 100%
rename from packages/@react-aria/combobox/docs/styled-components.png
rename to packages/react-aria/docs/combobox/styled-components.png
diff --git a/packages/@react-aria/combobox/docs/useComboBox.mdx b/packages/react-aria/docs/combobox/useComboBox.mdx
similarity index 100%
rename from packages/@react-aria/combobox/docs/useComboBox.mdx
rename to packages/react-aria/docs/combobox/useComboBox.mdx
diff --git a/packages/@react-aria/datepicker/docs/DateField-tailwind.png b/packages/react-aria/docs/datepicker/DateField-tailwind.png
similarity index 100%
rename from packages/@react-aria/datepicker/docs/DateField-tailwind.png
rename to packages/react-aria/docs/datepicker/DateField-tailwind.png
diff --git a/packages/@react-aria/datepicker/docs/DatePicker-chakra.png b/packages/react-aria/docs/datepicker/DatePicker-chakra.png
similarity index 100%
rename from packages/@react-aria/datepicker/docs/DatePicker-chakra.png
rename to packages/react-aria/docs/datepicker/DatePicker-chakra.png
diff --git a/packages/@react-aria/datepicker/docs/DatePicker-tailwind.png b/packages/react-aria/docs/datepicker/DatePicker-tailwind.png
similarity index 100%
rename from packages/@react-aria/datepicker/docs/DatePicker-tailwind.png
rename to packages/react-aria/docs/datepicker/DatePicker-tailwind.png
diff --git a/packages/@react-aria/datepicker/docs/DateRangePicker-chakra.png b/packages/react-aria/docs/datepicker/DateRangePicker-chakra.png
similarity index 100%
rename from packages/@react-aria/datepicker/docs/DateRangePicker-chakra.png
rename to packages/react-aria/docs/datepicker/DateRangePicker-chakra.png
diff --git a/packages/@react-aria/datepicker/docs/DateRangePicker-tailwind.png b/packages/react-aria/docs/datepicker/DateRangePicker-tailwind.png
similarity index 100%
rename from packages/@react-aria/datepicker/docs/DateRangePicker-tailwind.png
rename to packages/react-aria/docs/datepicker/DateRangePicker-tailwind.png
diff --git a/packages/@react-aria/datepicker/docs/TimeField-tailwind.png b/packages/react-aria/docs/datepicker/TimeField-tailwind.png
similarity index 100%
rename from packages/@react-aria/datepicker/docs/TimeField-tailwind.png
rename to packages/react-aria/docs/datepicker/TimeField-tailwind.png
diff --git a/packages/@react-aria/datepicker/docs/datefield-anatomy.svg b/packages/react-aria/docs/datepicker/datefield-anatomy.svg
similarity index 100%
rename from packages/@react-aria/datepicker/docs/datefield-anatomy.svg
rename to packages/react-aria/docs/datepicker/datefield-anatomy.svg
diff --git a/packages/@react-aria/datepicker/docs/datepicker-anatomy.svg b/packages/react-aria/docs/datepicker/datepicker-anatomy.svg
similarity index 100%
rename from packages/@react-aria/datepicker/docs/datepicker-anatomy.svg
rename to packages/react-aria/docs/datepicker/datepicker-anatomy.svg
diff --git a/packages/@react-aria/datepicker/docs/daterangepicker-anatomy.svg b/packages/react-aria/docs/datepicker/daterangepicker-anatomy.svg
similarity index 100%
rename from packages/@react-aria/datepicker/docs/daterangepicker-anatomy.svg
rename to packages/react-aria/docs/datepicker/daterangepicker-anatomy.svg
diff --git a/packages/@react-aria/datepicker/docs/timefield-anatomy.svg b/packages/react-aria/docs/datepicker/timefield-anatomy.svg
similarity index 100%
rename from packages/@react-aria/datepicker/docs/timefield-anatomy.svg
rename to packages/react-aria/docs/datepicker/timefield-anatomy.svg
diff --git a/packages/@react-aria/datepicker/docs/useDateField.mdx b/packages/react-aria/docs/datepicker/useDateField.mdx
similarity index 100%
rename from packages/@react-aria/datepicker/docs/useDateField.mdx
rename to packages/react-aria/docs/datepicker/useDateField.mdx
diff --git a/packages/@react-aria/datepicker/docs/useDatePicker.mdx b/packages/react-aria/docs/datepicker/useDatePicker.mdx
similarity index 100%
rename from packages/@react-aria/datepicker/docs/useDatePicker.mdx
rename to packages/react-aria/docs/datepicker/useDatePicker.mdx
diff --git a/packages/@react-aria/datepicker/docs/useDateRangePicker.mdx b/packages/react-aria/docs/datepicker/useDateRangePicker.mdx
similarity index 100%
rename from packages/@react-aria/datepicker/docs/useDateRangePicker.mdx
rename to packages/react-aria/docs/datepicker/useDateRangePicker.mdx
diff --git a/packages/@react-aria/datepicker/docs/useTimeField.mdx b/packages/react-aria/docs/datepicker/useTimeField.mdx
similarity index 100%
rename from packages/@react-aria/datepicker/docs/useTimeField.mdx
rename to packages/react-aria/docs/datepicker/useTimeField.mdx
diff --git a/packages/@react-aria/dialog/docs/anatomy.svg b/packages/react-aria/docs/dialog/anatomy.svg
similarity index 100%
rename from packages/@react-aria/dialog/docs/anatomy.svg
rename to packages/react-aria/docs/dialog/anatomy.svg
diff --git a/packages/@react-aria/dialog/docs/tailwind.png b/packages/react-aria/docs/dialog/tailwind.png
similarity index 100%
rename from packages/@react-aria/dialog/docs/tailwind.png
rename to packages/react-aria/docs/dialog/tailwind.png
diff --git a/packages/@react-aria/dialog/docs/useDialog.mdx b/packages/react-aria/docs/dialog/useDialog.mdx
similarity index 100%
rename from packages/@react-aria/dialog/docs/useDialog.mdx
rename to packages/react-aria/docs/dialog/useDialog.mdx
diff --git a/packages/@react-aria/disclosure/docs/anatomy.svg b/packages/react-aria/docs/disclosure/anatomy.svg
similarity index 100%
rename from packages/@react-aria/disclosure/docs/anatomy.svg
rename to packages/react-aria/docs/disclosure/anatomy.svg
diff --git a/packages/@react-aria/disclosure/docs/useDisclosure.mdx b/packages/react-aria/docs/disclosure/useDisclosure.mdx
similarity index 100%
rename from packages/@react-aria/disclosure/docs/useDisclosure.mdx
rename to packages/react-aria/docs/disclosure/useDisclosure.mdx
diff --git a/packages/@react-aria/dnd/docs/Anatomy.svg b/packages/react-aria/docs/dnd/Anatomy.svg
similarity index 100%
rename from packages/@react-aria/dnd/docs/Anatomy.svg
rename to packages/react-aria/docs/dnd/Anatomy.svg
diff --git a/packages/@react-aria/dnd/docs/BetweenDropPosition.svg b/packages/react-aria/docs/dnd/BetweenDropPosition.svg
similarity index 100%
rename from packages/@react-aria/dnd/docs/BetweenDropPosition.svg
rename to packages/react-aria/docs/dnd/BetweenDropPosition.svg
diff --git a/packages/@react-aria/dnd/docs/DragAffordance.svg b/packages/react-aria/docs/dnd/DragAffordance.svg
similarity index 100%
rename from packages/@react-aria/dnd/docs/DragAffordance.svg
rename to packages/react-aria/docs/dnd/DragAffordance.svg
diff --git a/packages/@react-aria/dnd/docs/DragPreview.svg b/packages/react-aria/docs/dnd/DragPreview.svg
similarity index 100%
rename from packages/@react-aria/dnd/docs/DragPreview.svg
rename to packages/react-aria/docs/dnd/DragPreview.svg
diff --git a/packages/@react-aria/dnd/docs/DropOperation.svg b/packages/react-aria/docs/dnd/DropOperation.svg
similarity index 100%
rename from packages/@react-aria/dnd/docs/DropOperation.svg
rename to packages/react-aria/docs/dnd/DropOperation.svg
diff --git a/packages/@react-aria/dnd/docs/OnDropPosition.svg b/packages/react-aria/docs/dnd/OnDropPosition.svg
similarity index 100%
rename from packages/@react-aria/dnd/docs/OnDropPosition.svg
rename to packages/react-aria/docs/dnd/OnDropPosition.svg
diff --git a/packages/@react-aria/dnd/docs/RootDropPosition.svg b/packages/react-aria/docs/dnd/RootDropPosition.svg
similarity index 100%
rename from packages/@react-aria/dnd/docs/RootDropPosition.svg
rename to packages/react-aria/docs/dnd/RootDropPosition.svg
diff --git a/packages/@react-aria/dnd/docs/useDraggableCollection.mdx b/packages/react-aria/docs/dnd/useDraggableCollection.mdx
similarity index 100%
rename from packages/@react-aria/dnd/docs/useDraggableCollection.mdx
rename to packages/react-aria/docs/dnd/useDraggableCollection.mdx
diff --git a/packages/@react-aria/dnd/docs/useDroppableCollection.mdx b/packages/react-aria/docs/dnd/useDroppableCollection.mdx
similarity index 100%
rename from packages/@react-aria/dnd/docs/useDroppableCollection.mdx
rename to packages/react-aria/docs/dnd/useDroppableCollection.mdx
diff --git a/packages/@react-aria/gridlist/docs/anatomy.svg b/packages/react-aria/docs/gridlist/anatomy.svg
similarity index 100%
rename from packages/@react-aria/gridlist/docs/anatomy.svg
rename to packages/react-aria/docs/gridlist/anatomy.svg
diff --git a/packages/@react-aria/gridlist/docs/useGridList.mdx b/packages/react-aria/docs/gridlist/useGridList.mdx
similarity index 100%
rename from packages/@react-aria/gridlist/docs/useGridList.mdx
rename to packages/react-aria/docs/gridlist/useGridList.mdx
diff --git a/packages/@react-aria/link/docs/useLink.mdx b/packages/react-aria/docs/link/useLink.mdx
similarity index 100%
rename from packages/@react-aria/link/docs/useLink.mdx
rename to packages/react-aria/docs/link/useLink.mdx
diff --git a/packages/@react-aria/listbox/docs/anatomy.svg b/packages/react-aria/docs/listbox/anatomy.svg
similarity index 100%
rename from packages/@react-aria/listbox/docs/anatomy.svg
rename to packages/react-aria/docs/listbox/anatomy.svg
diff --git a/packages/@react-aria/listbox/docs/useListBox.mdx b/packages/react-aria/docs/listbox/useListBox.mdx
similarity index 100%
rename from packages/@react-aria/listbox/docs/useListBox.mdx
rename to packages/react-aria/docs/listbox/useListBox.mdx
diff --git a/packages/@react-aria/menu/docs/menu-trigger-anatomy.svg b/packages/react-aria/docs/menu/menu-trigger-anatomy.svg
similarity index 100%
rename from packages/@react-aria/menu/docs/menu-trigger-anatomy.svg
rename to packages/react-aria/docs/menu/menu-trigger-anatomy.svg
diff --git a/packages/@react-aria/menu/docs/tailwind.png b/packages/react-aria/docs/menu/tailwind.png
similarity index 100%
rename from packages/@react-aria/menu/docs/tailwind.png
rename to packages/react-aria/docs/menu/tailwind.png
diff --git a/packages/@react-aria/menu/docs/useMenu.mdx b/packages/react-aria/docs/menu/useMenu.mdx
similarity index 100%
rename from packages/@react-aria/menu/docs/useMenu.mdx
rename to packages/react-aria/docs/menu/useMenu.mdx
diff --git a/packages/@react-aria/meter/docs/anatomy.svg b/packages/react-aria/docs/meter/anatomy.svg
similarity index 100%
rename from packages/@react-aria/meter/docs/anatomy.svg
rename to packages/react-aria/docs/meter/anatomy.svg
diff --git a/packages/@react-aria/meter/docs/circular-example.png b/packages/react-aria/docs/meter/circular-example.png
similarity index 100%
rename from packages/@react-aria/meter/docs/circular-example.png
rename to packages/react-aria/docs/meter/circular-example.png
diff --git a/packages/@react-aria/meter/docs/useMeter.mdx b/packages/react-aria/docs/meter/useMeter.mdx
similarity index 100%
rename from packages/@react-aria/meter/docs/useMeter.mdx
rename to packages/react-aria/docs/meter/useMeter.mdx
diff --git a/packages/@react-aria/numberfield/docs/anatomy.svg b/packages/react-aria/docs/numberfield/anatomy.svg
similarity index 100%
rename from packages/@react-aria/numberfield/docs/anatomy.svg
rename to packages/react-aria/docs/numberfield/anatomy.svg
diff --git a/packages/@react-aria/numberfield/docs/useNumberField.mdx b/packages/react-aria/docs/numberfield/useNumberField.mdx
similarity index 100%
rename from packages/@react-aria/numberfield/docs/useNumberField.mdx
rename to packages/react-aria/docs/numberfield/useNumberField.mdx
diff --git a/packages/@react-aria/overlays/docs/modal-anatomy.svg b/packages/react-aria/docs/overlays/modal-anatomy.svg
similarity index 100%
rename from packages/@react-aria/overlays/docs/modal-anatomy.svg
rename to packages/react-aria/docs/overlays/modal-anatomy.svg
diff --git a/packages/@react-aria/overlays/docs/popover-anatomy.svg b/packages/react-aria/docs/overlays/popover-anatomy.svg
similarity index 100%
rename from packages/@react-aria/overlays/docs/popover-anatomy.svg
rename to packages/react-aria/docs/overlays/popover-anatomy.svg
diff --git a/packages/@react-aria/overlays/docs/useModalOverlay.mdx b/packages/react-aria/docs/overlays/useModalOverlay.mdx
similarity index 100%
rename from packages/@react-aria/overlays/docs/useModalOverlay.mdx
rename to packages/react-aria/docs/overlays/useModalOverlay.mdx
diff --git a/packages/@react-aria/overlays/docs/usePopover.mdx b/packages/react-aria/docs/overlays/usePopover.mdx
similarity index 100%
rename from packages/@react-aria/overlays/docs/usePopover.mdx
rename to packages/react-aria/docs/overlays/usePopover.mdx
diff --git a/packages/@react-aria/progress/docs/anatomy.svg b/packages/react-aria/docs/progress/anatomy.svg
similarity index 100%
rename from packages/@react-aria/progress/docs/anatomy.svg
rename to packages/react-aria/docs/progress/anatomy.svg
diff --git a/packages/@react-aria/progress/docs/useProgressBar.mdx b/packages/react-aria/docs/progress/useProgressBar.mdx
similarity index 100%
rename from packages/@react-aria/progress/docs/useProgressBar.mdx
rename to packages/react-aria/docs/progress/useProgressBar.mdx
diff --git a/packages/@react-aria/radio/docs/anatomy.svg b/packages/react-aria/docs/radio/anatomy.svg
similarity index 100%
rename from packages/@react-aria/radio/docs/anatomy.svg
rename to packages/react-aria/docs/radio/anatomy.svg
diff --git a/packages/@react-aria/radio/docs/buttongroup-example.png b/packages/react-aria/docs/radio/buttongroup-example.png
similarity index 100%
rename from packages/@react-aria/radio/docs/buttongroup-example.png
rename to packages/react-aria/docs/radio/buttongroup-example.png
diff --git a/packages/@react-aria/radio/docs/card-example.png b/packages/react-aria/docs/radio/card-example.png
similarity index 100%
rename from packages/@react-aria/radio/docs/card-example.png
rename to packages/react-aria/docs/radio/card-example.png
diff --git a/packages/@react-aria/radio/docs/swatch-example.png b/packages/react-aria/docs/radio/swatch-example.png
similarity index 100%
rename from packages/@react-aria/radio/docs/swatch-example.png
rename to packages/react-aria/docs/radio/swatch-example.png
diff --git a/packages/@react-aria/radio/docs/useRadioGroup.mdx b/packages/react-aria/docs/radio/useRadioGroup.mdx
similarity index 100%
rename from packages/@react-aria/radio/docs/useRadioGroup.mdx
rename to packages/react-aria/docs/radio/useRadioGroup.mdx
diff --git a/packages/@react-aria/searchfield/docs/anatomy.svg b/packages/react-aria/docs/searchfield/anatomy.svg
similarity index 100%
rename from packages/@react-aria/searchfield/docs/anatomy.svg
rename to packages/react-aria/docs/searchfield/anatomy.svg
diff --git a/packages/@react-aria/searchfield/docs/useSearchField.mdx b/packages/react-aria/docs/searchfield/useSearchField.mdx
similarity index 100%
rename from packages/@react-aria/searchfield/docs/useSearchField.mdx
rename to packages/react-aria/docs/searchfield/useSearchField.mdx
diff --git a/packages/@react-aria/select/docs/anatomy.svg b/packages/react-aria/docs/select/anatomy.svg
similarity index 100%
rename from packages/@react-aria/select/docs/anatomy.svg
rename to packages/react-aria/docs/select/anatomy.svg
diff --git a/packages/@react-aria/select/docs/example.png b/packages/react-aria/docs/select/example.png
similarity index 100%
rename from packages/@react-aria/select/docs/example.png
rename to packages/react-aria/docs/select/example.png
diff --git a/packages/@react-aria/select/docs/popup-example.png b/packages/react-aria/docs/select/popup-example.png
similarity index 100%
rename from packages/@react-aria/select/docs/popup-example.png
rename to packages/react-aria/docs/select/popup-example.png
diff --git a/packages/@react-aria/select/docs/styled-components.png b/packages/react-aria/docs/select/styled-components.png
similarity index 100%
rename from packages/@react-aria/select/docs/styled-components.png
rename to packages/react-aria/docs/select/styled-components.png
diff --git a/packages/@react-aria/select/docs/useSelect.mdx b/packages/react-aria/docs/select/useSelect.mdx
similarity index 100%
rename from packages/@react-aria/select/docs/useSelect.mdx
rename to packages/react-aria/docs/select/useSelect.mdx
diff --git a/packages/@react-aria/separator/docs/useSeparator.mdx b/packages/react-aria/docs/separator/useSeparator.mdx
similarity index 100%
rename from packages/@react-aria/separator/docs/useSeparator.mdx
rename to packages/react-aria/docs/separator/useSeparator.mdx
diff --git a/packages/@react-aria/slider/docs/anatomy.svg b/packages/react-aria/docs/slider/anatomy.svg
similarity index 100%
rename from packages/@react-aria/slider/docs/anatomy.svg
rename to packages/react-aria/docs/slider/anatomy.svg
diff --git a/packages/@react-aria/slider/docs/useSlider.mdx b/packages/react-aria/docs/slider/useSlider.mdx
similarity index 100%
rename from packages/@react-aria/slider/docs/useSlider.mdx
rename to packages/react-aria/docs/slider/useSlider.mdx
diff --git a/packages/@react-aria/switch/docs/anatomy.svg b/packages/react-aria/docs/switch/anatomy.svg
similarity index 100%
rename from packages/@react-aria/switch/docs/anatomy.svg
rename to packages/react-aria/docs/switch/anatomy.svg
diff --git a/packages/@react-aria/switch/docs/useSwitch.mdx b/packages/react-aria/docs/switch/useSwitch.mdx
similarity index 100%
rename from packages/@react-aria/switch/docs/useSwitch.mdx
rename to packages/react-aria/docs/switch/useSwitch.mdx
diff --git a/packages/@react-aria/table/docs/Table-tailwind.png b/packages/react-aria/docs/table/Table-tailwind.png
similarity index 100%
rename from packages/@react-aria/table/docs/Table-tailwind.png
rename to packages/react-aria/docs/table/Table-tailwind.png
diff --git a/packages/@react-aria/table/docs/TableAnatomy.svg b/packages/react-aria/docs/table/TableAnatomy.svg
similarity index 100%
rename from packages/@react-aria/table/docs/TableAnatomy.svg
rename to packages/react-aria/docs/table/TableAnatomy.svg
diff --git a/packages/@react-aria/table/docs/useTable.mdx b/packages/react-aria/docs/table/useTable.mdx
similarity index 100%
rename from packages/@react-aria/table/docs/useTable.mdx
rename to packages/react-aria/docs/table/useTable.mdx
diff --git a/packages/@react-aria/tabs/docs/anatomy.svg b/packages/react-aria/docs/tabs/anatomy.svg
similarity index 100%
rename from packages/@react-aria/tabs/docs/anatomy.svg
rename to packages/react-aria/docs/tabs/anatomy.svg
diff --git a/packages/@react-aria/tabs/docs/animated-example.png b/packages/react-aria/docs/tabs/animated-example.png
similarity index 100%
rename from packages/@react-aria/tabs/docs/animated-example.png
rename to packages/react-aria/docs/tabs/animated-example.png
diff --git a/packages/@react-aria/tabs/docs/useTabList.mdx b/packages/react-aria/docs/tabs/useTabList.mdx
similarity index 100%
rename from packages/@react-aria/tabs/docs/useTabList.mdx
rename to packages/react-aria/docs/tabs/useTabList.mdx
diff --git a/packages/@react-aria/tag/docs/anatomy.svg b/packages/react-aria/docs/tag/anatomy.svg
similarity index 100%
rename from packages/@react-aria/tag/docs/anatomy.svg
rename to packages/react-aria/docs/tag/anatomy.svg
diff --git a/packages/@react-aria/tag/docs/tailwind.png b/packages/react-aria/docs/tag/tailwind.png
similarity index 100%
rename from packages/@react-aria/tag/docs/tailwind.png
rename to packages/react-aria/docs/tag/tailwind.png
diff --git a/packages/@react-aria/tag/docs/useTagGroup.mdx b/packages/react-aria/docs/tag/useTagGroup.mdx
similarity index 100%
rename from packages/@react-aria/tag/docs/useTagGroup.mdx
rename to packages/react-aria/docs/tag/useTagGroup.mdx
diff --git a/packages/@react-aria/textfield/docs/anatomy.svg b/packages/react-aria/docs/textfield/anatomy.svg
similarity index 100%
rename from packages/@react-aria/textfield/docs/anatomy.svg
rename to packages/react-aria/docs/textfield/anatomy.svg
diff --git a/packages/@react-aria/textfield/docs/useTextField.mdx b/packages/react-aria/docs/textfield/useTextField.mdx
similarity index 100%
rename from packages/@react-aria/textfield/docs/useTextField.mdx
rename to packages/react-aria/docs/textfield/useTextField.mdx
diff --git a/packages/@react-aria/toast/docs/toast-anatomy.svg b/packages/react-aria/docs/toast/toast-anatomy.svg
similarity index 100%
rename from packages/@react-aria/toast/docs/toast-anatomy.svg
rename to packages/react-aria/docs/toast/toast-anatomy.svg
diff --git a/packages/@react-aria/toast/docs/useToast.mdx b/packages/react-aria/docs/toast/useToast.mdx
similarity index 100%
rename from packages/@react-aria/toast/docs/useToast.mdx
rename to packages/react-aria/docs/toast/useToast.mdx
diff --git a/packages/@react-aria/toolbar/docs/toolbar-anatomy.svg b/packages/react-aria/docs/toolbar/toolbar-anatomy.svg
similarity index 100%
rename from packages/@react-aria/toolbar/docs/toolbar-anatomy.svg
rename to packages/react-aria/docs/toolbar/toolbar-anatomy.svg
diff --git a/packages/@react-aria/toolbar/docs/useToolbar.mdx b/packages/react-aria/docs/toolbar/useToolbar.mdx
similarity index 100%
rename from packages/@react-aria/toolbar/docs/useToolbar.mdx
rename to packages/react-aria/docs/toolbar/useToolbar.mdx
diff --git a/packages/@react-aria/tooltip/docs/anatomy.svg b/packages/react-aria/docs/tooltip/anatomy.svg
similarity index 100%
rename from packages/@react-aria/tooltip/docs/anatomy.svg
rename to packages/react-aria/docs/tooltip/anatomy.svg
diff --git a/packages/@react-aria/tooltip/docs/useTooltipTrigger.mdx b/packages/react-aria/docs/tooltip/useTooltipTrigger.mdx
similarity index 100%
rename from packages/@react-aria/tooltip/docs/useTooltipTrigger.mdx
rename to packages/react-aria/docs/tooltip/useTooltipTrigger.mdx
diff --git a/packages/react-aria/exports/DragPreview.ts b/packages/react-aria/exports/DragPreview.ts
new file mode 100644
index 00000000000..e1e73479d86
--- /dev/null
+++ b/packages/react-aria/exports/DragPreview.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {DragPreviewProps} from '../src/dnd/DragPreview';
+export {DragPreview} from '../src/dnd/DragPreview';
+export type {DirectoryDropItem, DragEndEvent, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DragTypes, DropEnterEvent, DropEvent, DropExitEvent, DropItem, DropMoveEvent, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, DropTargetDelegate, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
diff --git a/packages/react-aria/exports/FocusRing.ts b/packages/react-aria/exports/FocusRing.ts
new file mode 100644
index 00000000000..b60451f9099
--- /dev/null
+++ b/packages/react-aria/exports/FocusRing.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {FocusRing} from '../src/focus/FocusRing';
+export type {FocusRingProps} from '../src/focus/FocusRing';
+export {} from '../src/utils/isFocusable';
+
+export {Focusable, useFocusable} from '../src/interactions/useFocusable';
+export {} from '../src/interactions/focusSafely';
+
+export type {FocusableAria, FocusableOptions} from '../src/interactions/useFocusable';
diff --git a/packages/react-aria/exports/FocusScope.ts b/packages/react-aria/exports/FocusScope.ts
new file mode 100644
index 00000000000..8609b3c9a71
--- /dev/null
+++ b/packages/react-aria/exports/FocusScope.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {FocusScope, useFocusManager} from '../src/focus/FocusScope';
+
+export type {FocusScopeProps, FocusManager, FocusManagerOptions} from '../src/focus/FocusScope';
+export {} from '../src/utils/isFocusable';
+
+export {Focusable, useFocusable} from '../src/interactions/useFocusable';
+export {} from '../src/interactions/focusSafely';
+
+export type {FocusableAria, FocusableOptions} from '../src/interactions/useFocusable';
diff --git a/packages/react-aria/exports/I18nProvider.ts b/packages/react-aria/exports/I18nProvider.ts
new file mode 100644
index 00000000000..a8f932f3400
--- /dev/null
+++ b/packages/react-aria/exports/I18nProvider.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {I18nProvider, useLocale} from '../src/i18n/I18nProvider';
+export type {I18nProviderProps, Locale} from '../src/i18n/I18nProvider';
+export type {LocalizedStringFormatter} from '@internationalized/string';
+export type {LocalizedStrings} from '@internationalized/message';
+export type {DateFormatter} from '@internationalized/date';
diff --git a/packages/react-aria/exports/ListDropTargetDelegate.ts b/packages/react-aria/exports/ListDropTargetDelegate.ts
new file mode 100644
index 00000000000..8ba19a84395
--- /dev/null
+++ b/packages/react-aria/exports/ListDropTargetDelegate.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {ListDropTargetDelegate} from '../src/dnd/ListDropTargetDelegate';
+export type {DirectoryDropItem, DragEndEvent, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DragTypes, DropEnterEvent, DropEvent, DropExitEvent, DropItem, DropMoveEvent, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, DropTargetDelegate, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
diff --git a/packages/@react-aria/actiongroup/index.ts b/packages/react-aria/exports/ListKeyboardDelegate.ts
similarity index 89%
rename from packages/@react-aria/actiongroup/index.ts
rename to packages/react-aria/exports/ListKeyboardDelegate.ts
index 1210ae1e402..5c9fb2a8573 100644
--- a/packages/@react-aria/actiongroup/index.ts
+++ b/packages/react-aria/exports/ListKeyboardDelegate.ts
@@ -10,4 +10,4 @@
  * governing permissions and limitations under the License.
  */
 
-export * from './src';
+export {ListKeyboardDelegate} from '../src/selection/ListKeyboardDelegate';
diff --git a/packages/react-aria/exports/Overlay.ts b/packages/react-aria/exports/Overlay.ts
new file mode 100644
index 00000000000..90682506dd9
--- /dev/null
+++ b/packages/react-aria/exports/Overlay.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {DismissButton} from '../src/overlays/DismissButton';
+export {Overlay} from '../src/overlays/Overlay';
+export type {DismissButtonProps} from '../src/overlays/DismissButton';
+export type {OverlayProps} from '../src/overlays/Overlay';
+export type {Placement, PlacementAxis, PositionProps} from '@react-types/overlays';
diff --git a/packages/react-aria/exports/PortalProvider.ts b/packages/react-aria/exports/PortalProvider.ts
new file mode 100644
index 00000000000..54c59a3acb0
--- /dev/null
+++ b/packages/react-aria/exports/PortalProvider.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {UNSAFE_PortalProvider, useUNSAFE_PortalContext} from '../src/overlays/PortalProvider';
+
+export type {PortalProviderProps, PortalProviderContextValue} from '../src/overlays/PortalProvider';
+export type {Placement, PlacementAxis, PositionProps} from '@react-types/overlays';
diff --git a/packages/react-aria/exports/SSRProvider.ts b/packages/react-aria/exports/SSRProvider.ts
new file mode 100644
index 00000000000..57b425b2230
--- /dev/null
+++ b/packages/react-aria/exports/SSRProvider.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {SSRProvider, useIsSSR} from '../src/ssr/SSRProvider';
+export type {SSRProviderProps} from '../src/ssr/SSRProvider';
diff --git a/packages/react-aria/exports/VisuallyHidden.ts b/packages/react-aria/exports/VisuallyHidden.ts
new file mode 100644
index 00000000000..aaa078437af
--- /dev/null
+++ b/packages/react-aria/exports/VisuallyHidden.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useVisuallyHidden, VisuallyHidden} from '../src/visually-hidden/VisuallyHidden';
+export type {VisuallyHiddenAria, VisuallyHiddenProps} from '../src/visually-hidden/VisuallyHidden';
diff --git a/packages/react-aria/exports/index.ts b/packages/react-aria/exports/index.ts
new file mode 100644
index 00000000000..40e336bcae2
--- /dev/null
+++ b/packages/react-aria/exports/index.ts
@@ -0,0 +1,275 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useBreadcrumbItem} from '../src/breadcrumbs/useBreadcrumbItem';
+
+export {useBreadcrumbs} from '../src/breadcrumbs/useBreadcrumbs';
+export {useButton} from '../src/button/useButton';
+export {useToggleButton} from '../src/button/useToggleButton';
+export {useToggleButtonGroup, useToggleButtonGroupItem} from '../src/button/useToggleButtonGroup';
+export {useCalendar} from '../src/calendar/useCalendar';
+export {useCalendarCell} from '../src/calendar/useCalendarCell';
+export {useCalendarGrid} from '../src/calendar/useCalendarGrid';
+export {useRangeCalendar} from '../src/calendar/useRangeCalendar';
+export {useCheckbox} from '../src/checkbox/useCheckbox';
+export {useCheckboxGroup} from '../src/checkbox/useCheckboxGroup';
+export {useCheckboxGroupItem} from '../src/checkbox/useCheckboxGroupItem';
+export {useColorArea} from '../src/color/useColorArea';
+export {useColorChannelField} from '../src/color/useColorChannelField';
+export {useColorField} from '../src/color/useColorField';
+export {useColorSlider} from '../src/color/useColorSlider';
+export {useColorSwatch} from '../src/color/useColorSwatch';
+export {useColorWheel} from '../src/color/useColorWheel';
+export {useComboBox} from '../src/combobox/useComboBox';
+export {useDateField, useTimeField} from '../src/datepicker/useDateField';
+export {useDatePicker} from '../src/datepicker/useDatePicker';
+export {useDateRangePicker} from '../src/datepicker/useDateRangePicker';
+export {useDateSegment} from '../src/datepicker/useDateSegment';
+export {useDialog} from '../src/dialog/useDialog';
+export {useDisclosure} from '../src/disclosure/useDisclosure';
+export {useDrag} from '../src/dnd/useDrag';
+export {useDrop} from '../src/dnd/useDrop';
+export {useDraggableCollection} from '../src/dnd/useDraggableCollection';
+export {useDroppableCollection} from '../src/dnd/useDroppableCollection';
+export {useDroppableItem} from '../src/dnd/useDroppableItem';
+export {useDropIndicator} from '../src/dnd/useDropIndicator';
+export {useDraggableItem} from '../src/dnd/useDraggableItem';
+export {useClipboard} from '../src/dnd/useClipboard';
+export {DragPreview} from '../src/dnd/DragPreview';
+export {ListDropTargetDelegate} from '../src/dnd/ListDropTargetDelegate';
+export {DIRECTORY_DRAG_TYPE, isDirectoryDropItem, isFileDropItem, isTextDropItem} from '../src/dnd/utils';
+export {FocusRing} from '../src/focus/FocusRing';
+export {FocusScope, useFocusManager} from '../src/focus/FocusScope';
+export {useFocusRing} from '../src/focus/useFocusRing';
+export {I18nProvider, useLocale} from '../src/i18n/I18nProvider';
+export {isRTL} from '../src/i18n/utils';
+export {useCollator} from '../src/i18n/useCollator';
+export {useDateFormatter} from '../src/i18n/useDateFormatter';
+export {useFilter} from '../src/i18n/useFilter';
+export {useLocalizedStringFormatter} from '../src/i18n/useLocalizedStringFormatter';
+export {useMessageFormatter} from '../src/i18n/useMessageFormatter';
+export {useNumberFormatter} from '../src/i18n/useNumberFormatter';
+export {useListFormatter} from '../src/i18n/useListFormatter';
+export {useFocus} from '../src/interactions/useFocus';
+export {useFocusVisible} from '../src/interactions/useFocusVisible';
+export {useFocusWithin} from '../src/interactions/useFocusWithin';
+export {useHover} from '../src/interactions/useHover';
+export {useInteractOutside} from '../src/interactions/useInteractOutside';
+export {useKeyboard} from '../src/interactions/useKeyboard';
+export {useMove} from '../src/interactions/useMove';
+export {usePress} from '../src/interactions/usePress';
+export {useLongPress} from '../src/interactions/useLongPress';
+export {useFocusable, Focusable} from '../src/interactions/useFocusable';
+export {Pressable} from '../src/interactions/Pressable';
+export {useField} from '../src/label/useField';
+export {useLabel} from '../src/label/useLabel';
+export {useGridList} from '../src/gridlist/useGridList';
+export {useGridListItem} from '../src/gridlist/useGridListItem';
+export {useGridListSection} from '../src/gridlist/useGridListSection';
+export {useGridListSelectionCheckbox} from '../src/gridlist/useGridListSelectionCheckbox';
+export {useLandmark} from '../src/landmark/useLandmark';
+export {useLink} from '../src/link/useLink';
+export {useListBox} from '../src/listbox/useListBox';
+export {useListBoxSection} from '../src/listbox/useListBoxSection';
+export {useOption} from '../src/listbox/useOption';
+export {useMenu} from '../src/menu/useMenu';
+export {useMenuItem} from '../src/menu/useMenuItem';
+export {useMenuSection} from '../src/menu/useMenuSection';
+export {useMenuTrigger} from '../src/menu/useMenuTrigger';
+export {useSubmenuTrigger} from '../src/menu/useSubmenuTrigger';
+export {useMeter} from '../src/meter/useMeter';
+export {useNumberField} from '../src/numberfield/useNumberField';
+export {DismissButton} from '../src/overlays/DismissButton';
+export {ModalProvider, OverlayContainer, OverlayProvider, useModal, useModalProvider} from '../src/overlays/useModal';
+export {Overlay} from '../src/overlays/Overlay';
+export {useModalOverlay} from '../src/overlays/useModalOverlay';
+export {useOverlay} from '../src/overlays/useOverlay';
+export {useOverlayPosition} from '../src/overlays/useOverlayPosition';
+export {useOverlayTrigger} from '../src/overlays/useOverlayTrigger';
+export {usePopover} from '../src/overlays/usePopover';
+export {usePreventScroll} from '../src/overlays/usePreventScroll';
+export {UNSAFE_PortalProvider, useUNSAFE_PortalContext} from '../src/overlays/PortalProvider';
+export {useProgressBar} from '../src/progress/useProgressBar';
+export {useRadio} from '../src/radio/useRadio';
+export {useRadioGroup} from '../src/radio/useRadioGroup';
+export {useSearchField} from '../src/searchfield/useSearchField';
+export {HiddenSelect, useHiddenSelect} from '../src/select/HiddenSelect';
+export {useSelect} from '../src/select/useSelect';
+export {ListKeyboardDelegate} from '../src/selection/ListKeyboardDelegate';
+export {useSeparator} from '../src/separator/useSeparator';
+export {SSRProvider, useIsSSR} from '../src/ssr/SSRProvider';
+export {useSlider} from '../src/slider/useSlider';
+export {useSliderThumb} from '../src/slider/useSliderThumb';
+export {useSwitch} from '../src/switch/useSwitch';
+export {useTable} from '../src/table/useTable';
+export {useTableCell} from '../src/table/useTableCell';
+export {useTableColumnHeader} from '../src/table/useTableColumnHeader';
+export {useTableColumnResize} from '../src/table/useTableColumnResize';
+export {useTableHeaderRow} from '../src/table/useTableHeaderRow';
+export {useTableRow} from '../src/table/useTableRow';
+export {useTableRowGroup} from '../src/table/useTableRowGroup';
+export {useTableSelectAllCheckbox, useTableSelectionCheckbox} from '../src/table/useTableSelectionCheckbox';
+export {useTab} from '../src/tabs/useTab';
+export {useTabList} from '../src/tabs/useTabList';
+export {useTabPanel} from '../src/tabs/useTabPanel';
+export {useTag} from '../src/tag/useTag';
+export {useTagGroup} from '../src/tag/useTagGroup';
+export {useTextField} from '../src/textfield/useTextField';
+export {useToast} from '../src/toast/useToast';
+export {useToastRegion} from '../src/toast/useToastRegion';
+export {useTooltip} from '../src/tooltip/useTooltip';
+export {useTooltipTrigger} from '../src/tooltip/useTooltipTrigger';
+export {useTree} from '../src/tree/useTree';
+export {useTreeItem} from '../src/tree/useTreeItem';
+export {chain} from '../src/utils/chain';
+export {mergeProps} from '../src/utils/mergeProps';
+export {useId} from '../src/utils/useId';
+export {useObjectRef} from '../src/utils/useObjectRef';
+export {RouterProvider} from '../src/utils/openLink';
+export {VisuallyHidden, useVisuallyHidden} from '../src/visually-hidden/VisuallyHidden';
+export type {AriaBreadcrumbItemProps, AriaBreadcrumbsProps} from '@react-types/breadcrumbs';
+export type {BreadcrumbItemAria} from '../src/breadcrumbs/useBreadcrumbItem';
+export type {BreadcrumbsAria} from '../src/breadcrumbs/useBreadcrumbs';
+export type {AriaButtonOptions, ButtonAria} from '../src/button/useButton';
+export type {AriaButtonProps, AriaToggleButtonProps} from '@react-types/button';
+export type {AriaToggleButtonOptions, ToggleButtonAria} from '../src/button/useToggleButton';
+export type {AriaToggleButtonGroupProps, ToggleButtonGroupAria, AriaToggleButtonGroupItemProps, AriaToggleButtonGroupItemOptions} from '../src/button/useToggleButtonGroup';
+export type {AriaCalendarCellProps, CalendarCellAria} from '../src/calendar/useCalendarCell';
+export type {AriaCalendarGridProps, CalendarGridAria} from '../src/calendar/useCalendarGrid';
+export type {AriaCalendarProps, AriaRangeCalendarProps, CalendarProps, RangeCalendarProps} from '@react-types/calendar';
+export type {CalendarAria} from '../src/calendar/useCalendarBase';
+export type {AriaCheckboxGroupItemProps, AriaCheckboxGroupProps, AriaCheckboxProps} from '@react-types/checkbox';
+export type {CheckboxAria} from '../src/checkbox/useCheckbox';
+export type {CheckboxGroupAria} from '../src/checkbox/useCheckboxGroup';
+export type {AriaColorAreaOptions, ColorAreaAria} from '../src/color/useColorArea';
+export type {AriaColorAreaProps, AriaColorFieldProps, AriaColorSliderProps} from '@react-types/color';
+export type {AriaColorChannelFieldProps, ColorChannelFieldAria} from '../src/color/useColorChannelField';
+export type {AriaColorSliderOptions, ColorSliderAria} from '../src/color/useColorSlider';
+export type {AriaColorSwatchProps, ColorSwatchAria} from '../src/color/useColorSwatch';
+export type {AriaColorWheelOptions, ColorWheelAria} from '../src/color/useColorWheel';
+export type {ColorFieldAria} from '../src/color/useColorField';
+export type {AriaComboBoxOptions, ComboBoxAria} from '../src/combobox/useComboBox';
+export type {AriaComboBoxProps} from '@react-types/combobox';
+export type {AriaDateFieldProps, AriaDatePickerProps, AriaDateRangePickerProps, AriaTimeFieldProps, DateRange, DateValue, TimeValue} from '@react-types/datepicker';
+export type {AriaDateFieldOptions, AriaTimeFieldOptions, DateFieldAria} from '../src/datepicker/useDateField';
+export type {DatePickerAria} from '../src/datepicker/useDatePicker';
+export type {DateRangePickerAria} from '../src/datepicker/useDateRangePicker';
+export type {DateSegmentAria} from '../src/datepicker/useDateSegment';
+export type {AriaDialogProps} from '@react-types/dialog';
+export type {DialogAria} from '../src/dialog/useDialog';
+export type {DisclosureAria, AriaDisclosureProps} from '../src/disclosure/useDisclosure';
+export type {AriaFocusRingProps, FocusRingAria} from '../src/focus/useFocusRing';
+export type {FocusableAria, FocusableOptions} from '../src/interactions/useFocusable';
+export type {FocusManager, FocusManagerOptions, FocusScopeProps} from '../src/focus/FocusScope';
+export type {FocusRingProps} from '../src/focus/FocusRing';
+export type {DateFormatter} from '@internationalized/date';
+export type {DateFormatterOptions} from '../src/i18n/useDateFormatter';
+export type {Filter} from '../src/i18n/useFilter';
+export type {FormatMessage} from '../src/i18n/useMessageFormatter';
+export type {I18nProviderProps, Locale} from '../src/i18n/I18nProvider';
+export type {LocalizedStringFormatter} from '@internationalized/string';
+export type {LocalizedStrings} from '@internationalized/message';
+export type {ClipboardProps, ClipboardResult} from '../src/dnd/useClipboard';
+export type {DirectoryDropItem, DragEndEvent, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DragTypes, DropEnterEvent, DropEvent, DropExitEvent, DropItem, DropMoveEvent, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, DropTargetDelegate, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
+export type {DraggableCollectionOptions} from '../src/dnd/useDraggableCollection';
+export type {DraggableItemProps, DraggableItemResult} from '../src/dnd/useDraggableItem';
+export type {DragOptions, DragResult} from '../src/dnd/useDrag';
+export type {DragPreviewProps} from '../src/dnd/DragPreview';
+export type {DropIndicatorAria, DropIndicatorProps} from '../src/dnd/useDropIndicator';
+export type {DropOptions, DropResult} from '../src/dnd/useDrop';
+export type {DroppableCollectionOptions, DroppableCollectionResult} from '../src/dnd/useDroppableCollection';
+export type {DroppableItemOptions, DroppableItemResult} from '../src/dnd/useDroppableItem';
+export type {FocusProps, FocusResult} from '../src/interactions/useFocus';
+export type {FocusVisibleProps, FocusVisibleResult} from '../src/interactions/useFocusVisible';
+export type {FocusWithinProps, FocusWithinResult} from '../src/interactions/useFocusWithin';
+export type {HoverProps, HoverResult} from '../src/interactions/useHover';
+export type {InteractOutsideProps} from '../src/interactions/useInteractOutside';
+export type {KeyboardProps, KeyboardResult} from '../src/interactions/useKeyboard';
+export type {LongPressProps, LongPressResult} from '../src/interactions/useLongPress';
+export type {MoveEvents, PressEvent, PressEvents, LongPressEvent, MoveStartEvent, MoveMoveEvent, MoveEndEvent, MoveEvent, HoverEvent, HoverEvents, FocusEvents, KeyboardEvents} from '@react-types/shared';
+export type {MoveResult} from '../src/interactions/useMove';
+export type {PressHookProps, PressProps, PressResult} from '../src/interactions/usePress';
+export type {ScrollWheelProps} from '../src/interactions/useScrollWheel';
+export type {AriaFieldProps, FieldAria} from '../src/label/useField';
+export type {LabelAria, LabelAriaProps} from '../src/label/useLabel';
+export type {AriaLandmarkRole, AriaLandmarkProps, LandmarkAria, LandmarkController} from '../src/landmark/useLandmark';
+export type {AriaLinkOptions, LinkAria} from '../src/link/useLink';
+export type {AriaListBoxOptions, ListBoxAria} from '../src/listbox/useListBox';
+export type {AriaListBoxProps} from '@react-types/listbox';
+export type {AriaListBoxSectionProps, ListBoxSectionAria} from '../src/listbox/useListBoxSection';
+export type {AriaOptionProps, OptionAria} from '../src/listbox/useOption';
+export type {AriaGridListOptions, GridListProps, AriaGridListProps, GridListAria} from '../src/gridlist/useGridList';
+export type {AriaGridListItemOptions, GridListItemAria} from '../src/gridlist/useGridListItem';
+export type {AriaGridSelectionCheckboxProps, GridSelectionCheckboxAria} from '../src/grid/useGridSelectionCheckbox';
+export type {AriaGridListSectionProps, GridListSectionAria} from '../src/gridlist/useGridListSection';
+export type {AriaMenuProps} from '@react-types/menu';
+export type {AriaMenuItemProps, MenuItemAria} from '../src/menu/useMenuItem';
+export type {AriaMenuOptions, MenuAria} from '../src/menu/useMenu';
+export type {AriaMenuSectionProps, MenuSectionAria} from '../src/menu/useMenuSection';
+export type {AriaMenuTriggerProps, MenuTriggerAria} from '../src/menu/useMenuTrigger';
+export type {SubmenuTriggerAria, AriaSubmenuTriggerProps} from '../src/menu/useSubmenuTrigger';
+export type {AriaMeterProps} from '@react-types/meter';
+export type {MeterAria} from '../src/meter/useMeter';
+export type {AriaNumberFieldProps} from '@react-types/numberfield';
+export type {NumberFieldAria} from '../src/numberfield/useNumberField';
+export type {AriaModalOptions, ModalAria, ModalProviderAria, ModalProviderProps, OverlayContainerProps} from '../src/overlays/useModal';
+export type {AriaModalOverlayProps, ModalOverlayAria} from '../src/overlays/useModalOverlay';
+export type {AriaOverlayProps, OverlayAria} from '../src/overlays/useOverlay';
+export type {AriaPopoverProps, PopoverAria} from '../src/overlays/usePopover';
+export type {AriaPositionProps, PositionAria} from '../src/overlays/useOverlayPosition';
+export type {DismissButtonProps} from '../src/overlays/DismissButton';
+export type {OverlayProps} from '../src/overlays/Overlay';
+export type {OverlayTriggerAria, OverlayTriggerProps} from '../src/overlays/useOverlayTrigger';
+export type {Placement, PlacementAxis, PositionProps} from '@react-types/overlays';
+export type {PortalProviderProps, PortalProviderContextValue} from '../src/overlays/PortalProvider';
+export type {AriaProgressBarProps} from '@react-types/progress';
+export type {ProgressBarAria} from '../src/progress/useProgressBar';
+export type {AriaRadioGroupProps, AriaRadioProps} from '@react-types/radio';
+export type {RadioAria} from '../src/radio/useRadio';
+export type {RadioGroupAria} from '../src/radio/useRadioGroup';
+export type {AriaSearchFieldProps} from '@react-types/searchfield';
+export type {SearchFieldAria} from '../src/searchfield/useSearchField';
+export type {AriaHiddenSelectProps, AriaHiddenSelectOptions, HiddenSelectAria, HiddenSelectProps} from '../src/select/HiddenSelect';
+export type {AriaSelectProps} from '@react-types/select';
+export type {AriaSelectOptions, SelectAria} from '../src/select/useSelect';
+export type {SeparatorAria, SeparatorProps} from '../src/separator/useSeparator';
+export type {SSRProviderProps} from '../src/ssr/SSRProvider';
+export type {AriaSliderProps, AriaSliderThumbProps} from '@react-types/slider';
+export type {AriaSliderThumbOptions, SliderThumbAria} from '../src/slider/useSliderThumb';
+export type {SliderAria} from '../src/slider/useSlider';
+export type {AriaSwitchProps} from '@react-types/switch';
+export type {SwitchAria} from '../src/switch/useSwitch';
+export type {AriaTableCellProps, TableCellAria} from '../src/table/useTableCell';
+export type {AriaTableColumnHeaderProps, TableColumnHeaderAria} from '../src/table/useTableColumnHeader';
+export type {AriaTableColumnResizeProps, TableColumnResizeAria} from '../src/table/useTableColumnResize';
+export type {AriaTableProps} from '../src/table/useTable';
+export type {AriaTableSelectionCheckboxProps, TableSelectAllCheckboxAria, TableSelectionCheckboxAria} from '../src/table/useTableSelectionCheckbox';
+export type {GridAria} from '../src/grid/useGrid';
+export type {GridRowAria, GridRowProps} from '../src/grid/useGridRow';
+export type {TableHeaderRowAria} from '../src/table/useTableHeaderRow';
+export type {AriaTabListProps, AriaTabPanelProps, AriaTabProps} from '@react-types/tabs';
+export type {AriaTabListOptions, TabListAria} from '../src/tabs/useTabList';
+export type {TabAria} from '../src/tabs/useTab';
+export type {TabPanelAria} from '../src/tabs/useTabPanel';
+export type {AriaTagGroupProps, AriaTagGroupOptions, TagGroupAria} from '../src/tag/useTagGroup';
+export type {AriaTagProps, TagAria} from '../src/tag/useTag';
+export type {AriaTextFieldOptions, TextFieldAria} from '../src/textfield/useTextField';
+export type {AriaTextFieldProps} from '@react-types/textfield';
+export type {AriaToastRegionProps, ToastRegionAria} from '../src/toast/useToastRegion';
+export type {AriaToastProps, ToastAria} from '../src/toast/useToast';
+export type {AriaTooltipProps, TooltipTriggerProps} from '@react-types/tooltip';
+export type {TooltipAria} from '../src/tooltip/useTooltip';
+export type {TooltipTriggerAria} from '../src/tooltip/useTooltipTrigger';
+export type {AriaTreeProps, TreeProps, TreeAria} from '../src/tree/useTree';
+export type {AriaTreeItemOptions, TreeItemAria} from '../src/tree/useTreeItem';
+export type {VisuallyHiddenAria, VisuallyHiddenProps} from '../src/visually-hidden/VisuallyHidden';
+export type {Key, Orientation, RangeValue} from '@react-types/shared';
diff --git a/packages/react-aria/exports/mergeProps.ts b/packages/react-aria/exports/mergeProps.ts
new file mode 100644
index 00000000000..e3fb055b0b2
--- /dev/null
+++ b/packages/react-aria/exports/mergeProps.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {mergeProps} from '../src/utils/mergeProps';
+export {} from 'react-stately/private/utils/number';
diff --git a/packages/react-aria/exports/private/actiongroup/useActionGroup.ts b/packages/react-aria/exports/private/actiongroup/useActionGroup.ts
new file mode 100644
index 00000000000..565e61c170b
--- /dev/null
+++ b/packages/react-aria/exports/private/actiongroup/useActionGroup.ts
@@ -0,0 +1 @@
+export {useActionGroup, type ActionGroupAria} from '../../../src/actiongroup/useActionGroup';
diff --git a/packages/react-aria/exports/private/actiongroup/useActionGroupItem.ts b/packages/react-aria/exports/private/actiongroup/useActionGroupItem.ts
new file mode 100644
index 00000000000..2b9625c9bd2
--- /dev/null
+++ b/packages/react-aria/exports/private/actiongroup/useActionGroupItem.ts
@@ -0,0 +1 @@
+export {useActionGroupItem, type ActionGroupItemAria, type AriaActionGroupItemProps} from '../../../src/actiongroup/useActionGroupItem';
diff --git a/packages/react-aria/exports/private/aria-modal-polyfill/ariaModalPolyfill.ts b/packages/react-aria/exports/private/aria-modal-polyfill/ariaModalPolyfill.ts
new file mode 100644
index 00000000000..4549d2b2ec9
--- /dev/null
+++ b/packages/react-aria/exports/private/aria-modal-polyfill/ariaModalPolyfill.ts
@@ -0,0 +1 @@
+export {watchModals} from '../../../src/aria-modal-polyfill/ariaModalPolyfill';
diff --git a/packages/react-aria/exports/private/autocomplete/useAutocomplete.ts b/packages/react-aria/exports/private/autocomplete/useAutocomplete.ts
new file mode 100644
index 00000000000..7b424974fc8
--- /dev/null
+++ b/packages/react-aria/exports/private/autocomplete/useAutocomplete.ts
@@ -0,0 +1 @@
+export {type AriaAutocompleteProps, useAutocomplete, type AriaAutocompleteOptions, type AutocompleteAria, type CollectionOptions, type InputProps} from '../../../src/autocomplete/useAutocomplete';
diff --git a/packages/react-aria/exports/private/autocomplete/useSearchAutocomplete.ts b/packages/react-aria/exports/private/autocomplete/useSearchAutocomplete.ts
new file mode 100644
index 00000000000..11a02d4ed2b
--- /dev/null
+++ b/packages/react-aria/exports/private/autocomplete/useSearchAutocomplete.ts
@@ -0,0 +1 @@
+export {useSearchAutocomplete, type AriaSearchAutocompleteOptions, type SearchAutocompleteAria} from '../../../src/autocomplete/useSearchAutocomplete';
diff --git a/packages/react-aria/exports/private/calendar/useCalendarBase.ts b/packages/react-aria/exports/private/calendar/useCalendarBase.ts
new file mode 100644
index 00000000000..7b37f386f79
--- /dev/null
+++ b/packages/react-aria/exports/private/calendar/useCalendarBase.ts
@@ -0,0 +1 @@
+export {type CalendarAria} from '../../../src/calendar/useCalendarBase';
diff --git a/packages/react-aria/exports/private/collections/BaseCollection.ts b/packages/react-aria/exports/private/collections/BaseCollection.ts
new file mode 100644
index 00000000000..f322706a7fd
--- /dev/null
+++ b/packages/react-aria/exports/private/collections/BaseCollection.ts
@@ -0,0 +1 @@
+export {CollectionNode, HeaderNode, ItemNode, LoaderNode, SectionNode, BaseCollection, FilterableNode} from '../../../src/collections/BaseCollection';
diff --git a/packages/react-aria/exports/private/collections/CollectionBuilder.ts b/packages/react-aria/exports/private/collections/CollectionBuilder.ts
new file mode 100644
index 00000000000..07cc0f93dc8
--- /dev/null
+++ b/packages/react-aria/exports/private/collections/CollectionBuilder.ts
@@ -0,0 +1 @@
+export {Collection, CollectionBuilder, createLeafComponent, createBranchComponent, type CollectionBuilderProps, type CollectionProps} from '../../../src/collections/CollectionBuilder';
diff --git a/packages/react-aria/exports/private/collections/Hidden.ts b/packages/react-aria/exports/private/collections/Hidden.ts
new file mode 100644
index 00000000000..58b05b59f76
--- /dev/null
+++ b/packages/react-aria/exports/private/collections/Hidden.ts
@@ -0,0 +1 @@
+export {createHideableComponent, useIsHidden} from '../../../src/collections/Hidden';
diff --git a/packages/react-aria/exports/private/collections/useCachedChildren.ts b/packages/react-aria/exports/private/collections/useCachedChildren.ts
new file mode 100644
index 00000000000..bd013a9d964
--- /dev/null
+++ b/packages/react-aria/exports/private/collections/useCachedChildren.ts
@@ -0,0 +1 @@
+export {useCachedChildren, type CachedChildrenOptions} from '../../../src/collections/useCachedChildren';
diff --git a/packages/react-aria/exports/private/datepicker/useDisplayNames.ts b/packages/react-aria/exports/private/datepicker/useDisplayNames.ts
new file mode 100644
index 00000000000..0ffdc512e51
--- /dev/null
+++ b/packages/react-aria/exports/private/datepicker/useDisplayNames.ts
@@ -0,0 +1 @@
+export {useDisplayNames} from '../../../src/datepicker/useDisplayNames';
diff --git a/packages/react-aria/exports/private/dnd/DragManager.ts b/packages/react-aria/exports/private/dnd/DragManager.ts
new file mode 100644
index 00000000000..7ca257627a7
--- /dev/null
+++ b/packages/react-aria/exports/private/dnd/DragManager.ts
@@ -0,0 +1 @@
+export {isVirtualDragging} from '../../../src/dnd/DragManager';
diff --git a/packages/react-aria/exports/private/dnd/utils.ts b/packages/react-aria/exports/private/dnd/utils.ts
new file mode 100644
index 00000000000..c98a0ff2f4c
--- /dev/null
+++ b/packages/react-aria/exports/private/dnd/utils.ts
@@ -0,0 +1 @@
+export {isTextDropItem, DIRECTORY_DRAG_TYPE, isDirectoryDropItem, isFileDropItem} from '../../../src/dnd/utils';
diff --git a/packages/react-aria/exports/private/focus/FocusScope.ts b/packages/react-aria/exports/private/focus/FocusScope.ts
new file mode 100644
index 00000000000..41fb9204409
--- /dev/null
+++ b/packages/react-aria/exports/private/focus/FocusScope.ts
@@ -0,0 +1 @@
+export {getFocusableTreeWalker, createFocusManager, isElementInChildOfActiveScope} from '../../../src/focus/FocusScope';
diff --git a/packages/react-aria/exports/private/focus/useHasTabbableChild.ts b/packages/react-aria/exports/private/focus/useHasTabbableChild.ts
new file mode 100644
index 00000000000..d6b92d8130e
--- /dev/null
+++ b/packages/react-aria/exports/private/focus/useHasTabbableChild.ts
@@ -0,0 +1 @@
+export {useHasTabbableChild} from '../../../src/focus/useHasTabbableChild';
diff --git a/packages/react-aria/exports/private/focus/virtualFocus.ts b/packages/react-aria/exports/private/focus/virtualFocus.ts
new file mode 100644
index 00000000000..a66b7892e15
--- /dev/null
+++ b/packages/react-aria/exports/private/focus/virtualFocus.ts
@@ -0,0 +1 @@
+export {moveVirtualFocus, dispatchVirtualBlur, dispatchVirtualFocus, getVirtuallyFocusedElement} from '../../../src/focus/virtualFocus';
diff --git a/packages/react-aria/exports/private/form/useFormValidation.ts b/packages/react-aria/exports/private/form/useFormValidation.ts
new file mode 100644
index 00000000000..e19c808e995
--- /dev/null
+++ b/packages/react-aria/exports/private/form/useFormValidation.ts
@@ -0,0 +1 @@
+export {useFormValidation} from '../../../src/form/useFormValidation';
diff --git a/packages/react-aria/exports/private/grid/GridKeyboardDelegate.ts b/packages/react-aria/exports/private/grid/GridKeyboardDelegate.ts
new file mode 100644
index 00000000000..7c8b39664fe
--- /dev/null
+++ b/packages/react-aria/exports/private/grid/GridKeyboardDelegate.ts
@@ -0,0 +1 @@
+export {GridKeyboardDelegate, type GridKeyboardDelegateOptions} from '../../../src/grid/GridKeyboardDelegate';
diff --git a/packages/react-aria/exports/private/grid/useGrid.ts b/packages/react-aria/exports/private/grid/useGrid.ts
new file mode 100644
index 00000000000..89ed2c402ad
--- /dev/null
+++ b/packages/react-aria/exports/private/grid/useGrid.ts
@@ -0,0 +1 @@
+export {type GridAria, useGrid, type GridProps} from '../../../src/grid/useGrid';
diff --git a/packages/react-aria/exports/private/grid/useGridCell.ts b/packages/react-aria/exports/private/grid/useGridCell.ts
new file mode 100644
index 00000000000..32b8313a2ab
--- /dev/null
+++ b/packages/react-aria/exports/private/grid/useGridCell.ts
@@ -0,0 +1 @@
+export {useGridCell, type GridCellAria, type GridCellProps} from '../../../src/grid/useGridCell';
diff --git a/packages/react-aria/exports/private/grid/useGridRow.ts b/packages/react-aria/exports/private/grid/useGridRow.ts
new file mode 100644
index 00000000000..8b2e7d81c1d
--- /dev/null
+++ b/packages/react-aria/exports/private/grid/useGridRow.ts
@@ -0,0 +1 @@
+export {type GridRowAria, type GridRowProps, useGridRow} from '../../../src/grid/useGridRow';
diff --git a/packages/react-aria/exports/private/grid/useGridRowGroup.ts b/packages/react-aria/exports/private/grid/useGridRowGroup.ts
new file mode 100644
index 00000000000..8996a154757
--- /dev/null
+++ b/packages/react-aria/exports/private/grid/useGridRowGroup.ts
@@ -0,0 +1 @@
+export {useGridRowGroup, type GridRowGroupAria} from '../../../src/grid/useGridRowGroup';
diff --git a/packages/react-aria/exports/private/grid/useGridSelectionAnnouncement.ts b/packages/react-aria/exports/private/grid/useGridSelectionAnnouncement.ts
new file mode 100644
index 00000000000..627da7019a0
--- /dev/null
+++ b/packages/react-aria/exports/private/grid/useGridSelectionAnnouncement.ts
@@ -0,0 +1 @@
+export {useGridSelectionAnnouncement, type GridSelectionAnnouncementProps} from '../../../src/grid/useGridSelectionAnnouncement';
diff --git a/packages/react-aria/exports/private/grid/useGridSelectionCheckbox.ts b/packages/react-aria/exports/private/grid/useGridSelectionCheckbox.ts
new file mode 100644
index 00000000000..0fad2ed51a4
--- /dev/null
+++ b/packages/react-aria/exports/private/grid/useGridSelectionCheckbox.ts
@@ -0,0 +1 @@
+export {type AriaGridSelectionCheckboxProps, type GridSelectionCheckboxAria, useGridSelectionCheckbox} from '../../../src/grid/useGridSelectionCheckbox';
diff --git a/packages/react-aria/exports/private/grid/useHighlightSelectionDescription.ts b/packages/react-aria/exports/private/grid/useHighlightSelectionDescription.ts
new file mode 100644
index 00000000000..627a20ea9b7
--- /dev/null
+++ b/packages/react-aria/exports/private/grid/useHighlightSelectionDescription.ts
@@ -0,0 +1 @@
+export {useHighlightSelectionDescription, type HighlightSelectionDescriptionProps} from '../../../src/grid/useHighlightSelectionDescription';
diff --git a/packages/react-aria/exports/private/i18n/useLocalizedStringFormatter.ts b/packages/react-aria/exports/private/i18n/useLocalizedStringFormatter.ts
new file mode 100644
index 00000000000..7524921cd0f
--- /dev/null
+++ b/packages/react-aria/exports/private/i18n/useLocalizedStringFormatter.ts
@@ -0,0 +1 @@
+export {useLocalizedStringDictionary} from '../../../src/i18n/useLocalizedStringFormatter';
diff --git a/packages/react-aria/exports/private/i18n/useMessageFormatter.ts b/packages/react-aria/exports/private/i18n/useMessageFormatter.ts
new file mode 100644
index 00000000000..26bfb4243e3
--- /dev/null
+++ b/packages/react-aria/exports/private/i18n/useMessageFormatter.ts
@@ -0,0 +1 @@
+export {useMessageFormatter, type FormatMessage} from '../../../src/i18n/useMessageFormatter';
diff --git a/packages/react-aria/exports/private/i18n/utils.ts b/packages/react-aria/exports/private/i18n/utils.ts
new file mode 100644
index 00000000000..35ba57138a6
--- /dev/null
+++ b/packages/react-aria/exports/private/i18n/utils.ts
@@ -0,0 +1 @@
+export {isRTL} from '../../../src/i18n/utils';
diff --git a/packages/react-aria/exports/private/interactions/PressResponder.ts b/packages/react-aria/exports/private/interactions/PressResponder.ts
new file mode 100644
index 00000000000..fe4166d0f1a
--- /dev/null
+++ b/packages/react-aria/exports/private/interactions/PressResponder.ts
@@ -0,0 +1 @@
+export {PressResponder, ClearPressResponder} from '../../../src/interactions/PressResponder';
diff --git a/packages/react-aria/exports/private/interactions/Pressable.ts b/packages/react-aria/exports/private/interactions/Pressable.ts
new file mode 100644
index 00000000000..458a27595f1
--- /dev/null
+++ b/packages/react-aria/exports/private/interactions/Pressable.ts
@@ -0,0 +1 @@
+export {Pressable} from '../../../src/interactions/Pressable';
diff --git a/packages/react-aria/exports/private/interactions/focusSafely.ts b/packages/react-aria/exports/private/interactions/focusSafely.ts
new file mode 100644
index 00000000000..40610bce9b3
--- /dev/null
+++ b/packages/react-aria/exports/private/interactions/focusSafely.ts
@@ -0,0 +1 @@
+export {focusSafely} from '../../../src/interactions/focusSafely';
diff --git a/packages/react-aria/exports/private/interactions/useFocusVisible.ts b/packages/react-aria/exports/private/interactions/useFocusVisible.ts
new file mode 100644
index 00000000000..3c65f6b794b
--- /dev/null
+++ b/packages/react-aria/exports/private/interactions/useFocusVisible.ts
@@ -0,0 +1 @@
+export {setInteractionModality, getInteractionModality, isFocusVisible, getPointerType, addWindowFocusTracking, useInteractionModality, useFocusVisibleListener, type FocusVisibleHandler, type Modality} from '../../../src/interactions/useFocusVisible';
diff --git a/packages/react-aria/exports/private/interactions/useFocusable.ts b/packages/react-aria/exports/private/interactions/useFocusable.ts
new file mode 100644
index 00000000000..467ee6876b5
--- /dev/null
+++ b/packages/react-aria/exports/private/interactions/useFocusable.ts
@@ -0,0 +1 @@
+export {Focusable, FocusableProvider, useFocusable, FocusableContext, type FocusableAria, type FocusableOptions, type FocusableProviderProps} from '../../../src/interactions/useFocusable';
diff --git a/packages/react-aria/exports/private/interactions/useInteractOutside.ts b/packages/react-aria/exports/private/interactions/useInteractOutside.ts
new file mode 100644
index 00000000000..3a64551646b
--- /dev/null
+++ b/packages/react-aria/exports/private/interactions/useInteractOutside.ts
@@ -0,0 +1 @@
+export {useInteractOutside, type InteractOutsideProps} from '../../../src/interactions/useInteractOutside';
diff --git a/packages/react-aria/exports/private/interactions/useScrollWheel.ts b/packages/react-aria/exports/private/interactions/useScrollWheel.ts
new file mode 100644
index 00000000000..d4e6f97470a
--- /dev/null
+++ b/packages/react-aria/exports/private/interactions/useScrollWheel.ts
@@ -0,0 +1 @@
+export {useScrollWheel, type ScrollWheelProps} from '../../../src/interactions/useScrollWheel';
diff --git a/packages/react-aria/exports/private/landmark/useLandmark.ts b/packages/react-aria/exports/private/landmark/useLandmark.ts
new file mode 100644
index 00000000000..a3d8c5baa78
--- /dev/null
+++ b/packages/react-aria/exports/private/landmark/useLandmark.ts
@@ -0,0 +1 @@
+export {UNSTABLE_createLandmarkController, type LandmarkControllerOptions} from '../../../src/landmark/useLandmark';
diff --git a/packages/react-aria/exports/private/listbox/utils.ts b/packages/react-aria/exports/private/listbox/utils.ts
new file mode 100644
index 00000000000..6cd2e7f5699
--- /dev/null
+++ b/packages/react-aria/exports/private/listbox/utils.ts
@@ -0,0 +1 @@
+export {listData, getItemId} from '../../../src/listbox/utils';
diff --git a/packages/react-aria/exports/private/live-announcer/LiveAnnouncer.ts b/packages/react-aria/exports/private/live-announcer/LiveAnnouncer.ts
new file mode 100644
index 00000000000..4b8ac8c487b
--- /dev/null
+++ b/packages/react-aria/exports/private/live-announcer/LiveAnnouncer.ts
@@ -0,0 +1 @@
+export {announce, clearAnnouncer, destroyAnnouncer} from '../../../src/live-announcer/LiveAnnouncer';
diff --git a/packages/react-aria/exports/private/overlays/Overlay.ts b/packages/react-aria/exports/private/overlays/Overlay.ts
new file mode 100644
index 00000000000..7c91a40eb9d
--- /dev/null
+++ b/packages/react-aria/exports/private/overlays/Overlay.ts
@@ -0,0 +1 @@
+export {useOverlayFocusContain} from '../../../src/overlays/Overlay';
diff --git a/packages/react-aria/exports/private/overlays/ariaHideOutside.ts b/packages/react-aria/exports/private/overlays/ariaHideOutside.ts
new file mode 100644
index 00000000000..599708cfc3d
--- /dev/null
+++ b/packages/react-aria/exports/private/overlays/ariaHideOutside.ts
@@ -0,0 +1 @@
+export {ariaHideOutside} from '../../../src/overlays/ariaHideOutside';
diff --git a/packages/react-aria/exports/private/overlays/useModal.ts b/packages/react-aria/exports/private/overlays/useModal.ts
new file mode 100644
index 00000000000..619f087efc3
--- /dev/null
+++ b/packages/react-aria/exports/private/overlays/useModal.ts
@@ -0,0 +1 @@
+export {OverlayContainer, ModalProvider, useModalProvider, OverlayProvider, useModal, type AriaModalOptions, type ModalAria, type ModalProviderAria, type ModalProviderProps, type OverlayContainerProps} from '../../../src/overlays/useModal';
diff --git a/packages/react-aria/exports/private/overlays/useOverlay.ts b/packages/react-aria/exports/private/overlays/useOverlay.ts
new file mode 100644
index 00000000000..72c632ade1d
--- /dev/null
+++ b/packages/react-aria/exports/private/overlays/useOverlay.ts
@@ -0,0 +1 @@
+export {useOverlay, type AriaOverlayProps, type OverlayAria} from '../../../src/overlays/useOverlay';
diff --git a/packages/react-aria/exports/private/overlays/useOverlayPosition.ts b/packages/react-aria/exports/private/overlays/useOverlayPosition.ts
new file mode 100644
index 00000000000..d367c5be1b3
--- /dev/null
+++ b/packages/react-aria/exports/private/overlays/useOverlayPosition.ts
@@ -0,0 +1 @@
+export {type AriaPositionProps, useOverlayPosition, type PositionAria} from '../../../src/overlays/useOverlayPosition';
diff --git a/packages/react-aria/exports/private/overlays/usePreventScroll.ts b/packages/react-aria/exports/private/overlays/usePreventScroll.ts
new file mode 100644
index 00000000000..37159089230
--- /dev/null
+++ b/packages/react-aria/exports/private/overlays/usePreventScroll.ts
@@ -0,0 +1 @@
+export {usePreventScroll} from '../../../src/overlays/usePreventScroll';
diff --git a/packages/react-aria/exports/private/selection/DOMLayoutDelegate.ts b/packages/react-aria/exports/private/selection/DOMLayoutDelegate.ts
new file mode 100644
index 00000000000..90c72aebc2d
--- /dev/null
+++ b/packages/react-aria/exports/private/selection/DOMLayoutDelegate.ts
@@ -0,0 +1 @@
+export {DOMLayoutDelegate} from '../../../src/selection/DOMLayoutDelegate';
diff --git a/packages/react-aria/exports/private/selection/useSelectableCollection.ts b/packages/react-aria/exports/private/selection/useSelectableCollection.ts
new file mode 100644
index 00000000000..c2afc9e0b03
--- /dev/null
+++ b/packages/react-aria/exports/private/selection/useSelectableCollection.ts
@@ -0,0 +1 @@
+export {useSelectableCollection, type AriaSelectableCollectionOptions, type SelectableCollectionAria} from '../../../src/selection/useSelectableCollection';
diff --git a/packages/react-aria/exports/private/selection/useSelectableItem.ts b/packages/react-aria/exports/private/selection/useSelectableItem.ts
new file mode 100644
index 00000000000..a922c7014af
--- /dev/null
+++ b/packages/react-aria/exports/private/selection/useSelectableItem.ts
@@ -0,0 +1 @@
+export {useSelectableItem, type SelectableItemOptions, type SelectableItemStates, type SelectableItemAria} from '../../../src/selection/useSelectableItem';
diff --git a/packages/react-aria/exports/private/selection/useSelectableList.ts b/packages/react-aria/exports/private/selection/useSelectableList.ts
new file mode 100644
index 00000000000..c62c41f35e8
--- /dev/null
+++ b/packages/react-aria/exports/private/selection/useSelectableList.ts
@@ -0,0 +1 @@
+export {useSelectableList, type AriaSelectableListOptions, type SelectableListAria} from '../../../src/selection/useSelectableList';
diff --git a/packages/react-aria/exports/private/selection/useTypeSelect.ts b/packages/react-aria/exports/private/selection/useTypeSelect.ts
new file mode 100644
index 00000000000..cb868f049f4
--- /dev/null
+++ b/packages/react-aria/exports/private/selection/useTypeSelect.ts
@@ -0,0 +1 @@
+export {useTypeSelect, type AriaTypeSelectOptions, type TypeSelectAria} from '../../../src/selection/useTypeSelect';
diff --git a/packages/react-aria/exports/private/spinbutton/useSpinButton.ts b/packages/react-aria/exports/private/spinbutton/useSpinButton.ts
new file mode 100644
index 00000000000..96db667708f
--- /dev/null
+++ b/packages/react-aria/exports/private/spinbutton/useSpinButton.ts
@@ -0,0 +1 @@
+export {useSpinButton, type SpinButtonProps, type SpinbuttonAria} from '../../../src/spinbutton/useSpinButton';
diff --git a/packages/react-aria/exports/private/ssr/SSRProvider.ts b/packages/react-aria/exports/private/ssr/SSRProvider.ts
new file mode 100644
index 00000000000..809dba45ccb
--- /dev/null
+++ b/packages/react-aria/exports/private/ssr/SSRProvider.ts
@@ -0,0 +1 @@
+export {useSSRSafeId} from '../../../src/ssr/SSRProvider';
diff --git a/packages/react-aria/exports/private/steplist/useStepList.ts b/packages/react-aria/exports/private/steplist/useStepList.ts
new file mode 100644
index 00000000000..f72746b80cd
--- /dev/null
+++ b/packages/react-aria/exports/private/steplist/useStepList.ts
@@ -0,0 +1 @@
+export {useStepList, type AriaStepListProps, type StepListAria} from '../../../src/steplist/useStepList';
diff --git a/packages/react-aria/exports/private/steplist/useStepListItem.ts b/packages/react-aria/exports/private/steplist/useStepListItem.ts
new file mode 100644
index 00000000000..0154f468d98
--- /dev/null
+++ b/packages/react-aria/exports/private/steplist/useStepListItem.ts
@@ -0,0 +1 @@
+export {useStepListItem, type AriaStepListItemProps, type StepListItemAria} from '../../../src/steplist/useStepListItem';
diff --git a/packages/react-aria/exports/private/textfield/useFormattedTextField.ts b/packages/react-aria/exports/private/textfield/useFormattedTextField.ts
new file mode 100644
index 00000000000..37fa36c1b10
--- /dev/null
+++ b/packages/react-aria/exports/private/textfield/useFormattedTextField.ts
@@ -0,0 +1 @@
+export {useFormattedTextField} from '../../../src/textfield/useFormattedTextField';
diff --git a/packages/react-aria/exports/private/toggle/useToggle.ts b/packages/react-aria/exports/private/toggle/useToggle.ts
new file mode 100644
index 00000000000..d4b2c92e77c
--- /dev/null
+++ b/packages/react-aria/exports/private/toggle/useToggle.ts
@@ -0,0 +1 @@
+export {useToggle, type ToggleAria} from '../../../src/toggle/useToggle';
diff --git a/packages/react-aria/exports/private/toolbar/useToolbar.ts b/packages/react-aria/exports/private/toolbar/useToolbar.ts
new file mode 100644
index 00000000000..12f935650a5
--- /dev/null
+++ b/packages/react-aria/exports/private/toolbar/useToolbar.ts
@@ -0,0 +1 @@
+export {type AriaToolbarProps, useToolbar, type ToolbarAria} from '../../../src/toolbar/useToolbar';
diff --git a/packages/react-aria/exports/private/tree/useTree.ts b/packages/react-aria/exports/private/tree/useTree.ts
new file mode 100644
index 00000000000..65a884e1c40
--- /dev/null
+++ b/packages/react-aria/exports/private/tree/useTree.ts
@@ -0,0 +1 @@
+export {type AriaTreeProps, useTree, type AriaTreeOptions, type TreeAria, type TreeProps} from '../../../src/tree/useTree';
diff --git a/packages/react-aria/exports/private/tree/useTreeItem.ts b/packages/react-aria/exports/private/tree/useTreeItem.ts
new file mode 100644
index 00000000000..f48ba8fcf17
--- /dev/null
+++ b/packages/react-aria/exports/private/tree/useTreeItem.ts
@@ -0,0 +1 @@
+export {type AriaTreeItemOptions, useTreeItem, type TreeItemAria} from '../../../src/tree/useTreeItem';
diff --git a/packages/react-aria/exports/private/utils/animation.ts b/packages/react-aria/exports/private/utils/animation.ts
new file mode 100644
index 00000000000..fcb37101d2a
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/animation.ts
@@ -0,0 +1 @@
+export {useEnterAnimation, useExitAnimation} from '../../../src/utils/animation';
diff --git a/packages/react-aria/exports/private/utils/chain.ts b/packages/react-aria/exports/private/utils/chain.ts
new file mode 100644
index 00000000000..053445d2e5d
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/chain.ts
@@ -0,0 +1 @@
+export {chain} from '../../../src/utils/chain';
diff --git a/packages/react-aria/exports/private/utils/constants.ts b/packages/react-aria/exports/private/utils/constants.ts
new file mode 100644
index 00000000000..a68c5d60dbf
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/constants.ts
@@ -0,0 +1 @@
+export {CLEAR_FOCUS_EVENT, FOCUS_EVENT} from '../../../src/utils/constants';
diff --git a/packages/react-aria/exports/private/utils/domHelpers.ts b/packages/react-aria/exports/private/utils/domHelpers.ts
new file mode 100644
index 00000000000..bc415a70891
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/domHelpers.ts
@@ -0,0 +1 @@
+export {getOwnerDocument, getOwnerWindow, isShadowRoot} from '../../../src/utils/domHelpers';
diff --git a/packages/react-aria/exports/private/utils/filterDOMProps.ts b/packages/react-aria/exports/private/utils/filterDOMProps.ts
new file mode 100644
index 00000000000..0dba9105e38
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/filterDOMProps.ts
@@ -0,0 +1 @@
+export {filterDOMProps} from '../../../src/utils/filterDOMProps';
diff --git a/packages/react-aria/exports/private/utils/focusWithoutScrolling.ts b/packages/react-aria/exports/private/utils/focusWithoutScrolling.ts
new file mode 100644
index 00000000000..f9edb2854d0
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/focusWithoutScrolling.ts
@@ -0,0 +1 @@
+export {focusWithoutScrolling} from '../../../src/utils/focusWithoutScrolling';
diff --git a/packages/react-aria/exports/private/utils/getNonce.ts b/packages/react-aria/exports/private/utils/getNonce.ts
new file mode 100644
index 00000000000..b21e4ab4213
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/getNonce.ts
@@ -0,0 +1 @@
+export {getNonce} from '../../../src/utils/getNonce';
diff --git a/packages/react-aria/exports/private/utils/getOffset.ts b/packages/react-aria/exports/private/utils/getOffset.ts
new file mode 100644
index 00000000000..282efee5ce1
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/getOffset.ts
@@ -0,0 +1 @@
+export {getOffset} from '../../../src/utils/getOffset';
diff --git a/packages/react-aria/exports/private/utils/getScrollParent.ts b/packages/react-aria/exports/private/utils/getScrollParent.ts
new file mode 100644
index 00000000000..df217e4dc6c
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/getScrollParent.ts
@@ -0,0 +1 @@
+export {getScrollParent} from '../../../src/utils/getScrollParent';
diff --git a/packages/react-aria/exports/private/utils/getScrollParents.ts b/packages/react-aria/exports/private/utils/getScrollParents.ts
new file mode 100644
index 00000000000..59ab5cc74ef
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/getScrollParents.ts
@@ -0,0 +1 @@
+export {getScrollParents} from '../../../src/utils/getScrollParents';
diff --git a/packages/react-aria/exports/private/utils/inertValue.ts b/packages/react-aria/exports/private/utils/inertValue.ts
new file mode 100644
index 00000000000..e54e68894f7
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/inertValue.ts
@@ -0,0 +1 @@
+export {inertValue} from '../../../src/utils/inertValue';
diff --git a/packages/react-aria/exports/private/utils/isFocusable.ts b/packages/react-aria/exports/private/utils/isFocusable.ts
new file mode 100644
index 00000000000..0873425f339
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/isFocusable.ts
@@ -0,0 +1 @@
+export {isFocusable, isTabbable} from '../../../src/utils/isFocusable';
diff --git a/packages/react-aria/exports/private/utils/isScrollable.ts b/packages/react-aria/exports/private/utils/isScrollable.ts
new file mode 100644
index 00000000000..77b90f0f5a3
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/isScrollable.ts
@@ -0,0 +1 @@
+export {isScrollable} from '../../../src/utils/isScrollable';
diff --git a/packages/react-aria/exports/private/utils/isVirtualEvent.ts b/packages/react-aria/exports/private/utils/isVirtualEvent.ts
new file mode 100644
index 00000000000..083e9270bb1
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/isVirtualEvent.ts
@@ -0,0 +1 @@
+export {isVirtualClick, isVirtualPointerEvent} from '../../../src/utils/isVirtualEvent';
diff --git a/packages/react-aria/exports/private/utils/keyboard.ts b/packages/react-aria/exports/private/utils/keyboard.ts
new file mode 100644
index 00000000000..b38151e04cc
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/keyboard.ts
@@ -0,0 +1 @@
+export {isCtrlKeyPressed, willOpenKeyboard} from '../../../src/utils/keyboard';
diff --git a/packages/react-aria/exports/private/utils/mergeRefs.ts b/packages/react-aria/exports/private/utils/mergeRefs.ts
new file mode 100644
index 00000000000..2fdffe182e5
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/mergeRefs.ts
@@ -0,0 +1 @@
+export {mergeRefs} from '../../../src/utils/mergeRefs';
diff --git a/packages/react-aria/exports/private/utils/openLink.ts b/packages/react-aria/exports/private/utils/openLink.ts
new file mode 100644
index 00000000000..01481c357d6
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/openLink.ts
@@ -0,0 +1 @@
+export {RouterProvider, openLink, getSyntheticLinkProps, useSyntheticLinkProps, shouldClientNavigate, useRouter, useLinkProps, handleLinkClick} from '../../../src/utils/openLink';
diff --git a/packages/react-aria/exports/private/utils/platform.ts b/packages/react-aria/exports/private/utils/platform.ts
new file mode 100644
index 00000000000..80ca6457bf4
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/platform.ts
@@ -0,0 +1 @@
+export {isWebKit, isMac, isIPhone, isIPad, isIOS, isAppleDevice, isChrome, isAndroid, isFirefox} from '../../../src/utils/platform';
diff --git a/packages/react-aria/exports/private/utils/runAfterTransition.ts b/packages/react-aria/exports/private/utils/runAfterTransition.ts
new file mode 100644
index 00000000000..509b95112e9
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/runAfterTransition.ts
@@ -0,0 +1 @@
+export {runAfterTransition} from '../../../src/utils/runAfterTransition';
diff --git a/packages/react-aria/exports/private/utils/scrollIntoView.ts b/packages/react-aria/exports/private/utils/scrollIntoView.ts
new file mode 100644
index 00000000000..b5974c43cf8
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/scrollIntoView.ts
@@ -0,0 +1 @@
+export {scrollIntoView, scrollIntoViewport} from '../../../src/utils/scrollIntoView';
diff --git a/packages/react-aria/exports/private/utils/shadowdom/DOMFunctions.ts b/packages/react-aria/exports/private/utils/shadowdom/DOMFunctions.ts
new file mode 100644
index 00000000000..5e82e02378e
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/shadowdom/DOMFunctions.ts
@@ -0,0 +1 @@
+export {getEventTarget, nodeContains, isFocusWithin, getActiveElement} from '../../../../src/utils/shadowdom/DOMFunctions';
diff --git a/packages/react-aria/exports/private/utils/shadowdom/ShadowTreeWalker.ts b/packages/react-aria/exports/private/utils/shadowdom/ShadowTreeWalker.ts
new file mode 100644
index 00000000000..692c7ea0b5f
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/shadowdom/ShadowTreeWalker.ts
@@ -0,0 +1 @@
+export {createShadowTreeWalker, ShadowTreeWalker} from '../../../../src/utils/shadowdom/ShadowTreeWalker';
diff --git a/packages/react-aria/exports/private/utils/useDeepMemo.ts b/packages/react-aria/exports/private/utils/useDeepMemo.ts
new file mode 100644
index 00000000000..059a3d67e92
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useDeepMemo.ts
@@ -0,0 +1 @@
+export {useDeepMemo} from '../../../src/utils/useDeepMemo';
diff --git a/packages/react-aria/exports/private/utils/useDescription.ts b/packages/react-aria/exports/private/utils/useDescription.ts
new file mode 100644
index 00000000000..62c92f6e27d
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useDescription.ts
@@ -0,0 +1 @@
+export {useDescription} from '../../../src/utils/useDescription';
diff --git a/packages/react-aria/exports/private/utils/useDrag1D.ts b/packages/react-aria/exports/private/utils/useDrag1D.ts
new file mode 100644
index 00000000000..c4eeec58003
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useDrag1D.ts
@@ -0,0 +1 @@
+export {useDrag1D} from '../../../src/utils/useDrag1D';
diff --git a/packages/react-aria/exports/private/utils/useEffectEvent.ts b/packages/react-aria/exports/private/utils/useEffectEvent.ts
new file mode 100644
index 00000000000..5c91ae651cc
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useEffectEvent.ts
@@ -0,0 +1 @@
+export {useEffectEvent} from '../../../src/utils/useEffectEvent';
diff --git a/packages/react-aria/exports/private/utils/useEvent.ts b/packages/react-aria/exports/private/utils/useEvent.ts
new file mode 100644
index 00000000000..26f260f4154
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useEvent.ts
@@ -0,0 +1 @@
+export {useEvent} from '../../../src/utils/useEvent';
diff --git a/packages/react-aria/exports/private/utils/useFormReset.ts b/packages/react-aria/exports/private/utils/useFormReset.ts
new file mode 100644
index 00000000000..342b989e23e
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useFormReset.ts
@@ -0,0 +1 @@
+export {useFormReset} from '../../../src/utils/useFormReset';
diff --git a/packages/react-aria/exports/private/utils/useGlobalListeners.ts b/packages/react-aria/exports/private/utils/useGlobalListeners.ts
new file mode 100644
index 00000000000..f1caab33adc
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useGlobalListeners.ts
@@ -0,0 +1 @@
+export {useGlobalListeners} from '../../../src/utils/useGlobalListeners';
diff --git a/packages/react-aria/exports/private/utils/useId.ts b/packages/react-aria/exports/private/utils/useId.ts
new file mode 100644
index 00000000000..41b85b52aea
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useId.ts
@@ -0,0 +1 @@
+export {useSlotId, mergeIds} from '../../../src/utils/useId';
diff --git a/packages/react-aria/exports/private/utils/useLabels.ts b/packages/react-aria/exports/private/utils/useLabels.ts
new file mode 100644
index 00000000000..42cd3f01ca0
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useLabels.ts
@@ -0,0 +1 @@
+export {useLabels} from '../../../src/utils/useLabels';
diff --git a/packages/react-aria/exports/private/utils/useLayoutEffect.ts b/packages/react-aria/exports/private/utils/useLayoutEffect.ts
new file mode 100644
index 00000000000..ea60b33b49b
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useLayoutEffect.ts
@@ -0,0 +1 @@
+export {useLayoutEffect} from '../../../src/utils/useLayoutEffect';
diff --git a/packages/react-aria/exports/private/utils/useLoadMore.ts b/packages/react-aria/exports/private/utils/useLoadMore.ts
new file mode 100644
index 00000000000..d6d1bb8dde8
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useLoadMore.ts
@@ -0,0 +1 @@
+export {useLoadMore} from '../../../src/utils/useLoadMore';
diff --git a/packages/react-aria/exports/private/utils/useLoadMoreSentinel.ts b/packages/react-aria/exports/private/utils/useLoadMoreSentinel.ts
new file mode 100644
index 00000000000..ac60636c7e4
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useLoadMoreSentinel.ts
@@ -0,0 +1 @@
+export {type LoadMoreSentinelProps, useLoadMoreSentinel} from '../../../src/utils/useLoadMoreSentinel';
diff --git a/packages/react-aria/exports/private/utils/useResizeObserver.ts b/packages/react-aria/exports/private/utils/useResizeObserver.ts
new file mode 100644
index 00000000000..c59927521d1
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useResizeObserver.ts
@@ -0,0 +1 @@
+export {useResizeObserver} from '../../../src/utils/useResizeObserver';
diff --git a/packages/react-aria/exports/private/utils/useSyncRef.ts b/packages/react-aria/exports/private/utils/useSyncRef.ts
new file mode 100644
index 00000000000..44f97194bd1
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useSyncRef.ts
@@ -0,0 +1 @@
+export {useSyncRef} from '../../../src/utils/useSyncRef';
diff --git a/packages/react-aria/exports/private/utils/useUpdateEffect.ts b/packages/react-aria/exports/private/utils/useUpdateEffect.ts
new file mode 100644
index 00000000000..e147a8640ae
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useUpdateEffect.ts
@@ -0,0 +1 @@
+export {useUpdateEffect} from '../../../src/utils/useUpdateEffect';
diff --git a/packages/react-aria/exports/private/utils/useUpdateLayoutEffect.ts b/packages/react-aria/exports/private/utils/useUpdateLayoutEffect.ts
new file mode 100644
index 00000000000..dbb8d961f45
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useUpdateLayoutEffect.ts
@@ -0,0 +1 @@
+export {useUpdateLayoutEffect} from '../../../src/utils/useUpdateLayoutEffect';
diff --git a/packages/react-aria/exports/private/utils/useValueEffect.ts b/packages/react-aria/exports/private/utils/useValueEffect.ts
new file mode 100644
index 00000000000..cf0ed615db9
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useValueEffect.ts
@@ -0,0 +1 @@
+export {useValueEffect} from '../../../src/utils/useValueEffect';
diff --git a/packages/react-aria/exports/private/utils/useViewportSize.ts b/packages/react-aria/exports/private/utils/useViewportSize.ts
new file mode 100644
index 00000000000..22a7e0bb219
--- /dev/null
+++ b/packages/react-aria/exports/private/utils/useViewportSize.ts
@@ -0,0 +1 @@
+export {useViewportSize} from '../../../src/utils/useViewportSize';
diff --git a/packages/react-aria/exports/private/virtualizer/ScrollView.ts b/packages/react-aria/exports/private/virtualizer/ScrollView.ts
new file mode 100644
index 00000000000..3f352920a74
--- /dev/null
+++ b/packages/react-aria/exports/private/virtualizer/ScrollView.ts
@@ -0,0 +1 @@
+export {useScrollView, ScrollView} from '../../../src/virtualizer/ScrollView';
diff --git a/packages/react-aria/exports/private/virtualizer/Virtualizer.ts b/packages/react-aria/exports/private/virtualizer/Virtualizer.ts
new file mode 100644
index 00000000000..d1cad80a3da
--- /dev/null
+++ b/packages/react-aria/exports/private/virtualizer/Virtualizer.ts
@@ -0,0 +1 @@
+export {Virtualizer} from '../../../src/virtualizer/Virtualizer';
diff --git a/packages/react-aria/exports/private/virtualizer/VirtualizerItem.ts b/packages/react-aria/exports/private/virtualizer/VirtualizerItem.ts
new file mode 100644
index 00000000000..ca0cbaa5f6f
--- /dev/null
+++ b/packages/react-aria/exports/private/virtualizer/VirtualizerItem.ts
@@ -0,0 +1 @@
+export {VirtualizerItem, layoutInfoToStyle} from '../../../src/virtualizer/VirtualizerItem';
diff --git a/packages/react-aria/exports/private/virtualizer/useVirtualizerItem.ts b/packages/react-aria/exports/private/virtualizer/useVirtualizerItem.ts
new file mode 100644
index 00000000000..2311a4b6423
--- /dev/null
+++ b/packages/react-aria/exports/private/virtualizer/useVirtualizerItem.ts
@@ -0,0 +1 @@
+export {useVirtualizerItem, type VirtualizerItemOptions} from '../../../src/virtualizer/useVirtualizerItem';
diff --git a/packages/react-aria/exports/private/virtualizer/utils.ts b/packages/react-aria/exports/private/virtualizer/utils.ts
new file mode 100644
index 00000000000..5849812b932
--- /dev/null
+++ b/packages/react-aria/exports/private/virtualizer/utils.ts
@@ -0,0 +1 @@
+export {getRTLOffsetType, getScrollLeft, setScrollLeft, type RTLOffsetType} from '../../../src/virtualizer/utils';
diff --git a/packages/react-aria/exports/useBreadcrumbs.ts b/packages/react-aria/exports/useBreadcrumbs.ts
new file mode 100644
index 00000000000..713e34eb77a
--- /dev/null
+++ b/packages/react-aria/exports/useBreadcrumbs.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useBreadcrumbItem} from '../src/breadcrumbs/useBreadcrumbItem';
+export {useBreadcrumbs} from '../src/breadcrumbs/useBreadcrumbs';
+export type {BreadcrumbItemAria} from '../src/breadcrumbs/useBreadcrumbItem';
+export type {BreadcrumbsAria} from '../src/breadcrumbs/useBreadcrumbs';
+export type {AriaBreadcrumbItemProps, AriaBreadcrumbsProps} from '@react-types/breadcrumbs';
diff --git a/packages/react-aria/exports/useButton.ts b/packages/react-aria/exports/useButton.ts
new file mode 100644
index 00000000000..8ea5cb62278
--- /dev/null
+++ b/packages/react-aria/exports/useButton.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useButton} from '../src/button/useButton';
+export type {AriaButtonOptions, ButtonAria} from '../src/button/useButton';
+export type {AriaButtonProps, AriaToggleButtonProps} from '@react-types/button';
diff --git a/packages/react-aria/exports/useCalendar.ts b/packages/react-aria/exports/useCalendar.ts
new file mode 100644
index 00000000000..e4227899b49
--- /dev/null
+++ b/packages/react-aria/exports/useCalendar.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useCalendar} from '../src/calendar/useCalendar';
+export {useCalendarGrid} from '../src/calendar/useCalendarGrid';
+export {useCalendarCell} from '../src/calendar/useCalendarCell';
+
+export type {AriaCalendarGridProps, CalendarGridAria} from '../src/calendar/useCalendarGrid';
+export type {AriaCalendarCellProps, CalendarCellAria} from '../src/calendar/useCalendarCell';
+
+export type {AriaCalendarProps, AriaRangeCalendarProps, CalendarProps, DateValue, RangeCalendarProps} from '@react-types/calendar';
diff --git a/packages/react-aria/exports/useCheckbox.ts b/packages/react-aria/exports/useCheckbox.ts
new file mode 100644
index 00000000000..bdced2aa1fe
--- /dev/null
+++ b/packages/react-aria/exports/useCheckbox.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export type {CheckboxAria} from '../src/checkbox/useCheckbox';
+export {useCheckbox} from '../src/checkbox/useCheckbox';
+export type {AriaCheckboxGroupItemProps, AriaCheckboxGroupProps, AriaCheckboxProps} from '@react-types/checkbox';
diff --git a/packages/react-aria/exports/useCheckboxGroup.ts b/packages/react-aria/exports/useCheckboxGroup.ts
new file mode 100644
index 00000000000..64b25e0a207
--- /dev/null
+++ b/packages/react-aria/exports/useCheckboxGroup.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useCheckboxGroup} from '../src/checkbox/useCheckboxGroup';
+export {useCheckboxGroupItem} from '../src/checkbox/useCheckboxGroupItem';
+export type {CheckboxGroupAria} from '../src/checkbox/useCheckboxGroup';
+export type {AriaCheckboxGroupItemProps, AriaCheckboxGroupProps, AriaCheckboxProps} from '@react-types/checkbox';
diff --git a/packages/react-aria/exports/useClipboard.ts b/packages/react-aria/exports/useClipboard.ts
new file mode 100644
index 00000000000..1d640eb73cf
--- /dev/null
+++ b/packages/react-aria/exports/useClipboard.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {ClipboardProps, ClipboardResult} from '../src/dnd/useClipboard';
+export {useClipboard} from '../src/dnd/useClipboard';
+export type {DirectoryDropItem, DragEndEvent, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DragTypes, DropEnterEvent, DropEvent, DropExitEvent, DropItem, DropMoveEvent, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, DropTargetDelegate, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useCollator.ts b/packages/react-aria/exports/useCollator.ts
new file mode 100644
index 00000000000..a2fef2bc181
--- /dev/null
+++ b/packages/react-aria/exports/useCollator.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useCollator} from '../src/i18n/useCollator';
+export type {LocalizedStringFormatter} from '@internationalized/string';
+export type {LocalizedStrings} from '@internationalized/message';
+export type {DateFormatter} from '@internationalized/date';
diff --git a/packages/react-aria/exports/useColorArea.ts b/packages/react-aria/exports/useColorArea.ts
new file mode 100644
index 00000000000..7041c2fdb1b
--- /dev/null
+++ b/packages/react-aria/exports/useColorArea.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useColorArea} from '../src/color/useColorArea';
+export type {AriaColorAreaOptions, ColorAreaAria} from '../src/color/useColorArea';
+export type {AriaColorAreaProps, AriaColorFieldProps, AriaColorSliderProps} from '@react-types/color';
diff --git a/packages/react-aria/exports/useColorField.ts b/packages/react-aria/exports/useColorField.ts
new file mode 100644
index 00000000000..7eb391cbc8d
--- /dev/null
+++ b/packages/react-aria/exports/useColorField.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useColorField} from '../src/color/useColorField';
+export {useColorChannelField} from '../src/color/useColorChannelField';
+export type {ColorFieldAria} from '../src/color/useColorField';
+export type {AriaColorChannelFieldProps, ColorChannelFieldAria} from '../src/color/useColorChannelField';
+export type {AriaColorAreaProps, AriaColorFieldProps, AriaColorSliderProps} from '@react-types/color';
diff --git a/packages/react-aria/exports/useColorSlider.ts b/packages/react-aria/exports/useColorSlider.ts
new file mode 100644
index 00000000000..2eadabf97e1
--- /dev/null
+++ b/packages/react-aria/exports/useColorSlider.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useColorSlider} from '../src/color/useColorSlider';
+export type {AriaColorSliderOptions, ColorSliderAria} from '../src/color/useColorSlider';
+export type {AriaColorAreaProps, AriaColorFieldProps, AriaColorSliderProps} from '@react-types/color';
diff --git a/packages/react-aria/exports/useColorSwatch.ts b/packages/react-aria/exports/useColorSwatch.ts
new file mode 100644
index 00000000000..77bc1549ae7
--- /dev/null
+++ b/packages/react-aria/exports/useColorSwatch.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useColorSwatch} from '../src/color/useColorSwatch';
+export type {AriaColorSwatchProps, ColorSwatchAria} from '../src/color/useColorSwatch';
+export type {AriaColorAreaProps, AriaColorFieldProps, AriaColorSliderProps} from '@react-types/color';
diff --git a/packages/react-aria/exports/useColorWheel.ts b/packages/react-aria/exports/useColorWheel.ts
new file mode 100644
index 00000000000..8230453a21d
--- /dev/null
+++ b/packages/react-aria/exports/useColorWheel.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useColorWheel} from '../src/color/useColorWheel';
+export type {AriaColorWheelOptions, ColorWheelAria} from '../src/color/useColorWheel';
+export type {AriaColorAreaProps, AriaColorFieldProps, AriaColorSliderProps} from '@react-types/color';
diff --git a/packages/react-aria/exports/useComboBox.ts b/packages/react-aria/exports/useComboBox.ts
new file mode 100644
index 00000000000..4ba9858779d
--- /dev/null
+++ b/packages/react-aria/exports/useComboBox.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useComboBox} from '../src/combobox/useComboBox';
+export type {AriaComboBoxOptions, ComboBoxAria} from '../src/combobox/useComboBox';
+export type {AriaComboBoxProps} from '@react-types/combobox';
diff --git a/packages/react-aria/exports/useDateField.ts b/packages/react-aria/exports/useDateField.ts
new file mode 100644
index 00000000000..ff8b7c02874
--- /dev/null
+++ b/packages/react-aria/exports/useDateField.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useDateSegment} from '../src/datepicker/useDateSegment';
+export {useDateField, useTimeField} from '../src/datepicker/useDateField';
+export type {AriaDateFieldOptions, DateFieldAria, AriaTimeFieldOptions} from '../src/datepicker/useDateField';
+export type {DateSegmentAria} from '../src/datepicker/useDateSegment';
+
+export type {AriaDateFieldProps, AriaDatePickerProps, AriaDateRangePickerProps, DateRange, DateValue, TimeValue} from '@react-types/datepicker';
+export type {AriaTimeFieldProps} from '@react-types/datepicker';
diff --git a/packages/react-aria/exports/useDateFormatter.ts b/packages/react-aria/exports/useDateFormatter.ts
new file mode 100644
index 00000000000..6d4b6ea45fd
--- /dev/null
+++ b/packages/react-aria/exports/useDateFormatter.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useDateFormatter} from '../src/i18n/useDateFormatter';
+export type {DateFormatterOptions} from '../src/i18n/useDateFormatter';
+export type {LocalizedStringFormatter} from '@internationalized/string';
+export type {LocalizedStrings} from '@internationalized/message';
+export type {DateFormatter} from '@internationalized/date';
diff --git a/packages/react-aria/exports/useDatePicker.ts b/packages/react-aria/exports/useDatePicker.ts
new file mode 100644
index 00000000000..705d042ab2e
--- /dev/null
+++ b/packages/react-aria/exports/useDatePicker.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useDatePicker} from '../src/datepicker/useDatePicker';
+export type {DatePickerAria} from '../src/datepicker/useDatePicker';
+
+export type {AriaDateFieldProps, AriaDatePickerProps, AriaDateRangePickerProps, DateRange, DateValue, TimeValue} from '@react-types/datepicker';
+export type {AriaTimeFieldProps} from '@react-types/datepicker';
diff --git a/packages/react-aria/exports/useDateRangePicker.ts b/packages/react-aria/exports/useDateRangePicker.ts
new file mode 100644
index 00000000000..a4533d53544
--- /dev/null
+++ b/packages/react-aria/exports/useDateRangePicker.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useDateRangePicker} from '../src/datepicker/useDateRangePicker';
+export type {DateRangePickerAria} from '../src/datepicker/useDateRangePicker';
+
+export type {AriaDateFieldProps, AriaDatePickerProps, AriaDateRangePickerProps, DateRange, DateValue, TimeValue} from '@react-types/datepicker';
+export type {AriaTimeFieldProps} from '@react-types/datepicker';
diff --git a/packages/react-aria/exports/useDialog.ts b/packages/react-aria/exports/useDialog.ts
new file mode 100644
index 00000000000..fac9afaf874
--- /dev/null
+++ b/packages/react-aria/exports/useDialog.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useDialog} from '../src/dialog/useDialog';
+export type {DialogAria} from '../src/dialog/useDialog';
+export type {AriaDialogProps} from '@react-types/dialog';
diff --git a/packages/@react-aria/combobox/index.ts b/packages/react-aria/exports/useDisclosure.ts
similarity index 80%
rename from packages/@react-aria/combobox/index.ts
rename to packages/react-aria/exports/useDisclosure.ts
index bbd9b8c2c84..0909dac9d8f 100644
--- a/packages/@react-aria/combobox/index.ts
+++ b/packages/react-aria/exports/useDisclosure.ts
@@ -9,5 +9,5 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-
-export * from './src';
+export {useDisclosure} from '../src/disclosure/useDisclosure';
+export type {DisclosureAria, AriaDisclosureProps} from '../src/disclosure/useDisclosure';
diff --git a/packages/react-aria/exports/useDrag.ts b/packages/react-aria/exports/useDrag.ts
new file mode 100644
index 00000000000..25f5a970834
--- /dev/null
+++ b/packages/react-aria/exports/useDrag.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {DragOptions, DragResult} from '../src/dnd/useDrag';
+export {useDrag} from '../src/dnd/useDrag';
+export type {DirectoryDropItem, DragEndEvent, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DragTypes, DropEnterEvent, DropEvent, DropExitEvent, DropItem, DropMoveEvent, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, DropTargetDelegate, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useDraggableCollection.ts b/packages/react-aria/exports/useDraggableCollection.ts
new file mode 100644
index 00000000000..9e247a9defd
--- /dev/null
+++ b/packages/react-aria/exports/useDraggableCollection.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {DraggableItemProps, DraggableItemResult} from '../src/dnd/useDraggableItem';
+export type {DraggableCollectionOptions} from '../src/dnd/useDraggableCollection';
+export {useDraggableItem} from '../src/dnd/useDraggableItem';
+export {useDraggableCollection} from '../src/dnd/useDraggableCollection';
+export type {DirectoryDropItem, DragEndEvent, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DragTypes, DropEnterEvent, DropEvent, DropExitEvent, DropItem, DropMoveEvent, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, DropTargetDelegate, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useDrop.ts b/packages/react-aria/exports/useDrop.ts
new file mode 100644
index 00000000000..ae47834a574
--- /dev/null
+++ b/packages/react-aria/exports/useDrop.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {DropOptions, DropResult} from '../src/dnd/useDrop';
+export {useDrop} from '../src/dnd/useDrop';
+export type {DirectoryDropItem, DragEndEvent, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DragTypes, DropEnterEvent, DropEvent, DropExitEvent, DropItem, DropMoveEvent, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, DropTargetDelegate, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useDroppableCollection.ts b/packages/react-aria/exports/useDroppableCollection.ts
new file mode 100644
index 00000000000..ade3305a128
--- /dev/null
+++ b/packages/react-aria/exports/useDroppableCollection.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {DroppableCollectionOptions, DroppableCollectionResult} from '../src/dnd/useDroppableCollection';
+export type {DroppableItemOptions, DroppableItemResult} from '../src/dnd/useDroppableItem';
+export type {DropIndicatorProps, DropIndicatorAria} from '../src/dnd/useDropIndicator';
+export {useDroppableCollection} from '../src/dnd/useDroppableCollection';
+export {useDroppableItem} from '../src/dnd/useDroppableItem';
+export {useDropIndicator} from '../src/dnd/useDropIndicator';
+export type {DirectoryDropItem, DragEndEvent, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DragTypes, DropEnterEvent, DropEvent, DropExitEvent, DropItem, DropMoveEvent, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, DropTargetDelegate, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useField.ts b/packages/react-aria/exports/useField.ts
new file mode 100644
index 00000000000..cfca21d16d5
--- /dev/null
+++ b/packages/react-aria/exports/useField.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {AriaFieldProps, FieldAria} from '../src/label/useField';
+
+export {useField} from '../src/label/useField';
diff --git a/packages/react-aria/exports/useFilter.ts b/packages/react-aria/exports/useFilter.ts
new file mode 100644
index 00000000000..bf8aa915cfb
--- /dev/null
+++ b/packages/react-aria/exports/useFilter.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useFilter} from '../src/i18n/useFilter';
+export type {Filter} from '../src/i18n/useFilter';
+export type {LocalizedStringFormatter} from '@internationalized/string';
+export type {LocalizedStrings} from '@internationalized/message';
+export type {DateFormatter} from '@internationalized/date';
diff --git a/packages/react-aria/exports/useFocus.ts b/packages/react-aria/exports/useFocus.ts
new file mode 100644
index 00000000000..b05f8ad9e10
--- /dev/null
+++ b/packages/react-aria/exports/useFocus.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useFocus} from '../src/interactions/useFocus';
+
+export type {FocusProps, FocusResult} from '../src/interactions/useFocus';
+export type {PressEvent, PressEvents, LongPressEvent, MoveStartEvent, MoveMoveEvent, MoveEndEvent, MoveEvent, MoveEvents, HoverEvent, HoverEvents, FocusEvents, KeyboardEvents} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useFocusRing.ts b/packages/react-aria/exports/useFocusRing.ts
new file mode 100644
index 00000000000..3666bb2f87e
--- /dev/null
+++ b/packages/react-aria/exports/useFocusRing.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useFocusRing} from '../src/focus/useFocusRing';
+export type {AriaFocusRingProps, FocusRingAria} from '../src/focus/useFocusRing';
+export {} from '../src/utils/isFocusable';
+
+export {Focusable, useFocusable} from '../src/interactions/useFocusable';
+export {} from '../src/interactions/focusSafely';
+
+export type {FocusableAria, FocusableOptions} from '../src/interactions/useFocusable';
diff --git a/packages/react-aria/exports/useFocusVisible.ts b/packages/react-aria/exports/useFocusVisible.ts
new file mode 100644
index 00000000000..59f0caf1010
--- /dev/null
+++ b/packages/react-aria/exports/useFocusVisible.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useFocusVisible} from '../src/interactions/useFocusVisible';
+export type {FocusVisibleProps, FocusVisibleResult} from '../src/interactions/useFocusVisible';
+export type {PressEvent, PressEvents, LongPressEvent, MoveStartEvent, MoveMoveEvent, MoveEndEvent, MoveEvent, MoveEvents, HoverEvent, HoverEvents, FocusEvents, KeyboardEvents} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useFocusWithin.ts b/packages/react-aria/exports/useFocusWithin.ts
new file mode 100644
index 00000000000..90300e2e220
--- /dev/null
+++ b/packages/react-aria/exports/useFocusWithin.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useFocusWithin} from '../src/interactions/useFocusWithin';
+export type {FocusWithinProps, FocusWithinResult} from '../src/interactions/useFocusWithin';
+export type {PressEvent, PressEvents, LongPressEvent, MoveStartEvent, MoveMoveEvent, MoveEndEvent, MoveEvent, MoveEvents, HoverEvent, HoverEvents, FocusEvents, KeyboardEvents} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useGridList.ts b/packages/react-aria/exports/useGridList.ts
new file mode 100644
index 00000000000..031bfa93907
--- /dev/null
+++ b/packages/react-aria/exports/useGridList.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2022 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useGridList} from '../src/gridlist/useGridList';
+export {useGridListItem} from '../src/gridlist/useGridListItem';
+export {useGridListSelectionCheckbox} from '../src/gridlist/useGridListSelectionCheckbox';
+export {useGridListSection} from '../src/gridlist/useGridListSection';
+
+export type {AriaGridListOptions, AriaGridListProps, GridListAria, GridListProps} from '../src/gridlist/useGridList';
+export type {AriaGridListItemOptions, GridListItemAria} from '../src/gridlist/useGridListItem';
+export type {AriaGridListSectionProps, GridListSectionAria} from '../src/gridlist/useGridListSection';
+export type {AriaGridSelectionCheckboxProps, GridSelectionCheckboxAria} from '../src/grid/useGridSelectionCheckbox';
diff --git a/packages/react-aria/exports/useHover.ts b/packages/react-aria/exports/useHover.ts
new file mode 100644
index 00000000000..cb358cb1c52
--- /dev/null
+++ b/packages/react-aria/exports/useHover.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useHover} from '../src/interactions/useHover';
+export type {HoverProps, HoverResult} from '../src/interactions/useHover';
+export type {PressEvent, PressEvents, LongPressEvent, MoveStartEvent, MoveMoveEvent, MoveEndEvent, MoveEvent, MoveEvents, HoverEvent, HoverEvents, FocusEvents, KeyboardEvents} from '@react-types/shared';
diff --git a/packages/@react-aria/breadcrumbs/index.ts b/packages/react-aria/exports/useId.ts
similarity index 86%
rename from packages/@react-aria/breadcrumbs/index.ts
rename to packages/react-aria/exports/useId.ts
index 1210ae1e402..6c593a70057 100644
--- a/packages/@react-aria/breadcrumbs/index.ts
+++ b/packages/react-aria/exports/useId.ts
@@ -9,5 +9,5 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-
-export * from './src';
+export {useId} from '../src/utils/useId';
+export {} from 'react-stately/private/utils/number';
diff --git a/packages/react-aria/exports/useKeyboard.ts b/packages/react-aria/exports/useKeyboard.ts
new file mode 100644
index 00000000000..efb14904f61
--- /dev/null
+++ b/packages/react-aria/exports/useKeyboard.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useKeyboard} from '../src/interactions/useKeyboard';
+export type {KeyboardProps, KeyboardResult} from '../src/interactions/useKeyboard';
+export type {PressEvent, PressEvents, LongPressEvent, MoveStartEvent, MoveMoveEvent, MoveEndEvent, MoveEvent, MoveEvents, HoverEvent, HoverEvents, FocusEvents, KeyboardEvents} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useLabel.ts b/packages/react-aria/exports/useLabel.ts
new file mode 100644
index 00000000000..6aa0481f6d0
--- /dev/null
+++ b/packages/react-aria/exports/useLabel.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {LabelAriaProps, LabelAria} from '../src/label/useLabel';
+
+export {useLabel} from '../src/label/useLabel';
diff --git a/packages/@react-spectrum/badge/index.ts b/packages/react-aria/exports/useLandmark.ts
similarity index 77%
rename from packages/@react-spectrum/badge/index.ts
rename to packages/react-aria/exports/useLandmark.ts
index 4e9931530d8..31de0de195c 100644
--- a/packages/@react-spectrum/badge/index.ts
+++ b/packages/react-aria/exports/useLandmark.ts
@@ -10,4 +10,5 @@
  * governing permissions and limitations under the License.
  */
 
-export * from './src';
+export type {AriaLandmarkRole, AriaLandmarkProps, LandmarkAria, LandmarkController} from '../src/landmark/useLandmark';
+export {useLandmark} from '../src/landmark/useLandmark';
diff --git a/packages/react-aria/exports/useLink.ts b/packages/react-aria/exports/useLink.ts
new file mode 100644
index 00000000000..c86df029113
--- /dev/null
+++ b/packages/react-aria/exports/useLink.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export type {AriaLinkOptions, LinkAria} from '../src/link/useLink';
+export {useLink} from '../src/link/useLink';
diff --git a/packages/react-aria/exports/useListBox.ts b/packages/react-aria/exports/useListBox.ts
new file mode 100644
index 00000000000..6042d846532
--- /dev/null
+++ b/packages/react-aria/exports/useListBox.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useListBox} from '../src/listbox/useListBox';
+export {useOption} from '../src/listbox/useOption';
+export {useListBoxSection} from '../src/listbox/useListBoxSection';
+export type {AriaListBoxOptions, ListBoxAria} from '../src/listbox/useListBox';
+export type {AriaOptionProps, OptionAria} from '../src/listbox/useOption';
+export type {AriaListBoxSectionProps, ListBoxSectionAria} from '../src/listbox/useListBoxSection';
+
+export type {AriaListBoxProps} from '@react-types/listbox';
diff --git a/packages/react-aria/exports/useListFormatter.ts b/packages/react-aria/exports/useListFormatter.ts
new file mode 100644
index 00000000000..bd338de5e8c
--- /dev/null
+++ b/packages/react-aria/exports/useListFormatter.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useListFormatter} from '../src/i18n/useListFormatter';
+export type {LocalizedStringFormatter} from '@internationalized/string';
+export type {LocalizedStrings} from '@internationalized/message';
+export type {DateFormatter} from '@internationalized/date';
diff --git a/packages/react-aria/exports/useLocalizedStringFormatter.ts b/packages/react-aria/exports/useLocalizedStringFormatter.ts
new file mode 100644
index 00000000000..d7ff28e53f2
--- /dev/null
+++ b/packages/react-aria/exports/useLocalizedStringFormatter.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useLocalizedStringFormatter} from '../src/i18n/useLocalizedStringFormatter';
+export type {LocalizedStringFormatter} from '@internationalized/string';
+export type {LocalizedStrings} from '@internationalized/message';
+export type {DateFormatter} from '@internationalized/date';
diff --git a/packages/react-aria/exports/useLongPress.ts b/packages/react-aria/exports/useLongPress.ts
new file mode 100644
index 00000000000..528308319b8
--- /dev/null
+++ b/packages/react-aria/exports/useLongPress.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useLongPress} from '../src/interactions/useLongPress';
+export type {LongPressProps, LongPressResult} from '../src/interactions/useLongPress';
+export type {PressEvent, PressEvents, LongPressEvent, MoveStartEvent, MoveMoveEvent, MoveEndEvent, MoveEvent, MoveEvents, HoverEvent, HoverEvents, FocusEvents, KeyboardEvents} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useMenu.ts b/packages/react-aria/exports/useMenu.ts
new file mode 100644
index 00000000000..f3f56745029
--- /dev/null
+++ b/packages/react-aria/exports/useMenu.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useMenuTrigger} from '../src/menu/useMenuTrigger';
+export {useMenu} from '../src/menu/useMenu';
+export {useMenuItem} from '../src/menu/useMenuItem';
+export {useMenuSection} from '../src/menu/useMenuSection';
+export {useSubmenuTrigger} from '../src/menu/useSubmenuTrigger';
+
+export type {AriaMenuTriggerProps, MenuTriggerAria} from '../src/menu/useMenuTrigger';
+export type {AriaMenuOptions, MenuAria} from '../src/menu/useMenu';
+export type {AriaMenuItemProps, MenuItemAria} from '../src/menu/useMenuItem';
+export type {AriaMenuSectionProps, MenuSectionAria} from '../src/menu/useMenuSection';
+export type {AriaSubmenuTriggerProps, SubmenuTriggerAria} from '../src/menu/useSubmenuTrigger';
+
+export type {AriaMenuProps} from '@react-types/menu';
diff --git a/packages/react-aria/exports/useMeter.ts b/packages/react-aria/exports/useMeter.ts
new file mode 100644
index 00000000000..5ccf44f4191
--- /dev/null
+++ b/packages/react-aria/exports/useMeter.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useMeter} from '../src/meter/useMeter';
+export type {MeterAria} from '../src/meter/useMeter';
+export type {AriaMeterProps} from '@react-types/meter';
diff --git a/packages/react-aria/exports/useModalOverlay.ts b/packages/react-aria/exports/useModalOverlay.ts
new file mode 100644
index 00000000000..2b1cb6a7565
--- /dev/null
+++ b/packages/react-aria/exports/useModalOverlay.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useModalOverlay} from '../src/overlays/useModalOverlay';
+export type {AriaModalOverlayProps, ModalOverlayAria} from '../src/overlays/useModalOverlay';
+export type {Placement, PlacementAxis, PositionProps} from '@react-types/overlays';
diff --git a/packages/react-aria/exports/useMove.ts b/packages/react-aria/exports/useMove.ts
new file mode 100644
index 00000000000..2ebaf96062d
--- /dev/null
+++ b/packages/react-aria/exports/useMove.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useMove} from '../src/interactions/useMove';
+export type {MoveResult} from '../src/interactions/useMove';
+export type {PressEvent, PressEvents, LongPressEvent, MoveStartEvent, MoveMoveEvent, MoveEndEvent, MoveEvent, MoveEvents, HoverEvent, HoverEvents, FocusEvents, KeyboardEvents} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useNumberField.ts b/packages/react-aria/exports/useNumberField.ts
new file mode 100644
index 00000000000..a34b63a62dd
--- /dev/null
+++ b/packages/react-aria/exports/useNumberField.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useNumberField} from '../src/numberfield/useNumberField';
+export type {NumberFieldAria} from '../src/numberfield/useNumberField';
+export type {AriaNumberFieldProps} from '@react-types/numberfield';
diff --git a/packages/react-aria/exports/useNumberFormatter.ts b/packages/react-aria/exports/useNumberFormatter.ts
new file mode 100644
index 00000000000..bb1b1ffb478
--- /dev/null
+++ b/packages/react-aria/exports/useNumberFormatter.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useNumberFormatter} from '../src/i18n/useNumberFormatter';
+export type {LocalizedStringFormatter} from '@internationalized/string';
+export type {LocalizedStrings} from '@internationalized/message';
+export type {DateFormatter} from '@internationalized/date';
diff --git a/packages/react-aria/exports/useObjectRef.ts b/packages/react-aria/exports/useObjectRef.ts
new file mode 100644
index 00000000000..3a6eaa8c7ec
--- /dev/null
+++ b/packages/react-aria/exports/useObjectRef.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useObjectRef} from '../src/utils/useObjectRef';
+export {} from 'react-stately/private/utils/number';
diff --git a/packages/react-aria/exports/useOverlayTrigger.ts b/packages/react-aria/exports/useOverlayTrigger.ts
new file mode 100644
index 00000000000..98d99da9371
--- /dev/null
+++ b/packages/react-aria/exports/useOverlayTrigger.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useOverlayTrigger} from '../src/overlays/useOverlayTrigger';
+export type {OverlayTriggerAria, OverlayTriggerProps} from '../src/overlays/useOverlayTrigger';
+export type {Placement, PlacementAxis, PositionProps} from '@react-types/overlays';
diff --git a/packages/react-aria/exports/usePopover.ts b/packages/react-aria/exports/usePopover.ts
new file mode 100644
index 00000000000..0698f06dbea
--- /dev/null
+++ b/packages/react-aria/exports/usePopover.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {usePopover} from '../src/overlays/usePopover';
+export type {AriaPopoverProps, PopoverAria} from '../src/overlays/usePopover';
+export type {Placement, PlacementAxis, PositionProps} from '@react-types/overlays';
diff --git a/packages/react-aria/exports/usePress.ts b/packages/react-aria/exports/usePress.ts
new file mode 100644
index 00000000000..0304ee7aa55
--- /dev/null
+++ b/packages/react-aria/exports/usePress.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {usePress} from '../src/interactions/usePress';
+export type {PressProps, PressHookProps, PressResult} from '../src/interactions/usePress';
+export type {PressEvent, PressEvents, LongPressEvent, MoveStartEvent, MoveMoveEvent, MoveEndEvent, MoveEvent, MoveEvents, HoverEvent, HoverEvents, FocusEvents, KeyboardEvents} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useProgressBar.ts b/packages/react-aria/exports/useProgressBar.ts
new file mode 100644
index 00000000000..9c801e0b13e
--- /dev/null
+++ b/packages/react-aria/exports/useProgressBar.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useProgressBar} from '../src/progress/useProgressBar';
+export type {ProgressBarAria} from '../src/progress/useProgressBar';
+export type {AriaProgressBarProps} from '@react-types/progress';
diff --git a/packages/react-aria/exports/useRadioGroup.ts b/packages/react-aria/exports/useRadioGroup.ts
new file mode 100644
index 00000000000..efa885d132e
--- /dev/null
+++ b/packages/react-aria/exports/useRadioGroup.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useRadio} from '../src/radio/useRadio';
+export {useRadioGroup} from '../src/radio/useRadioGroup';
+export type {RadioAria} from '../src/radio/useRadio';
+export type {RadioGroupAria} from '../src/radio/useRadioGroup';
+export type {AriaRadioGroupProps, AriaRadioProps} from '@react-types/radio';
+export type {Orientation} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useRangeCalendar.ts b/packages/react-aria/exports/useRangeCalendar.ts
new file mode 100644
index 00000000000..b1f9e165518
--- /dev/null
+++ b/packages/react-aria/exports/useRangeCalendar.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useRangeCalendar} from '../src/calendar/useRangeCalendar';
+
+export type {AriaCalendarProps, AriaRangeCalendarProps, CalendarProps, DateValue, RangeCalendarProps} from '@react-types/calendar';
diff --git a/packages/react-aria/exports/useSearchField.ts b/packages/react-aria/exports/useSearchField.ts
new file mode 100644
index 00000000000..3578910058f
--- /dev/null
+++ b/packages/react-aria/exports/useSearchField.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useSearchField} from '../src/searchfield/useSearchField';
+export type {SearchFieldAria} from '../src/searchfield/useSearchField';
+export type {AriaSearchFieldProps} from '@react-types/searchfield';
diff --git a/packages/react-aria/exports/useSelect.ts b/packages/react-aria/exports/useSelect.ts
new file mode 100644
index 00000000000..b693532af55
--- /dev/null
+++ b/packages/react-aria/exports/useSelect.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useSelect} from '../src/select/useSelect';
+export {useHiddenSelect, HiddenSelect} from '../src/select/HiddenSelect';
+export type {AriaSelectOptions, SelectAria} from '../src/select/useSelect';
+export type {AriaHiddenSelectProps, AriaHiddenSelectOptions, HiddenSelectProps, HiddenSelectAria} from '../src/select/HiddenSelect';
+export type {AriaSelectProps} from '@react-types/select';
diff --git a/packages/react-aria/exports/useSeparator.ts b/packages/react-aria/exports/useSeparator.ts
new file mode 100644
index 00000000000..12c57126c93
--- /dev/null
+++ b/packages/react-aria/exports/useSeparator.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export type {SeparatorProps, SeparatorAria} from '../src/separator/useSeparator';
+export {useSeparator} from '../src/separator/useSeparator';
diff --git a/packages/react-aria/exports/useSlider.ts b/packages/react-aria/exports/useSlider.ts
new file mode 100644
index 00000000000..f2498c4b971
--- /dev/null
+++ b/packages/react-aria/exports/useSlider.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useSlider} from '../src/slider/useSlider';
+export {useSliderThumb} from '../src/slider/useSliderThumb';
+export type {SliderAria} from '../src/slider/useSlider';
+export type {AriaSliderThumbOptions, SliderThumbAria} from '../src/slider/useSliderThumb';
+export type {AriaSliderProps} from '@react-types/slider';
+export type {AriaSliderThumbProps} from '@react-types/slider';
+export type {Orientation} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useSwitch.ts b/packages/react-aria/exports/useSwitch.ts
new file mode 100644
index 00000000000..cd247aab648
--- /dev/null
+++ b/packages/react-aria/exports/useSwitch.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useSwitch} from '../src/switch/useSwitch';
+
+export type {SwitchAria} from '../src/switch/useSwitch';
+
+export type {AriaSwitchProps} from '@react-types/switch';
diff --git a/packages/react-aria/exports/useTabList.ts b/packages/react-aria/exports/useTabList.ts
new file mode 100644
index 00000000000..48378000d52
--- /dev/null
+++ b/packages/react-aria/exports/useTabList.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useTab} from '../src/tabs/useTab';
+export {useTabPanel} from '../src/tabs/useTabPanel';
+export {useTabList} from '../src/tabs/useTabList';
+export type {TabAria} from '../src/tabs/useTab';
+export type {TabPanelAria} from '../src/tabs/useTabPanel';
+export type {AriaTabListOptions, TabListAria} from '../src/tabs/useTabList';
+export type {AriaTabListProps, AriaTabPanelProps, AriaTabProps} from '@react-types/tabs';
+export type {Orientation} from '@react-types/shared';
diff --git a/packages/react-aria/exports/useTable.ts b/packages/react-aria/exports/useTable.ts
new file mode 100644
index 00000000000..80441f35ec0
--- /dev/null
+++ b/packages/react-aria/exports/useTable.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useTable} from '../src/table/useTable';
+export {useTableColumnHeader} from '../src/table/useTableColumnHeader';
+export {useTableRow} from '../src/table/useTableRow';
+export {useTableHeaderRow} from '../src/table/useTableHeaderRow';
+export {useTableCell} from '../src/table/useTableCell';
+export {useTableSelectionCheckbox, useTableSelectAllCheckbox} from '../src/table/useTableSelectionCheckbox';
+export {useTableColumnResize} from '../src/table/useTableColumnResize';
+
+export {useTableRowGroup} from '../src/table/useTableRowGroup';
+
+export type {AriaTableProps} from '../src/table/useTable';
+export type {AriaTableColumnHeaderProps, TableColumnHeaderAria} from '../src/table/useTableColumnHeader';
+export type {AriaTableCellProps, TableCellAria} from '../src/table/useTableCell';
+export type {TableHeaderRowAria} from '../src/table/useTableHeaderRow';
+export type {AriaTableSelectionCheckboxProps, TableSelectionCheckboxAria, TableSelectAllCheckboxAria} from '../src/table/useTableSelectionCheckbox';
+export type {AriaTableColumnResizeProps, TableColumnResizeAria} from '../src/table/useTableColumnResize';
+export type {GridAria} from '../src/grid/useGrid';
+export type {GridRowAria, GridRowProps} from '../src/grid/useGridRow';
diff --git a/packages/react-aria/exports/useTagGroup.ts b/packages/react-aria/exports/useTagGroup.ts
new file mode 100644
index 00000000000..eea6a1ad184
--- /dev/null
+++ b/packages/react-aria/exports/useTagGroup.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useTag} from '../src/tag/useTag';
+export {useTagGroup} from '../src/tag/useTagGroup';
+
+export type {TagGroupAria, AriaTagGroupProps, AriaTagGroupOptions} from '../src/tag/useTagGroup';
+export type {AriaTagProps, TagAria} from '../src/tag/useTag';
diff --git a/packages/react-aria/exports/useTextField.ts b/packages/react-aria/exports/useTextField.ts
new file mode 100644
index 00000000000..4590088a5b3
--- /dev/null
+++ b/packages/react-aria/exports/useTextField.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export type {TextFieldAria} from '../src/textfield/useTextField';
+export {useTextField} from '../src/textfield/useTextField';
+export type {AriaTextFieldOptions} from '../src/textfield/useTextField';
+export type {AriaTextFieldProps} from '@react-types/textfield';
diff --git a/packages/react-aria/exports/useToast.ts b/packages/react-aria/exports/useToast.ts
new file mode 100644
index 00000000000..048104ad80c
--- /dev/null
+++ b/packages/react-aria/exports/useToast.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useToast} from '../src/toast/useToast';
+export {useToastRegion} from '../src/toast/useToastRegion';
+
+export type {AriaToastRegionProps, ToastRegionAria} from '../src/toast/useToastRegion';
+export type {AriaToastProps, ToastAria} from '../src/toast/useToast';
diff --git a/packages/react-aria/exports/useToggleButton.ts b/packages/react-aria/exports/useToggleButton.ts
new file mode 100644
index 00000000000..702e5d48d9f
--- /dev/null
+++ b/packages/react-aria/exports/useToggleButton.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useToggleButton} from '../src/button/useToggleButton';
+export type {AriaToggleButtonOptions, ToggleButtonAria} from '../src/button/useToggleButton';
+export type {AriaButtonProps, AriaToggleButtonProps} from '@react-types/button';
diff --git a/packages/react-aria/exports/useToggleButtonGroup.ts b/packages/react-aria/exports/useToggleButtonGroup.ts
new file mode 100644
index 00000000000..38b02460fb0
--- /dev/null
+++ b/packages/react-aria/exports/useToggleButtonGroup.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useToggleButtonGroup, useToggleButtonGroupItem} from '../src/button/useToggleButtonGroup';
+export type {AriaToggleButtonGroupProps, ToggleButtonGroupAria, AriaToggleButtonGroupItemProps, AriaToggleButtonGroupItemOptions} from '../src/button/useToggleButtonGroup';
+export type {AriaButtonProps, AriaToggleButtonProps} from '@react-types/button';
diff --git a/packages/react-aria/exports/useTooltipTrigger.ts b/packages/react-aria/exports/useTooltipTrigger.ts
new file mode 100644
index 00000000000..f20e7011e57
--- /dev/null
+++ b/packages/react-aria/exports/useTooltipTrigger.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useTooltip} from '../src/tooltip/useTooltip';
+export {useTooltipTrigger} from '../src/tooltip/useTooltipTrigger';
+export type {TooltipAria} from '../src/tooltip/useTooltip';
+export type {TooltipTriggerAria} from '../src/tooltip/useTooltipTrigger';
+export type {AriaTooltipProps, TooltipTriggerProps} from '@react-types/tooltip';
diff --git a/packages/react-aria/index.ts b/packages/react-aria/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/react-aria/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-aria/autocomplete/intl/ar-AE.json b/packages/react-aria/intl/autocomplete/ar-AE.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/ar-AE.json
rename to packages/react-aria/intl/autocomplete/ar-AE.json
diff --git a/packages/@react-aria/autocomplete/intl/bg-BG.json b/packages/react-aria/intl/autocomplete/bg-BG.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/bg-BG.json
rename to packages/react-aria/intl/autocomplete/bg-BG.json
diff --git a/packages/@react-aria/autocomplete/intl/cs-CZ.json b/packages/react-aria/intl/autocomplete/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/cs-CZ.json
rename to packages/react-aria/intl/autocomplete/cs-CZ.json
diff --git a/packages/@react-aria/autocomplete/intl/da-DK.json b/packages/react-aria/intl/autocomplete/da-DK.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/da-DK.json
rename to packages/react-aria/intl/autocomplete/da-DK.json
diff --git a/packages/@react-aria/autocomplete/intl/de-DE.json b/packages/react-aria/intl/autocomplete/de-DE.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/de-DE.json
rename to packages/react-aria/intl/autocomplete/de-DE.json
diff --git a/packages/@react-aria/autocomplete/intl/el-GR.json b/packages/react-aria/intl/autocomplete/el-GR.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/el-GR.json
rename to packages/react-aria/intl/autocomplete/el-GR.json
diff --git a/packages/@react-aria/autocomplete/intl/en-US.json b/packages/react-aria/intl/autocomplete/en-US.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/en-US.json
rename to packages/react-aria/intl/autocomplete/en-US.json
diff --git a/packages/@react-aria/autocomplete/intl/es-ES.json b/packages/react-aria/intl/autocomplete/es-ES.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/es-ES.json
rename to packages/react-aria/intl/autocomplete/es-ES.json
diff --git a/packages/@react-aria/autocomplete/intl/et-EE.json b/packages/react-aria/intl/autocomplete/et-EE.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/et-EE.json
rename to packages/react-aria/intl/autocomplete/et-EE.json
diff --git a/packages/@react-aria/autocomplete/intl/fi-FI.json b/packages/react-aria/intl/autocomplete/fi-FI.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/fi-FI.json
rename to packages/react-aria/intl/autocomplete/fi-FI.json
diff --git a/packages/@react-aria/autocomplete/intl/fr-FR.json b/packages/react-aria/intl/autocomplete/fr-FR.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/fr-FR.json
rename to packages/react-aria/intl/autocomplete/fr-FR.json
diff --git a/packages/@react-aria/autocomplete/intl/he-IL.json b/packages/react-aria/intl/autocomplete/he-IL.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/he-IL.json
rename to packages/react-aria/intl/autocomplete/he-IL.json
diff --git a/packages/@react-aria/autocomplete/intl/hr-HR.json b/packages/react-aria/intl/autocomplete/hr-HR.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/hr-HR.json
rename to packages/react-aria/intl/autocomplete/hr-HR.json
diff --git a/packages/@react-aria/autocomplete/intl/hu-HU.json b/packages/react-aria/intl/autocomplete/hu-HU.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/hu-HU.json
rename to packages/react-aria/intl/autocomplete/hu-HU.json
diff --git a/packages/@react-aria/autocomplete/intl/it-IT.json b/packages/react-aria/intl/autocomplete/it-IT.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/it-IT.json
rename to packages/react-aria/intl/autocomplete/it-IT.json
diff --git a/packages/@react-aria/autocomplete/intl/ja-JP.json b/packages/react-aria/intl/autocomplete/ja-JP.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/ja-JP.json
rename to packages/react-aria/intl/autocomplete/ja-JP.json
diff --git a/packages/@react-aria/autocomplete/intl/ko-KR.json b/packages/react-aria/intl/autocomplete/ko-KR.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/ko-KR.json
rename to packages/react-aria/intl/autocomplete/ko-KR.json
diff --git a/packages/@react-aria/autocomplete/intl/lt-LT.json b/packages/react-aria/intl/autocomplete/lt-LT.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/lt-LT.json
rename to packages/react-aria/intl/autocomplete/lt-LT.json
diff --git a/packages/@react-aria/autocomplete/intl/lv-LV.json b/packages/react-aria/intl/autocomplete/lv-LV.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/lv-LV.json
rename to packages/react-aria/intl/autocomplete/lv-LV.json
diff --git a/packages/@react-aria/autocomplete/intl/nb-NO.json b/packages/react-aria/intl/autocomplete/nb-NO.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/nb-NO.json
rename to packages/react-aria/intl/autocomplete/nb-NO.json
diff --git a/packages/@react-aria/autocomplete/intl/nl-NL.json b/packages/react-aria/intl/autocomplete/nl-NL.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/nl-NL.json
rename to packages/react-aria/intl/autocomplete/nl-NL.json
diff --git a/packages/@react-aria/autocomplete/intl/pl-PL.json b/packages/react-aria/intl/autocomplete/pl-PL.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/pl-PL.json
rename to packages/react-aria/intl/autocomplete/pl-PL.json
diff --git a/packages/@react-aria/autocomplete/intl/pt-BR.json b/packages/react-aria/intl/autocomplete/pt-BR.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/pt-BR.json
rename to packages/react-aria/intl/autocomplete/pt-BR.json
diff --git a/packages/@react-aria/autocomplete/intl/pt-PT.json b/packages/react-aria/intl/autocomplete/pt-PT.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/pt-PT.json
rename to packages/react-aria/intl/autocomplete/pt-PT.json
diff --git a/packages/@react-aria/autocomplete/intl/ro-RO.json b/packages/react-aria/intl/autocomplete/ro-RO.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/ro-RO.json
rename to packages/react-aria/intl/autocomplete/ro-RO.json
diff --git a/packages/@react-aria/autocomplete/intl/ru-RU.json b/packages/react-aria/intl/autocomplete/ru-RU.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/ru-RU.json
rename to packages/react-aria/intl/autocomplete/ru-RU.json
diff --git a/packages/@react-aria/autocomplete/intl/sk-SK.json b/packages/react-aria/intl/autocomplete/sk-SK.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/sk-SK.json
rename to packages/react-aria/intl/autocomplete/sk-SK.json
diff --git a/packages/@react-aria/autocomplete/intl/sl-SI.json b/packages/react-aria/intl/autocomplete/sl-SI.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/sl-SI.json
rename to packages/react-aria/intl/autocomplete/sl-SI.json
diff --git a/packages/@react-aria/autocomplete/intl/sr-SP.json b/packages/react-aria/intl/autocomplete/sr-SP.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/sr-SP.json
rename to packages/react-aria/intl/autocomplete/sr-SP.json
diff --git a/packages/@react-aria/autocomplete/intl/sv-SE.json b/packages/react-aria/intl/autocomplete/sv-SE.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/sv-SE.json
rename to packages/react-aria/intl/autocomplete/sv-SE.json
diff --git a/packages/@react-aria/autocomplete/intl/tr-TR.json b/packages/react-aria/intl/autocomplete/tr-TR.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/tr-TR.json
rename to packages/react-aria/intl/autocomplete/tr-TR.json
diff --git a/packages/@react-aria/autocomplete/intl/uk-UA.json b/packages/react-aria/intl/autocomplete/uk-UA.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/uk-UA.json
rename to packages/react-aria/intl/autocomplete/uk-UA.json
diff --git a/packages/@react-aria/autocomplete/intl/zh-CN.json b/packages/react-aria/intl/autocomplete/zh-CN.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/zh-CN.json
rename to packages/react-aria/intl/autocomplete/zh-CN.json
diff --git a/packages/@react-aria/autocomplete/intl/zh-TW.json b/packages/react-aria/intl/autocomplete/zh-TW.json
similarity index 100%
rename from packages/@react-aria/autocomplete/intl/zh-TW.json
rename to packages/react-aria/intl/autocomplete/zh-TW.json
diff --git a/packages/@react-aria/breadcrumbs/intl/ar-AE.json b/packages/react-aria/intl/breadcrumbs/ar-AE.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/ar-AE.json
rename to packages/react-aria/intl/breadcrumbs/ar-AE.json
diff --git a/packages/@react-aria/breadcrumbs/intl/bg-BG.json b/packages/react-aria/intl/breadcrumbs/bg-BG.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/bg-BG.json
rename to packages/react-aria/intl/breadcrumbs/bg-BG.json
diff --git a/packages/@react-aria/breadcrumbs/intl/cs-CZ.json b/packages/react-aria/intl/breadcrumbs/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/cs-CZ.json
rename to packages/react-aria/intl/breadcrumbs/cs-CZ.json
diff --git a/packages/@react-aria/breadcrumbs/intl/da-DK.json b/packages/react-aria/intl/breadcrumbs/da-DK.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/da-DK.json
rename to packages/react-aria/intl/breadcrumbs/da-DK.json
diff --git a/packages/@react-aria/breadcrumbs/intl/de-DE.json b/packages/react-aria/intl/breadcrumbs/de-DE.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/de-DE.json
rename to packages/react-aria/intl/breadcrumbs/de-DE.json
diff --git a/packages/@react-aria/breadcrumbs/intl/el-GR.json b/packages/react-aria/intl/breadcrumbs/el-GR.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/el-GR.json
rename to packages/react-aria/intl/breadcrumbs/el-GR.json
diff --git a/packages/@react-aria/breadcrumbs/intl/en-US.json b/packages/react-aria/intl/breadcrumbs/en-US.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/en-US.json
rename to packages/react-aria/intl/breadcrumbs/en-US.json
diff --git a/packages/@react-aria/breadcrumbs/intl/es-ES.json b/packages/react-aria/intl/breadcrumbs/es-ES.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/es-ES.json
rename to packages/react-aria/intl/breadcrumbs/es-ES.json
diff --git a/packages/@react-aria/breadcrumbs/intl/et-EE.json b/packages/react-aria/intl/breadcrumbs/et-EE.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/et-EE.json
rename to packages/react-aria/intl/breadcrumbs/et-EE.json
diff --git a/packages/@react-aria/breadcrumbs/intl/fi-FI.json b/packages/react-aria/intl/breadcrumbs/fi-FI.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/fi-FI.json
rename to packages/react-aria/intl/breadcrumbs/fi-FI.json
diff --git a/packages/@react-aria/breadcrumbs/intl/fr-FR.json b/packages/react-aria/intl/breadcrumbs/fr-FR.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/fr-FR.json
rename to packages/react-aria/intl/breadcrumbs/fr-FR.json
diff --git a/packages/@react-aria/breadcrumbs/intl/he-IL.json b/packages/react-aria/intl/breadcrumbs/he-IL.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/he-IL.json
rename to packages/react-aria/intl/breadcrumbs/he-IL.json
diff --git a/packages/@react-aria/breadcrumbs/intl/hr-HR.json b/packages/react-aria/intl/breadcrumbs/hr-HR.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/hr-HR.json
rename to packages/react-aria/intl/breadcrumbs/hr-HR.json
diff --git a/packages/@react-aria/breadcrumbs/intl/hu-HU.json b/packages/react-aria/intl/breadcrumbs/hu-HU.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/hu-HU.json
rename to packages/react-aria/intl/breadcrumbs/hu-HU.json
diff --git a/packages/@react-aria/breadcrumbs/intl/it-IT.json b/packages/react-aria/intl/breadcrumbs/it-IT.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/it-IT.json
rename to packages/react-aria/intl/breadcrumbs/it-IT.json
diff --git a/packages/@react-aria/breadcrumbs/intl/ja-JP.json b/packages/react-aria/intl/breadcrumbs/ja-JP.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/ja-JP.json
rename to packages/react-aria/intl/breadcrumbs/ja-JP.json
diff --git a/packages/@react-aria/breadcrumbs/intl/ko-KR.json b/packages/react-aria/intl/breadcrumbs/ko-KR.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/ko-KR.json
rename to packages/react-aria/intl/breadcrumbs/ko-KR.json
diff --git a/packages/@react-aria/breadcrumbs/intl/lt-LT.json b/packages/react-aria/intl/breadcrumbs/lt-LT.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/lt-LT.json
rename to packages/react-aria/intl/breadcrumbs/lt-LT.json
diff --git a/packages/@react-aria/breadcrumbs/intl/lv-LV.json b/packages/react-aria/intl/breadcrumbs/lv-LV.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/lv-LV.json
rename to packages/react-aria/intl/breadcrumbs/lv-LV.json
diff --git a/packages/@react-aria/breadcrumbs/intl/nb-NO.json b/packages/react-aria/intl/breadcrumbs/nb-NO.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/nb-NO.json
rename to packages/react-aria/intl/breadcrumbs/nb-NO.json
diff --git a/packages/@react-aria/breadcrumbs/intl/nl-NL.json b/packages/react-aria/intl/breadcrumbs/nl-NL.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/nl-NL.json
rename to packages/react-aria/intl/breadcrumbs/nl-NL.json
diff --git a/packages/@react-aria/breadcrumbs/intl/pl-PL.json b/packages/react-aria/intl/breadcrumbs/pl-PL.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/pl-PL.json
rename to packages/react-aria/intl/breadcrumbs/pl-PL.json
diff --git a/packages/@react-aria/breadcrumbs/intl/pt-BR.json b/packages/react-aria/intl/breadcrumbs/pt-BR.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/pt-BR.json
rename to packages/react-aria/intl/breadcrumbs/pt-BR.json
diff --git a/packages/@react-aria/breadcrumbs/intl/pt-PT.json b/packages/react-aria/intl/breadcrumbs/pt-PT.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/pt-PT.json
rename to packages/react-aria/intl/breadcrumbs/pt-PT.json
diff --git a/packages/@react-aria/breadcrumbs/intl/ro-RO.json b/packages/react-aria/intl/breadcrumbs/ro-RO.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/ro-RO.json
rename to packages/react-aria/intl/breadcrumbs/ro-RO.json
diff --git a/packages/@react-aria/breadcrumbs/intl/ru-RU.json b/packages/react-aria/intl/breadcrumbs/ru-RU.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/ru-RU.json
rename to packages/react-aria/intl/breadcrumbs/ru-RU.json
diff --git a/packages/@react-aria/breadcrumbs/intl/sk-SK.json b/packages/react-aria/intl/breadcrumbs/sk-SK.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/sk-SK.json
rename to packages/react-aria/intl/breadcrumbs/sk-SK.json
diff --git a/packages/@react-aria/breadcrumbs/intl/sl-SI.json b/packages/react-aria/intl/breadcrumbs/sl-SI.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/sl-SI.json
rename to packages/react-aria/intl/breadcrumbs/sl-SI.json
diff --git a/packages/@react-aria/breadcrumbs/intl/sr-SP.json b/packages/react-aria/intl/breadcrumbs/sr-SP.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/sr-SP.json
rename to packages/react-aria/intl/breadcrumbs/sr-SP.json
diff --git a/packages/@react-aria/breadcrumbs/intl/sv-SE.json b/packages/react-aria/intl/breadcrumbs/sv-SE.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/sv-SE.json
rename to packages/react-aria/intl/breadcrumbs/sv-SE.json
diff --git a/packages/@react-aria/breadcrumbs/intl/tr-TR.json b/packages/react-aria/intl/breadcrumbs/tr-TR.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/tr-TR.json
rename to packages/react-aria/intl/breadcrumbs/tr-TR.json
diff --git a/packages/@react-aria/breadcrumbs/intl/uk-UA.json b/packages/react-aria/intl/breadcrumbs/uk-UA.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/uk-UA.json
rename to packages/react-aria/intl/breadcrumbs/uk-UA.json
diff --git a/packages/@react-aria/breadcrumbs/intl/zh-CN.json b/packages/react-aria/intl/breadcrumbs/zh-CN.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/zh-CN.json
rename to packages/react-aria/intl/breadcrumbs/zh-CN.json
diff --git a/packages/@react-aria/breadcrumbs/intl/zh-TW.json b/packages/react-aria/intl/breadcrumbs/zh-TW.json
similarity index 100%
rename from packages/@react-aria/breadcrumbs/intl/zh-TW.json
rename to packages/react-aria/intl/breadcrumbs/zh-TW.json
diff --git a/packages/@react-aria/calendar/intl/ar-AE.json b/packages/react-aria/intl/calendar/ar-AE.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/ar-AE.json
rename to packages/react-aria/intl/calendar/ar-AE.json
diff --git a/packages/@react-aria/calendar/intl/bg-BG.json b/packages/react-aria/intl/calendar/bg-BG.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/bg-BG.json
rename to packages/react-aria/intl/calendar/bg-BG.json
diff --git a/packages/@react-aria/calendar/intl/cs-CZ.json b/packages/react-aria/intl/calendar/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/cs-CZ.json
rename to packages/react-aria/intl/calendar/cs-CZ.json
diff --git a/packages/@react-aria/calendar/intl/da-DK.json b/packages/react-aria/intl/calendar/da-DK.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/da-DK.json
rename to packages/react-aria/intl/calendar/da-DK.json
diff --git a/packages/@react-aria/calendar/intl/de-DE.json b/packages/react-aria/intl/calendar/de-DE.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/de-DE.json
rename to packages/react-aria/intl/calendar/de-DE.json
diff --git a/packages/@react-aria/calendar/intl/el-GR.json b/packages/react-aria/intl/calendar/el-GR.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/el-GR.json
rename to packages/react-aria/intl/calendar/el-GR.json
diff --git a/packages/@react-aria/calendar/intl/en-US.json b/packages/react-aria/intl/calendar/en-US.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/en-US.json
rename to packages/react-aria/intl/calendar/en-US.json
diff --git a/packages/@react-aria/calendar/intl/es-ES.json b/packages/react-aria/intl/calendar/es-ES.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/es-ES.json
rename to packages/react-aria/intl/calendar/es-ES.json
diff --git a/packages/@react-aria/calendar/intl/et-EE.json b/packages/react-aria/intl/calendar/et-EE.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/et-EE.json
rename to packages/react-aria/intl/calendar/et-EE.json
diff --git a/packages/@react-aria/calendar/intl/fi-FI.json b/packages/react-aria/intl/calendar/fi-FI.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/fi-FI.json
rename to packages/react-aria/intl/calendar/fi-FI.json
diff --git a/packages/@react-aria/calendar/intl/fr-FR.json b/packages/react-aria/intl/calendar/fr-FR.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/fr-FR.json
rename to packages/react-aria/intl/calendar/fr-FR.json
diff --git a/packages/@react-aria/calendar/intl/he-IL.json b/packages/react-aria/intl/calendar/he-IL.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/he-IL.json
rename to packages/react-aria/intl/calendar/he-IL.json
diff --git a/packages/@react-aria/calendar/intl/hr-HR.json b/packages/react-aria/intl/calendar/hr-HR.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/hr-HR.json
rename to packages/react-aria/intl/calendar/hr-HR.json
diff --git a/packages/@react-aria/calendar/intl/hu-HU.json b/packages/react-aria/intl/calendar/hu-HU.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/hu-HU.json
rename to packages/react-aria/intl/calendar/hu-HU.json
diff --git a/packages/@react-aria/calendar/intl/it-IT.json b/packages/react-aria/intl/calendar/it-IT.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/it-IT.json
rename to packages/react-aria/intl/calendar/it-IT.json
diff --git a/packages/@react-aria/calendar/intl/ja-JP.json b/packages/react-aria/intl/calendar/ja-JP.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/ja-JP.json
rename to packages/react-aria/intl/calendar/ja-JP.json
diff --git a/packages/@react-aria/calendar/intl/ko-KR.json b/packages/react-aria/intl/calendar/ko-KR.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/ko-KR.json
rename to packages/react-aria/intl/calendar/ko-KR.json
diff --git a/packages/@react-aria/calendar/intl/lt-LT.json b/packages/react-aria/intl/calendar/lt-LT.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/lt-LT.json
rename to packages/react-aria/intl/calendar/lt-LT.json
diff --git a/packages/@react-aria/calendar/intl/lv-LV.json b/packages/react-aria/intl/calendar/lv-LV.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/lv-LV.json
rename to packages/react-aria/intl/calendar/lv-LV.json
diff --git a/packages/@react-aria/calendar/intl/nb-NO.json b/packages/react-aria/intl/calendar/nb-NO.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/nb-NO.json
rename to packages/react-aria/intl/calendar/nb-NO.json
diff --git a/packages/@react-aria/calendar/intl/nl-NL.json b/packages/react-aria/intl/calendar/nl-NL.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/nl-NL.json
rename to packages/react-aria/intl/calendar/nl-NL.json
diff --git a/packages/@react-aria/calendar/intl/pl-PL.json b/packages/react-aria/intl/calendar/pl-PL.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/pl-PL.json
rename to packages/react-aria/intl/calendar/pl-PL.json
diff --git a/packages/@react-aria/calendar/intl/pt-BR.json b/packages/react-aria/intl/calendar/pt-BR.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/pt-BR.json
rename to packages/react-aria/intl/calendar/pt-BR.json
diff --git a/packages/@react-aria/calendar/intl/pt-PT.json b/packages/react-aria/intl/calendar/pt-PT.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/pt-PT.json
rename to packages/react-aria/intl/calendar/pt-PT.json
diff --git a/packages/@react-aria/calendar/intl/ro-RO.json b/packages/react-aria/intl/calendar/ro-RO.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/ro-RO.json
rename to packages/react-aria/intl/calendar/ro-RO.json
diff --git a/packages/@react-aria/calendar/intl/ru-RU.json b/packages/react-aria/intl/calendar/ru-RU.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/ru-RU.json
rename to packages/react-aria/intl/calendar/ru-RU.json
diff --git a/packages/@react-aria/calendar/intl/sk-SK.json b/packages/react-aria/intl/calendar/sk-SK.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/sk-SK.json
rename to packages/react-aria/intl/calendar/sk-SK.json
diff --git a/packages/@react-aria/calendar/intl/sl-SI.json b/packages/react-aria/intl/calendar/sl-SI.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/sl-SI.json
rename to packages/react-aria/intl/calendar/sl-SI.json
diff --git a/packages/@react-aria/calendar/intl/sr-SP.json b/packages/react-aria/intl/calendar/sr-SP.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/sr-SP.json
rename to packages/react-aria/intl/calendar/sr-SP.json
diff --git a/packages/@react-aria/calendar/intl/sv-SE.json b/packages/react-aria/intl/calendar/sv-SE.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/sv-SE.json
rename to packages/react-aria/intl/calendar/sv-SE.json
diff --git a/packages/@react-aria/calendar/intl/tr-TR.json b/packages/react-aria/intl/calendar/tr-TR.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/tr-TR.json
rename to packages/react-aria/intl/calendar/tr-TR.json
diff --git a/packages/@react-aria/calendar/intl/uk-UA.json b/packages/react-aria/intl/calendar/uk-UA.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/uk-UA.json
rename to packages/react-aria/intl/calendar/uk-UA.json
diff --git a/packages/@react-aria/calendar/intl/zh-CN.json b/packages/react-aria/intl/calendar/zh-CN.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/zh-CN.json
rename to packages/react-aria/intl/calendar/zh-CN.json
diff --git a/packages/@react-aria/calendar/intl/zh-TW.json b/packages/react-aria/intl/calendar/zh-TW.json
similarity index 100%
rename from packages/@react-aria/calendar/intl/zh-TW.json
rename to packages/react-aria/intl/calendar/zh-TW.json
diff --git a/packages/@react-aria/color/intl/ar-AE.json b/packages/react-aria/intl/color/ar-AE.json
similarity index 100%
rename from packages/@react-aria/color/intl/ar-AE.json
rename to packages/react-aria/intl/color/ar-AE.json
diff --git a/packages/@react-aria/color/intl/bg-BG.json b/packages/react-aria/intl/color/bg-BG.json
similarity index 100%
rename from packages/@react-aria/color/intl/bg-BG.json
rename to packages/react-aria/intl/color/bg-BG.json
diff --git a/packages/@react-aria/color/intl/cs-CZ.json b/packages/react-aria/intl/color/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/color/intl/cs-CZ.json
rename to packages/react-aria/intl/color/cs-CZ.json
diff --git a/packages/@react-aria/color/intl/da-DK.json b/packages/react-aria/intl/color/da-DK.json
similarity index 100%
rename from packages/@react-aria/color/intl/da-DK.json
rename to packages/react-aria/intl/color/da-DK.json
diff --git a/packages/@react-aria/color/intl/de-DE.json b/packages/react-aria/intl/color/de-DE.json
similarity index 100%
rename from packages/@react-aria/color/intl/de-DE.json
rename to packages/react-aria/intl/color/de-DE.json
diff --git a/packages/@react-aria/color/intl/el-GR.json b/packages/react-aria/intl/color/el-GR.json
similarity index 100%
rename from packages/@react-aria/color/intl/el-GR.json
rename to packages/react-aria/intl/color/el-GR.json
diff --git a/packages/@react-aria/color/intl/en-US.json b/packages/react-aria/intl/color/en-US.json
similarity index 100%
rename from packages/@react-aria/color/intl/en-US.json
rename to packages/react-aria/intl/color/en-US.json
diff --git a/packages/@react-aria/color/intl/es-ES.json b/packages/react-aria/intl/color/es-ES.json
similarity index 100%
rename from packages/@react-aria/color/intl/es-ES.json
rename to packages/react-aria/intl/color/es-ES.json
diff --git a/packages/@react-aria/color/intl/et-EE.json b/packages/react-aria/intl/color/et-EE.json
similarity index 100%
rename from packages/@react-aria/color/intl/et-EE.json
rename to packages/react-aria/intl/color/et-EE.json
diff --git a/packages/@react-aria/color/intl/fi-FI.json b/packages/react-aria/intl/color/fi-FI.json
similarity index 100%
rename from packages/@react-aria/color/intl/fi-FI.json
rename to packages/react-aria/intl/color/fi-FI.json
diff --git a/packages/@react-aria/color/intl/fr-FR.json b/packages/react-aria/intl/color/fr-FR.json
similarity index 100%
rename from packages/@react-aria/color/intl/fr-FR.json
rename to packages/react-aria/intl/color/fr-FR.json
diff --git a/packages/@react-aria/color/intl/he-IL.json b/packages/react-aria/intl/color/he-IL.json
similarity index 100%
rename from packages/@react-aria/color/intl/he-IL.json
rename to packages/react-aria/intl/color/he-IL.json
diff --git a/packages/@react-aria/color/intl/hr-HR.json b/packages/react-aria/intl/color/hr-HR.json
similarity index 100%
rename from packages/@react-aria/color/intl/hr-HR.json
rename to packages/react-aria/intl/color/hr-HR.json
diff --git a/packages/@react-aria/color/intl/hu-HU.json b/packages/react-aria/intl/color/hu-HU.json
similarity index 100%
rename from packages/@react-aria/color/intl/hu-HU.json
rename to packages/react-aria/intl/color/hu-HU.json
diff --git a/packages/@react-aria/color/intl/it-IT.json b/packages/react-aria/intl/color/it-IT.json
similarity index 100%
rename from packages/@react-aria/color/intl/it-IT.json
rename to packages/react-aria/intl/color/it-IT.json
diff --git a/packages/@react-aria/color/intl/ja-JP.json b/packages/react-aria/intl/color/ja-JP.json
similarity index 100%
rename from packages/@react-aria/color/intl/ja-JP.json
rename to packages/react-aria/intl/color/ja-JP.json
diff --git a/packages/@react-aria/color/intl/ko-KR.json b/packages/react-aria/intl/color/ko-KR.json
similarity index 100%
rename from packages/@react-aria/color/intl/ko-KR.json
rename to packages/react-aria/intl/color/ko-KR.json
diff --git a/packages/@react-aria/color/intl/lt-LT.json b/packages/react-aria/intl/color/lt-LT.json
similarity index 100%
rename from packages/@react-aria/color/intl/lt-LT.json
rename to packages/react-aria/intl/color/lt-LT.json
diff --git a/packages/@react-aria/color/intl/lv-LV.json b/packages/react-aria/intl/color/lv-LV.json
similarity index 100%
rename from packages/@react-aria/color/intl/lv-LV.json
rename to packages/react-aria/intl/color/lv-LV.json
diff --git a/packages/@react-aria/color/intl/nb-NO.json b/packages/react-aria/intl/color/nb-NO.json
similarity index 100%
rename from packages/@react-aria/color/intl/nb-NO.json
rename to packages/react-aria/intl/color/nb-NO.json
diff --git a/packages/@react-aria/color/intl/nl-NL.json b/packages/react-aria/intl/color/nl-NL.json
similarity index 100%
rename from packages/@react-aria/color/intl/nl-NL.json
rename to packages/react-aria/intl/color/nl-NL.json
diff --git a/packages/@react-aria/color/intl/pl-PL.json b/packages/react-aria/intl/color/pl-PL.json
similarity index 100%
rename from packages/@react-aria/color/intl/pl-PL.json
rename to packages/react-aria/intl/color/pl-PL.json
diff --git a/packages/@react-aria/color/intl/pt-BR.json b/packages/react-aria/intl/color/pt-BR.json
similarity index 100%
rename from packages/@react-aria/color/intl/pt-BR.json
rename to packages/react-aria/intl/color/pt-BR.json
diff --git a/packages/@react-aria/color/intl/pt-PT.json b/packages/react-aria/intl/color/pt-PT.json
similarity index 100%
rename from packages/@react-aria/color/intl/pt-PT.json
rename to packages/react-aria/intl/color/pt-PT.json
diff --git a/packages/@react-aria/color/intl/ro-RO.json b/packages/react-aria/intl/color/ro-RO.json
similarity index 100%
rename from packages/@react-aria/color/intl/ro-RO.json
rename to packages/react-aria/intl/color/ro-RO.json
diff --git a/packages/@react-aria/color/intl/ru-RU.json b/packages/react-aria/intl/color/ru-RU.json
similarity index 100%
rename from packages/@react-aria/color/intl/ru-RU.json
rename to packages/react-aria/intl/color/ru-RU.json
diff --git a/packages/@react-aria/color/intl/sk-SK.json b/packages/react-aria/intl/color/sk-SK.json
similarity index 100%
rename from packages/@react-aria/color/intl/sk-SK.json
rename to packages/react-aria/intl/color/sk-SK.json
diff --git a/packages/@react-aria/color/intl/sl-SI.json b/packages/react-aria/intl/color/sl-SI.json
similarity index 100%
rename from packages/@react-aria/color/intl/sl-SI.json
rename to packages/react-aria/intl/color/sl-SI.json
diff --git a/packages/@react-aria/color/intl/sr-SP.json b/packages/react-aria/intl/color/sr-SP.json
similarity index 100%
rename from packages/@react-aria/color/intl/sr-SP.json
rename to packages/react-aria/intl/color/sr-SP.json
diff --git a/packages/@react-aria/color/intl/sv-SE.json b/packages/react-aria/intl/color/sv-SE.json
similarity index 100%
rename from packages/@react-aria/color/intl/sv-SE.json
rename to packages/react-aria/intl/color/sv-SE.json
diff --git a/packages/@react-aria/color/intl/tr-TR.json b/packages/react-aria/intl/color/tr-TR.json
similarity index 100%
rename from packages/@react-aria/color/intl/tr-TR.json
rename to packages/react-aria/intl/color/tr-TR.json
diff --git a/packages/@react-aria/color/intl/uk-UA.json b/packages/react-aria/intl/color/uk-UA.json
similarity index 100%
rename from packages/@react-aria/color/intl/uk-UA.json
rename to packages/react-aria/intl/color/uk-UA.json
diff --git a/packages/@react-aria/color/intl/zh-CN.json b/packages/react-aria/intl/color/zh-CN.json
similarity index 100%
rename from packages/@react-aria/color/intl/zh-CN.json
rename to packages/react-aria/intl/color/zh-CN.json
diff --git a/packages/@react-aria/color/intl/zh-TW.json b/packages/react-aria/intl/color/zh-TW.json
similarity index 100%
rename from packages/@react-aria/color/intl/zh-TW.json
rename to packages/react-aria/intl/color/zh-TW.json
diff --git a/packages/@react-aria/combobox/intl/ar-AE.json b/packages/react-aria/intl/combobox/ar-AE.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/ar-AE.json
rename to packages/react-aria/intl/combobox/ar-AE.json
diff --git a/packages/@react-aria/combobox/intl/bg-BG.json b/packages/react-aria/intl/combobox/bg-BG.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/bg-BG.json
rename to packages/react-aria/intl/combobox/bg-BG.json
diff --git a/packages/@react-aria/combobox/intl/cs-CZ.json b/packages/react-aria/intl/combobox/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/cs-CZ.json
rename to packages/react-aria/intl/combobox/cs-CZ.json
diff --git a/packages/@react-aria/combobox/intl/da-DK.json b/packages/react-aria/intl/combobox/da-DK.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/da-DK.json
rename to packages/react-aria/intl/combobox/da-DK.json
diff --git a/packages/@react-aria/combobox/intl/de-DE.json b/packages/react-aria/intl/combobox/de-DE.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/de-DE.json
rename to packages/react-aria/intl/combobox/de-DE.json
diff --git a/packages/@react-aria/combobox/intl/el-GR.json b/packages/react-aria/intl/combobox/el-GR.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/el-GR.json
rename to packages/react-aria/intl/combobox/el-GR.json
diff --git a/packages/@react-aria/combobox/intl/en-US.json b/packages/react-aria/intl/combobox/en-US.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/en-US.json
rename to packages/react-aria/intl/combobox/en-US.json
diff --git a/packages/@react-aria/combobox/intl/es-ES.json b/packages/react-aria/intl/combobox/es-ES.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/es-ES.json
rename to packages/react-aria/intl/combobox/es-ES.json
diff --git a/packages/@react-aria/combobox/intl/et-EE.json b/packages/react-aria/intl/combobox/et-EE.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/et-EE.json
rename to packages/react-aria/intl/combobox/et-EE.json
diff --git a/packages/@react-aria/combobox/intl/fi-FI.json b/packages/react-aria/intl/combobox/fi-FI.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/fi-FI.json
rename to packages/react-aria/intl/combobox/fi-FI.json
diff --git a/packages/@react-aria/combobox/intl/fr-FR.json b/packages/react-aria/intl/combobox/fr-FR.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/fr-FR.json
rename to packages/react-aria/intl/combobox/fr-FR.json
diff --git a/packages/@react-aria/combobox/intl/he-IL.json b/packages/react-aria/intl/combobox/he-IL.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/he-IL.json
rename to packages/react-aria/intl/combobox/he-IL.json
diff --git a/packages/@react-aria/combobox/intl/hr-HR.json b/packages/react-aria/intl/combobox/hr-HR.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/hr-HR.json
rename to packages/react-aria/intl/combobox/hr-HR.json
diff --git a/packages/@react-aria/combobox/intl/hu-HU.json b/packages/react-aria/intl/combobox/hu-HU.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/hu-HU.json
rename to packages/react-aria/intl/combobox/hu-HU.json
diff --git a/packages/@react-aria/combobox/intl/it-IT.json b/packages/react-aria/intl/combobox/it-IT.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/it-IT.json
rename to packages/react-aria/intl/combobox/it-IT.json
diff --git a/packages/@react-aria/combobox/intl/ja-JP.json b/packages/react-aria/intl/combobox/ja-JP.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/ja-JP.json
rename to packages/react-aria/intl/combobox/ja-JP.json
diff --git a/packages/@react-aria/combobox/intl/ko-KR.json b/packages/react-aria/intl/combobox/ko-KR.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/ko-KR.json
rename to packages/react-aria/intl/combobox/ko-KR.json
diff --git a/packages/@react-aria/combobox/intl/lt-LT.json b/packages/react-aria/intl/combobox/lt-LT.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/lt-LT.json
rename to packages/react-aria/intl/combobox/lt-LT.json
diff --git a/packages/@react-aria/combobox/intl/lv-LV.json b/packages/react-aria/intl/combobox/lv-LV.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/lv-LV.json
rename to packages/react-aria/intl/combobox/lv-LV.json
diff --git a/packages/@react-aria/combobox/intl/nb-NO.json b/packages/react-aria/intl/combobox/nb-NO.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/nb-NO.json
rename to packages/react-aria/intl/combobox/nb-NO.json
diff --git a/packages/@react-aria/combobox/intl/nl-NL.json b/packages/react-aria/intl/combobox/nl-NL.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/nl-NL.json
rename to packages/react-aria/intl/combobox/nl-NL.json
diff --git a/packages/@react-aria/combobox/intl/pl-PL.json b/packages/react-aria/intl/combobox/pl-PL.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/pl-PL.json
rename to packages/react-aria/intl/combobox/pl-PL.json
diff --git a/packages/@react-aria/combobox/intl/pt-BR.json b/packages/react-aria/intl/combobox/pt-BR.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/pt-BR.json
rename to packages/react-aria/intl/combobox/pt-BR.json
diff --git a/packages/@react-aria/combobox/intl/pt-PT.json b/packages/react-aria/intl/combobox/pt-PT.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/pt-PT.json
rename to packages/react-aria/intl/combobox/pt-PT.json
diff --git a/packages/@react-aria/combobox/intl/ro-RO.json b/packages/react-aria/intl/combobox/ro-RO.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/ro-RO.json
rename to packages/react-aria/intl/combobox/ro-RO.json
diff --git a/packages/@react-aria/combobox/intl/ru-RU.json b/packages/react-aria/intl/combobox/ru-RU.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/ru-RU.json
rename to packages/react-aria/intl/combobox/ru-RU.json
diff --git a/packages/@react-aria/combobox/intl/sk-SK.json b/packages/react-aria/intl/combobox/sk-SK.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/sk-SK.json
rename to packages/react-aria/intl/combobox/sk-SK.json
diff --git a/packages/@react-aria/combobox/intl/sl-SI.json b/packages/react-aria/intl/combobox/sl-SI.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/sl-SI.json
rename to packages/react-aria/intl/combobox/sl-SI.json
diff --git a/packages/@react-aria/combobox/intl/sr-SP.json b/packages/react-aria/intl/combobox/sr-SP.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/sr-SP.json
rename to packages/react-aria/intl/combobox/sr-SP.json
diff --git a/packages/@react-aria/combobox/intl/sv-SE.json b/packages/react-aria/intl/combobox/sv-SE.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/sv-SE.json
rename to packages/react-aria/intl/combobox/sv-SE.json
diff --git a/packages/@react-aria/combobox/intl/tr-TR.json b/packages/react-aria/intl/combobox/tr-TR.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/tr-TR.json
rename to packages/react-aria/intl/combobox/tr-TR.json
diff --git a/packages/@react-aria/combobox/intl/uk-UA.json b/packages/react-aria/intl/combobox/uk-UA.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/uk-UA.json
rename to packages/react-aria/intl/combobox/uk-UA.json
diff --git a/packages/@react-aria/combobox/intl/zh-CN.json b/packages/react-aria/intl/combobox/zh-CN.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/zh-CN.json
rename to packages/react-aria/intl/combobox/zh-CN.json
diff --git a/packages/@react-aria/combobox/intl/zh-TW.json b/packages/react-aria/intl/combobox/zh-TW.json
similarity index 100%
rename from packages/@react-aria/combobox/intl/zh-TW.json
rename to packages/react-aria/intl/combobox/zh-TW.json
diff --git a/packages/@react-aria/datepicker/intl/ar-AE.json b/packages/react-aria/intl/datepicker/ar-AE.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/ar-AE.json
rename to packages/react-aria/intl/datepicker/ar-AE.json
diff --git a/packages/@react-aria/datepicker/intl/bg-BG.json b/packages/react-aria/intl/datepicker/bg-BG.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/bg-BG.json
rename to packages/react-aria/intl/datepicker/bg-BG.json
diff --git a/packages/@react-aria/datepicker/intl/cs-CZ.json b/packages/react-aria/intl/datepicker/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/cs-CZ.json
rename to packages/react-aria/intl/datepicker/cs-CZ.json
diff --git a/packages/@react-aria/datepicker/intl/da-DK.json b/packages/react-aria/intl/datepicker/da-DK.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/da-DK.json
rename to packages/react-aria/intl/datepicker/da-DK.json
diff --git a/packages/@react-aria/datepicker/intl/de-DE.json b/packages/react-aria/intl/datepicker/de-DE.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/de-DE.json
rename to packages/react-aria/intl/datepicker/de-DE.json
diff --git a/packages/@react-aria/datepicker/intl/el-GR.json b/packages/react-aria/intl/datepicker/el-GR.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/el-GR.json
rename to packages/react-aria/intl/datepicker/el-GR.json
diff --git a/packages/@react-aria/datepicker/intl/en-US.json b/packages/react-aria/intl/datepicker/en-US.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/en-US.json
rename to packages/react-aria/intl/datepicker/en-US.json
diff --git a/packages/@react-aria/datepicker/intl/es-ES.json b/packages/react-aria/intl/datepicker/es-ES.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/es-ES.json
rename to packages/react-aria/intl/datepicker/es-ES.json
diff --git a/packages/@react-aria/datepicker/intl/et-EE.json b/packages/react-aria/intl/datepicker/et-EE.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/et-EE.json
rename to packages/react-aria/intl/datepicker/et-EE.json
diff --git a/packages/@react-aria/datepicker/intl/fi-FI.json b/packages/react-aria/intl/datepicker/fi-FI.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/fi-FI.json
rename to packages/react-aria/intl/datepicker/fi-FI.json
diff --git a/packages/@react-aria/datepicker/intl/fr-FR.json b/packages/react-aria/intl/datepicker/fr-FR.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/fr-FR.json
rename to packages/react-aria/intl/datepicker/fr-FR.json
diff --git a/packages/@react-aria/datepicker/intl/he-IL.json b/packages/react-aria/intl/datepicker/he-IL.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/he-IL.json
rename to packages/react-aria/intl/datepicker/he-IL.json
diff --git a/packages/@react-aria/datepicker/intl/hr-HR.json b/packages/react-aria/intl/datepicker/hr-HR.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/hr-HR.json
rename to packages/react-aria/intl/datepicker/hr-HR.json
diff --git a/packages/@react-aria/datepicker/intl/hu-HU.json b/packages/react-aria/intl/datepicker/hu-HU.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/hu-HU.json
rename to packages/react-aria/intl/datepicker/hu-HU.json
diff --git a/packages/@react-aria/datepicker/intl/it-IT.json b/packages/react-aria/intl/datepicker/it-IT.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/it-IT.json
rename to packages/react-aria/intl/datepicker/it-IT.json
diff --git a/packages/@react-aria/datepicker/intl/ja-JP.json b/packages/react-aria/intl/datepicker/ja-JP.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/ja-JP.json
rename to packages/react-aria/intl/datepicker/ja-JP.json
diff --git a/packages/@react-aria/datepicker/intl/ko-KR.json b/packages/react-aria/intl/datepicker/ko-KR.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/ko-KR.json
rename to packages/react-aria/intl/datepicker/ko-KR.json
diff --git a/packages/@react-aria/datepicker/intl/lt-LT.json b/packages/react-aria/intl/datepicker/lt-LT.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/lt-LT.json
rename to packages/react-aria/intl/datepicker/lt-LT.json
diff --git a/packages/@react-aria/datepicker/intl/lv-LV.json b/packages/react-aria/intl/datepicker/lv-LV.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/lv-LV.json
rename to packages/react-aria/intl/datepicker/lv-LV.json
diff --git a/packages/@react-aria/datepicker/intl/nb-NO.json b/packages/react-aria/intl/datepicker/nb-NO.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/nb-NO.json
rename to packages/react-aria/intl/datepicker/nb-NO.json
diff --git a/packages/@react-aria/datepicker/intl/nl-NL.json b/packages/react-aria/intl/datepicker/nl-NL.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/nl-NL.json
rename to packages/react-aria/intl/datepicker/nl-NL.json
diff --git a/packages/@react-aria/datepicker/intl/pl-PL.json b/packages/react-aria/intl/datepicker/pl-PL.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/pl-PL.json
rename to packages/react-aria/intl/datepicker/pl-PL.json
diff --git a/packages/@react-aria/datepicker/intl/pt-BR.json b/packages/react-aria/intl/datepicker/pt-BR.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/pt-BR.json
rename to packages/react-aria/intl/datepicker/pt-BR.json
diff --git a/packages/@react-aria/datepicker/intl/pt-PT.json b/packages/react-aria/intl/datepicker/pt-PT.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/pt-PT.json
rename to packages/react-aria/intl/datepicker/pt-PT.json
diff --git a/packages/@react-aria/datepicker/intl/ro-RO.json b/packages/react-aria/intl/datepicker/ro-RO.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/ro-RO.json
rename to packages/react-aria/intl/datepicker/ro-RO.json
diff --git a/packages/@react-aria/datepicker/intl/ru-RU.json b/packages/react-aria/intl/datepicker/ru-RU.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/ru-RU.json
rename to packages/react-aria/intl/datepicker/ru-RU.json
diff --git a/packages/@react-aria/datepicker/intl/sk-SK.json b/packages/react-aria/intl/datepicker/sk-SK.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/sk-SK.json
rename to packages/react-aria/intl/datepicker/sk-SK.json
diff --git a/packages/@react-aria/datepicker/intl/sl-SI.json b/packages/react-aria/intl/datepicker/sl-SI.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/sl-SI.json
rename to packages/react-aria/intl/datepicker/sl-SI.json
diff --git a/packages/@react-aria/datepicker/intl/sr-SP.json b/packages/react-aria/intl/datepicker/sr-SP.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/sr-SP.json
rename to packages/react-aria/intl/datepicker/sr-SP.json
diff --git a/packages/@react-aria/datepicker/intl/sv-SE.json b/packages/react-aria/intl/datepicker/sv-SE.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/sv-SE.json
rename to packages/react-aria/intl/datepicker/sv-SE.json
diff --git a/packages/@react-aria/datepicker/intl/tr-TR.json b/packages/react-aria/intl/datepicker/tr-TR.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/tr-TR.json
rename to packages/react-aria/intl/datepicker/tr-TR.json
diff --git a/packages/@react-aria/datepicker/intl/uk-UA.json b/packages/react-aria/intl/datepicker/uk-UA.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/uk-UA.json
rename to packages/react-aria/intl/datepicker/uk-UA.json
diff --git a/packages/@react-aria/datepicker/intl/zh-CN.json b/packages/react-aria/intl/datepicker/zh-CN.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/zh-CN.json
rename to packages/react-aria/intl/datepicker/zh-CN.json
diff --git a/packages/@react-aria/datepicker/intl/zh-TW.json b/packages/react-aria/intl/datepicker/zh-TW.json
similarity index 100%
rename from packages/@react-aria/datepicker/intl/zh-TW.json
rename to packages/react-aria/intl/datepicker/zh-TW.json
diff --git a/packages/@react-aria/dnd/intl/ar-AE.json b/packages/react-aria/intl/dnd/ar-AE.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/ar-AE.json
rename to packages/react-aria/intl/dnd/ar-AE.json
diff --git a/packages/@react-aria/dnd/intl/bg-BG.json b/packages/react-aria/intl/dnd/bg-BG.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/bg-BG.json
rename to packages/react-aria/intl/dnd/bg-BG.json
diff --git a/packages/@react-aria/dnd/intl/cs-CZ.json b/packages/react-aria/intl/dnd/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/cs-CZ.json
rename to packages/react-aria/intl/dnd/cs-CZ.json
diff --git a/packages/@react-aria/dnd/intl/da-DK.json b/packages/react-aria/intl/dnd/da-DK.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/da-DK.json
rename to packages/react-aria/intl/dnd/da-DK.json
diff --git a/packages/@react-aria/dnd/intl/de-DE.json b/packages/react-aria/intl/dnd/de-DE.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/de-DE.json
rename to packages/react-aria/intl/dnd/de-DE.json
diff --git a/packages/@react-aria/dnd/intl/el-GR.json b/packages/react-aria/intl/dnd/el-GR.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/el-GR.json
rename to packages/react-aria/intl/dnd/el-GR.json
diff --git a/packages/@react-aria/dnd/intl/en-US.json b/packages/react-aria/intl/dnd/en-US.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/en-US.json
rename to packages/react-aria/intl/dnd/en-US.json
diff --git a/packages/@react-aria/dnd/intl/es-ES.json b/packages/react-aria/intl/dnd/es-ES.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/es-ES.json
rename to packages/react-aria/intl/dnd/es-ES.json
diff --git a/packages/@react-aria/dnd/intl/et-EE.json b/packages/react-aria/intl/dnd/et-EE.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/et-EE.json
rename to packages/react-aria/intl/dnd/et-EE.json
diff --git a/packages/@react-aria/dnd/intl/fi-FI.json b/packages/react-aria/intl/dnd/fi-FI.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/fi-FI.json
rename to packages/react-aria/intl/dnd/fi-FI.json
diff --git a/packages/@react-aria/dnd/intl/fr-FR.json b/packages/react-aria/intl/dnd/fr-FR.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/fr-FR.json
rename to packages/react-aria/intl/dnd/fr-FR.json
diff --git a/packages/@react-aria/dnd/intl/he-IL.json b/packages/react-aria/intl/dnd/he-IL.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/he-IL.json
rename to packages/react-aria/intl/dnd/he-IL.json
diff --git a/packages/@react-aria/dnd/intl/hr-HR.json b/packages/react-aria/intl/dnd/hr-HR.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/hr-HR.json
rename to packages/react-aria/intl/dnd/hr-HR.json
diff --git a/packages/@react-aria/dnd/intl/hu-HU.json b/packages/react-aria/intl/dnd/hu-HU.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/hu-HU.json
rename to packages/react-aria/intl/dnd/hu-HU.json
diff --git a/packages/@react-aria/dnd/intl/it-IT.json b/packages/react-aria/intl/dnd/it-IT.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/it-IT.json
rename to packages/react-aria/intl/dnd/it-IT.json
diff --git a/packages/@react-aria/dnd/intl/ja-JP.json b/packages/react-aria/intl/dnd/ja-JP.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/ja-JP.json
rename to packages/react-aria/intl/dnd/ja-JP.json
diff --git a/packages/@react-aria/dnd/intl/ko-KR.json b/packages/react-aria/intl/dnd/ko-KR.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/ko-KR.json
rename to packages/react-aria/intl/dnd/ko-KR.json
diff --git a/packages/@react-aria/dnd/intl/lt-LT.json b/packages/react-aria/intl/dnd/lt-LT.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/lt-LT.json
rename to packages/react-aria/intl/dnd/lt-LT.json
diff --git a/packages/@react-aria/dnd/intl/lv-LV.json b/packages/react-aria/intl/dnd/lv-LV.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/lv-LV.json
rename to packages/react-aria/intl/dnd/lv-LV.json
diff --git a/packages/@react-aria/dnd/intl/nb-NO.json b/packages/react-aria/intl/dnd/nb-NO.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/nb-NO.json
rename to packages/react-aria/intl/dnd/nb-NO.json
diff --git a/packages/@react-aria/dnd/intl/nl-NL.json b/packages/react-aria/intl/dnd/nl-NL.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/nl-NL.json
rename to packages/react-aria/intl/dnd/nl-NL.json
diff --git a/packages/@react-aria/dnd/intl/pl-PL.json b/packages/react-aria/intl/dnd/pl-PL.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/pl-PL.json
rename to packages/react-aria/intl/dnd/pl-PL.json
diff --git a/packages/@react-aria/dnd/intl/pt-BR.json b/packages/react-aria/intl/dnd/pt-BR.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/pt-BR.json
rename to packages/react-aria/intl/dnd/pt-BR.json
diff --git a/packages/@react-aria/dnd/intl/pt-PT.json b/packages/react-aria/intl/dnd/pt-PT.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/pt-PT.json
rename to packages/react-aria/intl/dnd/pt-PT.json
diff --git a/packages/@react-aria/dnd/intl/ro-RO.json b/packages/react-aria/intl/dnd/ro-RO.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/ro-RO.json
rename to packages/react-aria/intl/dnd/ro-RO.json
diff --git a/packages/@react-aria/dnd/intl/ru-RU.json b/packages/react-aria/intl/dnd/ru-RU.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/ru-RU.json
rename to packages/react-aria/intl/dnd/ru-RU.json
diff --git a/packages/@react-aria/dnd/intl/sk-SK.json b/packages/react-aria/intl/dnd/sk-SK.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/sk-SK.json
rename to packages/react-aria/intl/dnd/sk-SK.json
diff --git a/packages/@react-aria/dnd/intl/sl-SI.json b/packages/react-aria/intl/dnd/sl-SI.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/sl-SI.json
rename to packages/react-aria/intl/dnd/sl-SI.json
diff --git a/packages/@react-aria/dnd/intl/sr-SP.json b/packages/react-aria/intl/dnd/sr-SP.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/sr-SP.json
rename to packages/react-aria/intl/dnd/sr-SP.json
diff --git a/packages/@react-aria/dnd/intl/sv-SE.json b/packages/react-aria/intl/dnd/sv-SE.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/sv-SE.json
rename to packages/react-aria/intl/dnd/sv-SE.json
diff --git a/packages/@react-aria/dnd/intl/tr-TR.json b/packages/react-aria/intl/dnd/tr-TR.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/tr-TR.json
rename to packages/react-aria/intl/dnd/tr-TR.json
diff --git a/packages/@react-aria/dnd/intl/uk-UA.json b/packages/react-aria/intl/dnd/uk-UA.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/uk-UA.json
rename to packages/react-aria/intl/dnd/uk-UA.json
diff --git a/packages/@react-aria/dnd/intl/zh-CN.json b/packages/react-aria/intl/dnd/zh-CN.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/zh-CN.json
rename to packages/react-aria/intl/dnd/zh-CN.json
diff --git a/packages/@react-aria/dnd/intl/zh-TW.json b/packages/react-aria/intl/dnd/zh-TW.json
similarity index 100%
rename from packages/@react-aria/dnd/intl/zh-TW.json
rename to packages/react-aria/intl/dnd/zh-TW.json
diff --git a/packages/@react-aria/grid/intl/ar-AE.json b/packages/react-aria/intl/grid/ar-AE.json
similarity index 100%
rename from packages/@react-aria/grid/intl/ar-AE.json
rename to packages/react-aria/intl/grid/ar-AE.json
diff --git a/packages/@react-aria/grid/intl/bg-BG.json b/packages/react-aria/intl/grid/bg-BG.json
similarity index 100%
rename from packages/@react-aria/grid/intl/bg-BG.json
rename to packages/react-aria/intl/grid/bg-BG.json
diff --git a/packages/@react-aria/grid/intl/cs-CZ.json b/packages/react-aria/intl/grid/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/grid/intl/cs-CZ.json
rename to packages/react-aria/intl/grid/cs-CZ.json
diff --git a/packages/@react-aria/grid/intl/da-DK.json b/packages/react-aria/intl/grid/da-DK.json
similarity index 100%
rename from packages/@react-aria/grid/intl/da-DK.json
rename to packages/react-aria/intl/grid/da-DK.json
diff --git a/packages/@react-aria/grid/intl/de-DE.json b/packages/react-aria/intl/grid/de-DE.json
similarity index 100%
rename from packages/@react-aria/grid/intl/de-DE.json
rename to packages/react-aria/intl/grid/de-DE.json
diff --git a/packages/@react-aria/grid/intl/el-GR.json b/packages/react-aria/intl/grid/el-GR.json
similarity index 100%
rename from packages/@react-aria/grid/intl/el-GR.json
rename to packages/react-aria/intl/grid/el-GR.json
diff --git a/packages/@react-aria/grid/intl/en-US.json b/packages/react-aria/intl/grid/en-US.json
similarity index 100%
rename from packages/@react-aria/grid/intl/en-US.json
rename to packages/react-aria/intl/grid/en-US.json
diff --git a/packages/@react-aria/grid/intl/es-ES.json b/packages/react-aria/intl/grid/es-ES.json
similarity index 100%
rename from packages/@react-aria/grid/intl/es-ES.json
rename to packages/react-aria/intl/grid/es-ES.json
diff --git a/packages/@react-aria/grid/intl/et-EE.json b/packages/react-aria/intl/grid/et-EE.json
similarity index 100%
rename from packages/@react-aria/grid/intl/et-EE.json
rename to packages/react-aria/intl/grid/et-EE.json
diff --git a/packages/@react-aria/grid/intl/fi-FI.json b/packages/react-aria/intl/grid/fi-FI.json
similarity index 100%
rename from packages/@react-aria/grid/intl/fi-FI.json
rename to packages/react-aria/intl/grid/fi-FI.json
diff --git a/packages/@react-aria/grid/intl/fr-FR.json b/packages/react-aria/intl/grid/fr-FR.json
similarity index 100%
rename from packages/@react-aria/grid/intl/fr-FR.json
rename to packages/react-aria/intl/grid/fr-FR.json
diff --git a/packages/@react-aria/grid/intl/he-IL.json b/packages/react-aria/intl/grid/he-IL.json
similarity index 100%
rename from packages/@react-aria/grid/intl/he-IL.json
rename to packages/react-aria/intl/grid/he-IL.json
diff --git a/packages/@react-aria/grid/intl/hr-HR.json b/packages/react-aria/intl/grid/hr-HR.json
similarity index 100%
rename from packages/@react-aria/grid/intl/hr-HR.json
rename to packages/react-aria/intl/grid/hr-HR.json
diff --git a/packages/@react-aria/grid/intl/hu-HU.json b/packages/react-aria/intl/grid/hu-HU.json
similarity index 100%
rename from packages/@react-aria/grid/intl/hu-HU.json
rename to packages/react-aria/intl/grid/hu-HU.json
diff --git a/packages/@react-aria/grid/intl/it-IT.json b/packages/react-aria/intl/grid/it-IT.json
similarity index 100%
rename from packages/@react-aria/grid/intl/it-IT.json
rename to packages/react-aria/intl/grid/it-IT.json
diff --git a/packages/@react-aria/grid/intl/ja-JP.json b/packages/react-aria/intl/grid/ja-JP.json
similarity index 100%
rename from packages/@react-aria/grid/intl/ja-JP.json
rename to packages/react-aria/intl/grid/ja-JP.json
diff --git a/packages/@react-aria/grid/intl/ko-KR.json b/packages/react-aria/intl/grid/ko-KR.json
similarity index 100%
rename from packages/@react-aria/grid/intl/ko-KR.json
rename to packages/react-aria/intl/grid/ko-KR.json
diff --git a/packages/@react-aria/grid/intl/lt-LT.json b/packages/react-aria/intl/grid/lt-LT.json
similarity index 100%
rename from packages/@react-aria/grid/intl/lt-LT.json
rename to packages/react-aria/intl/grid/lt-LT.json
diff --git a/packages/@react-aria/grid/intl/lv-LV.json b/packages/react-aria/intl/grid/lv-LV.json
similarity index 100%
rename from packages/@react-aria/grid/intl/lv-LV.json
rename to packages/react-aria/intl/grid/lv-LV.json
diff --git a/packages/@react-aria/grid/intl/nb-NO.json b/packages/react-aria/intl/grid/nb-NO.json
similarity index 100%
rename from packages/@react-aria/grid/intl/nb-NO.json
rename to packages/react-aria/intl/grid/nb-NO.json
diff --git a/packages/@react-aria/grid/intl/nl-NL.json b/packages/react-aria/intl/grid/nl-NL.json
similarity index 100%
rename from packages/@react-aria/grid/intl/nl-NL.json
rename to packages/react-aria/intl/grid/nl-NL.json
diff --git a/packages/@react-aria/grid/intl/pl-PL.json b/packages/react-aria/intl/grid/pl-PL.json
similarity index 100%
rename from packages/@react-aria/grid/intl/pl-PL.json
rename to packages/react-aria/intl/grid/pl-PL.json
diff --git a/packages/@react-aria/grid/intl/pt-BR.json b/packages/react-aria/intl/grid/pt-BR.json
similarity index 100%
rename from packages/@react-aria/grid/intl/pt-BR.json
rename to packages/react-aria/intl/grid/pt-BR.json
diff --git a/packages/@react-aria/grid/intl/pt-PT.json b/packages/react-aria/intl/grid/pt-PT.json
similarity index 100%
rename from packages/@react-aria/grid/intl/pt-PT.json
rename to packages/react-aria/intl/grid/pt-PT.json
diff --git a/packages/@react-aria/grid/intl/ro-RO.json b/packages/react-aria/intl/grid/ro-RO.json
similarity index 100%
rename from packages/@react-aria/grid/intl/ro-RO.json
rename to packages/react-aria/intl/grid/ro-RO.json
diff --git a/packages/@react-aria/grid/intl/ru-RU.json b/packages/react-aria/intl/grid/ru-RU.json
similarity index 100%
rename from packages/@react-aria/grid/intl/ru-RU.json
rename to packages/react-aria/intl/grid/ru-RU.json
diff --git a/packages/@react-aria/grid/intl/sk-SK.json b/packages/react-aria/intl/grid/sk-SK.json
similarity index 100%
rename from packages/@react-aria/grid/intl/sk-SK.json
rename to packages/react-aria/intl/grid/sk-SK.json
diff --git a/packages/@react-aria/grid/intl/sl-SI.json b/packages/react-aria/intl/grid/sl-SI.json
similarity index 100%
rename from packages/@react-aria/grid/intl/sl-SI.json
rename to packages/react-aria/intl/grid/sl-SI.json
diff --git a/packages/@react-aria/grid/intl/sr-SP.json b/packages/react-aria/intl/grid/sr-SP.json
similarity index 100%
rename from packages/@react-aria/grid/intl/sr-SP.json
rename to packages/react-aria/intl/grid/sr-SP.json
diff --git a/packages/@react-aria/grid/intl/sv-SE.json b/packages/react-aria/intl/grid/sv-SE.json
similarity index 100%
rename from packages/@react-aria/grid/intl/sv-SE.json
rename to packages/react-aria/intl/grid/sv-SE.json
diff --git a/packages/@react-aria/grid/intl/tr-TR.json b/packages/react-aria/intl/grid/tr-TR.json
similarity index 100%
rename from packages/@react-aria/grid/intl/tr-TR.json
rename to packages/react-aria/intl/grid/tr-TR.json
diff --git a/packages/@react-aria/grid/intl/uk-UA.json b/packages/react-aria/intl/grid/uk-UA.json
similarity index 100%
rename from packages/@react-aria/grid/intl/uk-UA.json
rename to packages/react-aria/intl/grid/uk-UA.json
diff --git a/packages/@react-aria/grid/intl/zh-CN.json b/packages/react-aria/intl/grid/zh-CN.json
similarity index 100%
rename from packages/@react-aria/grid/intl/zh-CN.json
rename to packages/react-aria/intl/grid/zh-CN.json
diff --git a/packages/@react-aria/grid/intl/zh-TW.json b/packages/react-aria/intl/grid/zh-TW.json
similarity index 100%
rename from packages/@react-aria/grid/intl/zh-TW.json
rename to packages/react-aria/intl/grid/zh-TW.json
diff --git a/packages/@react-aria/gridlist/intl/ar-AE.json b/packages/react-aria/intl/gridlist/ar-AE.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/ar-AE.json
rename to packages/react-aria/intl/gridlist/ar-AE.json
diff --git a/packages/@react-aria/gridlist/intl/bg-BG.json b/packages/react-aria/intl/gridlist/bg-BG.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/bg-BG.json
rename to packages/react-aria/intl/gridlist/bg-BG.json
diff --git a/packages/@react-aria/gridlist/intl/cs-CZ.json b/packages/react-aria/intl/gridlist/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/cs-CZ.json
rename to packages/react-aria/intl/gridlist/cs-CZ.json
diff --git a/packages/@react-aria/gridlist/intl/da-DK.json b/packages/react-aria/intl/gridlist/da-DK.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/da-DK.json
rename to packages/react-aria/intl/gridlist/da-DK.json
diff --git a/packages/@react-aria/gridlist/intl/de-DE.json b/packages/react-aria/intl/gridlist/de-DE.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/de-DE.json
rename to packages/react-aria/intl/gridlist/de-DE.json
diff --git a/packages/@react-aria/gridlist/intl/el-GR.json b/packages/react-aria/intl/gridlist/el-GR.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/el-GR.json
rename to packages/react-aria/intl/gridlist/el-GR.json
diff --git a/packages/@react-aria/gridlist/intl/en-US.json b/packages/react-aria/intl/gridlist/en-US.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/en-US.json
rename to packages/react-aria/intl/gridlist/en-US.json
diff --git a/packages/@react-aria/gridlist/intl/es-ES.json b/packages/react-aria/intl/gridlist/es-ES.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/es-ES.json
rename to packages/react-aria/intl/gridlist/es-ES.json
diff --git a/packages/@react-aria/gridlist/intl/et-EE.json b/packages/react-aria/intl/gridlist/et-EE.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/et-EE.json
rename to packages/react-aria/intl/gridlist/et-EE.json
diff --git a/packages/@react-aria/gridlist/intl/fi-FI.json b/packages/react-aria/intl/gridlist/fi-FI.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/fi-FI.json
rename to packages/react-aria/intl/gridlist/fi-FI.json
diff --git a/packages/@react-aria/gridlist/intl/fr-FR.json b/packages/react-aria/intl/gridlist/fr-FR.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/fr-FR.json
rename to packages/react-aria/intl/gridlist/fr-FR.json
diff --git a/packages/@react-aria/gridlist/intl/he-IL.json b/packages/react-aria/intl/gridlist/he-IL.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/he-IL.json
rename to packages/react-aria/intl/gridlist/he-IL.json
diff --git a/packages/@react-aria/gridlist/intl/hr-HR.json b/packages/react-aria/intl/gridlist/hr-HR.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/hr-HR.json
rename to packages/react-aria/intl/gridlist/hr-HR.json
diff --git a/packages/@react-aria/gridlist/intl/hu-HU.json b/packages/react-aria/intl/gridlist/hu-HU.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/hu-HU.json
rename to packages/react-aria/intl/gridlist/hu-HU.json
diff --git a/packages/@react-aria/gridlist/intl/it-IT.json b/packages/react-aria/intl/gridlist/it-IT.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/it-IT.json
rename to packages/react-aria/intl/gridlist/it-IT.json
diff --git a/packages/@react-aria/gridlist/intl/ja-JP.json b/packages/react-aria/intl/gridlist/ja-JP.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/ja-JP.json
rename to packages/react-aria/intl/gridlist/ja-JP.json
diff --git a/packages/@react-aria/gridlist/intl/ko-KR.json b/packages/react-aria/intl/gridlist/ko-KR.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/ko-KR.json
rename to packages/react-aria/intl/gridlist/ko-KR.json
diff --git a/packages/@react-aria/gridlist/intl/lt-LT.json b/packages/react-aria/intl/gridlist/lt-LT.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/lt-LT.json
rename to packages/react-aria/intl/gridlist/lt-LT.json
diff --git a/packages/@react-aria/gridlist/intl/lv-LV.json b/packages/react-aria/intl/gridlist/lv-LV.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/lv-LV.json
rename to packages/react-aria/intl/gridlist/lv-LV.json
diff --git a/packages/@react-aria/gridlist/intl/nb-NO.json b/packages/react-aria/intl/gridlist/nb-NO.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/nb-NO.json
rename to packages/react-aria/intl/gridlist/nb-NO.json
diff --git a/packages/@react-aria/gridlist/intl/nl-NL.json b/packages/react-aria/intl/gridlist/nl-NL.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/nl-NL.json
rename to packages/react-aria/intl/gridlist/nl-NL.json
diff --git a/packages/@react-aria/gridlist/intl/pl-PL.json b/packages/react-aria/intl/gridlist/pl-PL.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/pl-PL.json
rename to packages/react-aria/intl/gridlist/pl-PL.json
diff --git a/packages/@react-aria/gridlist/intl/pt-BR.json b/packages/react-aria/intl/gridlist/pt-BR.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/pt-BR.json
rename to packages/react-aria/intl/gridlist/pt-BR.json
diff --git a/packages/@react-aria/gridlist/intl/pt-PT.json b/packages/react-aria/intl/gridlist/pt-PT.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/pt-PT.json
rename to packages/react-aria/intl/gridlist/pt-PT.json
diff --git a/packages/@react-aria/gridlist/intl/ro-RO.json b/packages/react-aria/intl/gridlist/ro-RO.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/ro-RO.json
rename to packages/react-aria/intl/gridlist/ro-RO.json
diff --git a/packages/@react-aria/gridlist/intl/ru-RU.json b/packages/react-aria/intl/gridlist/ru-RU.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/ru-RU.json
rename to packages/react-aria/intl/gridlist/ru-RU.json
diff --git a/packages/@react-aria/gridlist/intl/sk-SK.json b/packages/react-aria/intl/gridlist/sk-SK.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/sk-SK.json
rename to packages/react-aria/intl/gridlist/sk-SK.json
diff --git a/packages/@react-aria/gridlist/intl/sl-SI.json b/packages/react-aria/intl/gridlist/sl-SI.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/sl-SI.json
rename to packages/react-aria/intl/gridlist/sl-SI.json
diff --git a/packages/@react-aria/gridlist/intl/sr-SP.json b/packages/react-aria/intl/gridlist/sr-SP.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/sr-SP.json
rename to packages/react-aria/intl/gridlist/sr-SP.json
diff --git a/packages/@react-aria/gridlist/intl/sv-SE.json b/packages/react-aria/intl/gridlist/sv-SE.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/sv-SE.json
rename to packages/react-aria/intl/gridlist/sv-SE.json
diff --git a/packages/@react-aria/gridlist/intl/tr-TR.json b/packages/react-aria/intl/gridlist/tr-TR.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/tr-TR.json
rename to packages/react-aria/intl/gridlist/tr-TR.json
diff --git a/packages/@react-aria/gridlist/intl/uk-UA.json b/packages/react-aria/intl/gridlist/uk-UA.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/uk-UA.json
rename to packages/react-aria/intl/gridlist/uk-UA.json
diff --git a/packages/@react-aria/gridlist/intl/zh-CN.json b/packages/react-aria/intl/gridlist/zh-CN.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/zh-CN.json
rename to packages/react-aria/intl/gridlist/zh-CN.json
diff --git a/packages/@react-aria/gridlist/intl/zh-TW.json b/packages/react-aria/intl/gridlist/zh-TW.json
similarity index 100%
rename from packages/@react-aria/gridlist/intl/zh-TW.json
rename to packages/react-aria/intl/gridlist/zh-TW.json
diff --git a/packages/@react-aria/menu/intl/ar-AE.json b/packages/react-aria/intl/menu/ar-AE.json
similarity index 100%
rename from packages/@react-aria/menu/intl/ar-AE.json
rename to packages/react-aria/intl/menu/ar-AE.json
diff --git a/packages/@react-aria/menu/intl/bg-BG.json b/packages/react-aria/intl/menu/bg-BG.json
similarity index 100%
rename from packages/@react-aria/menu/intl/bg-BG.json
rename to packages/react-aria/intl/menu/bg-BG.json
diff --git a/packages/@react-aria/menu/intl/cs-CZ.json b/packages/react-aria/intl/menu/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/menu/intl/cs-CZ.json
rename to packages/react-aria/intl/menu/cs-CZ.json
diff --git a/packages/@react-aria/menu/intl/da-DK.json b/packages/react-aria/intl/menu/da-DK.json
similarity index 100%
rename from packages/@react-aria/menu/intl/da-DK.json
rename to packages/react-aria/intl/menu/da-DK.json
diff --git a/packages/@react-aria/menu/intl/de-DE.json b/packages/react-aria/intl/menu/de-DE.json
similarity index 100%
rename from packages/@react-aria/menu/intl/de-DE.json
rename to packages/react-aria/intl/menu/de-DE.json
diff --git a/packages/@react-aria/menu/intl/el-GR.json b/packages/react-aria/intl/menu/el-GR.json
similarity index 100%
rename from packages/@react-aria/menu/intl/el-GR.json
rename to packages/react-aria/intl/menu/el-GR.json
diff --git a/packages/@react-aria/menu/intl/en-US.json b/packages/react-aria/intl/menu/en-US.json
similarity index 100%
rename from packages/@react-aria/menu/intl/en-US.json
rename to packages/react-aria/intl/menu/en-US.json
diff --git a/packages/@react-aria/menu/intl/es-ES.json b/packages/react-aria/intl/menu/es-ES.json
similarity index 100%
rename from packages/@react-aria/menu/intl/es-ES.json
rename to packages/react-aria/intl/menu/es-ES.json
diff --git a/packages/@react-aria/menu/intl/et-EE.json b/packages/react-aria/intl/menu/et-EE.json
similarity index 100%
rename from packages/@react-aria/menu/intl/et-EE.json
rename to packages/react-aria/intl/menu/et-EE.json
diff --git a/packages/@react-aria/menu/intl/fi-FI.json b/packages/react-aria/intl/menu/fi-FI.json
similarity index 100%
rename from packages/@react-aria/menu/intl/fi-FI.json
rename to packages/react-aria/intl/menu/fi-FI.json
diff --git a/packages/@react-aria/menu/intl/fr-FR.json b/packages/react-aria/intl/menu/fr-FR.json
similarity index 100%
rename from packages/@react-aria/menu/intl/fr-FR.json
rename to packages/react-aria/intl/menu/fr-FR.json
diff --git a/packages/@react-aria/menu/intl/he-IL.json b/packages/react-aria/intl/menu/he-IL.json
similarity index 100%
rename from packages/@react-aria/menu/intl/he-IL.json
rename to packages/react-aria/intl/menu/he-IL.json
diff --git a/packages/@react-aria/menu/intl/hr-HR.json b/packages/react-aria/intl/menu/hr-HR.json
similarity index 100%
rename from packages/@react-aria/menu/intl/hr-HR.json
rename to packages/react-aria/intl/menu/hr-HR.json
diff --git a/packages/@react-aria/menu/intl/hu-HU.json b/packages/react-aria/intl/menu/hu-HU.json
similarity index 100%
rename from packages/@react-aria/menu/intl/hu-HU.json
rename to packages/react-aria/intl/menu/hu-HU.json
diff --git a/packages/@react-aria/menu/intl/it-IT.json b/packages/react-aria/intl/menu/it-IT.json
similarity index 100%
rename from packages/@react-aria/menu/intl/it-IT.json
rename to packages/react-aria/intl/menu/it-IT.json
diff --git a/packages/@react-aria/menu/intl/ja-JP.json b/packages/react-aria/intl/menu/ja-JP.json
similarity index 100%
rename from packages/@react-aria/menu/intl/ja-JP.json
rename to packages/react-aria/intl/menu/ja-JP.json
diff --git a/packages/@react-aria/menu/intl/ko-KR.json b/packages/react-aria/intl/menu/ko-KR.json
similarity index 100%
rename from packages/@react-aria/menu/intl/ko-KR.json
rename to packages/react-aria/intl/menu/ko-KR.json
diff --git a/packages/@react-aria/menu/intl/lt-LT.json b/packages/react-aria/intl/menu/lt-LT.json
similarity index 100%
rename from packages/@react-aria/menu/intl/lt-LT.json
rename to packages/react-aria/intl/menu/lt-LT.json
diff --git a/packages/@react-aria/menu/intl/lv-LV.json b/packages/react-aria/intl/menu/lv-LV.json
similarity index 100%
rename from packages/@react-aria/menu/intl/lv-LV.json
rename to packages/react-aria/intl/menu/lv-LV.json
diff --git a/packages/@react-aria/menu/intl/nb-NO.json b/packages/react-aria/intl/menu/nb-NO.json
similarity index 100%
rename from packages/@react-aria/menu/intl/nb-NO.json
rename to packages/react-aria/intl/menu/nb-NO.json
diff --git a/packages/@react-aria/menu/intl/nl-NL.json b/packages/react-aria/intl/menu/nl-NL.json
similarity index 100%
rename from packages/@react-aria/menu/intl/nl-NL.json
rename to packages/react-aria/intl/menu/nl-NL.json
diff --git a/packages/@react-aria/menu/intl/pl-PL.json b/packages/react-aria/intl/menu/pl-PL.json
similarity index 100%
rename from packages/@react-aria/menu/intl/pl-PL.json
rename to packages/react-aria/intl/menu/pl-PL.json
diff --git a/packages/@react-aria/menu/intl/pt-BR.json b/packages/react-aria/intl/menu/pt-BR.json
similarity index 100%
rename from packages/@react-aria/menu/intl/pt-BR.json
rename to packages/react-aria/intl/menu/pt-BR.json
diff --git a/packages/@react-aria/menu/intl/pt-PT.json b/packages/react-aria/intl/menu/pt-PT.json
similarity index 100%
rename from packages/@react-aria/menu/intl/pt-PT.json
rename to packages/react-aria/intl/menu/pt-PT.json
diff --git a/packages/@react-aria/menu/intl/ro-RO.json b/packages/react-aria/intl/menu/ro-RO.json
similarity index 100%
rename from packages/@react-aria/menu/intl/ro-RO.json
rename to packages/react-aria/intl/menu/ro-RO.json
diff --git a/packages/@react-aria/menu/intl/ru-RU.json b/packages/react-aria/intl/menu/ru-RU.json
similarity index 100%
rename from packages/@react-aria/menu/intl/ru-RU.json
rename to packages/react-aria/intl/menu/ru-RU.json
diff --git a/packages/@react-aria/menu/intl/sk-SK.json b/packages/react-aria/intl/menu/sk-SK.json
similarity index 100%
rename from packages/@react-aria/menu/intl/sk-SK.json
rename to packages/react-aria/intl/menu/sk-SK.json
diff --git a/packages/@react-aria/menu/intl/sl-SI.json b/packages/react-aria/intl/menu/sl-SI.json
similarity index 100%
rename from packages/@react-aria/menu/intl/sl-SI.json
rename to packages/react-aria/intl/menu/sl-SI.json
diff --git a/packages/@react-aria/menu/intl/sr-SP.json b/packages/react-aria/intl/menu/sr-SP.json
similarity index 100%
rename from packages/@react-aria/menu/intl/sr-SP.json
rename to packages/react-aria/intl/menu/sr-SP.json
diff --git a/packages/@react-aria/menu/intl/sv-SE.json b/packages/react-aria/intl/menu/sv-SE.json
similarity index 100%
rename from packages/@react-aria/menu/intl/sv-SE.json
rename to packages/react-aria/intl/menu/sv-SE.json
diff --git a/packages/@react-aria/menu/intl/tr-TR.json b/packages/react-aria/intl/menu/tr-TR.json
similarity index 100%
rename from packages/@react-aria/menu/intl/tr-TR.json
rename to packages/react-aria/intl/menu/tr-TR.json
diff --git a/packages/@react-aria/menu/intl/uk-UA.json b/packages/react-aria/intl/menu/uk-UA.json
similarity index 100%
rename from packages/@react-aria/menu/intl/uk-UA.json
rename to packages/react-aria/intl/menu/uk-UA.json
diff --git a/packages/@react-aria/menu/intl/zh-CN.json b/packages/react-aria/intl/menu/zh-CN.json
similarity index 100%
rename from packages/@react-aria/menu/intl/zh-CN.json
rename to packages/react-aria/intl/menu/zh-CN.json
diff --git a/packages/@react-aria/menu/intl/zh-TW.json b/packages/react-aria/intl/menu/zh-TW.json
similarity index 100%
rename from packages/@react-aria/menu/intl/zh-TW.json
rename to packages/react-aria/intl/menu/zh-TW.json
diff --git a/packages/@react-aria/numberfield/intl/ar-AE.json b/packages/react-aria/intl/numberfield/ar-AE.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/ar-AE.json
rename to packages/react-aria/intl/numberfield/ar-AE.json
diff --git a/packages/@react-aria/numberfield/intl/bg-BG.json b/packages/react-aria/intl/numberfield/bg-BG.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/bg-BG.json
rename to packages/react-aria/intl/numberfield/bg-BG.json
diff --git a/packages/@react-aria/numberfield/intl/cs-CZ.json b/packages/react-aria/intl/numberfield/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/cs-CZ.json
rename to packages/react-aria/intl/numberfield/cs-CZ.json
diff --git a/packages/@react-aria/numberfield/intl/da-DK.json b/packages/react-aria/intl/numberfield/da-DK.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/da-DK.json
rename to packages/react-aria/intl/numberfield/da-DK.json
diff --git a/packages/@react-aria/numberfield/intl/de-DE.json b/packages/react-aria/intl/numberfield/de-DE.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/de-DE.json
rename to packages/react-aria/intl/numberfield/de-DE.json
diff --git a/packages/@react-aria/numberfield/intl/el-GR.json b/packages/react-aria/intl/numberfield/el-GR.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/el-GR.json
rename to packages/react-aria/intl/numberfield/el-GR.json
diff --git a/packages/@react-aria/numberfield/intl/en-US.json b/packages/react-aria/intl/numberfield/en-US.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/en-US.json
rename to packages/react-aria/intl/numberfield/en-US.json
diff --git a/packages/@react-aria/numberfield/intl/es-ES.json b/packages/react-aria/intl/numberfield/es-ES.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/es-ES.json
rename to packages/react-aria/intl/numberfield/es-ES.json
diff --git a/packages/@react-aria/numberfield/intl/et-EE.json b/packages/react-aria/intl/numberfield/et-EE.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/et-EE.json
rename to packages/react-aria/intl/numberfield/et-EE.json
diff --git a/packages/@react-aria/numberfield/intl/fi-FI.json b/packages/react-aria/intl/numberfield/fi-FI.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/fi-FI.json
rename to packages/react-aria/intl/numberfield/fi-FI.json
diff --git a/packages/@react-aria/numberfield/intl/fr-FR.json b/packages/react-aria/intl/numberfield/fr-FR.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/fr-FR.json
rename to packages/react-aria/intl/numberfield/fr-FR.json
diff --git a/packages/@react-aria/numberfield/intl/he-IL.json b/packages/react-aria/intl/numberfield/he-IL.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/he-IL.json
rename to packages/react-aria/intl/numberfield/he-IL.json
diff --git a/packages/@react-aria/numberfield/intl/hr-HR.json b/packages/react-aria/intl/numberfield/hr-HR.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/hr-HR.json
rename to packages/react-aria/intl/numberfield/hr-HR.json
diff --git a/packages/@react-aria/numberfield/intl/hu-HU.json b/packages/react-aria/intl/numberfield/hu-HU.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/hu-HU.json
rename to packages/react-aria/intl/numberfield/hu-HU.json
diff --git a/packages/@react-aria/numberfield/intl/it-IT.json b/packages/react-aria/intl/numberfield/it-IT.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/it-IT.json
rename to packages/react-aria/intl/numberfield/it-IT.json
diff --git a/packages/@react-aria/numberfield/intl/ja-JP.json b/packages/react-aria/intl/numberfield/ja-JP.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/ja-JP.json
rename to packages/react-aria/intl/numberfield/ja-JP.json
diff --git a/packages/@react-aria/numberfield/intl/ko-KR.json b/packages/react-aria/intl/numberfield/ko-KR.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/ko-KR.json
rename to packages/react-aria/intl/numberfield/ko-KR.json
diff --git a/packages/@react-aria/numberfield/intl/lt-LT.json b/packages/react-aria/intl/numberfield/lt-LT.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/lt-LT.json
rename to packages/react-aria/intl/numberfield/lt-LT.json
diff --git a/packages/@react-aria/numberfield/intl/lv-LV.json b/packages/react-aria/intl/numberfield/lv-LV.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/lv-LV.json
rename to packages/react-aria/intl/numberfield/lv-LV.json
diff --git a/packages/@react-aria/numberfield/intl/nb-NO.json b/packages/react-aria/intl/numberfield/nb-NO.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/nb-NO.json
rename to packages/react-aria/intl/numberfield/nb-NO.json
diff --git a/packages/@react-aria/numberfield/intl/nl-NL.json b/packages/react-aria/intl/numberfield/nl-NL.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/nl-NL.json
rename to packages/react-aria/intl/numberfield/nl-NL.json
diff --git a/packages/@react-aria/numberfield/intl/pl-PL.json b/packages/react-aria/intl/numberfield/pl-PL.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/pl-PL.json
rename to packages/react-aria/intl/numberfield/pl-PL.json
diff --git a/packages/@react-aria/numberfield/intl/pt-BR.json b/packages/react-aria/intl/numberfield/pt-BR.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/pt-BR.json
rename to packages/react-aria/intl/numberfield/pt-BR.json
diff --git a/packages/@react-aria/numberfield/intl/pt-PT.json b/packages/react-aria/intl/numberfield/pt-PT.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/pt-PT.json
rename to packages/react-aria/intl/numberfield/pt-PT.json
diff --git a/packages/@react-aria/numberfield/intl/ro-RO.json b/packages/react-aria/intl/numberfield/ro-RO.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/ro-RO.json
rename to packages/react-aria/intl/numberfield/ro-RO.json
diff --git a/packages/@react-aria/numberfield/intl/ru-RU.json b/packages/react-aria/intl/numberfield/ru-RU.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/ru-RU.json
rename to packages/react-aria/intl/numberfield/ru-RU.json
diff --git a/packages/@react-aria/numberfield/intl/sk-SK.json b/packages/react-aria/intl/numberfield/sk-SK.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/sk-SK.json
rename to packages/react-aria/intl/numberfield/sk-SK.json
diff --git a/packages/@react-aria/numberfield/intl/sl-SI.json b/packages/react-aria/intl/numberfield/sl-SI.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/sl-SI.json
rename to packages/react-aria/intl/numberfield/sl-SI.json
diff --git a/packages/@react-aria/numberfield/intl/sr-SP.json b/packages/react-aria/intl/numberfield/sr-SP.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/sr-SP.json
rename to packages/react-aria/intl/numberfield/sr-SP.json
diff --git a/packages/@react-aria/numberfield/intl/sv-SE.json b/packages/react-aria/intl/numberfield/sv-SE.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/sv-SE.json
rename to packages/react-aria/intl/numberfield/sv-SE.json
diff --git a/packages/@react-aria/numberfield/intl/tr-TR.json b/packages/react-aria/intl/numberfield/tr-TR.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/tr-TR.json
rename to packages/react-aria/intl/numberfield/tr-TR.json
diff --git a/packages/@react-aria/numberfield/intl/uk-UA.json b/packages/react-aria/intl/numberfield/uk-UA.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/uk-UA.json
rename to packages/react-aria/intl/numberfield/uk-UA.json
diff --git a/packages/@react-aria/numberfield/intl/zh-CN.json b/packages/react-aria/intl/numberfield/zh-CN.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/zh-CN.json
rename to packages/react-aria/intl/numberfield/zh-CN.json
diff --git a/packages/@react-aria/numberfield/intl/zh-TW.json b/packages/react-aria/intl/numberfield/zh-TW.json
similarity index 100%
rename from packages/@react-aria/numberfield/intl/zh-TW.json
rename to packages/react-aria/intl/numberfield/zh-TW.json
diff --git a/packages/@react-aria/overlays/intl/ar-AE.json b/packages/react-aria/intl/overlays/ar-AE.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/ar-AE.json
rename to packages/react-aria/intl/overlays/ar-AE.json
diff --git a/packages/@react-aria/overlays/intl/bg-BG.json b/packages/react-aria/intl/overlays/bg-BG.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/bg-BG.json
rename to packages/react-aria/intl/overlays/bg-BG.json
diff --git a/packages/@react-aria/overlays/intl/cs-CZ.json b/packages/react-aria/intl/overlays/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/cs-CZ.json
rename to packages/react-aria/intl/overlays/cs-CZ.json
diff --git a/packages/@react-aria/overlays/intl/da-DK.json b/packages/react-aria/intl/overlays/da-DK.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/da-DK.json
rename to packages/react-aria/intl/overlays/da-DK.json
diff --git a/packages/@react-aria/overlays/intl/de-DE.json b/packages/react-aria/intl/overlays/de-DE.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/de-DE.json
rename to packages/react-aria/intl/overlays/de-DE.json
diff --git a/packages/@react-aria/overlays/intl/el-GR.json b/packages/react-aria/intl/overlays/el-GR.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/el-GR.json
rename to packages/react-aria/intl/overlays/el-GR.json
diff --git a/packages/@react-aria/overlays/intl/en-US.json b/packages/react-aria/intl/overlays/en-US.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/en-US.json
rename to packages/react-aria/intl/overlays/en-US.json
diff --git a/packages/@react-aria/overlays/intl/es-ES.json b/packages/react-aria/intl/overlays/es-ES.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/es-ES.json
rename to packages/react-aria/intl/overlays/es-ES.json
diff --git a/packages/@react-aria/overlays/intl/et-EE.json b/packages/react-aria/intl/overlays/et-EE.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/et-EE.json
rename to packages/react-aria/intl/overlays/et-EE.json
diff --git a/packages/@react-aria/overlays/intl/fi-FI.json b/packages/react-aria/intl/overlays/fi-FI.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/fi-FI.json
rename to packages/react-aria/intl/overlays/fi-FI.json
diff --git a/packages/@react-aria/overlays/intl/fr-FR.json b/packages/react-aria/intl/overlays/fr-FR.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/fr-FR.json
rename to packages/react-aria/intl/overlays/fr-FR.json
diff --git a/packages/@react-aria/overlays/intl/he-IL.json b/packages/react-aria/intl/overlays/he-IL.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/he-IL.json
rename to packages/react-aria/intl/overlays/he-IL.json
diff --git a/packages/@react-aria/overlays/intl/hr-HR.json b/packages/react-aria/intl/overlays/hr-HR.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/hr-HR.json
rename to packages/react-aria/intl/overlays/hr-HR.json
diff --git a/packages/@react-aria/overlays/intl/hu-HU.json b/packages/react-aria/intl/overlays/hu-HU.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/hu-HU.json
rename to packages/react-aria/intl/overlays/hu-HU.json
diff --git a/packages/@react-aria/overlays/intl/it-IT.json b/packages/react-aria/intl/overlays/it-IT.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/it-IT.json
rename to packages/react-aria/intl/overlays/it-IT.json
diff --git a/packages/@react-aria/overlays/intl/ja-JP.json b/packages/react-aria/intl/overlays/ja-JP.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/ja-JP.json
rename to packages/react-aria/intl/overlays/ja-JP.json
diff --git a/packages/@react-aria/overlays/intl/ko-KR.json b/packages/react-aria/intl/overlays/ko-KR.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/ko-KR.json
rename to packages/react-aria/intl/overlays/ko-KR.json
diff --git a/packages/@react-aria/overlays/intl/lt-LT.json b/packages/react-aria/intl/overlays/lt-LT.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/lt-LT.json
rename to packages/react-aria/intl/overlays/lt-LT.json
diff --git a/packages/@react-aria/overlays/intl/lv-LV.json b/packages/react-aria/intl/overlays/lv-LV.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/lv-LV.json
rename to packages/react-aria/intl/overlays/lv-LV.json
diff --git a/packages/@react-aria/overlays/intl/nb-NO.json b/packages/react-aria/intl/overlays/nb-NO.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/nb-NO.json
rename to packages/react-aria/intl/overlays/nb-NO.json
diff --git a/packages/@react-aria/overlays/intl/nl-NL.json b/packages/react-aria/intl/overlays/nl-NL.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/nl-NL.json
rename to packages/react-aria/intl/overlays/nl-NL.json
diff --git a/packages/@react-aria/overlays/intl/pl-PL.json b/packages/react-aria/intl/overlays/pl-PL.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/pl-PL.json
rename to packages/react-aria/intl/overlays/pl-PL.json
diff --git a/packages/@react-aria/overlays/intl/pt-BR.json b/packages/react-aria/intl/overlays/pt-BR.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/pt-BR.json
rename to packages/react-aria/intl/overlays/pt-BR.json
diff --git a/packages/@react-aria/overlays/intl/pt-PT.json b/packages/react-aria/intl/overlays/pt-PT.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/pt-PT.json
rename to packages/react-aria/intl/overlays/pt-PT.json
diff --git a/packages/@react-aria/overlays/intl/ro-RO.json b/packages/react-aria/intl/overlays/ro-RO.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/ro-RO.json
rename to packages/react-aria/intl/overlays/ro-RO.json
diff --git a/packages/@react-aria/overlays/intl/ru-RU.json b/packages/react-aria/intl/overlays/ru-RU.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/ru-RU.json
rename to packages/react-aria/intl/overlays/ru-RU.json
diff --git a/packages/@react-aria/overlays/intl/sk-SK.json b/packages/react-aria/intl/overlays/sk-SK.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/sk-SK.json
rename to packages/react-aria/intl/overlays/sk-SK.json
diff --git a/packages/@react-aria/overlays/intl/sl-SI.json b/packages/react-aria/intl/overlays/sl-SI.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/sl-SI.json
rename to packages/react-aria/intl/overlays/sl-SI.json
diff --git a/packages/@react-aria/overlays/intl/sr-SP.json b/packages/react-aria/intl/overlays/sr-SP.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/sr-SP.json
rename to packages/react-aria/intl/overlays/sr-SP.json
diff --git a/packages/@react-aria/overlays/intl/sv-SE.json b/packages/react-aria/intl/overlays/sv-SE.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/sv-SE.json
rename to packages/react-aria/intl/overlays/sv-SE.json
diff --git a/packages/@react-aria/overlays/intl/tr-TR.json b/packages/react-aria/intl/overlays/tr-TR.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/tr-TR.json
rename to packages/react-aria/intl/overlays/tr-TR.json
diff --git a/packages/@react-aria/overlays/intl/uk-UA.json b/packages/react-aria/intl/overlays/uk-UA.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/uk-UA.json
rename to packages/react-aria/intl/overlays/uk-UA.json
diff --git a/packages/@react-aria/overlays/intl/zh-CN.json b/packages/react-aria/intl/overlays/zh-CN.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/zh-CN.json
rename to packages/react-aria/intl/overlays/zh-CN.json
diff --git a/packages/@react-aria/overlays/intl/zh-TW.json b/packages/react-aria/intl/overlays/zh-TW.json
similarity index 100%
rename from packages/@react-aria/overlays/intl/zh-TW.json
rename to packages/react-aria/intl/overlays/zh-TW.json
diff --git a/packages/@react-aria/searchfield/intl/ar-AE.json b/packages/react-aria/intl/searchfield/ar-AE.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/ar-AE.json
rename to packages/react-aria/intl/searchfield/ar-AE.json
diff --git a/packages/@react-aria/searchfield/intl/bg-BG.json b/packages/react-aria/intl/searchfield/bg-BG.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/bg-BG.json
rename to packages/react-aria/intl/searchfield/bg-BG.json
diff --git a/packages/@react-aria/searchfield/intl/cs-CZ.json b/packages/react-aria/intl/searchfield/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/cs-CZ.json
rename to packages/react-aria/intl/searchfield/cs-CZ.json
diff --git a/packages/@react-aria/searchfield/intl/da-DK.json b/packages/react-aria/intl/searchfield/da-DK.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/da-DK.json
rename to packages/react-aria/intl/searchfield/da-DK.json
diff --git a/packages/@react-aria/searchfield/intl/de-DE.json b/packages/react-aria/intl/searchfield/de-DE.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/de-DE.json
rename to packages/react-aria/intl/searchfield/de-DE.json
diff --git a/packages/@react-aria/searchfield/intl/el-GR.json b/packages/react-aria/intl/searchfield/el-GR.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/el-GR.json
rename to packages/react-aria/intl/searchfield/el-GR.json
diff --git a/packages/@react-aria/searchfield/intl/en-US.json b/packages/react-aria/intl/searchfield/en-US.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/en-US.json
rename to packages/react-aria/intl/searchfield/en-US.json
diff --git a/packages/@react-aria/searchfield/intl/es-ES.json b/packages/react-aria/intl/searchfield/es-ES.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/es-ES.json
rename to packages/react-aria/intl/searchfield/es-ES.json
diff --git a/packages/@react-aria/searchfield/intl/et-EE.json b/packages/react-aria/intl/searchfield/et-EE.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/et-EE.json
rename to packages/react-aria/intl/searchfield/et-EE.json
diff --git a/packages/@react-aria/searchfield/intl/fi-FI.json b/packages/react-aria/intl/searchfield/fi-FI.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/fi-FI.json
rename to packages/react-aria/intl/searchfield/fi-FI.json
diff --git a/packages/@react-aria/searchfield/intl/fr-FR.json b/packages/react-aria/intl/searchfield/fr-FR.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/fr-FR.json
rename to packages/react-aria/intl/searchfield/fr-FR.json
diff --git a/packages/@react-aria/searchfield/intl/he-IL.json b/packages/react-aria/intl/searchfield/he-IL.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/he-IL.json
rename to packages/react-aria/intl/searchfield/he-IL.json
diff --git a/packages/@react-aria/searchfield/intl/hr-HR.json b/packages/react-aria/intl/searchfield/hr-HR.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/hr-HR.json
rename to packages/react-aria/intl/searchfield/hr-HR.json
diff --git a/packages/@react-aria/searchfield/intl/hu-HU.json b/packages/react-aria/intl/searchfield/hu-HU.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/hu-HU.json
rename to packages/react-aria/intl/searchfield/hu-HU.json
diff --git a/packages/@react-aria/searchfield/intl/it-IT.json b/packages/react-aria/intl/searchfield/it-IT.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/it-IT.json
rename to packages/react-aria/intl/searchfield/it-IT.json
diff --git a/packages/@react-aria/searchfield/intl/ja-JP.json b/packages/react-aria/intl/searchfield/ja-JP.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/ja-JP.json
rename to packages/react-aria/intl/searchfield/ja-JP.json
diff --git a/packages/@react-aria/searchfield/intl/ko-KR.json b/packages/react-aria/intl/searchfield/ko-KR.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/ko-KR.json
rename to packages/react-aria/intl/searchfield/ko-KR.json
diff --git a/packages/@react-aria/searchfield/intl/lt-LT.json b/packages/react-aria/intl/searchfield/lt-LT.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/lt-LT.json
rename to packages/react-aria/intl/searchfield/lt-LT.json
diff --git a/packages/@react-aria/searchfield/intl/lv-LV.json b/packages/react-aria/intl/searchfield/lv-LV.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/lv-LV.json
rename to packages/react-aria/intl/searchfield/lv-LV.json
diff --git a/packages/@react-aria/searchfield/intl/nb-NO.json b/packages/react-aria/intl/searchfield/nb-NO.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/nb-NO.json
rename to packages/react-aria/intl/searchfield/nb-NO.json
diff --git a/packages/@react-aria/searchfield/intl/nl-NL.json b/packages/react-aria/intl/searchfield/nl-NL.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/nl-NL.json
rename to packages/react-aria/intl/searchfield/nl-NL.json
diff --git a/packages/@react-aria/searchfield/intl/pl-PL.json b/packages/react-aria/intl/searchfield/pl-PL.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/pl-PL.json
rename to packages/react-aria/intl/searchfield/pl-PL.json
diff --git a/packages/@react-aria/searchfield/intl/pt-BR.json b/packages/react-aria/intl/searchfield/pt-BR.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/pt-BR.json
rename to packages/react-aria/intl/searchfield/pt-BR.json
diff --git a/packages/@react-aria/searchfield/intl/pt-PT.json b/packages/react-aria/intl/searchfield/pt-PT.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/pt-PT.json
rename to packages/react-aria/intl/searchfield/pt-PT.json
diff --git a/packages/@react-aria/searchfield/intl/ro-RO.json b/packages/react-aria/intl/searchfield/ro-RO.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/ro-RO.json
rename to packages/react-aria/intl/searchfield/ro-RO.json
diff --git a/packages/@react-aria/searchfield/intl/ru-RU.json b/packages/react-aria/intl/searchfield/ru-RU.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/ru-RU.json
rename to packages/react-aria/intl/searchfield/ru-RU.json
diff --git a/packages/@react-aria/searchfield/intl/sk-SK.json b/packages/react-aria/intl/searchfield/sk-SK.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/sk-SK.json
rename to packages/react-aria/intl/searchfield/sk-SK.json
diff --git a/packages/@react-aria/searchfield/intl/sl-SI.json b/packages/react-aria/intl/searchfield/sl-SI.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/sl-SI.json
rename to packages/react-aria/intl/searchfield/sl-SI.json
diff --git a/packages/@react-aria/searchfield/intl/sr-SP.json b/packages/react-aria/intl/searchfield/sr-SP.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/sr-SP.json
rename to packages/react-aria/intl/searchfield/sr-SP.json
diff --git a/packages/@react-aria/searchfield/intl/sv-SE.json b/packages/react-aria/intl/searchfield/sv-SE.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/sv-SE.json
rename to packages/react-aria/intl/searchfield/sv-SE.json
diff --git a/packages/@react-aria/searchfield/intl/tr-TR.json b/packages/react-aria/intl/searchfield/tr-TR.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/tr-TR.json
rename to packages/react-aria/intl/searchfield/tr-TR.json
diff --git a/packages/@react-aria/searchfield/intl/uk-UA.json b/packages/react-aria/intl/searchfield/uk-UA.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/uk-UA.json
rename to packages/react-aria/intl/searchfield/uk-UA.json
diff --git a/packages/@react-aria/searchfield/intl/zh-CN.json b/packages/react-aria/intl/searchfield/zh-CN.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/zh-CN.json
rename to packages/react-aria/intl/searchfield/zh-CN.json
diff --git a/packages/@react-aria/searchfield/intl/zh-TW.json b/packages/react-aria/intl/searchfield/zh-TW.json
similarity index 100%
rename from packages/@react-aria/searchfield/intl/zh-TW.json
rename to packages/react-aria/intl/searchfield/zh-TW.json
diff --git a/packages/@react-aria/spinbutton/intl/ar-AE.json b/packages/react-aria/intl/spinbutton/ar-AE.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/ar-AE.json
rename to packages/react-aria/intl/spinbutton/ar-AE.json
diff --git a/packages/@react-aria/spinbutton/intl/bg-BG.json b/packages/react-aria/intl/spinbutton/bg-BG.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/bg-BG.json
rename to packages/react-aria/intl/spinbutton/bg-BG.json
diff --git a/packages/@react-aria/spinbutton/intl/cs-CZ.json b/packages/react-aria/intl/spinbutton/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/cs-CZ.json
rename to packages/react-aria/intl/spinbutton/cs-CZ.json
diff --git a/packages/@react-aria/spinbutton/intl/da-DK.json b/packages/react-aria/intl/spinbutton/da-DK.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/da-DK.json
rename to packages/react-aria/intl/spinbutton/da-DK.json
diff --git a/packages/@react-aria/spinbutton/intl/de-DE.json b/packages/react-aria/intl/spinbutton/de-DE.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/de-DE.json
rename to packages/react-aria/intl/spinbutton/de-DE.json
diff --git a/packages/@react-aria/spinbutton/intl/el-GR.json b/packages/react-aria/intl/spinbutton/el-GR.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/el-GR.json
rename to packages/react-aria/intl/spinbutton/el-GR.json
diff --git a/packages/@react-aria/spinbutton/intl/en-US.json b/packages/react-aria/intl/spinbutton/en-US.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/en-US.json
rename to packages/react-aria/intl/spinbutton/en-US.json
diff --git a/packages/@react-aria/spinbutton/intl/es-ES.json b/packages/react-aria/intl/spinbutton/es-ES.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/es-ES.json
rename to packages/react-aria/intl/spinbutton/es-ES.json
diff --git a/packages/@react-aria/spinbutton/intl/et-EE.json b/packages/react-aria/intl/spinbutton/et-EE.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/et-EE.json
rename to packages/react-aria/intl/spinbutton/et-EE.json
diff --git a/packages/@react-aria/spinbutton/intl/fi-FI.json b/packages/react-aria/intl/spinbutton/fi-FI.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/fi-FI.json
rename to packages/react-aria/intl/spinbutton/fi-FI.json
diff --git a/packages/@react-aria/spinbutton/intl/fr-FR.json b/packages/react-aria/intl/spinbutton/fr-FR.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/fr-FR.json
rename to packages/react-aria/intl/spinbutton/fr-FR.json
diff --git a/packages/@react-aria/spinbutton/intl/he-IL.json b/packages/react-aria/intl/spinbutton/he-IL.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/he-IL.json
rename to packages/react-aria/intl/spinbutton/he-IL.json
diff --git a/packages/@react-aria/spinbutton/intl/hr-HR.json b/packages/react-aria/intl/spinbutton/hr-HR.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/hr-HR.json
rename to packages/react-aria/intl/spinbutton/hr-HR.json
diff --git a/packages/@react-aria/spinbutton/intl/hu-HU.json b/packages/react-aria/intl/spinbutton/hu-HU.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/hu-HU.json
rename to packages/react-aria/intl/spinbutton/hu-HU.json
diff --git a/packages/@react-aria/spinbutton/intl/it-IT.json b/packages/react-aria/intl/spinbutton/it-IT.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/it-IT.json
rename to packages/react-aria/intl/spinbutton/it-IT.json
diff --git a/packages/@react-aria/spinbutton/intl/ja-JP.json b/packages/react-aria/intl/spinbutton/ja-JP.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/ja-JP.json
rename to packages/react-aria/intl/spinbutton/ja-JP.json
diff --git a/packages/@react-aria/spinbutton/intl/ko-KR.json b/packages/react-aria/intl/spinbutton/ko-KR.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/ko-KR.json
rename to packages/react-aria/intl/spinbutton/ko-KR.json
diff --git a/packages/@react-aria/spinbutton/intl/lt-LT.json b/packages/react-aria/intl/spinbutton/lt-LT.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/lt-LT.json
rename to packages/react-aria/intl/spinbutton/lt-LT.json
diff --git a/packages/@react-aria/spinbutton/intl/lv-LV.json b/packages/react-aria/intl/spinbutton/lv-LV.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/lv-LV.json
rename to packages/react-aria/intl/spinbutton/lv-LV.json
diff --git a/packages/@react-aria/spinbutton/intl/nb-NO.json b/packages/react-aria/intl/spinbutton/nb-NO.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/nb-NO.json
rename to packages/react-aria/intl/spinbutton/nb-NO.json
diff --git a/packages/@react-aria/spinbutton/intl/nl-NL.json b/packages/react-aria/intl/spinbutton/nl-NL.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/nl-NL.json
rename to packages/react-aria/intl/spinbutton/nl-NL.json
diff --git a/packages/@react-aria/spinbutton/intl/pl-PL.json b/packages/react-aria/intl/spinbutton/pl-PL.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/pl-PL.json
rename to packages/react-aria/intl/spinbutton/pl-PL.json
diff --git a/packages/@react-aria/spinbutton/intl/pt-BR.json b/packages/react-aria/intl/spinbutton/pt-BR.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/pt-BR.json
rename to packages/react-aria/intl/spinbutton/pt-BR.json
diff --git a/packages/@react-aria/spinbutton/intl/pt-PT.json b/packages/react-aria/intl/spinbutton/pt-PT.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/pt-PT.json
rename to packages/react-aria/intl/spinbutton/pt-PT.json
diff --git a/packages/@react-aria/spinbutton/intl/ro-RO.json b/packages/react-aria/intl/spinbutton/ro-RO.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/ro-RO.json
rename to packages/react-aria/intl/spinbutton/ro-RO.json
diff --git a/packages/@react-aria/spinbutton/intl/ru-RU.json b/packages/react-aria/intl/spinbutton/ru-RU.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/ru-RU.json
rename to packages/react-aria/intl/spinbutton/ru-RU.json
diff --git a/packages/@react-aria/spinbutton/intl/sk-SK.json b/packages/react-aria/intl/spinbutton/sk-SK.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/sk-SK.json
rename to packages/react-aria/intl/spinbutton/sk-SK.json
diff --git a/packages/@react-aria/spinbutton/intl/sl-SI.json b/packages/react-aria/intl/spinbutton/sl-SI.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/sl-SI.json
rename to packages/react-aria/intl/spinbutton/sl-SI.json
diff --git a/packages/@react-aria/spinbutton/intl/sr-SP.json b/packages/react-aria/intl/spinbutton/sr-SP.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/sr-SP.json
rename to packages/react-aria/intl/spinbutton/sr-SP.json
diff --git a/packages/@react-aria/spinbutton/intl/sv-SE.json b/packages/react-aria/intl/spinbutton/sv-SE.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/sv-SE.json
rename to packages/react-aria/intl/spinbutton/sv-SE.json
diff --git a/packages/@react-aria/spinbutton/intl/tr-TR.json b/packages/react-aria/intl/spinbutton/tr-TR.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/tr-TR.json
rename to packages/react-aria/intl/spinbutton/tr-TR.json
diff --git a/packages/@react-aria/spinbutton/intl/uk-UA.json b/packages/react-aria/intl/spinbutton/uk-UA.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/uk-UA.json
rename to packages/react-aria/intl/spinbutton/uk-UA.json
diff --git a/packages/@react-aria/spinbutton/intl/zh-CN.json b/packages/react-aria/intl/spinbutton/zh-CN.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/zh-CN.json
rename to packages/react-aria/intl/spinbutton/zh-CN.json
diff --git a/packages/@react-aria/spinbutton/intl/zh-TW.json b/packages/react-aria/intl/spinbutton/zh-TW.json
similarity index 100%
rename from packages/@react-aria/spinbutton/intl/zh-TW.json
rename to packages/react-aria/intl/spinbutton/zh-TW.json
diff --git a/packages/@react-aria/steplist/intl/ar-AE.json b/packages/react-aria/intl/steplist/ar-AE.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/ar-AE.json
rename to packages/react-aria/intl/steplist/ar-AE.json
diff --git a/packages/@react-aria/steplist/intl/bg-BG.json b/packages/react-aria/intl/steplist/bg-BG.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/bg-BG.json
rename to packages/react-aria/intl/steplist/bg-BG.json
diff --git a/packages/@react-aria/steplist/intl/cs-CZ.json b/packages/react-aria/intl/steplist/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/cs-CZ.json
rename to packages/react-aria/intl/steplist/cs-CZ.json
diff --git a/packages/@react-aria/steplist/intl/da-DK.json b/packages/react-aria/intl/steplist/da-DK.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/da-DK.json
rename to packages/react-aria/intl/steplist/da-DK.json
diff --git a/packages/@react-aria/steplist/intl/de-DE.json b/packages/react-aria/intl/steplist/de-DE.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/de-DE.json
rename to packages/react-aria/intl/steplist/de-DE.json
diff --git a/packages/@react-aria/steplist/intl/el-GR.json b/packages/react-aria/intl/steplist/el-GR.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/el-GR.json
rename to packages/react-aria/intl/steplist/el-GR.json
diff --git a/packages/@react-aria/steplist/intl/en-US.json b/packages/react-aria/intl/steplist/en-US.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/en-US.json
rename to packages/react-aria/intl/steplist/en-US.json
diff --git a/packages/@react-aria/steplist/intl/es-ES.json b/packages/react-aria/intl/steplist/es-ES.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/es-ES.json
rename to packages/react-aria/intl/steplist/es-ES.json
diff --git a/packages/@react-aria/steplist/intl/et-EE.json b/packages/react-aria/intl/steplist/et-EE.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/et-EE.json
rename to packages/react-aria/intl/steplist/et-EE.json
diff --git a/packages/@react-aria/steplist/intl/fi-FI.json b/packages/react-aria/intl/steplist/fi-FI.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/fi-FI.json
rename to packages/react-aria/intl/steplist/fi-FI.json
diff --git a/packages/@react-aria/steplist/intl/fr-FR.json b/packages/react-aria/intl/steplist/fr-FR.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/fr-FR.json
rename to packages/react-aria/intl/steplist/fr-FR.json
diff --git a/packages/@react-aria/steplist/intl/he-IL.json b/packages/react-aria/intl/steplist/he-IL.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/he-IL.json
rename to packages/react-aria/intl/steplist/he-IL.json
diff --git a/packages/@react-aria/steplist/intl/hr-HR.json b/packages/react-aria/intl/steplist/hr-HR.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/hr-HR.json
rename to packages/react-aria/intl/steplist/hr-HR.json
diff --git a/packages/@react-aria/steplist/intl/hu-HU.json b/packages/react-aria/intl/steplist/hu-HU.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/hu-HU.json
rename to packages/react-aria/intl/steplist/hu-HU.json
diff --git a/packages/@react-aria/steplist/intl/it-IT.json b/packages/react-aria/intl/steplist/it-IT.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/it-IT.json
rename to packages/react-aria/intl/steplist/it-IT.json
diff --git a/packages/@react-aria/steplist/intl/ja-JP.json b/packages/react-aria/intl/steplist/ja-JP.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/ja-JP.json
rename to packages/react-aria/intl/steplist/ja-JP.json
diff --git a/packages/@react-aria/steplist/intl/ko-KR.json b/packages/react-aria/intl/steplist/ko-KR.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/ko-KR.json
rename to packages/react-aria/intl/steplist/ko-KR.json
diff --git a/packages/@react-aria/steplist/intl/lt-LT.json b/packages/react-aria/intl/steplist/lt-LT.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/lt-LT.json
rename to packages/react-aria/intl/steplist/lt-LT.json
diff --git a/packages/@react-aria/steplist/intl/lv-LV.json b/packages/react-aria/intl/steplist/lv-LV.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/lv-LV.json
rename to packages/react-aria/intl/steplist/lv-LV.json
diff --git a/packages/@react-aria/steplist/intl/nb-NO.json b/packages/react-aria/intl/steplist/nb-NO.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/nb-NO.json
rename to packages/react-aria/intl/steplist/nb-NO.json
diff --git a/packages/@react-aria/steplist/intl/nl-NL.json b/packages/react-aria/intl/steplist/nl-NL.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/nl-NL.json
rename to packages/react-aria/intl/steplist/nl-NL.json
diff --git a/packages/@react-aria/steplist/intl/pl-PL.json b/packages/react-aria/intl/steplist/pl-PL.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/pl-PL.json
rename to packages/react-aria/intl/steplist/pl-PL.json
diff --git a/packages/@react-aria/steplist/intl/pt-BR.json b/packages/react-aria/intl/steplist/pt-BR.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/pt-BR.json
rename to packages/react-aria/intl/steplist/pt-BR.json
diff --git a/packages/@react-aria/steplist/intl/pt-PT.json b/packages/react-aria/intl/steplist/pt-PT.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/pt-PT.json
rename to packages/react-aria/intl/steplist/pt-PT.json
diff --git a/packages/@react-aria/steplist/intl/ro-RO.json b/packages/react-aria/intl/steplist/ro-RO.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/ro-RO.json
rename to packages/react-aria/intl/steplist/ro-RO.json
diff --git a/packages/@react-aria/steplist/intl/ru-RU.json b/packages/react-aria/intl/steplist/ru-RU.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/ru-RU.json
rename to packages/react-aria/intl/steplist/ru-RU.json
diff --git a/packages/@react-aria/steplist/intl/sk-SK.json b/packages/react-aria/intl/steplist/sk-SK.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/sk-SK.json
rename to packages/react-aria/intl/steplist/sk-SK.json
diff --git a/packages/@react-aria/steplist/intl/sl-SI.json b/packages/react-aria/intl/steplist/sl-SI.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/sl-SI.json
rename to packages/react-aria/intl/steplist/sl-SI.json
diff --git a/packages/@react-aria/steplist/intl/sr-SP.json b/packages/react-aria/intl/steplist/sr-SP.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/sr-SP.json
rename to packages/react-aria/intl/steplist/sr-SP.json
diff --git a/packages/@react-aria/steplist/intl/sv-SE.json b/packages/react-aria/intl/steplist/sv-SE.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/sv-SE.json
rename to packages/react-aria/intl/steplist/sv-SE.json
diff --git a/packages/@react-aria/steplist/intl/tr-TR.json b/packages/react-aria/intl/steplist/tr-TR.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/tr-TR.json
rename to packages/react-aria/intl/steplist/tr-TR.json
diff --git a/packages/@react-aria/steplist/intl/uk-UA.json b/packages/react-aria/intl/steplist/uk-UA.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/uk-UA.json
rename to packages/react-aria/intl/steplist/uk-UA.json
diff --git a/packages/@react-aria/steplist/intl/zh-CN.json b/packages/react-aria/intl/steplist/zh-CN.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/zh-CN.json
rename to packages/react-aria/intl/steplist/zh-CN.json
diff --git a/packages/@react-aria/steplist/intl/zh-TW.json b/packages/react-aria/intl/steplist/zh-TW.json
similarity index 100%
rename from packages/@react-aria/steplist/intl/zh-TW.json
rename to packages/react-aria/intl/steplist/zh-TW.json
diff --git a/packages/@react-aria/table/intl/ar-AE.json b/packages/react-aria/intl/table/ar-AE.json
similarity index 100%
rename from packages/@react-aria/table/intl/ar-AE.json
rename to packages/react-aria/intl/table/ar-AE.json
diff --git a/packages/@react-aria/table/intl/bg-BG.json b/packages/react-aria/intl/table/bg-BG.json
similarity index 100%
rename from packages/@react-aria/table/intl/bg-BG.json
rename to packages/react-aria/intl/table/bg-BG.json
diff --git a/packages/@react-aria/table/intl/cs-CZ.json b/packages/react-aria/intl/table/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/table/intl/cs-CZ.json
rename to packages/react-aria/intl/table/cs-CZ.json
diff --git a/packages/@react-aria/table/intl/da-DK.json b/packages/react-aria/intl/table/da-DK.json
similarity index 100%
rename from packages/@react-aria/table/intl/da-DK.json
rename to packages/react-aria/intl/table/da-DK.json
diff --git a/packages/@react-aria/table/intl/de-DE.json b/packages/react-aria/intl/table/de-DE.json
similarity index 100%
rename from packages/@react-aria/table/intl/de-DE.json
rename to packages/react-aria/intl/table/de-DE.json
diff --git a/packages/@react-aria/table/intl/el-GR.json b/packages/react-aria/intl/table/el-GR.json
similarity index 100%
rename from packages/@react-aria/table/intl/el-GR.json
rename to packages/react-aria/intl/table/el-GR.json
diff --git a/packages/@react-aria/table/intl/en-US.json b/packages/react-aria/intl/table/en-US.json
similarity index 100%
rename from packages/@react-aria/table/intl/en-US.json
rename to packages/react-aria/intl/table/en-US.json
diff --git a/packages/@react-aria/table/intl/es-ES.json b/packages/react-aria/intl/table/es-ES.json
similarity index 100%
rename from packages/@react-aria/table/intl/es-ES.json
rename to packages/react-aria/intl/table/es-ES.json
diff --git a/packages/@react-aria/table/intl/et-EE.json b/packages/react-aria/intl/table/et-EE.json
similarity index 100%
rename from packages/@react-aria/table/intl/et-EE.json
rename to packages/react-aria/intl/table/et-EE.json
diff --git a/packages/@react-aria/table/intl/fi-FI.json b/packages/react-aria/intl/table/fi-FI.json
similarity index 100%
rename from packages/@react-aria/table/intl/fi-FI.json
rename to packages/react-aria/intl/table/fi-FI.json
diff --git a/packages/@react-aria/table/intl/fr-FR.json b/packages/react-aria/intl/table/fr-FR.json
similarity index 100%
rename from packages/@react-aria/table/intl/fr-FR.json
rename to packages/react-aria/intl/table/fr-FR.json
diff --git a/packages/@react-aria/table/intl/he-IL.json b/packages/react-aria/intl/table/he-IL.json
similarity index 100%
rename from packages/@react-aria/table/intl/he-IL.json
rename to packages/react-aria/intl/table/he-IL.json
diff --git a/packages/@react-aria/table/intl/hr-HR.json b/packages/react-aria/intl/table/hr-HR.json
similarity index 100%
rename from packages/@react-aria/table/intl/hr-HR.json
rename to packages/react-aria/intl/table/hr-HR.json
diff --git a/packages/@react-aria/table/intl/hu-HU.json b/packages/react-aria/intl/table/hu-HU.json
similarity index 100%
rename from packages/@react-aria/table/intl/hu-HU.json
rename to packages/react-aria/intl/table/hu-HU.json
diff --git a/packages/@react-aria/table/intl/it-IT.json b/packages/react-aria/intl/table/it-IT.json
similarity index 100%
rename from packages/@react-aria/table/intl/it-IT.json
rename to packages/react-aria/intl/table/it-IT.json
diff --git a/packages/@react-aria/table/intl/ja-JP.json b/packages/react-aria/intl/table/ja-JP.json
similarity index 100%
rename from packages/@react-aria/table/intl/ja-JP.json
rename to packages/react-aria/intl/table/ja-JP.json
diff --git a/packages/@react-aria/table/intl/ko-KR.json b/packages/react-aria/intl/table/ko-KR.json
similarity index 100%
rename from packages/@react-aria/table/intl/ko-KR.json
rename to packages/react-aria/intl/table/ko-KR.json
diff --git a/packages/@react-aria/table/intl/lt-LT.json b/packages/react-aria/intl/table/lt-LT.json
similarity index 100%
rename from packages/@react-aria/table/intl/lt-LT.json
rename to packages/react-aria/intl/table/lt-LT.json
diff --git a/packages/@react-aria/table/intl/lv-LV.json b/packages/react-aria/intl/table/lv-LV.json
similarity index 100%
rename from packages/@react-aria/table/intl/lv-LV.json
rename to packages/react-aria/intl/table/lv-LV.json
diff --git a/packages/@react-aria/table/intl/nb-NO.json b/packages/react-aria/intl/table/nb-NO.json
similarity index 100%
rename from packages/@react-aria/table/intl/nb-NO.json
rename to packages/react-aria/intl/table/nb-NO.json
diff --git a/packages/@react-aria/table/intl/nl-NL.json b/packages/react-aria/intl/table/nl-NL.json
similarity index 100%
rename from packages/@react-aria/table/intl/nl-NL.json
rename to packages/react-aria/intl/table/nl-NL.json
diff --git a/packages/@react-aria/table/intl/pl-PL.json b/packages/react-aria/intl/table/pl-PL.json
similarity index 100%
rename from packages/@react-aria/table/intl/pl-PL.json
rename to packages/react-aria/intl/table/pl-PL.json
diff --git a/packages/@react-aria/table/intl/pt-BR.json b/packages/react-aria/intl/table/pt-BR.json
similarity index 100%
rename from packages/@react-aria/table/intl/pt-BR.json
rename to packages/react-aria/intl/table/pt-BR.json
diff --git a/packages/@react-aria/table/intl/pt-PT.json b/packages/react-aria/intl/table/pt-PT.json
similarity index 100%
rename from packages/@react-aria/table/intl/pt-PT.json
rename to packages/react-aria/intl/table/pt-PT.json
diff --git a/packages/@react-aria/table/intl/ro-RO.json b/packages/react-aria/intl/table/ro-RO.json
similarity index 100%
rename from packages/@react-aria/table/intl/ro-RO.json
rename to packages/react-aria/intl/table/ro-RO.json
diff --git a/packages/@react-aria/table/intl/ru-RU.json b/packages/react-aria/intl/table/ru-RU.json
similarity index 100%
rename from packages/@react-aria/table/intl/ru-RU.json
rename to packages/react-aria/intl/table/ru-RU.json
diff --git a/packages/@react-aria/table/intl/sk-SK.json b/packages/react-aria/intl/table/sk-SK.json
similarity index 100%
rename from packages/@react-aria/table/intl/sk-SK.json
rename to packages/react-aria/intl/table/sk-SK.json
diff --git a/packages/@react-aria/table/intl/sl-SI.json b/packages/react-aria/intl/table/sl-SI.json
similarity index 100%
rename from packages/@react-aria/table/intl/sl-SI.json
rename to packages/react-aria/intl/table/sl-SI.json
diff --git a/packages/@react-aria/table/intl/sr-SP.json b/packages/react-aria/intl/table/sr-SP.json
similarity index 100%
rename from packages/@react-aria/table/intl/sr-SP.json
rename to packages/react-aria/intl/table/sr-SP.json
diff --git a/packages/@react-aria/table/intl/sv-SE.json b/packages/react-aria/intl/table/sv-SE.json
similarity index 100%
rename from packages/@react-aria/table/intl/sv-SE.json
rename to packages/react-aria/intl/table/sv-SE.json
diff --git a/packages/@react-aria/table/intl/tr-TR.json b/packages/react-aria/intl/table/tr-TR.json
similarity index 100%
rename from packages/@react-aria/table/intl/tr-TR.json
rename to packages/react-aria/intl/table/tr-TR.json
diff --git a/packages/@react-aria/table/intl/uk-UA.json b/packages/react-aria/intl/table/uk-UA.json
similarity index 100%
rename from packages/@react-aria/table/intl/uk-UA.json
rename to packages/react-aria/intl/table/uk-UA.json
diff --git a/packages/@react-aria/table/intl/zh-CN.json b/packages/react-aria/intl/table/zh-CN.json
similarity index 100%
rename from packages/@react-aria/table/intl/zh-CN.json
rename to packages/react-aria/intl/table/zh-CN.json
diff --git a/packages/@react-aria/table/intl/zh-TW.json b/packages/react-aria/intl/table/zh-TW.json
similarity index 100%
rename from packages/@react-aria/table/intl/zh-TW.json
rename to packages/react-aria/intl/table/zh-TW.json
diff --git a/packages/@react-aria/tag/intl/ar-AE.json b/packages/react-aria/intl/tag/ar-AE.json
similarity index 100%
rename from packages/@react-aria/tag/intl/ar-AE.json
rename to packages/react-aria/intl/tag/ar-AE.json
diff --git a/packages/@react-aria/tag/intl/bg-BG.json b/packages/react-aria/intl/tag/bg-BG.json
similarity index 100%
rename from packages/@react-aria/tag/intl/bg-BG.json
rename to packages/react-aria/intl/tag/bg-BG.json
diff --git a/packages/@react-aria/tag/intl/cs-CZ.json b/packages/react-aria/intl/tag/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/tag/intl/cs-CZ.json
rename to packages/react-aria/intl/tag/cs-CZ.json
diff --git a/packages/@react-aria/tag/intl/da-DK.json b/packages/react-aria/intl/tag/da-DK.json
similarity index 100%
rename from packages/@react-aria/tag/intl/da-DK.json
rename to packages/react-aria/intl/tag/da-DK.json
diff --git a/packages/@react-aria/tag/intl/de-DE.json b/packages/react-aria/intl/tag/de-DE.json
similarity index 100%
rename from packages/@react-aria/tag/intl/de-DE.json
rename to packages/react-aria/intl/tag/de-DE.json
diff --git a/packages/@react-aria/tag/intl/el-GR.json b/packages/react-aria/intl/tag/el-GR.json
similarity index 100%
rename from packages/@react-aria/tag/intl/el-GR.json
rename to packages/react-aria/intl/tag/el-GR.json
diff --git a/packages/@react-aria/tag/intl/en-US.json b/packages/react-aria/intl/tag/en-US.json
similarity index 100%
rename from packages/@react-aria/tag/intl/en-US.json
rename to packages/react-aria/intl/tag/en-US.json
diff --git a/packages/@react-aria/tag/intl/es-ES.json b/packages/react-aria/intl/tag/es-ES.json
similarity index 100%
rename from packages/@react-aria/tag/intl/es-ES.json
rename to packages/react-aria/intl/tag/es-ES.json
diff --git a/packages/@react-aria/tag/intl/et-EE.json b/packages/react-aria/intl/tag/et-EE.json
similarity index 100%
rename from packages/@react-aria/tag/intl/et-EE.json
rename to packages/react-aria/intl/tag/et-EE.json
diff --git a/packages/@react-aria/tag/intl/fi-FI.json b/packages/react-aria/intl/tag/fi-FI.json
similarity index 100%
rename from packages/@react-aria/tag/intl/fi-FI.json
rename to packages/react-aria/intl/tag/fi-FI.json
diff --git a/packages/@react-aria/tag/intl/fr-FR.json b/packages/react-aria/intl/tag/fr-FR.json
similarity index 100%
rename from packages/@react-aria/tag/intl/fr-FR.json
rename to packages/react-aria/intl/tag/fr-FR.json
diff --git a/packages/@react-aria/tag/intl/he-IL.json b/packages/react-aria/intl/tag/he-IL.json
similarity index 100%
rename from packages/@react-aria/tag/intl/he-IL.json
rename to packages/react-aria/intl/tag/he-IL.json
diff --git a/packages/@react-aria/tag/intl/hr-HR.json b/packages/react-aria/intl/tag/hr-HR.json
similarity index 100%
rename from packages/@react-aria/tag/intl/hr-HR.json
rename to packages/react-aria/intl/tag/hr-HR.json
diff --git a/packages/@react-aria/tag/intl/hu-HU.json b/packages/react-aria/intl/tag/hu-HU.json
similarity index 100%
rename from packages/@react-aria/tag/intl/hu-HU.json
rename to packages/react-aria/intl/tag/hu-HU.json
diff --git a/packages/@react-aria/tag/intl/it-IT.json b/packages/react-aria/intl/tag/it-IT.json
similarity index 100%
rename from packages/@react-aria/tag/intl/it-IT.json
rename to packages/react-aria/intl/tag/it-IT.json
diff --git a/packages/@react-aria/tag/intl/ja-JP.json b/packages/react-aria/intl/tag/ja-JP.json
similarity index 100%
rename from packages/@react-aria/tag/intl/ja-JP.json
rename to packages/react-aria/intl/tag/ja-JP.json
diff --git a/packages/@react-aria/tag/intl/ko-KR.json b/packages/react-aria/intl/tag/ko-KR.json
similarity index 100%
rename from packages/@react-aria/tag/intl/ko-KR.json
rename to packages/react-aria/intl/tag/ko-KR.json
diff --git a/packages/@react-aria/tag/intl/lt-LT.json b/packages/react-aria/intl/tag/lt-LT.json
similarity index 100%
rename from packages/@react-aria/tag/intl/lt-LT.json
rename to packages/react-aria/intl/tag/lt-LT.json
diff --git a/packages/@react-aria/tag/intl/lv-LV.json b/packages/react-aria/intl/tag/lv-LV.json
similarity index 100%
rename from packages/@react-aria/tag/intl/lv-LV.json
rename to packages/react-aria/intl/tag/lv-LV.json
diff --git a/packages/@react-aria/tag/intl/nb-NO.json b/packages/react-aria/intl/tag/nb-NO.json
similarity index 100%
rename from packages/@react-aria/tag/intl/nb-NO.json
rename to packages/react-aria/intl/tag/nb-NO.json
diff --git a/packages/@react-aria/tag/intl/nl-NL.json b/packages/react-aria/intl/tag/nl-NL.json
similarity index 100%
rename from packages/@react-aria/tag/intl/nl-NL.json
rename to packages/react-aria/intl/tag/nl-NL.json
diff --git a/packages/@react-aria/tag/intl/pl-PL.json b/packages/react-aria/intl/tag/pl-PL.json
similarity index 100%
rename from packages/@react-aria/tag/intl/pl-PL.json
rename to packages/react-aria/intl/tag/pl-PL.json
diff --git a/packages/@react-aria/tag/intl/pt-BR.json b/packages/react-aria/intl/tag/pt-BR.json
similarity index 100%
rename from packages/@react-aria/tag/intl/pt-BR.json
rename to packages/react-aria/intl/tag/pt-BR.json
diff --git a/packages/@react-aria/tag/intl/pt-PT.json b/packages/react-aria/intl/tag/pt-PT.json
similarity index 100%
rename from packages/@react-aria/tag/intl/pt-PT.json
rename to packages/react-aria/intl/tag/pt-PT.json
diff --git a/packages/@react-aria/tag/intl/ro-RO.json b/packages/react-aria/intl/tag/ro-RO.json
similarity index 100%
rename from packages/@react-aria/tag/intl/ro-RO.json
rename to packages/react-aria/intl/tag/ro-RO.json
diff --git a/packages/@react-aria/tag/intl/ru-RU.json b/packages/react-aria/intl/tag/ru-RU.json
similarity index 100%
rename from packages/@react-aria/tag/intl/ru-RU.json
rename to packages/react-aria/intl/tag/ru-RU.json
diff --git a/packages/@react-aria/tag/intl/sk-SK.json b/packages/react-aria/intl/tag/sk-SK.json
similarity index 100%
rename from packages/@react-aria/tag/intl/sk-SK.json
rename to packages/react-aria/intl/tag/sk-SK.json
diff --git a/packages/@react-aria/tag/intl/sl-SI.json b/packages/react-aria/intl/tag/sl-SI.json
similarity index 100%
rename from packages/@react-aria/tag/intl/sl-SI.json
rename to packages/react-aria/intl/tag/sl-SI.json
diff --git a/packages/@react-aria/tag/intl/sr-SP.json b/packages/react-aria/intl/tag/sr-SP.json
similarity index 100%
rename from packages/@react-aria/tag/intl/sr-SP.json
rename to packages/react-aria/intl/tag/sr-SP.json
diff --git a/packages/@react-aria/tag/intl/sv-SE.json b/packages/react-aria/intl/tag/sv-SE.json
similarity index 100%
rename from packages/@react-aria/tag/intl/sv-SE.json
rename to packages/react-aria/intl/tag/sv-SE.json
diff --git a/packages/@react-aria/tag/intl/tr-TR.json b/packages/react-aria/intl/tag/tr-TR.json
similarity index 100%
rename from packages/@react-aria/tag/intl/tr-TR.json
rename to packages/react-aria/intl/tag/tr-TR.json
diff --git a/packages/@react-aria/tag/intl/uk-UA.json b/packages/react-aria/intl/tag/uk-UA.json
similarity index 100%
rename from packages/@react-aria/tag/intl/uk-UA.json
rename to packages/react-aria/intl/tag/uk-UA.json
diff --git a/packages/@react-aria/tag/intl/zh-CN.json b/packages/react-aria/intl/tag/zh-CN.json
similarity index 100%
rename from packages/@react-aria/tag/intl/zh-CN.json
rename to packages/react-aria/intl/tag/zh-CN.json
diff --git a/packages/@react-aria/tag/intl/zh-TW.json b/packages/react-aria/intl/tag/zh-TW.json
similarity index 100%
rename from packages/@react-aria/tag/intl/zh-TW.json
rename to packages/react-aria/intl/tag/zh-TW.json
diff --git a/packages/@react-aria/toast/intl/ar-AE.json b/packages/react-aria/intl/toast/ar-AE.json
similarity index 100%
rename from packages/@react-aria/toast/intl/ar-AE.json
rename to packages/react-aria/intl/toast/ar-AE.json
diff --git a/packages/@react-aria/toast/intl/bg-BG.json b/packages/react-aria/intl/toast/bg-BG.json
similarity index 100%
rename from packages/@react-aria/toast/intl/bg-BG.json
rename to packages/react-aria/intl/toast/bg-BG.json
diff --git a/packages/@react-aria/toast/intl/cs-CZ.json b/packages/react-aria/intl/toast/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/toast/intl/cs-CZ.json
rename to packages/react-aria/intl/toast/cs-CZ.json
diff --git a/packages/@react-aria/toast/intl/da-DK.json b/packages/react-aria/intl/toast/da-DK.json
similarity index 100%
rename from packages/@react-aria/toast/intl/da-DK.json
rename to packages/react-aria/intl/toast/da-DK.json
diff --git a/packages/@react-aria/toast/intl/de-DE.json b/packages/react-aria/intl/toast/de-DE.json
similarity index 100%
rename from packages/@react-aria/toast/intl/de-DE.json
rename to packages/react-aria/intl/toast/de-DE.json
diff --git a/packages/@react-aria/toast/intl/el-GR.json b/packages/react-aria/intl/toast/el-GR.json
similarity index 100%
rename from packages/@react-aria/toast/intl/el-GR.json
rename to packages/react-aria/intl/toast/el-GR.json
diff --git a/packages/@react-aria/toast/intl/en-US.json b/packages/react-aria/intl/toast/en-US.json
similarity index 100%
rename from packages/@react-aria/toast/intl/en-US.json
rename to packages/react-aria/intl/toast/en-US.json
diff --git a/packages/@react-aria/toast/intl/es-ES.json b/packages/react-aria/intl/toast/es-ES.json
similarity index 100%
rename from packages/@react-aria/toast/intl/es-ES.json
rename to packages/react-aria/intl/toast/es-ES.json
diff --git a/packages/@react-aria/toast/intl/et-EE.json b/packages/react-aria/intl/toast/et-EE.json
similarity index 100%
rename from packages/@react-aria/toast/intl/et-EE.json
rename to packages/react-aria/intl/toast/et-EE.json
diff --git a/packages/@react-aria/toast/intl/fi-FI.json b/packages/react-aria/intl/toast/fi-FI.json
similarity index 100%
rename from packages/@react-aria/toast/intl/fi-FI.json
rename to packages/react-aria/intl/toast/fi-FI.json
diff --git a/packages/@react-aria/toast/intl/fr-FR.json b/packages/react-aria/intl/toast/fr-FR.json
similarity index 100%
rename from packages/@react-aria/toast/intl/fr-FR.json
rename to packages/react-aria/intl/toast/fr-FR.json
diff --git a/packages/@react-aria/toast/intl/he-IL.json b/packages/react-aria/intl/toast/he-IL.json
similarity index 100%
rename from packages/@react-aria/toast/intl/he-IL.json
rename to packages/react-aria/intl/toast/he-IL.json
diff --git a/packages/@react-aria/toast/intl/hr-HR.json b/packages/react-aria/intl/toast/hr-HR.json
similarity index 100%
rename from packages/@react-aria/toast/intl/hr-HR.json
rename to packages/react-aria/intl/toast/hr-HR.json
diff --git a/packages/@react-aria/toast/intl/hu-HU.json b/packages/react-aria/intl/toast/hu-HU.json
similarity index 100%
rename from packages/@react-aria/toast/intl/hu-HU.json
rename to packages/react-aria/intl/toast/hu-HU.json
diff --git a/packages/@react-aria/toast/intl/it-IT.json b/packages/react-aria/intl/toast/it-IT.json
similarity index 100%
rename from packages/@react-aria/toast/intl/it-IT.json
rename to packages/react-aria/intl/toast/it-IT.json
diff --git a/packages/@react-aria/toast/intl/ja-JP.json b/packages/react-aria/intl/toast/ja-JP.json
similarity index 100%
rename from packages/@react-aria/toast/intl/ja-JP.json
rename to packages/react-aria/intl/toast/ja-JP.json
diff --git a/packages/@react-aria/toast/intl/ko-KR.json b/packages/react-aria/intl/toast/ko-KR.json
similarity index 100%
rename from packages/@react-aria/toast/intl/ko-KR.json
rename to packages/react-aria/intl/toast/ko-KR.json
diff --git a/packages/@react-aria/toast/intl/lt-LT.json b/packages/react-aria/intl/toast/lt-LT.json
similarity index 100%
rename from packages/@react-aria/toast/intl/lt-LT.json
rename to packages/react-aria/intl/toast/lt-LT.json
diff --git a/packages/@react-aria/toast/intl/lv-LV.json b/packages/react-aria/intl/toast/lv-LV.json
similarity index 100%
rename from packages/@react-aria/toast/intl/lv-LV.json
rename to packages/react-aria/intl/toast/lv-LV.json
diff --git a/packages/@react-aria/toast/intl/nb-NO.json b/packages/react-aria/intl/toast/nb-NO.json
similarity index 100%
rename from packages/@react-aria/toast/intl/nb-NO.json
rename to packages/react-aria/intl/toast/nb-NO.json
diff --git a/packages/@react-aria/toast/intl/nl-NL.json b/packages/react-aria/intl/toast/nl-NL.json
similarity index 100%
rename from packages/@react-aria/toast/intl/nl-NL.json
rename to packages/react-aria/intl/toast/nl-NL.json
diff --git a/packages/@react-aria/toast/intl/pl-PL.json b/packages/react-aria/intl/toast/pl-PL.json
similarity index 100%
rename from packages/@react-aria/toast/intl/pl-PL.json
rename to packages/react-aria/intl/toast/pl-PL.json
diff --git a/packages/@react-aria/toast/intl/pt-BR.json b/packages/react-aria/intl/toast/pt-BR.json
similarity index 100%
rename from packages/@react-aria/toast/intl/pt-BR.json
rename to packages/react-aria/intl/toast/pt-BR.json
diff --git a/packages/@react-aria/toast/intl/pt-PT.json b/packages/react-aria/intl/toast/pt-PT.json
similarity index 100%
rename from packages/@react-aria/toast/intl/pt-PT.json
rename to packages/react-aria/intl/toast/pt-PT.json
diff --git a/packages/@react-aria/toast/intl/ro-RO.json b/packages/react-aria/intl/toast/ro-RO.json
similarity index 100%
rename from packages/@react-aria/toast/intl/ro-RO.json
rename to packages/react-aria/intl/toast/ro-RO.json
diff --git a/packages/@react-aria/toast/intl/ru-RU.json b/packages/react-aria/intl/toast/ru-RU.json
similarity index 100%
rename from packages/@react-aria/toast/intl/ru-RU.json
rename to packages/react-aria/intl/toast/ru-RU.json
diff --git a/packages/@react-aria/toast/intl/sk-SK.json b/packages/react-aria/intl/toast/sk-SK.json
similarity index 100%
rename from packages/@react-aria/toast/intl/sk-SK.json
rename to packages/react-aria/intl/toast/sk-SK.json
diff --git a/packages/@react-aria/toast/intl/sl-SI.json b/packages/react-aria/intl/toast/sl-SI.json
similarity index 100%
rename from packages/@react-aria/toast/intl/sl-SI.json
rename to packages/react-aria/intl/toast/sl-SI.json
diff --git a/packages/@react-aria/toast/intl/sr-SP.json b/packages/react-aria/intl/toast/sr-SP.json
similarity index 100%
rename from packages/@react-aria/toast/intl/sr-SP.json
rename to packages/react-aria/intl/toast/sr-SP.json
diff --git a/packages/@react-aria/toast/intl/sv-SE.json b/packages/react-aria/intl/toast/sv-SE.json
similarity index 100%
rename from packages/@react-aria/toast/intl/sv-SE.json
rename to packages/react-aria/intl/toast/sv-SE.json
diff --git a/packages/@react-aria/toast/intl/tr-TR.json b/packages/react-aria/intl/toast/tr-TR.json
similarity index 100%
rename from packages/@react-aria/toast/intl/tr-TR.json
rename to packages/react-aria/intl/toast/tr-TR.json
diff --git a/packages/@react-aria/toast/intl/uk-UA.json b/packages/react-aria/intl/toast/uk-UA.json
similarity index 100%
rename from packages/@react-aria/toast/intl/uk-UA.json
rename to packages/react-aria/intl/toast/uk-UA.json
diff --git a/packages/@react-aria/toast/intl/zh-CN.json b/packages/react-aria/intl/toast/zh-CN.json
similarity index 100%
rename from packages/@react-aria/toast/intl/zh-CN.json
rename to packages/react-aria/intl/toast/zh-CN.json
diff --git a/packages/@react-aria/toast/intl/zh-TW.json b/packages/react-aria/intl/toast/zh-TW.json
similarity index 100%
rename from packages/@react-aria/toast/intl/zh-TW.json
rename to packages/react-aria/intl/toast/zh-TW.json
diff --git a/packages/@react-aria/tree/intl/ar-AE.json b/packages/react-aria/intl/tree/ar-AE.json
similarity index 100%
rename from packages/@react-aria/tree/intl/ar-AE.json
rename to packages/react-aria/intl/tree/ar-AE.json
diff --git a/packages/@react-aria/tree/intl/bg-BG.json b/packages/react-aria/intl/tree/bg-BG.json
similarity index 100%
rename from packages/@react-aria/tree/intl/bg-BG.json
rename to packages/react-aria/intl/tree/bg-BG.json
diff --git a/packages/@react-aria/tree/intl/cs-CZ.json b/packages/react-aria/intl/tree/cs-CZ.json
similarity index 100%
rename from packages/@react-aria/tree/intl/cs-CZ.json
rename to packages/react-aria/intl/tree/cs-CZ.json
diff --git a/packages/@react-aria/tree/intl/da-DK.json b/packages/react-aria/intl/tree/da-DK.json
similarity index 100%
rename from packages/@react-aria/tree/intl/da-DK.json
rename to packages/react-aria/intl/tree/da-DK.json
diff --git a/packages/@react-aria/tree/intl/de-DE.json b/packages/react-aria/intl/tree/de-DE.json
similarity index 100%
rename from packages/@react-aria/tree/intl/de-DE.json
rename to packages/react-aria/intl/tree/de-DE.json
diff --git a/packages/@react-aria/tree/intl/el-GR.json b/packages/react-aria/intl/tree/el-GR.json
similarity index 100%
rename from packages/@react-aria/tree/intl/el-GR.json
rename to packages/react-aria/intl/tree/el-GR.json
diff --git a/packages/@react-aria/tree/intl/en-US.json b/packages/react-aria/intl/tree/en-US.json
similarity index 100%
rename from packages/@react-aria/tree/intl/en-US.json
rename to packages/react-aria/intl/tree/en-US.json
diff --git a/packages/@react-aria/tree/intl/es-ES.json b/packages/react-aria/intl/tree/es-ES.json
similarity index 100%
rename from packages/@react-aria/tree/intl/es-ES.json
rename to packages/react-aria/intl/tree/es-ES.json
diff --git a/packages/@react-aria/tree/intl/et-EE.json b/packages/react-aria/intl/tree/et-EE.json
similarity index 100%
rename from packages/@react-aria/tree/intl/et-EE.json
rename to packages/react-aria/intl/tree/et-EE.json
diff --git a/packages/@react-aria/tree/intl/fi-FI.json b/packages/react-aria/intl/tree/fi-FI.json
similarity index 100%
rename from packages/@react-aria/tree/intl/fi-FI.json
rename to packages/react-aria/intl/tree/fi-FI.json
diff --git a/packages/@react-aria/tree/intl/fr-FR.json b/packages/react-aria/intl/tree/fr-FR.json
similarity index 100%
rename from packages/@react-aria/tree/intl/fr-FR.json
rename to packages/react-aria/intl/tree/fr-FR.json
diff --git a/packages/@react-aria/tree/intl/he-IL.json b/packages/react-aria/intl/tree/he-IL.json
similarity index 100%
rename from packages/@react-aria/tree/intl/he-IL.json
rename to packages/react-aria/intl/tree/he-IL.json
diff --git a/packages/@react-aria/tree/intl/hr-HR.json b/packages/react-aria/intl/tree/hr-HR.json
similarity index 100%
rename from packages/@react-aria/tree/intl/hr-HR.json
rename to packages/react-aria/intl/tree/hr-HR.json
diff --git a/packages/@react-aria/tree/intl/hu-HU.json b/packages/react-aria/intl/tree/hu-HU.json
similarity index 100%
rename from packages/@react-aria/tree/intl/hu-HU.json
rename to packages/react-aria/intl/tree/hu-HU.json
diff --git a/packages/@react-aria/tree/intl/it-IT.json b/packages/react-aria/intl/tree/it-IT.json
similarity index 100%
rename from packages/@react-aria/tree/intl/it-IT.json
rename to packages/react-aria/intl/tree/it-IT.json
diff --git a/packages/@react-aria/tree/intl/ja-JP.json b/packages/react-aria/intl/tree/ja-JP.json
similarity index 100%
rename from packages/@react-aria/tree/intl/ja-JP.json
rename to packages/react-aria/intl/tree/ja-JP.json
diff --git a/packages/@react-aria/tree/intl/ko-KR.json b/packages/react-aria/intl/tree/ko-KR.json
similarity index 100%
rename from packages/@react-aria/tree/intl/ko-KR.json
rename to packages/react-aria/intl/tree/ko-KR.json
diff --git a/packages/@react-aria/tree/intl/lt-LT.json b/packages/react-aria/intl/tree/lt-LT.json
similarity index 100%
rename from packages/@react-aria/tree/intl/lt-LT.json
rename to packages/react-aria/intl/tree/lt-LT.json
diff --git a/packages/@react-aria/tree/intl/lv-LV.json b/packages/react-aria/intl/tree/lv-LV.json
similarity index 100%
rename from packages/@react-aria/tree/intl/lv-LV.json
rename to packages/react-aria/intl/tree/lv-LV.json
diff --git a/packages/@react-aria/tree/intl/nb-NO.json b/packages/react-aria/intl/tree/nb-NO.json
similarity index 100%
rename from packages/@react-aria/tree/intl/nb-NO.json
rename to packages/react-aria/intl/tree/nb-NO.json
diff --git a/packages/@react-aria/tree/intl/nl-NL.json b/packages/react-aria/intl/tree/nl-NL.json
similarity index 100%
rename from packages/@react-aria/tree/intl/nl-NL.json
rename to packages/react-aria/intl/tree/nl-NL.json
diff --git a/packages/@react-aria/tree/intl/pl-PL.json b/packages/react-aria/intl/tree/pl-PL.json
similarity index 100%
rename from packages/@react-aria/tree/intl/pl-PL.json
rename to packages/react-aria/intl/tree/pl-PL.json
diff --git a/packages/@react-aria/tree/intl/pt-BR.json b/packages/react-aria/intl/tree/pt-BR.json
similarity index 100%
rename from packages/@react-aria/tree/intl/pt-BR.json
rename to packages/react-aria/intl/tree/pt-BR.json
diff --git a/packages/@react-aria/tree/intl/pt-PT.json b/packages/react-aria/intl/tree/pt-PT.json
similarity index 100%
rename from packages/@react-aria/tree/intl/pt-PT.json
rename to packages/react-aria/intl/tree/pt-PT.json
diff --git a/packages/@react-aria/tree/intl/ro-RO.json b/packages/react-aria/intl/tree/ro-RO.json
similarity index 100%
rename from packages/@react-aria/tree/intl/ro-RO.json
rename to packages/react-aria/intl/tree/ro-RO.json
diff --git a/packages/@react-aria/tree/intl/ru-RU.json b/packages/react-aria/intl/tree/ru-RU.json
similarity index 100%
rename from packages/@react-aria/tree/intl/ru-RU.json
rename to packages/react-aria/intl/tree/ru-RU.json
diff --git a/packages/@react-aria/tree/intl/sk-SK.json b/packages/react-aria/intl/tree/sk-SK.json
similarity index 100%
rename from packages/@react-aria/tree/intl/sk-SK.json
rename to packages/react-aria/intl/tree/sk-SK.json
diff --git a/packages/@react-aria/tree/intl/sl-SI.json b/packages/react-aria/intl/tree/sl-SI.json
similarity index 100%
rename from packages/@react-aria/tree/intl/sl-SI.json
rename to packages/react-aria/intl/tree/sl-SI.json
diff --git a/packages/@react-aria/tree/intl/sr-SP.json b/packages/react-aria/intl/tree/sr-SP.json
similarity index 100%
rename from packages/@react-aria/tree/intl/sr-SP.json
rename to packages/react-aria/intl/tree/sr-SP.json
diff --git a/packages/@react-aria/tree/intl/sv-SE.json b/packages/react-aria/intl/tree/sv-SE.json
similarity index 100%
rename from packages/@react-aria/tree/intl/sv-SE.json
rename to packages/react-aria/intl/tree/sv-SE.json
diff --git a/packages/@react-aria/tree/intl/tr-TR.json b/packages/react-aria/intl/tree/tr-TR.json
similarity index 100%
rename from packages/@react-aria/tree/intl/tr-TR.json
rename to packages/react-aria/intl/tree/tr-TR.json
diff --git a/packages/@react-aria/tree/intl/uk-UA.json b/packages/react-aria/intl/tree/uk-UA.json
similarity index 100%
rename from packages/@react-aria/tree/intl/uk-UA.json
rename to packages/react-aria/intl/tree/uk-UA.json
diff --git a/packages/@react-aria/tree/intl/zh-CN.json b/packages/react-aria/intl/tree/zh-CN.json
similarity index 100%
rename from packages/@react-aria/tree/intl/zh-CN.json
rename to packages/react-aria/intl/tree/zh-CN.json
diff --git a/packages/@react-aria/tree/intl/zh-TW.json b/packages/react-aria/intl/tree/zh-TW.json
similarity index 100%
rename from packages/@react-aria/tree/intl/zh-TW.json
rename to packages/react-aria/intl/tree/zh-TW.json
diff --git a/packages/react-aria/package.json b/packages/react-aria/package.json
index 2048a2c9398..408a015bdcb 100644
--- a/packages/react-aria/package.json
+++ b/packages/react-aria/package.json
@@ -7,13 +7,10 @@
   "module": "dist/module.js",
   "exports": {
     ".": {
-      "source": "./src/index.ts",
-      "types": [
-        "./dist/types.d.ts",
-        "./src/index.ts"
-      ],
-      "import": "./dist/import.mjs",
-      "require": "./dist/main.js"
+      "source": "./exports/index.ts",
+      "types": "./dist/types/exports/index.d.ts",
+      "import": "./dist/exports/index.mjs",
+      "require": "./dist/exports/index.cjs"
     },
     "./i18n": {
       "types": "./i18n/index.d.ts",
@@ -24,10 +21,17 @@
       "types": "./i18n/lang.d.ts",
       "import": "./i18n/*.mjs",
       "require": "./i18n/*.js"
+    },
+    "./package.json": "./package.json",
+    "./*": {
+      "source": "./exports/*.ts",
+      "types": "./dist/types/exports/*.d.ts",
+      "import": "./dist/exports/*.mjs",
+      "require": "./dist/exports/*.cjs"
     }
   },
   "types": "dist/types.d.ts",
-  "source": "src/index.ts",
+  "source": "exports/index.ts",
   "files": [
     "dist",
     "i18n"
@@ -42,47 +46,43 @@
   },
   "dependencies": {
     "@internationalized/string": "^3.2.7",
-    "@react-aria/breadcrumbs": "^3.5.32",
-    "@react-aria/button": "^3.14.5",
-    "@react-aria/calendar": "^3.9.5",
-    "@react-aria/checkbox": "^3.16.5",
-    "@react-aria/color": "^3.1.5",
-    "@react-aria/combobox": "^3.15.0",
-    "@react-aria/datepicker": "^3.16.1",
-    "@react-aria/dialog": "^3.5.34",
-    "@react-aria/disclosure": "^3.1.3",
-    "@react-aria/dnd": "^3.11.6",
-    "@react-aria/focus": "^3.21.5",
-    "@react-aria/gridlist": "^3.14.4",
-    "@react-aria/i18n": "^3.12.16",
-    "@react-aria/interactions": "^3.27.1",
-    "@react-aria/label": "^3.7.25",
-    "@react-aria/landmark": "^3.0.10",
-    "@react-aria/link": "^3.8.9",
-    "@react-aria/listbox": "^3.15.3",
-    "@react-aria/menu": "^3.21.0",
-    "@react-aria/meter": "^3.4.30",
-    "@react-aria/numberfield": "^3.12.5",
-    "@react-aria/overlays": "^3.31.2",
-    "@react-aria/progress": "^3.4.30",
-    "@react-aria/radio": "^3.12.5",
-    "@react-aria/searchfield": "^3.8.12",
-    "@react-aria/select": "^3.17.3",
-    "@react-aria/selection": "^3.27.2",
-    "@react-aria/separator": "^3.4.16",
-    "@react-aria/slider": "^3.8.5",
-    "@react-aria/ssr": "^3.9.10",
-    "@react-aria/switch": "^3.7.11",
-    "@react-aria/table": "^3.17.11",
-    "@react-aria/tabs": "^3.11.1",
-    "@react-aria/tag": "^3.8.1",
-    "@react-aria/textfield": "^3.18.5",
-    "@react-aria/toast": "^3.0.11",
-    "@react-aria/tooltip": "^3.9.2",
-    "@react-aria/tree": "^3.1.7",
-    "@react-aria/utils": "^3.33.1",
-    "@react-aria/visually-hidden": "^3.8.31",
-    "@react-types/shared": "^3.33.1"
+    "@react-types/shared": "^3.33.1",
+    "react-aria": "3.47.0",
+    "react-stately": "3.45.0",
+    "@react-types/actiongroup": "^3.4.23",
+    "@swc/helpers": "^0.5.0",
+    "aria-hidden": "^1.2.3",
+    "@react-types/autocomplete": "3.0.0-alpha.38",
+    "@react-types/button": "^3.15.1",
+    "@react-types/breadcrumbs": "^3.7.19",
+    "@internationalized/date": "^3.12.0",
+    "@react-types/calendar": "^3.8.3",
+    "@react-types/checkbox": "^3.10.4",
+    "use-sync-external-store": "^1.6.0",
+    "@react-types/color": "^3.1.4",
+    "@react-types/combobox": "^3.14.0",
+    "@internationalized/number": "^3.6.5",
+    "@react-types/datepicker": "^3.13.5",
+    "@react-types/dialog": "^3.5.24",
+    "clsx": "^2.0.0",
+    "@react-types/grid": "^3.3.8",
+    "@internationalized/message": "^3.1.8",
+    "@react-types/link": "^3.6.7",
+    "@react-types/listbox": "^3.7.6",
+    "@react-types/menu": "^3.10.7",
+    "@react-types/meter": "^3.4.15",
+    "@react-types/numberfield": "^3.8.18",
+    "@react-types/overlays": "^3.9.4",
+    "@react-types/progress": "^3.5.18",
+    "@react-types/radio": "^3.9.4",
+    "@react-types/searchfield": "^3.6.8",
+    "@react-types/select": "^3.12.2",
+    "@react-types/slider": "^3.8.4",
+    "@react-types/switch": "^3.5.17",
+    "@react-types/table": "^3.13.6",
+    "@react-types/tabs": "^3.3.22",
+    "@react-types/textfield": "^3.12.8",
+    "@react-types/tooltip": "^3.5.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
@@ -94,5 +94,28 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "main": false,
+    "module": false,
+    "types": false,
+    "exports-module": {
+      "source": [
+        "exports/**/*.ts"
+      ],
+      "distDir": "dist",
+      "isLibrary": true,
+      "outputFormat": "esmodule",
+      "includeNodeModules": false
+    },
+    "exports-main": {
+      "source": [
+        "exports/**/*.ts"
+      ],
+      "distDir": "dist",
+      "isLibrary": true,
+      "outputFormat": "commonjs",
+      "includeNodeModules": false
+    }
   }
 }
diff --git a/packages/@react-aria/actiongroup/src/useActionGroup.ts b/packages/react-aria/src/actiongroup/useActionGroup.ts
similarity index 89%
rename from packages/@react-aria/actiongroup/src/useActionGroup.ts
rename to packages/react-aria/src/actiongroup/useActionGroup.ts
index e06a3123776..7b7224d0e9e 100644
--- a/packages/@react-aria/actiongroup/src/useActionGroup.ts
+++ b/packages/react-aria/src/actiongroup/useActionGroup.ts
@@ -11,12 +11,14 @@
  */
 
 import {AriaActionGroupProps} from '@react-types/actiongroup';
-import {createFocusManager} from '@react-aria/focus';
+import {createFocusManager} from '../focus/FocusScope';
 import {DOMAttributes, FocusableElement, Orientation, RefObject} from '@react-types/shared';
-import {filterDOMProps, getEventTarget, nodeContains, useLayoutEffect} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
 import {KeyboardEventHandler, useState} from 'react';
-import {ListState} from '@react-stately/list';
-import {useLocale} from '@react-aria/i18n';
+import {ListState} from 'react-stately/useListState';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
+import {useLocale} from '../i18n/I18nProvider';
 
 const BUTTON_GROUP_ROLES = {
   'none': 'toolbar',
diff --git a/packages/@react-aria/actiongroup/src/useActionGroupItem.ts b/packages/react-aria/src/actiongroup/useActionGroupItem.ts
similarity index 91%
rename from packages/@react-aria/actiongroup/src/useActionGroupItem.ts
rename to packages/react-aria/src/actiongroup/useActionGroupItem.ts
index 5cb90c01764..12490a8ab17 100644
--- a/packages/@react-aria/actiongroup/src/useActionGroupItem.ts
+++ b/packages/react-aria/src/actiongroup/useActionGroupItem.ts
@@ -11,10 +11,11 @@
  */
 
 import {DOMAttributes, FocusableElement, Key, RefObject} from '@react-types/shared';
-import {ListState} from '@react-stately/list';
-import {mergeProps, useEffectEvent} from '@react-aria/utils';
-import {PressProps} from '@react-aria/interactions';
+import {ListState} from 'react-stately/useListState';
+import {mergeProps} from '../utils/mergeProps';
+import {PressProps} from '../interactions/usePress';
 import {useEffect} from 'react';
+import {useEffectEvent} from '../utils/useEffectEvent';
 
 export interface AriaActionGroupItemProps {
   key: Key
diff --git a/packages/@react-aria/aria-modal-polyfill/src/ariaModalPolyfill.ts b/packages/react-aria/src/aria-modal-polyfill/ariaModalPolyfill.ts
similarity index 100%
rename from packages/@react-aria/aria-modal-polyfill/src/ariaModalPolyfill.ts
rename to packages/react-aria/src/aria-modal-polyfill/ariaModalPolyfill.ts
diff --git a/packages/@react-aria/autocomplete/src/useAutocomplete.ts b/packages/react-aria/src/autocomplete/useAutocomplete.ts
similarity index 93%
rename from packages/@react-aria/autocomplete/src/useAutocomplete.ts
rename to packages/react-aria/src/autocomplete/useAutocomplete.ts
index 9ff0d4fd2b0..32571bcccca 100644
--- a/packages/@react-aria/autocomplete/src/useAutocomplete.ts
+++ b/packages/react-aria/src/autocomplete/useAutocomplete.ts
@@ -11,15 +11,34 @@
  */
 
 import {AriaLabelingProps, BaseEvent, DOMProps, FocusableElement, FocusEvents, KeyboardEvents, Node, RefObject, ValueBase} from '@react-types/shared';
-import {AriaTextFieldProps} from '@react-aria/textfield';
-import {AutocompleteProps, AutocompleteState} from '@react-stately/autocomplete';
-import {CLEAR_FOCUS_EVENT, FOCUS_EVENT, getActiveElement, getEventTarget, getOwnerDocument, isAndroid, isCtrlKeyPressed, isIOS, mergeProps, mergeRefs, useEffectEvent, useEvent, useId, useLabels, useLayoutEffect, useObjectRef} from '@react-aria/utils';
-import {dispatchVirtualBlur, dispatchVirtualFocus, getVirtuallyFocusedElement, moveVirtualFocus} from '@react-aria/focus';
-import {getInteractionModality, getPointerType} from '@react-aria/interactions';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
+import {AriaTextFieldProps} from '@react-types/textfield';
+import {AutocompleteProps, AutocompleteState} from 'react-stately/private/autocomplete/useAutocompleteState';
+import {CLEAR_FOCUS_EVENT, FOCUS_EVENT} from '../utils/constants';
+import {
+  dispatchVirtualBlur,
+  dispatchVirtualFocus,
+  getVirtuallyFocusedElement,
+  moveVirtualFocus
+} from '../focus/virtualFocus';
+import {getActiveElement, getEventTarget} from '../utils/shadowdom/DOMFunctions';
+import {getInteractionModality, getPointerType} from '../interactions/useFocusVisible';
+import {getOwnerDocument} from '../utils/domHelpers';
+import intlMessages from '../../intl/autocomplete/*.json';
+import {isAndroid, isIOS} from '../utils/platform';
+import {isCtrlKeyPressed} from '../utils/keyboard';
+import {mergeProps} from '../utils/mergeProps';
+import {mergeRefs} from '../utils/mergeRefs';
 import {FocusEvent as ReactFocusEvent, KeyboardEvent as ReactKeyboardEvent, useCallback, useEffect, useMemo, useRef, useState} from 'react';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useEffectEvent} from '../utils/useEffectEvent';
+import {useEvent} from '../utils/useEvent';
+
+import {useId} from '../utils/useId';
+
+import {useLabels} from '../utils/useLabels';
+// @ts-ignore
+import {useLayoutEffect} from '../utils/useLayoutEffect';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
+import {useObjectRef} from '../utils/useObjectRef';
 
 export interface CollectionOptions extends DOMProps, AriaLabelingProps {
   /** Whether the collection items should use virtual focus instead of being focused directly. */
diff --git a/packages/@react-aria/autocomplete/src/useSearchAutocomplete.ts b/packages/react-aria/src/autocomplete/useSearchAutocomplete.ts
similarity index 93%
rename from packages/@react-aria/autocomplete/src/useSearchAutocomplete.ts
rename to packages/react-aria/src/autocomplete/useSearchAutocomplete.ts
index 2c51aaf0a0a..28f9b49555a 100644
--- a/packages/@react-aria/autocomplete/src/useSearchAutocomplete.ts
+++ b/packages/react-aria/src/autocomplete/useSearchAutocomplete.ts
@@ -11,14 +11,14 @@
  */
 
 import {AriaButtonProps} from '@react-types/button';
-import {AriaListBoxOptions} from '@react-aria/listbox';
+import {AriaListBoxOptions} from '../listbox/useListBox';
 import {AriaSearchAutocompleteProps} from '@react-types/autocomplete';
-import {ComboBoxState} from '@react-stately/combobox';
+import {ComboBoxState} from 'react-stately/useComboBoxState';
 import {DOMAttributes, KeyboardDelegate, LayoutDelegate, RefObject, ValidationResult} from '@react-types/shared';
 import {InputHTMLAttributes} from 'react';
-import {mergeProps} from '@react-aria/utils';
-import {useComboBox} from '@react-aria/combobox';
-import {useSearchField} from '@react-aria/searchfield';
+import {mergeProps} from '../utils/mergeProps';
+import {useComboBox} from '../combobox/useComboBox';
+import {useSearchField} from '../searchfield/useSearchField';
 
 export interface SearchAutocompleteAria<T> extends ValidationResult {
   /** Props for the label element. */
diff --git a/packages/@react-aria/breadcrumbs/src/useBreadcrumbItem.ts b/packages/react-aria/src/breadcrumbs/useBreadcrumbItem.ts
similarity index 97%
rename from packages/@react-aria/breadcrumbs/src/useBreadcrumbItem.ts
rename to packages/react-aria/src/breadcrumbs/useBreadcrumbItem.ts
index fc791dd1dd3..a5c06bcc7da 100644
--- a/packages/@react-aria/breadcrumbs/src/useBreadcrumbItem.ts
+++ b/packages/react-aria/src/breadcrumbs/useBreadcrumbItem.ts
@@ -12,7 +12,7 @@
 
 import {AriaBreadcrumbItemProps} from '@react-types/breadcrumbs';
 import {DOMAttributes, FocusableElement, RefObject} from '@react-types/shared';
-import {useLink} from '@react-aria/link';
+import {useLink} from '../link/useLink';
 
 export interface BreadcrumbItemAria {
   /** Props for the breadcrumb item link element. */
diff --git a/packages/@react-aria/breadcrumbs/src/useBreadcrumbs.ts b/packages/react-aria/src/breadcrumbs/useBreadcrumbs.ts
similarity index 88%
rename from packages/@react-aria/breadcrumbs/src/useBreadcrumbs.ts
rename to packages/react-aria/src/breadcrumbs/useBreadcrumbs.ts
index dfc4d5dbdfd..e9bf79aa74a 100644
--- a/packages/@react-aria/breadcrumbs/src/useBreadcrumbs.ts
+++ b/packages/react-aria/src/breadcrumbs/useBreadcrumbs.ts
@@ -12,10 +12,10 @@
 
 import {AriaBreadcrumbsProps} from '@react-types/breadcrumbs';
 import {DOMAttributes} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import intlMessages from '../../intl/breadcrumbs/*.json';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 
 export interface BreadcrumbsAria {
   /** Props for the breadcrumbs navigation element. */
diff --git a/packages/@react-aria/button/src/useButton.ts b/packages/react-aria/src/button/useButton.ts
similarity index 95%
rename from packages/@react-aria/button/src/useButton.ts
rename to packages/react-aria/src/button/useButton.ts
index 163b00c05e6..f8132790eab 100644
--- a/packages/@react-aria/button/src/useButton.ts
+++ b/packages/react-aria/src/button/useButton.ts
@@ -20,8 +20,10 @@ import {
 } from 'react';
 import {AriaButtonProps} from '@react-types/button';
 import {DOMAttributes} from '@react-types/shared';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
-import {useFocusable, usePress} from '@react-aria/interactions';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import {mergeProps} from '../utils/mergeProps';
+import {useFocusable} from '../interactions/useFocusable';
+import {usePress} from '../interactions/usePress';
 
 export interface AriaButtonOptions<E extends ElementType> extends Omit<AriaButtonProps<E>, 'children'> {}
 
diff --git a/packages/@react-aria/button/src/useToggleButton.ts b/packages/react-aria/src/button/useToggleButton.ts
similarity index 95%
rename from packages/@react-aria/button/src/useToggleButton.ts
rename to packages/react-aria/src/button/useToggleButton.ts
index 9ec8d712194..0e71e93a7e6 100644
--- a/packages/@react-aria/button/src/useToggleButton.ts
+++ b/packages/react-aria/src/button/useToggleButton.ts
@@ -20,9 +20,10 @@ import {
 } from 'react';
 import {AriaToggleButtonProps} from '@react-types/button';
 import {ButtonAria, useButton} from './useButton';
-import {chain, mergeProps} from '@react-aria/utils';
+import {chain} from '../utils/chain';
 import {DOMAttributes} from '@react-types/shared';
-import {ToggleState} from '@react-stately/toggle';
+import {mergeProps} from '../utils/mergeProps';
+import {ToggleState} from 'react-stately/useToggleState';
 
 export interface AriaToggleButtonOptions<E extends ElementType> extends Omit<AriaToggleButtonProps<E>, 'children'> {}
 
diff --git a/packages/@react-aria/button/src/useToggleButtonGroup.ts b/packages/react-aria/src/button/useToggleButtonGroup.ts
similarity index 95%
rename from packages/@react-aria/button/src/useToggleButtonGroup.ts
rename to packages/react-aria/src/button/useToggleButtonGroup.ts
index 3115b1ade3f..a1c56759f51 100644
--- a/packages/@react-aria/button/src/useToggleButtonGroup.ts
+++ b/packages/react-aria/src/button/useToggleButtonGroup.ts
@@ -20,8 +20,9 @@ import {
 import {AriaLabelingProps, DOMAttributes, Orientation, RefObject} from '@react-types/shared';
 import {AriaToggleButtonGroupItemProps} from '@react-types/button';
 import {ToggleButtonAria, useToggleButton} from './useToggleButton';
-import {ToggleGroupProps, ToggleGroupState, ToggleState} from '@react-stately/toggle';
-import {useToolbar} from '@react-aria/toolbar';
+import {ToggleGroupProps, ToggleGroupState} from 'react-stately/useToggleGroupState';
+import {ToggleState} from 'react-stately/useToggleState';
+import {useToolbar} from '../toolbar/useToolbar';
 
 export interface AriaToggleButtonGroupProps extends ToggleGroupProps, AriaLabelingProps {
   /**
diff --git a/packages/@react-aria/calendar/src/useCalendar.ts b/packages/react-aria/src/calendar/useCalendar.ts
similarity index 94%
rename from packages/@react-aria/calendar/src/useCalendar.ts
rename to packages/react-aria/src/calendar/useCalendar.ts
index 40ac2395117..4d4b84901ca 100644
--- a/packages/@react-aria/calendar/src/useCalendar.ts
+++ b/packages/react-aria/src/calendar/useCalendar.ts
@@ -12,7 +12,7 @@
 
 import {AriaCalendarProps, DateValue} from '@react-types/calendar';
 import {CalendarAria, useCalendarBase} from './useCalendarBase';
-import {CalendarState} from '@react-stately/calendar';
+import {CalendarState} from 'react-stately/private/calendar/types';
 
 /**
  * Provides the behavior and accessibility implementation for a calendar component.
diff --git a/packages/@react-aria/calendar/src/useCalendarBase.ts b/packages/react-aria/src/calendar/useCalendarBase.ts
similarity index 89%
rename from packages/@react-aria/calendar/src/useCalendarBase.ts
rename to packages/react-aria/src/calendar/useCalendarBase.ts
index 7792a307c1c..87aa05f236e 100644
--- a/packages/@react-aria/calendar/src/useCalendarBase.ts
+++ b/packages/react-aria/src/calendar/useCalendarBase.ts
@@ -10,17 +10,22 @@
  * governing permissions and limitations under the License.
  */
 
-import {announce} from '@react-aria/live-announcer';
+import {announce} from '../live-announcer/LiveAnnouncer';
+
 import {AriaButtonProps} from '@react-types/button';
 import {AriaLabelingProps, DOMAttributes, DOMProps} from '@react-types/shared';
 import {CalendarPropsBase} from '@react-types/calendar';
-import {CalendarState, RangeCalendarState} from '@react-stately/calendar';
-import {filterDOMProps, mergeProps, useLabels, useSlotId, useUpdateEffect} from '@react-aria/utils';
+import {CalendarState, RangeCalendarState} from 'react-stately/private/calendar/types';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {hookData, useSelectedDateDescription, useVisibleRangeDescription} from './utils';
+import intlMessages from '../../intl/calendar/*.json';
+import {mergeProps} from '../utils/mergeProps';
+import {useLabels} from '../utils/useLabels';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useSlotId} from '../utils/useId';
 import {useState} from 'react';
+import {useUpdateEffect} from '../utils/useUpdateEffect';
 
 export interface CalendarAria {
   /** Props for the calendar grouping element. */
diff --git a/packages/@react-aria/calendar/src/useCalendarCell.ts b/packages/react-aria/src/calendar/useCalendarCell.ts
similarity index 94%
rename from packages/@react-aria/calendar/src/useCalendarCell.ts
rename to packages/react-aria/src/calendar/useCalendarCell.ts
index 82f44a07697..8d57090c849 100644
--- a/packages/@react-aria/calendar/src/useCalendarCell.ts
+++ b/packages/react-aria/src/calendar/useCalendarCell.ts
@@ -11,15 +11,23 @@
  */
 
 import {CalendarDate, isEqualDay, isSameDay, isToday} from '@internationalized/date';
-import {CalendarState, RangeCalendarState} from '@react-stately/calendar';
+import {CalendarState, RangeCalendarState} from 'react-stately/private/calendar/types';
 import {DOMAttributes, RefObject} from '@react-types/shared';
-import {focusWithoutScrolling, getActiveElement, getEventTarget, getScrollParent, mergeProps, scrollIntoViewport, useDeepMemo, useDescription} from '@react-aria/utils';
+import {focusWithoutScrolling} from '../utils/focusWithoutScrolling';
+import {getActiveElement, getEventTarget} from '../utils/shadowdom/DOMFunctions';
 import {getEraFormat, hookData} from './utils';
-import {getInteractionModality, usePress} from '@react-aria/interactions';
+import {getInteractionModality} from '../interactions/useFocusVisible';
+import {getScrollParent} from '../utils/getScrollParent';
+import intlMessages from '../../intl/calendar/*.json';
+import {mergeProps} from '../utils/mergeProps';
+import {scrollIntoViewport} from '../utils/scrollIntoView';
+import {useDateFormatter} from '../i18n/useDateFormatter';
+import {useDeepMemo} from '../utils/useDeepMemo';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {useDateFormatter, useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useDescription} from '../utils/useDescription';
 import {useEffect, useMemo, useRef} from 'react';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
+import {usePress} from '../interactions/usePress';
 
 export interface AriaCalendarCellProps {
   /** The date that this cell represents. */
diff --git a/packages/@react-aria/calendar/src/useCalendarGrid.ts b/packages/react-aria/src/calendar/useCalendarGrid.ts
similarity index 95%
rename from packages/@react-aria/calendar/src/useCalendarGrid.ts
rename to packages/react-aria/src/calendar/useCalendarGrid.ts
index 583c521cb37..1394aad9ace 100644
--- a/packages/@react-aria/calendar/src/useCalendarGrid.ts
+++ b/packages/react-aria/src/calendar/useCalendarGrid.ts
@@ -11,12 +11,14 @@
  */
 
 import {CalendarDate, getWeeksInMonth, startOfWeek, today} from '@internationalized/date';
-import {CalendarState, RangeCalendarState} from '@react-stately/calendar';
+import {CalendarState, RangeCalendarState} from 'react-stately/private/calendar/types';
 import {DOMAttributes} from '@react-types/shared';
 import {hookData, useVisibleRangeDescription} from './utils';
 import {KeyboardEvent, useMemo} from 'react';
-import {mergeProps, useLabels} from '@react-aria/utils';
-import {useDateFormatter, useLocale} from '@react-aria/i18n';
+import {mergeProps} from '../utils/mergeProps';
+import {useDateFormatter} from '../i18n/useDateFormatter';
+import {useLabels} from '../utils/useLabels';
+import {useLocale} from '../i18n/I18nProvider';
 
 export interface AriaCalendarGridProps {
   /**
diff --git a/packages/@react-aria/calendar/src/useRangeCalendar.ts b/packages/react-aria/src/calendar/useRangeCalendar.ts
similarity index 94%
rename from packages/@react-aria/calendar/src/useRangeCalendar.ts
rename to packages/react-aria/src/calendar/useRangeCalendar.ts
index 78bff4f50af..91fb1d7dc76 100644
--- a/packages/@react-aria/calendar/src/useRangeCalendar.ts
+++ b/packages/react-aria/src/calendar/useRangeCalendar.ts
@@ -13,8 +13,9 @@
 import {AriaRangeCalendarProps, DateValue} from '@react-types/calendar';
 import {CalendarAria, useCalendarBase} from './useCalendarBase';
 import {FocusableElement, RefObject} from '@react-types/shared';
-import {isFocusWithin, nodeContains, useEvent} from '@react-aria/utils';
-import {RangeCalendarState} from '@react-stately/calendar';
+import {isFocusWithin, nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {RangeCalendarState} from 'react-stately/private/calendar/types';
+import {useEvent} from '../utils/useEvent';
 import {useRef} from 'react';
 
 /**
diff --git a/packages/@react-aria/calendar/src/utils.ts b/packages/react-aria/src/calendar/utils.ts
similarity index 95%
rename from packages/@react-aria/calendar/src/utils.ts
rename to packages/react-aria/src/calendar/utils.ts
index 4cd5ae052ef..06fd562f627 100644
--- a/packages/@react-aria/calendar/src/utils.ts
+++ b/packages/react-aria/src/calendar/utils.ts
@@ -11,11 +11,12 @@
  */
 
 import {CalendarDate, DateFormatter, endOfMonth, isSameDay, startOfMonth} from '@internationalized/date';
-import {CalendarState, RangeCalendarState} from '@react-stately/calendar';
+import {CalendarState, RangeCalendarState} from 'react-stately/private/calendar/types';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/calendar/*.json';
 import type {LocalizedStringFormatter} from '@internationalized/string';
-import {useDateFormatter, useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useDateFormatter} from '../i18n/useDateFormatter';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 import {useMemo} from 'react';
 
 interface HookData {
diff --git a/packages/@react-aria/checkbox/src/useCheckbox.ts b/packages/react-aria/src/checkbox/useCheckbox.ts
similarity index 92%
rename from packages/@react-aria/checkbox/src/useCheckbox.ts
rename to packages/react-aria/src/checkbox/useCheckbox.ts
index 5ef879aeabd..5b1ea7f774d 100644
--- a/packages/@react-aria/checkbox/src/useCheckbox.ts
+++ b/packages/react-aria/src/checkbox/useCheckbox.ts
@@ -12,13 +12,13 @@
 
 import {AriaCheckboxProps} from '@react-types/checkbox';
 import {InputHTMLAttributes, LabelHTMLAttributes, useEffect, useMemo} from 'react';
-import {mergeProps} from '@react-aria/utils';
-import {privateValidationStateProp, useFormValidationState} from '@react-stately/form';
+import {mergeProps} from '../utils/mergeProps';
+import {privateValidationStateProp, useFormValidationState} from 'react-stately/private/form/useFormValidationState';
 import {RefObject, ValidationResult} from '@react-types/shared';
-import {ToggleState} from '@react-stately/toggle';
-import {useFormValidation} from '@react-aria/form';
-import {usePress} from '@react-aria/interactions';
-import {useToggle} from '@react-aria/toggle';
+import {ToggleState} from 'react-stately/useToggleState';
+import {useFormValidation} from '../form/useFormValidation';
+import {usePress} from '../interactions/usePress';
+import {useToggle} from '../toggle/useToggle';
 
 export interface CheckboxAria extends ValidationResult {
   /** Props for the label wrapper element. */
diff --git a/packages/@react-aria/checkbox/src/useCheckboxGroup.ts b/packages/react-aria/src/checkbox/useCheckboxGroup.ts
similarity index 90%
rename from packages/@react-aria/checkbox/src/useCheckboxGroup.ts
rename to packages/react-aria/src/checkbox/useCheckboxGroup.ts
index 0056b9978ba..f4aa7b827de 100644
--- a/packages/@react-aria/checkbox/src/useCheckboxGroup.ts
+++ b/packages/react-aria/src/checkbox/useCheckboxGroup.ts
@@ -12,11 +12,12 @@
 
 import {AriaCheckboxGroupProps} from '@react-types/checkbox';
 import {checkboxGroupData} from './utils';
-import {CheckboxGroupState} from '@react-stately/checkbox';
+import {CheckboxGroupState} from 'react-stately/useCheckboxGroupState';
 import {DOMAttributes, ValidationResult} from '@react-types/shared';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
-import {useField} from '@react-aria/label';
-import {useFocusWithin} from '@react-aria/interactions';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import {mergeProps} from '../utils/mergeProps';
+import {useField} from '../label/useField';
+import {useFocusWithin} from '../interactions/useFocusWithin';
 
 export interface CheckboxGroupAria extends ValidationResult {
   /** Props for the checkbox group wrapper element. */
diff --git a/packages/@react-aria/checkbox/src/useCheckboxGroupItem.ts b/packages/react-aria/src/checkbox/useCheckboxGroupItem.ts
similarity index 93%
rename from packages/@react-aria/checkbox/src/useCheckboxGroupItem.ts
rename to packages/react-aria/src/checkbox/useCheckboxGroupItem.ts
index cc91277bfe3..74b4e1d1d97 100644
--- a/packages/@react-aria/checkbox/src/useCheckboxGroupItem.ts
+++ b/packages/react-aria/src/checkbox/useCheckboxGroupItem.ts
@@ -13,11 +13,15 @@
 import {AriaCheckboxGroupItemProps} from '@react-types/checkbox';
 import {CheckboxAria, useCheckbox} from './useCheckbox';
 import {checkboxGroupData} from './utils';
-import {CheckboxGroupState} from '@react-stately/checkbox';
-import {DEFAULT_VALIDATION_RESULT, privateValidationStateProp, useFormValidationState} from '@react-stately/form';
+import {CheckboxGroupState} from 'react-stately/useCheckboxGroupState';
+import {
+  DEFAULT_VALIDATION_RESULT,
+  privateValidationStateProp,
+  useFormValidationState
+} from 'react-stately/private/form/useFormValidationState';
 import {RefObject, ValidationResult} from '@react-types/shared';
 import {useEffect, useRef} from 'react';
-import {useToggleState} from '@react-stately/toggle';
+import {useToggleState} from 'react-stately/useToggleState';
 
 /**
  * Provides the behavior and accessibility implementation for a checkbox component contained within a checkbox group.
diff --git a/packages/@react-aria/checkbox/src/utils.ts b/packages/react-aria/src/checkbox/utils.ts
similarity index 92%
rename from packages/@react-aria/checkbox/src/utils.ts
rename to packages/react-aria/src/checkbox/utils.ts
index 9d06b86e2fb..eb20e4f684d 100644
--- a/packages/@react-aria/checkbox/src/utils.ts
+++ b/packages/react-aria/src/checkbox/utils.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {CheckboxGroupState} from '@react-stately/checkbox';
+import {CheckboxGroupState} from 'react-stately/useCheckboxGroupState';
 
 interface CheckboxGroupData {
   name?: string,
diff --git a/packages/@react-aria/collections/src/BaseCollection.ts b/packages/react-aria/src/collections/BaseCollection.ts
similarity index 100%
rename from packages/@react-aria/collections/src/BaseCollection.ts
rename to packages/react-aria/src/collections/BaseCollection.ts
diff --git a/packages/@react-aria/collections/src/CollectionBuilder.tsx b/packages/react-aria/src/collections/CollectionBuilder.tsx
similarity index 98%
rename from packages/@react-aria/collections/src/CollectionBuilder.tsx
rename to packages/react-aria/src/collections/CollectionBuilder.tsx
index e7585b8ab81..e93746c392f 100644
--- a/packages/@react-aria/collections/src/CollectionBuilder.tsx
+++ b/packages/react-aria/src/collections/CollectionBuilder.tsx
@@ -14,11 +14,11 @@ import {BaseCollection, CollectionNode} from './BaseCollection';
 import {BaseNode, Document, ElementNode} from './Document';
 import {CachedChildrenOptions, useCachedChildren} from './useCachedChildren';
 import {createPortal} from 'react-dom';
-import {FocusableContext} from '@react-aria/interactions';
+import {FocusableContext} from '../interactions/useFocusable';
 import {forwardRefType, Key, Node} from '@react-types/shared';
 import {Hidden} from './Hidden';
 import React, {createContext, ForwardedRef, forwardRef, JSX, ReactElement, ReactNode, useCallback, useContext, useMemo, useRef, useState} from 'react';
-import {useIsSSR} from '@react-aria/ssr';
+import {useIsSSR} from '../ssr/SSRProvider';
 import {useSyncExternalStore as useSyncExternalStoreShim} from 'use-sync-external-store/shim/index.js';
 
 const ShallowRenderContext = createContext(false);
@@ -188,9 +188,9 @@ export function createLeafComponent<P extends object, E extends Element>(Collect
       null,
       node => (
         // Forward FocusableContext to real DOM tree so tooltips work.
-        <FocusableContext.Provider value={focusableProps}>
+        (<FocusableContext.Provider value={focusableProps}>
           <Component node={node} />
-        </FocusableContext.Provider>
+        </FocusableContext.Provider>)
       )
     );
   });
diff --git a/packages/@react-aria/collections/src/Document.ts b/packages/react-aria/src/collections/Document.ts
similarity index 100%
rename from packages/@react-aria/collections/src/Document.ts
rename to packages/react-aria/src/collections/Document.ts
diff --git a/packages/@react-aria/collections/src/Hidden.tsx b/packages/react-aria/src/collections/Hidden.tsx
similarity index 100%
rename from packages/@react-aria/collections/src/Hidden.tsx
rename to packages/react-aria/src/collections/Hidden.tsx
diff --git a/packages/@react-aria/collections/src/useCachedChildren.ts b/packages/react-aria/src/collections/useCachedChildren.ts
similarity index 100%
rename from packages/@react-aria/collections/src/useCachedChildren.ts
rename to packages/react-aria/src/collections/useCachedChildren.ts
diff --git a/packages/@react-aria/color/src/useColorArea.ts b/packages/react-aria/src/color/useColorArea.ts
similarity index 95%
rename from packages/@react-aria/color/src/useColorArea.ts
rename to packages/react-aria/src/color/useColorArea.ts
index 13d56119eef..3a8d202dc4d 100644
--- a/packages/@react-aria/color/src/useColorArea.ts
+++ b/packages/react-aria/src/color/useColorArea.ts
@@ -11,16 +11,25 @@
  */
 
 import {AriaColorAreaProps, ColorChannel} from '@react-types/color';
-import {ColorAreaState} from '@react-stately/color';
+import {ColorAreaState} from 'react-stately/useColorAreaState';
 import {DOMAttributes, RefObject} from '@react-types/shared';
-import {focusWithoutScrolling, isAndroid, isIOS, mergeProps, useFormReset, useGlobalListeners, useLabels} from '@react-aria/utils';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
+import {focusWithoutScrolling} from '../utils/focusWithoutScrolling';
+import intlMessages from '../../intl/color/*.json';
+import {isAndroid, isIOS} from '../utils/platform';
+import {mergeProps} from '../utils/mergeProps';
 import React, {ChangeEvent, InputHTMLAttributes, useCallback, useRef, useState} from 'react';
 import {useColorAreaGradient} from './useColorAreaGradient';
-import {useFocus, useFocusWithin, useKeyboard, useMove} from '@react-aria/interactions';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useVisuallyHidden} from '@react-aria/visually-hidden';
+// @ts-ignore
+import {useFocus} from '../interactions/useFocus';
+import {useFocusWithin} from '../interactions/useFocusWithin';
+import {useFormReset} from '../utils/useFormReset';
+import {useGlobalListeners} from '../utils/useGlobalListeners';
+import {useKeyboard} from '../interactions/useKeyboard';
+import {useLabels} from '../utils/useLabels';
+import {useLocale} from '../i18n/I18nProvider';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
+import {useMove} from '../interactions/useMove';
+import {useVisuallyHidden} from '../visually-hidden/VisuallyHidden';
 
 export interface ColorAreaAria {
   /** Props for the color area container element. */
diff --git a/packages/@react-aria/color/src/useColorAreaGradient.ts b/packages/react-aria/src/color/useColorAreaGradient.ts
similarity index 97%
rename from packages/@react-aria/color/src/useColorAreaGradient.ts
rename to packages/react-aria/src/color/useColorAreaGradient.ts
index 1bb231c5ddd..4018dde8e4a 100644
--- a/packages/@react-aria/color/src/useColorAreaGradient.ts
+++ b/packages/react-aria/src/color/useColorAreaGradient.ts
@@ -11,8 +11,9 @@
 */
 
 import {Color, ColorChannel} from '@react-types/color';
-import {ColorAreaState, parseColor} from '@react-stately/color';
+import {ColorAreaState} from 'react-stately/useColorAreaState';
 import {CSSProperties, useMemo} from 'react';
+import {parseColor} from 'react-stately/Color';
 
 const hue = (color: Color) => [0, 60, 120, 180, 240, 300, 360].map(hue => color.withChannelValue('hue', hue).toString('css')).join(', ');
 const saturation = (color: Color) => `${color.withChannelValue('saturation', 0)}, transparent`;
diff --git a/packages/@react-aria/color/src/useColorChannelField.ts b/packages/react-aria/src/color/useColorChannelField.ts
similarity index 87%
rename from packages/@react-aria/color/src/useColorChannelField.ts
rename to packages/react-aria/src/color/useColorChannelField.ts
index 8411cb2ca5a..93eefbdf0d9 100644
--- a/packages/@react-aria/color/src/useColorChannelField.ts
+++ b/packages/react-aria/src/color/useColorChannelField.ts
@@ -11,9 +11,9 @@
  */
 
 import {AriaLabelingProps, RefObject} from '@react-types/shared';
-import {ColorChannelFieldProps, ColorChannelFieldState} from '@react-stately/color';
-import {NumberFieldAria, useNumberField} from '@react-aria/numberfield';
-import {useLocale} from '@react-aria/i18n';
+import {ColorChannelFieldProps, ColorChannelFieldState} from 'react-stately/useColorFieldState';
+import {NumberFieldAria, useNumberField} from '../numberfield/useNumberField';
+import {useLocale} from '../i18n/I18nProvider';
 
 export interface AriaColorChannelFieldProps extends ColorChannelFieldProps, AriaLabelingProps {}
 export interface ColorChannelFieldAria extends NumberFieldAria {}
diff --git a/packages/@react-aria/color/src/useColorField.ts b/packages/react-aria/src/color/useColorField.ts
similarity index 87%
rename from packages/@react-aria/color/src/useColorField.ts
rename to packages/react-aria/src/color/useColorField.ts
index b5f00af6a55..ec588f94b37 100644
--- a/packages/@react-aria/color/src/useColorField.ts
+++ b/packages/react-aria/src/color/useColorField.ts
@@ -11,7 +11,7 @@
  */
 
 import {AriaColorFieldProps} from '@react-types/color';
-import {ColorFieldState} from '@react-stately/color';
+import {ColorFieldState} from 'react-stately/useColorFieldState';
 import {DOMAttributes, ValidationResult} from '@react-types/shared';
 import {
   InputHTMLAttributes,
@@ -20,11 +20,14 @@ import {
   useCallback,
   useState
 } from 'react';
-import {mergeProps, useFormReset, useId} from '@react-aria/utils';
-import {privateValidationStateProp} from '@react-stately/form';
-import {useFocusWithin, useScrollWheel} from '@react-aria/interactions';
-import {useFormattedTextField} from '@react-aria/textfield';
-import {useSpinButton} from '@react-aria/spinbutton';
+import {mergeProps} from '../utils/mergeProps';
+import {privateValidationStateProp} from 'react-stately/private/form/useFormValidationState';
+import {useFocusWithin} from '../interactions/useFocusWithin';
+import {useFormattedTextField} from '../textfield/useFormattedTextField';
+import {useFormReset} from '../utils/useFormReset';
+import {useId} from '../utils/useId';
+import {useScrollWheel} from '../interactions/useScrollWheel';
+import {useSpinButton} from '../spinbutton/useSpinButton';
 
 export interface ColorFieldAria extends ValidationResult {
   /** Props for the label element. */
diff --git a/packages/@react-aria/color/src/useColorSlider.ts b/packages/react-aria/src/color/useColorSlider.ts
similarity index 93%
rename from packages/@react-aria/color/src/useColorSlider.ts
rename to packages/react-aria/src/color/useColorSlider.ts
index 804914a983f..865eeaa33f0 100644
--- a/packages/@react-aria/color/src/useColorSlider.ts
+++ b/packages/react-aria/src/color/useColorSlider.ts
@@ -11,13 +11,14 @@
  */
 
 import {AriaColorSliderProps} from '@react-types/color';
-import {ColorSliderState} from '@react-stately/color';
+import {ColorSliderState} from 'react-stately/useColorSliderState';
 import {DOMAttributes, RefObject} from '@react-types/shared';
 import {InputHTMLAttributes} from 'react';
-import {mergeProps} from '@react-aria/utils';
-import {useLocale} from '@react-aria/i18n';
-import {useSlider, useSliderThumb} from '@react-aria/slider';
-import {useVisuallyHidden} from '@react-aria/visually-hidden';
+import {mergeProps} from '../utils/mergeProps';
+import {useLocale} from '../i18n/I18nProvider';
+import {useSlider} from '../slider/useSlider';
+import {useSliderThumb} from '../slider/useSliderThumb';
+import {useVisuallyHidden} from '../visually-hidden/VisuallyHidden';
 
 export interface AriaColorSliderOptions extends AriaColorSliderProps {
   /** A ref for the track element. */
diff --git a/packages/@react-aria/color/src/useColorSwatch.ts b/packages/react-aria/src/color/useColorSwatch.ts
similarity index 89%
rename from packages/@react-aria/color/src/useColorSwatch.ts
rename to packages/react-aria/src/color/useColorSwatch.ts
index f80d95e106b..d8b3cab1661 100644
--- a/packages/@react-aria/color/src/useColorSwatch.ts
+++ b/packages/react-aria/src/color/useColorSwatch.ts
@@ -12,12 +12,14 @@
 
 import {AriaLabelingProps, DOMProps} from '@react-types/shared';
 import {Color} from '@react-types/color';
-import {filterDOMProps, useId} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {HTMLAttributes, useMemo} from 'react';
+import intlMessages from '../../intl/color/*.json';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {parseColor} from '@react-stately/color';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
+import {parseColor} from 'react-stately/Color';
+import {useId} from '../utils/useId';
+import {useLocale} from '../i18n/I18nProvider';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 
 export interface AriaColorSwatchProps extends AriaLabelingProps, DOMProps {
   /** The color value to display in the swatch. */
diff --git a/packages/@react-aria/color/src/useColorWheel.ts b/packages/react-aria/src/color/useColorWheel.ts
similarity index 94%
rename from packages/@react-aria/color/src/useColorWheel.ts
rename to packages/react-aria/src/color/useColorWheel.ts
index 789e9312784..f05f1b6a3dc 100644
--- a/packages/@react-aria/color/src/useColorWheel.ts
+++ b/packages/react-aria/src/color/useColorWheel.ts
@@ -11,13 +11,19 @@
  */
 
 import {AriaColorWheelProps} from '@react-types/color';
-import {ColorWheelState} from '@react-stately/color';
+import {ColorWheelState} from 'react-stately/useColorWheelState';
 import {DOMAttributes, RefObject} from '@react-types/shared';
-import {focusWithoutScrolling, getEventTarget, mergeProps, useFormReset, useGlobalListeners, useLabels} from '@react-aria/utils';
+import {focusWithoutScrolling} from '../utils/focusWithoutScrolling';
+import {getEventTarget} from '../utils/shadowdom/DOMFunctions';
+import {mergeProps} from '../utils/mergeProps';
 import React, {ChangeEvent, InputHTMLAttributes, useCallback, useRef} from 'react';
-import {useKeyboard, useMove} from '@react-aria/interactions';
-import {useLocale} from '@react-aria/i18n';
-import {useVisuallyHidden} from '@react-aria/visually-hidden';
+import {useFormReset} from '../utils/useFormReset';
+import {useGlobalListeners} from '../utils/useGlobalListeners';
+import {useKeyboard} from '../interactions/useKeyboard';
+import {useLabels} from '../utils/useLabels';
+import {useLocale} from '../i18n/I18nProvider';
+import {useMove} from '../interactions/useMove';
+import {useVisuallyHidden} from '../visually-hidden/VisuallyHidden';
 
 export interface AriaColorWheelOptions extends AriaColorWheelProps {
   /** The outer radius of the color wheel. */
diff --git a/packages/@react-aria/combobox/src/useComboBox.ts b/packages/react-aria/src/combobox/useComboBox.ts
similarity index 91%
rename from packages/@react-aria/combobox/src/useComboBox.ts
rename to packages/react-aria/src/combobox/useComboBox.ts
index df4a19ce040..cbe6cdc0526 100644
--- a/packages/@react-aria/combobox/src/useComboBox.ts
+++ b/packages/react-aria/src/combobox/useComboBox.ts
@@ -10,24 +10,38 @@
  * governing permissions and limitations under the License.
  */
 
-import {announce} from '@react-aria/live-announcer';
+import {announce} from '../live-announcer/LiveAnnouncer';
+
 import {AriaButtonProps} from '@react-types/button';
 import {AriaComboBoxProps, SelectionMode} from '@react-types/combobox';
-import {ariaHideOutside} from '@react-aria/overlays';
-import {AriaListBoxOptions, getItemId, listData} from '@react-aria/listbox';
+import {ariaHideOutside} from '../overlays/ariaHideOutside';
+import {AriaListBoxOptions} from '../listbox/useListBox';
 import {BaseEvent, DOMAttributes, KeyboardDelegate, LayoutDelegate, PressEvent, RefObject, RouterOptions, ValidationResult} from '@react-types/shared';
-import {chain, getActiveElement, getEventTarget, getOwnerDocument, isAppleDevice, mergeProps, nodeContains, useEvent, useFormReset, useId, useLabels, useRouter, useUpdateEffect} from '@react-aria/utils';
-import {ComboBoxState} from '@react-stately/combobox';
-import {dispatchVirtualFocus} from '@react-aria/focus';
+import {chain} from '../utils/chain';
+import {ComboBoxState} from 'react-stately/useComboBoxState';
+import {dispatchVirtualFocus} from '../focus/virtualFocus';
 import {FocusEvent, InputHTMLAttributes, KeyboardEvent, TouchEvent, useEffect, useMemo, useRef, useState} from 'react';
-import {getChildNodes, getItemCount} from '@react-stately/collections';
+import {getActiveElement, getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {getChildNodes} from 'react-stately/private/collections/getChildNodes';
+import {getItemCount} from 'react-stately/private/collections/getItemCount';
+import {getItemId, listData} from '../listbox/utils';
+import {getOwnerDocument} from '../utils/domHelpers';
+import intlMessages from '../../intl/combobox/*.json';
+import {isAppleDevice} from '../utils/platform';
+import {ListKeyboardDelegate} from '../selection/ListKeyboardDelegate';
+import {mergeProps} from '../utils/mergeProps';
+import {privateValidationStateProp} from 'react-stately/private/form/useFormValidationState';
+import {useEvent} from '../utils/useEvent';
+import {useFormReset} from '../utils/useFormReset';
+import {useId} from '../utils/useId';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {ListKeyboardDelegate, useSelectableCollection} from '@react-aria/selection';
-import {privateValidationStateProp} from '@react-stately/form';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useMenuTrigger} from '@react-aria/menu';
-import {useTextField} from '@react-aria/textfield';
+import {useLabels} from '../utils/useLabels';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
+import {useMenuTrigger} from '../menu/useMenuTrigger';
+import {useRouter} from '../utils/openLink';
+import {useSelectableCollection} from '../selection/useSelectableCollection';
+import {useTextField} from '../textfield/useTextField';
+import {useUpdateEffect} from '../utils/useUpdateEffect';
 
 export interface AriaComboBoxOptions<T, M extends SelectionMode = 'single'> extends Omit<AriaComboBoxProps<T, M>, 'children'> {
   /** The ref for the input element. */
diff --git a/packages/@react-aria/datepicker/src/useDateField.ts b/packages/react-aria/src/datepicker/useDateField.ts
similarity index 91%
rename from packages/@react-aria/datepicker/src/useDateField.ts
rename to packages/react-aria/src/datepicker/useDateField.ts
index fe5c062ca13..48696905116 100644
--- a/packages/@react-aria/datepicker/src/useDateField.ts
+++ b/packages/react-aria/src/datepicker/useDateField.ts
@@ -11,18 +11,22 @@
  */
 
 import {AriaDateFieldProps as AriaDateFieldPropsBase, AriaTimeFieldProps, DateValue, TimeValue} from '@react-types/datepicker';
-import {createFocusManager, FocusManager} from '@react-aria/focus';
-import {DateFieldState, TimeFieldState} from '@react-stately/datepicker';
+import {createFocusManager, FocusManager} from '../focus/FocusScope';
+import {DateFieldState} from 'react-stately/useDateFieldState';
 import {DOMAttributes, GroupDOMAttributes, KeyboardEvent, RefObject, ValidationResult} from '@react-types/shared';
-import {filterDOMProps, mergeProps, useDescription, useFormReset} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {InputHTMLAttributes, useEffect, useMemo, useRef} from 'react';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/datepicker/*.json';
+import {mergeProps} from '../utils/mergeProps';
+import {TimeFieldState} from 'react-stately/useTimeFieldState';
 import {useDatePickerGroup} from './useDatePickerGroup';
-import {useField} from '@react-aria/label';
-import {useFocusWithin} from '@react-aria/interactions';
-import {useFormValidation} from '@react-aria/form';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+// @ts-ignore
+import {useDescription} from '../utils/useDescription';
+import {useField} from '../label/useField';
+import {useFocusWithin} from '../interactions/useFocusWithin';
+import {useFormReset} from '../utils/useFormReset';
+import {useFormValidation} from '../form/useFormValidation';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 
 // Allows this hook to also be used with TimeField
 export interface AriaDateFieldOptions<T extends DateValue> extends Omit<AriaDateFieldPropsBase<T>, 'value' | 'defaultValue' | 'onChange' | 'minValue' | 'maxValue' | 'placeholderValue' | 'validate'> {
diff --git a/packages/@react-aria/datepicker/src/useDatePicker.ts b/packages/react-aria/src/datepicker/useDatePicker.ts
similarity index 89%
rename from packages/@react-aria/datepicker/src/useDatePicker.ts
rename to packages/react-aria/src/datepicker/useDatePicker.ts
index 2677b39c020..c19ee6ebf0f 100644
--- a/packages/@react-aria/datepicker/src/useDatePicker.ts
+++ b/packages/react-aria/src/datepicker/useDatePicker.ts
@@ -14,18 +14,23 @@ import {AriaButtonProps} from '@react-types/button';
 import {AriaDatePickerProps, DateValue} from '@react-types/datepicker';
 import {AriaDialogProps} from '@react-types/dialog';
 import {CalendarProps} from '@react-types/calendar';
-import {createFocusManager} from '@react-aria/focus';
-import {DatePickerState} from '@react-stately/datepicker';
+import {createFocusManager} from '../focus/FocusScope';
+import {DatePickerState} from 'react-stately/useDatePickerState';
 import {DOMAttributes, GroupDOMAttributes, KeyboardEvent, RefObject, ValidationResult} from '@react-types/shared';
-import {filterDOMProps, mergeProps, nodeContains, useDescription, useId} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import intlMessages from '../../intl/datepicker/*.json';
+import {mergeProps} from '../utils/mergeProps';
+import {nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {privateValidationStateProp} from 'react-stately/private/form/useFormValidationState';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {privateValidationStateProp} from '@react-stately/form';
 import {roleSymbol} from './useDateField';
 import {useDatePickerGroup} from './useDatePickerGroup';
-import {useField} from '@react-aria/label';
-import {useFocusWithin} from '@react-aria/interactions';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useDescription} from '../utils/useDescription';
+import {useField} from '../label/useField';
+import {useFocusWithin} from '../interactions/useFocusWithin';
+import {useId} from '../utils/useId';
+import {useLocale} from '../i18n/I18nProvider';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 import {useMemo, useRef} from 'react';
 
 export interface DatePickerAria extends ValidationResult {
diff --git a/packages/@react-aria/datepicker/src/useDatePickerGroup.ts b/packages/react-aria/src/datepicker/useDatePickerGroup.ts
similarity index 88%
rename from packages/@react-aria/datepicker/src/useDatePickerGroup.ts
rename to packages/react-aria/src/datepicker/useDatePickerGroup.ts
index fff29ad078d..f57c73790e8 100644
--- a/packages/@react-aria/datepicker/src/useDatePickerGroup.ts
+++ b/packages/react-aria/src/datepicker/useDatePickerGroup.ts
@@ -1,10 +1,13 @@
-import {createFocusManager, getFocusableTreeWalker} from '@react-aria/focus';
-import {DateFieldState, DatePickerState, DateRangePickerState} from '@react-stately/datepicker';
+import {createFocusManager, getFocusableTreeWalker} from '../focus/FocusScope';
+import {DateFieldState} from 'react-stately/useDateFieldState';
+import {DatePickerState} from 'react-stately/useDatePickerState';
+import {DateRangePickerState} from 'react-stately/useDateRangePickerState';
 import {DOMAttributes, FocusableElement, KeyboardEvent, RefObject} from '@react-types/shared';
-import {getEventTarget, mergeProps, nodeContains} from '@react-aria/utils';
-import {useLocale} from '@react-aria/i18n';
+import {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {mergeProps} from '../utils/mergeProps';
+import {useLocale} from '../i18n/I18nProvider';
 import {useMemo} from 'react';
-import {usePress} from '@react-aria/interactions';
+import {usePress} from '../interactions/usePress';
 
 export function useDatePickerGroup(state: DatePickerState | DateRangePickerState | DateFieldState, ref: RefObject<Element | null>, disableArrowNavigation?: boolean): DOMAttributes<FocusableElement> {
   let {direction} = useLocale();
diff --git a/packages/@react-aria/datepicker/src/useDateRangePicker.ts b/packages/react-aria/src/datepicker/useDateRangePicker.ts
similarity index 91%
rename from packages/@react-aria/datepicker/src/useDateRangePicker.ts
rename to packages/react-aria/src/datepicker/useDateRangePicker.ts
index 5614487fced..a402d43d90b 100644
--- a/packages/@react-aria/datepicker/src/useDateRangePicker.ts
+++ b/packages/react-aria/src/datepicker/useDateRangePicker.ts
@@ -13,19 +13,24 @@
 import {AriaButtonProps} from '@react-types/button';
 import {AriaDatePickerProps, AriaDateRangePickerProps, DateValue} from '@react-types/datepicker';
 import {AriaDialogProps} from '@react-types/dialog';
-import {createFocusManager} from '@react-aria/focus';
+import {createFocusManager} from '../focus/FocusScope';
 import {DateRange, RangeCalendarProps} from '@react-types/calendar';
-import {DateRangePickerState} from '@react-stately/datepicker';
-import {DEFAULT_VALIDATION_RESULT, mergeValidation, privateValidationStateProp} from '@react-stately/form';
+import {DateRangePickerState} from 'react-stately/useDateRangePickerState';
+import {DEFAULT_VALIDATION_RESULT, mergeValidation, privateValidationStateProp} from 'react-stately/private/form/useFormValidationState';
 import {DOMAttributes, GroupDOMAttributes, KeyboardEvent, RefObject, ValidationResult} from '@react-types/shared';
-import {filterDOMProps, mergeProps, nodeContains, useDescription, useId} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {focusManagerSymbol, roleSymbol} from './useDateField';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/datepicker/*.json';
+import {mergeProps} from '../utils/mergeProps';
+import {nodeContains} from '../utils/shadowdom/DOMFunctions';
 import {useDatePickerGroup} from './useDatePickerGroup';
-import {useField} from '@react-aria/label';
-import {useFocusWithin} from '@react-aria/interactions';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
+// @ts-ignore
+import {useDescription} from '../utils/useDescription';
+import {useField} from '../label/useField';
+import {useFocusWithin} from '../interactions/useFocusWithin';
+import {useId} from '../utils/useId';
+import {useLocale} from '../i18n/I18nProvider';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 import {useMemo, useRef} from 'react';
 
 export interface DateRangePickerAria extends ValidationResult {
diff --git a/packages/@react-aria/datepicker/src/useDateSegment.ts b/packages/react-aria/src/datepicker/useDateSegment.ts
similarity index 95%
rename from packages/@react-aria/datepicker/src/useDateSegment.ts
rename to packages/react-aria/src/datepicker/useDateSegment.ts
index 4ed65b82fdb..90bae1cdbec 100644
--- a/packages/@react-aria/datepicker/src/useDateSegment.ts
+++ b/packages/react-aria/src/datepicker/useDateSegment.ts
@@ -11,15 +11,25 @@
  */
 
 import {CalendarDate, toCalendar} from '@internationalized/date';
-import {DateFieldState, DateSegment} from '@react-stately/datepicker';
-import {getActiveElement, getScrollParent, isIOS, isMac, mergeProps, nodeContains, scrollIntoViewport, useEvent, useId, useLabels, useLayoutEffect} from '@react-aria/utils';
+import {DateFieldState, DateSegment} from 'react-stately/useDateFieldState';
+import {getActiveElement, nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {getScrollParent} from '../utils/getScrollParent';
 import {hookData} from './useDateField';
+import {isIOS, isMac} from '../utils/platform';
+import {mergeProps} from '../utils/mergeProps';
 import {NumberParser} from '@internationalized/number';
 import React, {CSSProperties, useMemo, useRef} from 'react';
 import {RefObject} from '@react-types/shared';
-import {useDateFormatter, useFilter, useLocale} from '@react-aria/i18n';
+import {scrollIntoViewport} from '../utils/scrollIntoView';
+import {useDateFormatter} from '../i18n/useDateFormatter';
 import {useDisplayNames} from './useDisplayNames';
-import {useSpinButton} from '@react-aria/spinbutton';
+import {useEvent} from '../utils/useEvent';
+import {useFilter} from '../i18n/useFilter';
+import {useId} from '../utils/useId';
+import {useLabels} from '../utils/useLabels';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
+import {useLocale} from '../i18n/I18nProvider';
+import {useSpinButton} from '../spinbutton/useSpinButton';
 
 export interface DateSegmentAria {
   /** Props for the segment element. */
diff --git a/packages/@react-aria/datepicker/src/useDisplayNames.ts b/packages/react-aria/src/datepicker/useDisplayNames.ts
similarity index 90%
rename from packages/@react-aria/datepicker/src/useDisplayNames.ts
rename to packages/react-aria/src/datepicker/useDisplayNames.ts
index 07c3e933e02..1325e2d7326 100644
--- a/packages/@react-aria/datepicker/src/useDisplayNames.ts
+++ b/packages/react-aria/src/datepicker/useDisplayNames.ts
@@ -11,9 +11,10 @@
  */
 
 // @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/datepicker/*.json';
 import {LocalizedStringDictionary} from '@internationalized/string';
-import {useLocale, useLocalizedStringDictionary} from '@react-aria/i18n';
+import {useLocale} from '../i18n/I18nProvider';
+import {useLocalizedStringDictionary} from '../i18n/useLocalizedStringFormatter';
 import {useMemo} from 'react';
 
 type Field = Intl.DateTimeFormatPartTypes;
diff --git a/packages/@react-aria/dialog/src/useDialog.ts b/packages/react-aria/src/dialog/useDialog.ts
similarity index 91%
rename from packages/@react-aria/dialog/src/useDialog.ts
rename to packages/react-aria/src/dialog/useDialog.ts
index 01431b86990..b24091048f2 100644
--- a/packages/@react-aria/dialog/src/useDialog.ts
+++ b/packages/react-aria/src/dialog/useDialog.ts
@@ -12,10 +12,12 @@
 
 import {AriaDialogProps} from '@react-types/dialog';
 import {DOMAttributes, FocusableElement, RefObject} from '@react-types/shared';
-import {filterDOMProps, getActiveElement, isFocusWithin, useSlotId} from '@react-aria/utils';
-import {focusSafely} from '@react-aria/interactions';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import {focusSafely} from '../interactions/focusSafely';
+import {getActiveElement, isFocusWithin} from '../utils/shadowdom/DOMFunctions';
 import {useEffect, useRef} from 'react';
-import {useOverlayFocusContain} from '@react-aria/overlays';
+import {useOverlayFocusContain} from '../overlays/Overlay';
+import {useSlotId} from '../utils/useId';
 
 export interface DialogAria {
   /** Props for the dialog container element. */
diff --git a/packages/@react-aria/disclosure/src/useDisclosure.ts b/packages/react-aria/src/disclosure/useDisclosure.ts
similarity index 95%
rename from packages/@react-aria/disclosure/src/useDisclosure.ts
rename to packages/react-aria/src/disclosure/useDisclosure.ts
index 34b254afce6..91fd1de82d5 100644
--- a/packages/@react-aria/disclosure/src/useDisclosure.ts
+++ b/packages/react-aria/src/disclosure/useDisclosure.ts
@@ -11,11 +11,13 @@
  */
 
 import {AriaButtonProps} from '@react-types/button';
-import {DisclosureState} from '@react-stately/disclosure';
+import {DisclosureState} from 'react-stately/useDisclosureState';
 import {flushSync} from 'react-dom';
 import {HTMLAttributes, RefObject, useCallback, useEffect, useRef} from 'react';
-import {useEvent, useId, useLayoutEffect} from '@react-aria/utils';
-import {useIsSSR} from '@react-aria/ssr';
+import {useEvent} from '../utils/useEvent';
+import {useId} from '../utils/useId';
+import {useIsSSR} from '../ssr/SSRProvider';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
 
 export interface AriaDisclosureProps {
   /** Whether the disclosure is disabled. */
diff --git a/packages/@react-aria/dnd/src/DragManager.ts b/packages/react-aria/src/dnd/DragManager.ts
similarity index 98%
rename from packages/@react-aria/dnd/src/DragManager.ts
rename to packages/react-aria/src/dnd/DragManager.ts
index 3b947be4d84..a1537da9a6f 100644
--- a/packages/@react-aria/dnd/src/DragManager.ts
+++ b/packages/react-aria/src/dnd/DragManager.ts
@@ -10,11 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {announce} from '@react-aria/live-announcer';
-import {ariaHideOutside} from '@react-aria/overlays';
+import {announce} from '../live-announcer/LiveAnnouncer';
+
+import {ariaHideOutside} from '../overlays/ariaHideOutside';
 import {DragEndEvent, DragItem, DropActivateEvent, DropEnterEvent, DropEvent, DropExitEvent, DropItem, DropOperation, DropTarget as DroppableCollectionTarget, FocusableElement} from '@react-types/shared';
-import {getActiveElement, getEventTarget, isVirtualClick, isVirtualPointerEvent, nodeContains} from '@react-aria/utils';
+import {getActiveElement, getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
 import {getDragModality, getTypes} from './utils';
+import {isVirtualClick, isVirtualPointerEvent} from '../utils/isVirtualEvent';
 import type {LocalizedStringFormatter} from '@internationalized/string';
 import {RefObject, useEffect, useState} from 'react';
 
diff --git a/packages/@react-aria/dnd/src/DragPreview.tsx b/packages/react-aria/src/dnd/DragPreview.tsx
similarity index 100%
rename from packages/@react-aria/dnd/src/DragPreview.tsx
rename to packages/react-aria/src/dnd/DragPreview.tsx
diff --git a/packages/@react-aria/dnd/src/DropTargetKeyboardNavigation.ts b/packages/react-aria/src/dnd/DropTargetKeyboardNavigation.ts
similarity index 99%
rename from packages/@react-aria/dnd/src/DropTargetKeyboardNavigation.ts
rename to packages/react-aria/src/dnd/DropTargetKeyboardNavigation.ts
index d10c797d525..3fb6decff49 100644
--- a/packages/@react-aria/dnd/src/DropTargetKeyboardNavigation.ts
+++ b/packages/react-aria/src/dnd/DropTargetKeyboardNavigation.ts
@@ -1,5 +1,5 @@
 import {Collection, DropTarget, Key, KeyboardDelegate, Node} from '@react-types/shared';
-import {getChildNodes} from '@react-stately/collections';
+import {getChildNodes} from 'react-stately/private/collections/getChildNodes';
 
 export function navigate(
   keyboardDelegate: KeyboardDelegate,
diff --git a/packages/@react-aria/dnd/src/ListDropTargetDelegate.ts b/packages/react-aria/src/dnd/ListDropTargetDelegate.ts
similarity index 100%
rename from packages/@react-aria/dnd/src/ListDropTargetDelegate.ts
rename to packages/react-aria/src/dnd/ListDropTargetDelegate.ts
diff --git a/packages/@react-aria/dnd/src/constants.ts b/packages/react-aria/src/dnd/constants.ts
similarity index 100%
rename from packages/@react-aria/dnd/src/constants.ts
rename to packages/react-aria/src/dnd/constants.ts
diff --git a/packages/@react-aria/dnd/src/useAutoScroll.ts b/packages/react-aria/src/dnd/useAutoScroll.ts
similarity index 95%
rename from packages/@react-aria/dnd/src/useAutoScroll.ts
rename to packages/react-aria/src/dnd/useAutoScroll.ts
index f84dcf6b532..54216de8002 100644
--- a/packages/@react-aria/dnd/src/useAutoScroll.ts
+++ b/packages/react-aria/src/dnd/useAutoScroll.ts
@@ -10,7 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {getScrollParent, isIOS, isScrollable, isWebKit} from '@react-aria/utils';
+import {getScrollParent} from '../utils/getScrollParent';
+
+import {isIOS, isWebKit} from '../utils/platform';
+import {isScrollable} from '../utils/isScrollable';
 import {RefObject} from '@react-types/shared';
 import {useCallback, useEffect, useRef} from 'react';
 
diff --git a/packages/@react-aria/dnd/src/useClipboard.ts b/packages/react-aria/src/dnd/useClipboard.ts
similarity index 96%
rename from packages/@react-aria/dnd/src/useClipboard.ts
rename to packages/react-aria/src/dnd/useClipboard.ts
index fb883fa598e..6a890cd4ae4 100644
--- a/packages/@react-aria/dnd/src/useClipboard.ts
+++ b/packages/react-aria/src/dnd/useClipboard.ts
@@ -10,11 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {chain, useEffectEvent} from '@react-aria/utils';
+import {chain} from '../utils/chain';
+
 import {DOMAttributes, DragItem, DropItem} from '@react-types/shared';
 import {readFromDataTransfer, writeToDataTransfer} from './utils';
 import {useEffect, useRef} from 'react';
-import {useFocus} from '@react-aria/interactions';
+import {useEffectEvent} from '../utils/useEffectEvent';
+import {useFocus} from '../interactions/useFocus';
 
 export interface ClipboardProps {
   /** A function that returns the items to copy. */
diff --git a/packages/@react-aria/dnd/src/useDrag.ts b/packages/react-aria/src/dnd/useDrag.ts
similarity index 97%
rename from packages/@react-aria/dnd/src/useDrag.ts
rename to packages/react-aria/src/dnd/useDrag.ts
index d91c5b2dc6c..94af2576aa0 100644
--- a/packages/@react-aria/dnd/src/useDrag.ts
+++ b/packages/react-aria/src/dnd/useDrag.ts
@@ -15,11 +15,14 @@ import {DragEndEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEve
 import {DragEvent, HTMLAttributes, version as ReactVersion, useEffect, useRef, useState} from 'react';
 import * as DragManager from './DragManager';
 import {DROP_EFFECT_TO_DROP_OPERATION, DROP_OPERATION, EFFECT_ALLOWED} from './constants';
-import {getEventTarget, isVirtualClick, isVirtualPointerEvent, useDescription, useGlobalListeners} from '@react-aria/utils';
+import {getEventTarget} from '../utils/shadowdom/DOMFunctions';
 import {globalDropEffect, setGlobalAllowedDropOperations, setGlobalDropEffect, useDragModality, writeToDataTransfer} from './utils';
+import intlMessages from '../../intl/dnd/*.json';
+import {isVirtualClick, isVirtualPointerEvent} from '../utils/isVirtualEvent';
+import {useDescription} from '../utils/useDescription';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useGlobalListeners} from '../utils/useGlobalListeners';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 
 export interface DragOptions {
   /** Handler that is called when a drag operation is started. */
diff --git a/packages/@react-aria/dnd/src/useDraggableCollection.ts b/packages/react-aria/src/dnd/useDraggableCollection.ts
similarity index 94%
rename from packages/@react-aria/dnd/src/useDraggableCollection.ts
rename to packages/react-aria/src/dnd/useDraggableCollection.ts
index 21f918eafe5..17b85ce7a22 100644
--- a/packages/@react-aria/dnd/src/useDraggableCollection.ts
+++ b/packages/react-aria/src/dnd/useDraggableCollection.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {DraggableCollectionState} from '@react-stately/dnd';
+import {DraggableCollectionState} from 'react-stately/useDraggableCollectionState';
 import {globalDndState, setDraggingCollectionRef} from './utils';
 import {RefObject} from '@react-types/shared';
 
diff --git a/packages/@react-aria/dnd/src/useDraggableItem.ts b/packages/react-aria/src/dnd/useDraggableItem.ts
similarity index 95%
rename from packages/@react-aria/dnd/src/useDraggableItem.ts
rename to packages/react-aria/src/dnd/useDraggableItem.ts
index 6d5781ddeaa..dcfe93c2245 100644
--- a/packages/@react-aria/dnd/src/useDraggableItem.ts
+++ b/packages/react-aria/src/dnd/useDraggableItem.ts
@@ -12,14 +12,14 @@
 
 import {AriaButtonProps} from '@react-types/button';
 import {clearGlobalDnDState, isInternalDropOperation, setDraggingKeys, useDragModality} from './utils';
-import {DraggableCollectionState} from '@react-stately/dnd';
+import {DraggableCollectionState} from 'react-stately/useDraggableCollectionState';
 import {HTMLAttributes} from 'react';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/dnd/*.json';
 import {Key} from '@react-types/shared';
-import {useDescription} from '@react-aria/utils';
+import {useDescription} from '../utils/useDescription';
 import {useDrag} from './useDrag';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 
 export interface DraggableItemProps {
   /** The key of the draggable item within the collection. */
diff --git a/packages/@react-aria/dnd/src/useDrop.ts b/packages/react-aria/src/dnd/useDrop.ts
similarity index 98%
rename from packages/@react-aria/dnd/src/useDrop.ts
rename to packages/react-aria/src/dnd/useDrop.ts
index c48388f1dfc..10d787283b1 100644
--- a/packages/@react-aria/dnd/src/useDrop.ts
+++ b/packages/react-aria/src/dnd/useDrop.ts
@@ -16,7 +16,10 @@ import {DragEvent, useRef, useState} from 'react';
 import * as DragManager from './DragManager';
 import {DragTypes, globalAllowedDropOperations, globalDndState, readFromDataTransfer, setGlobalDnDState, setGlobalDropEffect} from './utils';
 import {DROP_EFFECT_TO_DROP_OPERATION, DROP_OPERATION, DROP_OPERATION_ALLOWED, DROP_OPERATION_TO_DROP_EFFECT} from './constants';
-import {getEventTarget, isIPad, isMac, nodeContains, useEffectEvent, useLayoutEffect} from '@react-aria/utils';
+import {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {isIPad, isMac} from '../utils/platform';
+import {useEffectEvent} from '../utils/useEffectEvent';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
 import {useVirtualDrop} from './useVirtualDrop';
 
 export interface DropOptions {
diff --git a/packages/@react-aria/dnd/src/useDropIndicator.ts b/packages/react-aria/src/dnd/useDropIndicator.ts
similarity index 94%
rename from packages/@react-aria/dnd/src/useDropIndicator.ts
rename to packages/react-aria/src/dnd/useDropIndicator.ts
index 91790744473..08b558f3a69 100644
--- a/packages/@react-aria/dnd/src/useDropIndicator.ts
+++ b/packages/react-aria/src/dnd/useDropIndicator.ts
@@ -11,15 +11,15 @@
  */
 
 import * as DragManager from './DragManager';
-import {DroppableCollectionState} from '@react-stately/dnd';
+import {DroppableCollectionState} from 'react-stately/useDroppableCollectionState';
 import {DropTarget, FocusableElement, Key, RefObject} from '@react-types/shared';
 import {getDroppableCollectionId} from './utils';
 import {HTMLAttributes} from 'react';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/dnd/*.json';
 import {useDroppableItem} from './useDroppableItem';
-import {useId} from '@react-aria/utils';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useId} from '../utils/useId';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 
 export interface DropIndicatorProps {
   /** The drop target that the drop indicator represents. */
diff --git a/packages/@react-aria/dnd/src/useDroppableCollection.ts b/packages/react-aria/src/dnd/useDroppableCollection.ts
similarity index 98%
rename from packages/@react-aria/dnd/src/useDroppableCollection.ts
rename to packages/react-aria/src/dnd/useDroppableCollection.ts
index 555c75e9380..19462aced36 100644
--- a/packages/@react-aria/dnd/src/useDroppableCollection.ts
+++ b/packages/react-aria/src/dnd/useDroppableCollection.ts
@@ -34,14 +34,16 @@ import {
   RefObject
 } from '@react-types/shared';
 import * as DragManager from './DragManager';
-import {DroppableCollectionState} from '@react-stately/dnd';
+import {DroppableCollectionState} from 'react-stately/useDroppableCollectionState';
 import {HTMLAttributes, useCallback, useEffect, useRef} from 'react';
-import {mergeProps, useId, useLayoutEffect} from '@react-aria/utils';
+import {mergeProps} from '../utils/mergeProps';
 import {navigate} from './DropTargetKeyboardNavigation';
-import {setInteractionModality} from '@react-aria/interactions';
+import {setInteractionModality} from '../interactions/useFocusVisible';
 import {useAutoScroll} from './useAutoScroll';
 import {useDrop} from './useDrop';
-import {useLocale} from '@react-aria/i18n';
+import {useId} from '../utils/useId';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
+import {useLocale} from '../i18n/I18nProvider';
 
 export interface DroppableCollectionOptions extends DroppableCollectionProps {
   /** A delegate object that implements behavior for keyboard focus movement. */
diff --git a/packages/@react-aria/dnd/src/useDroppableItem.ts b/packages/react-aria/src/dnd/useDroppableItem.ts
similarity index 97%
rename from packages/@react-aria/dnd/src/useDroppableItem.ts
rename to packages/react-aria/src/dnd/useDroppableItem.ts
index d54e45772ac..cc5a3cbf467 100644
--- a/packages/@react-aria/dnd/src/useDroppableItem.ts
+++ b/packages/react-aria/src/dnd/useDroppableItem.ts
@@ -11,7 +11,7 @@
  */
 
 import * as DragManager from './DragManager';
-import {DroppableCollectionState} from '@react-stately/dnd';
+import {DroppableCollectionState} from 'react-stately/useDroppableCollectionState';
 import {DropTarget, FocusableElement, RefObject} from '@react-types/shared';
 import {getDroppableCollectionRef, getTypes, globalDndState, isInternalDropOperation} from './utils';
 import {HTMLAttributes, useEffect} from 'react';
diff --git a/packages/@react-aria/dnd/src/useVirtualDrop.ts b/packages/react-aria/src/dnd/useVirtualDrop.ts
similarity index 90%
rename from packages/@react-aria/dnd/src/useVirtualDrop.ts
rename to packages/react-aria/src/dnd/useVirtualDrop.ts
index b74897d3cba..1e605cd5993 100644
--- a/packages/@react-aria/dnd/src/useVirtualDrop.ts
+++ b/packages/react-aria/src/dnd/useVirtualDrop.ts
@@ -14,10 +14,10 @@ import {AriaButtonProps} from '@react-types/button';
 import {DOMAttributes} from 'react';
 import * as DragManager from './DragManager';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {useDescription} from '@react-aria/utils';
+import intlMessages from '../../intl/dnd/*.json';
+import {useDescription} from '../utils/useDescription';
 import {useDragModality} from './utils';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 
 interface VirtualDropResult {
   dropProps: AriaButtonProps & DOMAttributes<HTMLDivElement>
diff --git a/packages/@react-aria/dnd/src/utils.ts b/packages/react-aria/src/dnd/utils.ts
similarity index 98%
rename from packages/@react-aria/dnd/src/utils.ts
rename to packages/react-aria/src/dnd/utils.ts
index 1fb8fa65abf..7fd699e36f2 100644
--- a/packages/@react-aria/dnd/src/utils.ts
+++ b/packages/react-aria/src/dnd/utils.ts
@@ -12,8 +12,8 @@
 
 import {CUSTOM_DRAG_TYPE, DROP_OPERATION, GENERIC_TYPE, NATIVE_DRAG_TYPES} from './constants';
 import {DirectoryDropItem, DragItem, DropItem, FileDropItem, DragTypes as IDragTypes, Key, RefObject, TextDropItem} from '@react-types/shared';
-import {DroppableCollectionState} from '@react-stately/dnd';
-import {getInteractionModality, useInteractionModality} from '@react-aria/interactions';
+import {DroppableCollectionState} from 'react-stately/useDroppableCollectionState';
+import {getInteractionModality, useInteractionModality} from '../interactions/useFocusVisible';
 
 interface DroppableCollectionMap {
   id: string,
diff --git a/packages/@react-aria/focus/src/FocusRing.tsx b/packages/react-aria/src/focus/FocusRing.tsx
similarity index 97%
rename from packages/@react-aria/focus/src/FocusRing.tsx
rename to packages/react-aria/src/focus/FocusRing.tsx
index 603b6abd3fd..182119a041b 100644
--- a/packages/@react-aria/focus/src/FocusRing.tsx
+++ b/packages/react-aria/src/focus/FocusRing.tsx
@@ -11,7 +11,7 @@
  */
 
 import clsx from 'clsx';
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from '../utils/mergeProps';
 import React, {ReactElement} from 'react';
 import {useFocusRing} from './useFocusRing';
 
diff --git a/packages/@react-aria/focus/src/FocusScope.tsx b/packages/react-aria/src/focus/FocusScope.tsx
similarity index 98%
rename from packages/@react-aria/focus/src/FocusScope.tsx
rename to packages/react-aria/src/focus/FocusScope.tsx
index 0a0dc1310f4..f694b293bfe 100644
--- a/packages/@react-aria/focus/src/FocusScope.tsx
+++ b/packages/react-aria/src/focus/FocusScope.tsx
@@ -10,23 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  createShadowTreeWalker,
-  getActiveElement,
-  getEventTarget,
-  getOwnerDocument,
-  getOwnerWindow,
-  isAndroid,
-  isChrome,
-  isFocusable,
-  isTabbable,
-  nodeContains,
-  ShadowTreeWalker,
-  useLayoutEffect
-} from '@react-aria/utils';
+import {createShadowTreeWalker, ShadowTreeWalker} from '../utils/shadowdom/ShadowTreeWalker';
+
 import {FocusableElement, RefObject} from '@react-types/shared';
-import {focusSafely, getInteractionModality} from '@react-aria/interactions';
+import {focusSafely} from '../interactions/focusSafely';
+import {getActiveElement, getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {getInteractionModality} from '../interactions/useFocusVisible';
+import {getOwnerDocument, getOwnerWindow} from '../utils/domHelpers';
+import {isAndroid, isChrome} from '../utils/platform';
+import {isFocusable, isTabbable} from '../utils/isFocusable';
 import React, {JSX, ReactNode, useContext, useEffect, useMemo, useRef} from 'react';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
 
 export interface FocusScopeProps {
   /** The contents of the focus scope. */
@@ -588,7 +582,7 @@ function shouldRestoreFocus(scopeRef: ScopeRef) {
 
 function useRestoreFocus(scopeRef: RefObject<Element[] | null>, restoreFocus?: boolean, contain?: boolean) {
   // create a ref during render instead of useLayoutEffect so the active element is saved before a child with autoFocus=true mounts.
-  // eslint-disable-next-line no-restricted-globals
+   
   const nodeToRestoreRef = useRef(typeof document !== 'undefined' ? getActiveElement(getOwnerDocument(scopeRef.current ? scopeRef.current[0] : undefined)) as FocusableElement : null);
 
   // restoring scopes should all track if they are active regardless of contain, but contain already tracks it plus logic to contain the focus
diff --git a/packages/@react-aria/focus/src/useFocusRing.ts b/packages/react-aria/src/focus/useFocusRing.ts
similarity index 91%
rename from packages/@react-aria/focus/src/useFocusRing.ts
rename to packages/react-aria/src/focus/useFocusRing.ts
index e8c98c4dfcd..6c769d47d4c 100644
--- a/packages/@react-aria/focus/src/useFocusRing.ts
+++ b/packages/react-aria/src/focus/useFocusRing.ts
@@ -1,6 +1,8 @@
 import {DOMAttributes} from '@react-types/shared';
-import {isFocusVisible, useFocus, useFocusVisibleListener, useFocusWithin} from '@react-aria/interactions';
+import {isFocusVisible, useFocusVisibleListener} from '../interactions/useFocusVisible';
 import {useCallback, useRef, useState} from 'react';
+import {useFocus} from '../interactions/useFocus';
+import {useFocusWithin} from '../interactions/useFocusWithin';
 
 export interface AriaFocusRingProps {
   /**
diff --git a/packages/@react-aria/focus/src/useHasTabbableChild.ts b/packages/react-aria/src/focus/useHasTabbableChild.ts
similarity index 97%
rename from packages/@react-aria/focus/src/useHasTabbableChild.ts
rename to packages/react-aria/src/focus/useHasTabbableChild.ts
index 250b077636b..c01f797a5d0 100644
--- a/packages/@react-aria/focus/src/useHasTabbableChild.ts
+++ b/packages/react-aria/src/focus/useHasTabbableChild.ts
@@ -12,7 +12,7 @@
 
 import {getFocusableTreeWalker} from './FocusScope';
 import {RefObject} from '@react-types/shared';
-import {useLayoutEffect} from '@react-aria/utils';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
 import {useState} from 'react';
 
 interface AriaHasTabbableChildOptions {
diff --git a/packages/@react-aria/focus/src/virtualFocus.ts b/packages/react-aria/src/focus/virtualFocus.ts
similarity index 89%
rename from packages/@react-aria/focus/src/virtualFocus.ts
rename to packages/react-aria/src/focus/virtualFocus.ts
index 3679f71ea31..a50248a1f82 100644
--- a/packages/@react-aria/focus/src/virtualFocus.ts
+++ b/packages/react-aria/src/focus/virtualFocus.ts
@@ -1,4 +1,5 @@
-import {getActiveElement, getOwnerDocument} from '@react-aria/utils';
+import {getActiveElement} from '../utils/shadowdom/DOMFunctions';
+import {getOwnerDocument} from '../utils/domHelpers';
 
 export function moveVirtualFocus(to: Element | null): void {
   let from = getVirtuallyFocusedElement(getOwnerDocument(to));
diff --git a/packages/@react-aria/form/src/useFormValidation.ts b/packages/react-aria/src/form/useFormValidation.ts
similarity index 94%
rename from packages/@react-aria/form/src/useFormValidation.ts
rename to packages/react-aria/src/form/useFormValidation.ts
index 60b8ad67a50..09ccc58c2de 100644
--- a/packages/@react-aria/form/src/useFormValidation.ts
+++ b/packages/react-aria/src/form/useFormValidation.ts
@@ -10,11 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {FormValidationState} from '@react-stately/form';
-import {getEventTarget, useEffectEvent, useLayoutEffect} from '@react-aria/utils';
+import {FormValidationState} from 'react-stately/private/form/useFormValidationState';
+
+import {getEventTarget} from '../utils/shadowdom/DOMFunctions';
 import {RefObject, Validation, ValidationResult} from '@react-types/shared';
-import {setInteractionModality} from '@react-aria/interactions';
+import {setInteractionModality} from '../interactions/useFocusVisible';
 import {useEffect, useRef} from 'react';
+import {useEffectEvent} from '../utils/useEffectEvent';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
 
 type ValidatableElement = HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement;
 
diff --git a/packages/@react-aria/grid/src/GridKeyboardDelegate.ts b/packages/react-aria/src/grid/GridKeyboardDelegate.ts
similarity index 99%
rename from packages/@react-aria/grid/src/GridKeyboardDelegate.ts
rename to packages/react-aria/src/grid/GridKeyboardDelegate.ts
index b1fceaf3cb3..ee94c59832f 100644
--- a/packages/@react-aria/grid/src/GridKeyboardDelegate.ts
+++ b/packages/react-aria/src/grid/GridKeyboardDelegate.ts
@@ -11,8 +11,8 @@
  */
 
 import {Direction, DisabledBehavior, Key, KeyboardDelegate, LayoutDelegate, Node, Rect, RefObject, Size} from '@react-types/shared';
-import {DOMLayoutDelegate} from '@react-aria/selection';
-import {getChildNodes, getFirstItem, getLastItem, getNthItem} from '@react-stately/collections';
+import {DOMLayoutDelegate} from '../selection/DOMLayoutDelegate';
+import {getChildNodes, getFirstItem, getLastItem, getNthItem} from 'react-stately/private/collections/getChildNodes';
 import {GridCollection, GridNode} from '@react-types/grid';
 
 export interface GridKeyboardDelegateOptions<C> {
diff --git a/packages/@react-aria/grid/src/useGrid.ts b/packages/react-aria/src/grid/useGrid.ts
similarity index 92%
rename from packages/@react-aria/grid/src/useGrid.ts
rename to packages/react-aria/src/grid/useGrid.ts
index 80a3c834899..913c29cb2c9 100644
--- a/packages/@react-aria/grid/src/useGrid.ts
+++ b/packages/react-aria/src/grid/useGrid.ts
@@ -11,17 +11,21 @@
  */
 
 import {AriaLabelingProps, DOMAttributes, DOMProps, Key, KeyboardDelegate, RefObject} from '@react-types/shared';
-import {filterDOMProps, getEventTarget, mergeProps, nodeContains, useId} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {FocusEventHandler, useCallback, useMemo} from 'react';
+import {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
 import {GridCollection} from '@react-types/grid';
 import {GridKeyboardDelegate} from './GridKeyboardDelegate';
 import {gridMap} from './utils';
-import {GridState} from '@react-stately/grid';
-import {useCollator, useLocale} from '@react-aria/i18n';
+import {GridState} from 'react-stately/private/grid/useGridState';
+import {mergeProps} from '../utils/mergeProps';
+import {useCollator} from '../i18n/useCollator';
 import {useGridSelectionAnnouncement} from './useGridSelectionAnnouncement';
-import {useHasTabbableChild} from '@react-aria/focus';
+import {useHasTabbableChild} from '../focus/useHasTabbableChild';
 import {useHighlightSelectionDescription} from './useHighlightSelectionDescription';
-import {useSelectableCollection} from '@react-aria/selection';
+import {useId} from '../utils/useId';
+import {useLocale} from '../i18n/I18nProvider';
+import {useSelectableCollection} from '../selection/useSelectableCollection';
 
 export interface GridProps extends DOMProps, AriaLabelingProps {
   /** Whether the grid uses virtual scrolling. */
diff --git a/packages/@react-aria/grid/src/useGridCell.ts b/packages/react-aria/src/grid/useGridCell.ts
similarity index 94%
rename from packages/@react-aria/grid/src/useGridCell.ts
rename to packages/react-aria/src/grid/useGridCell.ts
index 7f4a3ed6425..b74e84e3aff 100644
--- a/packages/@react-aria/grid/src/useGridCell.ts
+++ b/packages/react-aria/src/grid/useGridCell.ts
@@ -11,15 +11,19 @@
  */
 
 import {DOMAttributes, FocusableElement, Key, RefObject} from '@react-types/shared';
-import {focusSafely, isFocusVisible} from '@react-aria/interactions';
-import {getActiveElement, getEventTarget, getScrollParent, isFocusWithin, mergeProps, nodeContains, scrollIntoViewport} from '@react-aria/utils';
-import {getFocusableTreeWalker} from '@react-aria/focus';
+import {focusSafely} from '../interactions/focusSafely';
+import {getActiveElement, getEventTarget, isFocusWithin, nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {getFocusableTreeWalker} from '../focus/FocusScope';
+import {getScrollParent} from '../utils/getScrollParent';
 import {GridCollection, GridNode} from '@react-types/grid';
 import {gridMap} from './utils';
-import {GridState} from '@react-stately/grid';
+import {GridState} from 'react-stately/private/grid/useGridState';
+import {isFocusVisible} from '../interactions/useFocusVisible';
+import {mergeProps} from '../utils/mergeProps';
 import {KeyboardEvent as ReactKeyboardEvent, useRef} from 'react';
-import {useLocale} from '@react-aria/i18n';
-import {useSelectableItem} from '@react-aria/selection';
+import {scrollIntoViewport} from '../utils/scrollIntoView';
+import {useLocale} from '../i18n/I18nProvider';
+import {useSelectableItem} from '../selection/useSelectableItem';
 
 export interface GridCellProps {
   /** An object representing the grid cell. Contains all the relevant information that makes up the grid cell. */
diff --git a/packages/@react-aria/grid/src/useGridRow.ts b/packages/react-aria/src/grid/useGridRow.ts
similarity index 94%
rename from packages/@react-aria/grid/src/useGridRow.ts
rename to packages/react-aria/src/grid/useGridRow.ts
index e4907e9c59e..9b3b7994a15 100644
--- a/packages/@react-aria/grid/src/useGridRow.ts
+++ b/packages/react-aria/src/grid/useGridRow.ts
@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {chain} from '@react-aria/utils';
+import {chain} from '../utils/chain';
 import {DOMAttributes, FocusableElement, RefObject} from '@react-types/shared';
 import {GridCollection, GridNode} from '@react-types/grid';
 import {gridMap} from './utils';
-import {GridState} from '@react-stately/grid';
-import {SelectableItemStates, useSelectableItem} from '@react-aria/selection';
+import {GridState} from 'react-stately/private/grid/useGridState';
+import {SelectableItemStates, useSelectableItem} from '../selection/useSelectableItem';
 
 export interface GridRowProps<T> {
   /** An object representing the grid row. Contains all the relevant information that makes up the grid row. */
diff --git a/packages/@react-aria/grid/src/useGridRowGroup.ts b/packages/react-aria/src/grid/useGridRowGroup.ts
similarity index 100%
rename from packages/@react-aria/grid/src/useGridRowGroup.ts
rename to packages/react-aria/src/grid/useGridRowGroup.ts
diff --git a/packages/@react-aria/grid/src/useGridSelectionAnnouncement.ts b/packages/react-aria/src/grid/useGridSelectionAnnouncement.ts
similarity index 93%
rename from packages/@react-aria/grid/src/useGridSelectionAnnouncement.ts
rename to packages/react-aria/src/grid/useGridSelectionAnnouncement.ts
index 5d129aedba9..f7dfa12332e 100644
--- a/packages/@react-aria/grid/src/useGridSelectionAnnouncement.ts
+++ b/packages/react-aria/src/grid/useGridSelectionAnnouncement.ts
@@ -10,14 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {announce} from '@react-aria/live-announcer';
+import {announce} from '../live-announcer/LiveAnnouncer';
 import {Collection, Key, Node, Selection} from '@react-types/shared';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {SelectionManager} from '@react-stately/selection';
+import intlMessages from '../../intl/grid/*.json';
+import {SelectionManager} from 'react-stately/private/selection/SelectionManager';
 import {useCallback, useRef} from 'react';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useUpdateEffect} from '@react-aria/utils';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
+import {useUpdateEffect} from '../utils/useUpdateEffect';
 
 export interface GridSelectionAnnouncementProps {
   /**
diff --git a/packages/@react-aria/grid/src/useGridSelectionCheckbox.ts b/packages/react-aria/src/grid/useGridSelectionCheckbox.ts
similarity index 85%
rename from packages/@react-aria/grid/src/useGridSelectionCheckbox.ts
rename to packages/react-aria/src/grid/useGridSelectionCheckbox.ts
index 7326146fb57..d4509f427a3 100644
--- a/packages/@react-aria/grid/src/useGridSelectionCheckbox.ts
+++ b/packages/react-aria/src/grid/useGridSelectionCheckbox.ts
@@ -1,11 +1,11 @@
 import {AriaCheckboxProps} from '@react-types/checkbox';
 import {GridCollection} from '@react-types/grid';
-import {GridState} from '@react-stately/grid';
+import {GridState} from 'react-stately/private/grid/useGridState';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/grid/*.json';
 import {Key} from '@react-types/shared';
-import {useId} from '@react-aria/utils';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useId} from '../utils/useId';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 
 export interface AriaGridSelectionCheckboxProps {
   /** A unique key for the checkbox. */
diff --git a/packages/@react-aria/grid/src/useHighlightSelectionDescription.ts b/packages/react-aria/src/grid/useHighlightSelectionDescription.ts
similarity index 86%
rename from packages/@react-aria/grid/src/useHighlightSelectionDescription.ts
rename to packages/react-aria/src/grid/useHighlightSelectionDescription.ts
index 1d13c402ea9..ce47fcecae1 100644
--- a/packages/@react-aria/grid/src/useHighlightSelectionDescription.ts
+++ b/packages/react-aria/src/grid/useHighlightSelectionDescription.ts
@@ -12,11 +12,11 @@
 
 import {AriaLabelingProps} from '@react-types/shared';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {MultipleSelectionManager} from '@react-stately/selection';
-import {useDescription} from '@react-aria/utils';
-import {useInteractionModality} from '@react-aria/interactions';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import intlMessages from '../../intl/grid/*.json';
+import {MultipleSelectionManager} from 'react-stately/private/selection/types';
+import {useDescription} from '../utils/useDescription';
+import {useInteractionModality} from '../interactions/useFocusVisible';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 import {useMemo} from 'react';
 
 export interface HighlightSelectionDescriptionProps {
diff --git a/packages/@react-aria/grid/src/utils.ts b/packages/react-aria/src/grid/utils.ts
similarity index 94%
rename from packages/@react-aria/grid/src/utils.ts
rename to packages/react-aria/src/grid/utils.ts
index eb4defb3d47..8c4c8bd0418 100644
--- a/packages/@react-aria/grid/src/utils.ts
+++ b/packages/react-aria/src/grid/utils.ts
@@ -11,7 +11,7 @@
  */
 
 import type {GridCollection} from '@react-types/grid';
-import type {GridState} from '@react-stately/grid';
+import type {GridState} from 'react-stately/private/grid/useGridState';
 import type {Key, KeyboardDelegate} from '@react-types/shared';
 
 interface GridMapShared {
diff --git a/packages/@react-aria/gridlist/src/useGridList.ts b/packages/react-aria/src/gridlist/useGridList.ts
similarity index 92%
rename from packages/@react-aria/gridlist/src/useGridList.ts
rename to packages/react-aria/src/gridlist/useGridList.ts
index 055602c8146..dcc2af878ce 100644
--- a/packages/@react-aria/gridlist/src/useGridList.ts
+++ b/packages/react-aria/src/gridlist/useGridList.ts
@@ -23,12 +23,15 @@ import {
   MultipleSelection,
   RefObject
 } from '@react-types/shared';
-import {filterDOMProps, mergeProps, useId} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {listMap} from './utils';
-import {ListState} from '@react-stately/list';
-import {useGridSelectionAnnouncement, useHighlightSelectionDescription} from '@react-aria/grid';
-import {useHasTabbableChild} from '@react-aria/focus';
-import {useSelectableList} from '@react-aria/selection';
+import {ListState} from 'react-stately/useListState';
+import {mergeProps} from '../utils/mergeProps';
+import {useGridSelectionAnnouncement} from '../grid/useGridSelectionAnnouncement';
+import {useHasTabbableChild} from '../focus/useHasTabbableChild';
+import {useHighlightSelectionDescription} from '../grid/useHighlightSelectionDescription';
+import {useId} from '../utils/useId';
+import {useSelectableList} from '../selection/useSelectableList';
 
 export interface GridListProps<T> extends CollectionBase<T>, MultipleSelection {
   /** Whether to auto focus the gridlist or an option. */
diff --git a/packages/@react-aria/gridlist/src/useGridListItem.ts b/packages/react-aria/src/gridlist/useGridListItem.ts
similarity index 94%
rename from packages/@react-aria/gridlist/src/useGridListItem.ts
rename to packages/react-aria/src/gridlist/useGridListItem.ts
index 04873c2cee0..edfe9628851 100644
--- a/packages/@react-aria/gridlist/src/useGridListItem.ts
+++ b/packages/react-aria/src/gridlist/useGridListItem.ts
@@ -10,16 +10,24 @@
  * governing permissions and limitations under the License.
  */
 
-import {chain, getActiveElement, getEventTarget, getScrollParent, isFocusWithin, mergeProps, nodeContains, scrollIntoViewport, useSlotId, useSyntheticLinkProps} from '@react-aria/utils';
+import {chain} from '../utils/chain';
+
 import {Collection, DOMAttributes, FocusableElement, Key, RefObject, Node as RSNode} from '@react-types/shared';
-import {focusSafely, getFocusableTreeWalker} from '@react-aria/focus';
+import {focusSafely} from '../interactions/focusSafely';
+import {getActiveElement, getEventTarget, isFocusWithin, nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {getFocusableTreeWalker} from '../focus/FocusScope';
 import {getRowId, listMap} from './utils';
+import {getScrollParent} from '../utils/getScrollParent';
 import {HTMLAttributes, KeyboardEvent as ReactKeyboardEvent, useRef} from 'react';
-import {isFocusVisible} from '@react-aria/interactions';
-import type {ListState} from '@react-stately/list';
-import {SelectableItemStates, useSelectableItem} from '@react-aria/selection';
-import type {TreeState} from '@react-stately/tree';
-import {useLocale} from '@react-aria/i18n';
+import {isFocusVisible} from '../interactions/useFocusVisible';
+import type {ListState} from 'react-stately/useListState';
+import {mergeProps} from '../utils/mergeProps';
+import {scrollIntoViewport} from '../utils/scrollIntoView';
+import {SelectableItemStates, useSelectableItem} from '../selection/useSelectableItem';
+import type {TreeState} from 'react-stately/useTreeState';
+import {useLocale} from '../i18n/I18nProvider';
+import {useSlotId} from '../utils/useId';
+import {useSyntheticLinkProps} from '../utils/openLink';
 
 export interface AriaGridListItemOptions {
   /** An object representing the list item. Contains all the relevant information that makes up the list row. */
diff --git a/packages/@react-aria/gridlist/src/useGridListSection.ts b/packages/react-aria/src/gridlist/useGridListSection.ts
similarity index 92%
rename from packages/@react-aria/gridlist/src/useGridListSection.ts
rename to packages/react-aria/src/gridlist/useGridListSection.ts
index f7d8bce9433..9724fe05e03 100644
--- a/packages/@react-aria/gridlist/src/useGridListSection.ts
+++ b/packages/react-aria/src/gridlist/useGridListSection.ts
@@ -11,8 +11,9 @@
  */
 
 import {DOMAttributes, RefObject} from '@react-types/shared';
-import type {ListState} from '@react-stately/list';
-import {useLabels, useSlotId} from '@react-aria/utils';
+import type {ListState} from 'react-stately/useListState';
+import {useLabels} from '../utils/useLabels';
+import {useSlotId} from '../utils/useId';
 
 export interface AriaGridListSectionProps {
   /** An accessibility label for the section. Required if `heading` is not present. */
diff --git a/packages/@react-aria/gridlist/src/useGridListSelectionCheckbox.ts b/packages/react-aria/src/gridlist/useGridListSelectionCheckbox.ts
similarity index 86%
rename from packages/@react-aria/gridlist/src/useGridListSelectionCheckbox.ts
rename to packages/react-aria/src/gridlist/useGridListSelectionCheckbox.ts
index 5e6cb874eba..2536ab628d6 100644
--- a/packages/@react-aria/gridlist/src/useGridListSelectionCheckbox.ts
+++ b/packages/react-aria/src/gridlist/useGridListSelectionCheckbox.ts
@@ -10,9 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaGridSelectionCheckboxProps, GridSelectionCheckboxAria, useGridSelectionCheckbox} from '@react-aria/grid';
+import {
+  AriaGridSelectionCheckboxProps,
+  GridSelectionCheckboxAria,
+  useGridSelectionCheckbox
+} from '../grid/useGridSelectionCheckbox';
 import {getRowId} from './utils';
-import type {ListState} from '@react-stately/list';
+import type {ListState} from 'react-stately/useListState';
 
 /**
  * Provides the behavior and accessibility implementation for a selection checkbox in a grid list.
diff --git a/packages/@react-aria/gridlist/src/utils.ts b/packages/react-aria/src/gridlist/utils.ts
similarity index 96%
rename from packages/@react-aria/gridlist/src/utils.ts
rename to packages/react-aria/src/gridlist/utils.ts
index 9d1ab97a95d..2c8f72db0f6 100644
--- a/packages/@react-aria/gridlist/src/utils.ts
+++ b/packages/react-aria/src/gridlist/utils.ts
@@ -11,7 +11,7 @@
  */
 
 import {Key} from '@react-types/shared';
-import type {ListState} from '@react-stately/list';
+import type {ListState} from 'react-stately/useListState';
 
 interface ListMapShared {
   id: string,
diff --git a/packages/@react-aria/i18n/src/I18nProvider.tsx b/packages/react-aria/src/i18n/I18nProvider.tsx
similarity index 100%
rename from packages/@react-aria/i18n/src/I18nProvider.tsx
rename to packages/react-aria/src/i18n/I18nProvider.tsx
diff --git a/packages/@react-aria/i18n/src/main.js b/packages/react-aria/src/i18n/main.js
similarity index 100%
rename from packages/@react-aria/i18n/src/main.js
rename to packages/react-aria/src/i18n/main.js
diff --git a/packages/@react-aria/i18n/src/module.js b/packages/react-aria/src/i18n/module.js
similarity index 100%
rename from packages/@react-aria/i18n/src/module.js
rename to packages/react-aria/src/i18n/module.js
diff --git a/packages/@react-aria/i18n/src/server.tsx b/packages/react-aria/src/i18n/server.tsx
similarity index 100%
rename from packages/@react-aria/i18n/src/server.tsx
rename to packages/react-aria/src/i18n/server.tsx
diff --git a/packages/@react-aria/i18n/src/useCollator.ts b/packages/react-aria/src/i18n/useCollator.ts
similarity index 100%
rename from packages/@react-aria/i18n/src/useCollator.ts
rename to packages/react-aria/src/i18n/useCollator.ts
diff --git a/packages/@react-aria/i18n/src/useDateFormatter.ts b/packages/react-aria/src/i18n/useDateFormatter.ts
similarity index 97%
rename from packages/@react-aria/i18n/src/useDateFormatter.ts
rename to packages/react-aria/src/i18n/useDateFormatter.ts
index 96110bd9a2f..b71fdd2f3ca 100644
--- a/packages/@react-aria/i18n/src/useDateFormatter.ts
+++ b/packages/react-aria/src/i18n/useDateFormatter.ts
@@ -11,7 +11,7 @@
  */
 
 import {DateFormatter} from '@internationalized/date';
-import {useDeepMemo} from '@react-aria/utils';
+import {useDeepMemo} from '../utils/useDeepMemo';
 import {useLocale} from './I18nProvider';
 import {useMemo} from 'react';
 
diff --git a/packages/@react-aria/i18n/src/useDefaultLocale.ts b/packages/react-aria/src/i18n/useDefaultLocale.ts
similarity index 98%
rename from packages/@react-aria/i18n/src/useDefaultLocale.ts
rename to packages/react-aria/src/i18n/useDefaultLocale.ts
index 69d53efe9f1..db3bf04a93a 100644
--- a/packages/@react-aria/i18n/src/useDefaultLocale.ts
+++ b/packages/react-aria/src/i18n/useDefaultLocale.ts
@@ -13,7 +13,7 @@
 import {isRTL} from './utils';
 import {Locale} from './I18nProvider';
 import {useEffect, useState} from 'react';
-import {useIsSSR} from '@react-aria/ssr';
+import {useIsSSR} from '../ssr/SSRProvider';
 
 // Locale passed from server by PackageLocalizationProvider.
 const localeSymbol = Symbol.for('react-aria.i18n.locale');
diff --git a/packages/@react-aria/i18n/src/useFilter.ts b/packages/react-aria/src/i18n/useFilter.ts
similarity index 100%
rename from packages/@react-aria/i18n/src/useFilter.ts
rename to packages/react-aria/src/i18n/useFilter.ts
diff --git a/packages/@react-aria/i18n/src/useListFormatter.tsx b/packages/react-aria/src/i18n/useListFormatter.tsx
similarity index 100%
rename from packages/@react-aria/i18n/src/useListFormatter.tsx
rename to packages/react-aria/src/i18n/useListFormatter.tsx
diff --git a/packages/@react-aria/i18n/src/useLocalizedStringFormatter.ts b/packages/react-aria/src/i18n/useLocalizedStringFormatter.ts
similarity index 100%
rename from packages/@react-aria/i18n/src/useLocalizedStringFormatter.ts
rename to packages/react-aria/src/i18n/useLocalizedStringFormatter.ts
diff --git a/packages/@react-aria/i18n/src/useMessageFormatter.ts b/packages/react-aria/src/i18n/useMessageFormatter.ts
similarity index 100%
rename from packages/@react-aria/i18n/src/useMessageFormatter.ts
rename to packages/react-aria/src/i18n/useMessageFormatter.ts
diff --git a/packages/@react-aria/i18n/src/useNumberFormatter.ts b/packages/react-aria/src/i18n/useNumberFormatter.ts
similarity index 100%
rename from packages/@react-aria/i18n/src/useNumberFormatter.ts
rename to packages/react-aria/src/i18n/useNumberFormatter.ts
diff --git a/packages/@react-aria/i18n/src/utils.ts b/packages/react-aria/src/i18n/utils.ts
similarity index 100%
rename from packages/@react-aria/i18n/src/utils.ts
rename to packages/react-aria/src/i18n/utils.ts
diff --git a/packages/react-aria/src/index.ts b/packages/react-aria/src/index.ts
deleted file mode 100644
index 66c149dfe48..00000000000
--- a/packages/react-aria/src/index.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export {useBreadcrumbItem, useBreadcrumbs} from '@react-aria/breadcrumbs';
-export {useButton, useToggleButton, useToggleButtonGroup, useToggleButtonGroupItem} from '@react-aria/button';
-export {useCalendar, useCalendarCell, useCalendarGrid, useRangeCalendar} from '@react-aria/calendar';
-export {useCheckbox, useCheckboxGroup, useCheckboxGroupItem} from '@react-aria/checkbox';
-export {useColorArea, useColorChannelField, useColorField, useColorSlider, useColorSwatch, useColorWheel} from '@react-aria/color';
-export {useComboBox} from '@react-aria/combobox';
-export {useDateField, useDatePicker, useDateRangePicker, useDateSegment, useTimeField} from '@react-aria/datepicker';
-export {useDialog} from '@react-aria/dialog';
-export {useDisclosure} from '@react-aria/disclosure';
-export {useDrag, useDrop, useDraggableCollection, useDroppableCollection, useDroppableItem, useDropIndicator, useDraggableItem, useClipboard, DragPreview, ListDropTargetDelegate, DIRECTORY_DRAG_TYPE, isDirectoryDropItem, isFileDropItem, isTextDropItem} from '@react-aria/dnd';
-export {FocusRing, FocusScope, useFocusManager, useFocusRing} from '@react-aria/focus';
-export {I18nProvider, isRTL, useCollator, useDateFormatter, useFilter, useLocale, useLocalizedStringFormatter, useMessageFormatter, useNumberFormatter, useListFormatter} from '@react-aria/i18n';
-export {useFocus, useFocusVisible, useFocusWithin, useHover, useInteractOutside, useKeyboard, useMove, usePress, useLongPress, useFocusable, Pressable, Focusable} from '@react-aria/interactions';
-export {useField, useLabel} from '@react-aria/label';
-export {useGridList, useGridListItem, useGridListSection, useGridListSelectionCheckbox} from '@react-aria/gridlist';
-export {useLandmark} from '@react-aria/landmark';
-export {useLink} from '@react-aria/link';
-export {useListBox, useListBoxSection, useOption} from '@react-aria/listbox';
-export {useMenu, useMenuItem, useMenuSection, useMenuTrigger, useSubmenuTrigger} from '@react-aria/menu';
-export {useMeter} from '@react-aria/meter';
-export {useNumberField} from '@react-aria/numberfield';
-export {DismissButton, ModalProvider, Overlay, OverlayContainer, OverlayProvider, useModal, useModalOverlay, useModalProvider, useOverlay, useOverlayPosition, useOverlayTrigger, usePopover, usePreventScroll, UNSAFE_PortalProvider, useUNSAFE_PortalContext} from '@react-aria/overlays';
-export {useProgressBar} from '@react-aria/progress';
-export {useRadio, useRadioGroup} from '@react-aria/radio';
-export {useSearchField} from '@react-aria/searchfield';
-export {HiddenSelect, useHiddenSelect, useSelect} from '@react-aria/select';
-export {ListKeyboardDelegate} from '@react-aria/selection';
-export {useSeparator} from '@react-aria/separator';
-export {SSRProvider, useIsSSR} from '@react-aria/ssr';
-export {useSlider, useSliderThumb} from '@react-aria/slider';
-export {useSwitch} from '@react-aria/switch';
-export {useTable, useTableCell, useTableColumnHeader, useTableColumnResize, useTableHeaderRow, useTableRow, useTableRowGroup, useTableSelectAllCheckbox, useTableSelectionCheckbox} from '@react-aria/table';
-export {useTab, useTabList, useTabPanel} from '@react-aria/tabs';
-export {useTag, useTagGroup} from '@react-aria/tag';
-export {useTextField} from '@react-aria/textfield';
-export {useToast, useToastRegion} from '@react-aria/toast';
-export {useTooltip, useTooltipTrigger} from '@react-aria/tooltip';
-export {useTree, useTreeItem} from '@react-aria/tree';
-export {chain, mergeProps, useId, useObjectRef, RouterProvider} from '@react-aria/utils';
-export {VisuallyHidden, useVisuallyHidden} from '@react-aria/visually-hidden';
-
-export type {AriaBreadcrumbItemProps, AriaBreadcrumbsProps, BreadcrumbItemAria, BreadcrumbsAria} from '@react-aria/breadcrumbs';
-export type {AriaButtonOptions, AriaButtonProps, AriaToggleButtonProps, AriaToggleButtonOptions, ToggleButtonAria, ButtonAria, AriaToggleButtonGroupProps, ToggleButtonGroupAria, AriaToggleButtonGroupItemProps, AriaToggleButtonGroupItemOptions} from '@react-aria/button';
-export type {AriaCalendarCellProps, AriaCalendarGridProps, AriaCalendarProps, AriaRangeCalendarProps, CalendarAria, CalendarCellAria, CalendarGridAria, CalendarProps, RangeCalendarProps} from '@react-aria/calendar';
-export type {AriaCheckboxGroupItemProps, AriaCheckboxGroupProps, AriaCheckboxProps, CheckboxAria, CheckboxGroupAria} from '@react-aria/checkbox';
-export type {AriaColorAreaOptions, AriaColorAreaProps, AriaColorChannelFieldProps, AriaColorFieldProps, AriaColorSliderOptions, AriaColorSliderProps, AriaColorSwatchProps, AriaColorWheelOptions, ColorAreaAria, ColorChannelFieldAria, ColorFieldAria, ColorSliderAria, ColorSwatchAria, ColorWheelAria} from '@react-aria/color';
-export type {AriaComboBoxOptions, AriaComboBoxProps, ComboBoxAria} from '@react-aria/combobox';
-export type {AriaDateFieldProps, AriaDateFieldOptions, AriaDatePickerProps, AriaDateRangePickerProps, AriaTimeFieldProps, AriaTimeFieldOptions, DateFieldAria, DatePickerAria, DateRangePickerAria, DateSegmentAria, DateRange, DateValue, TimeValue} from '@react-aria/datepicker';
-export type {AriaDialogProps, DialogAria} from '@react-aria/dialog';
-export type {DisclosureAria, AriaDisclosureProps} from '@react-aria/disclosure';
-export type {AriaFocusRingProps, FocusableAria, FocusableOptions, FocusManager, FocusManagerOptions, FocusRingAria, FocusRingProps, FocusScopeProps} from '@react-aria/focus';
-export type {DateFormatter, DateFormatterOptions, Filter, FormatMessage, I18nProviderProps, Locale, LocalizedStringFormatter, LocalizedStrings} from '@react-aria/i18n';
-export type {ClipboardProps, ClipboardResult, DirectoryDropItem, DragEndEvent, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionOptions, DraggableCollectionStartEvent, DraggableItemProps, DraggableItemResult, DragItem, DragMoveEvent, DragOptions, DragPreviewProps, DragPreviewRenderer, DragResult, DragStartEvent, DragTypes, DropEnterEvent, DropEvent, DropExitEvent, DropIndicatorAria, DropIndicatorProps, DropItem, DropMoveEvent, DropOperation, DropOptions, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionOptions, DroppableCollectionReorderEvent, DroppableCollectionResult, DroppableCollectionRootDropEvent, DroppableItemOptions, DroppableItemResult, DropPosition, DropResult, DropTarget, DropTargetDelegate, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-aria/dnd';
-export type {FocusProps, FocusResult, FocusVisibleProps, FocusVisibleResult, FocusWithinProps, FocusWithinResult, HoverProps, HoverResult, InteractOutsideProps, KeyboardProps, KeyboardResult, LongPressProps, LongPressResult, MoveEvents, MoveResult, PressHookProps, PressProps, PressResult, ScrollWheelProps, PressEvent, PressEvents, LongPressEvent, MoveStartEvent, MoveMoveEvent, MoveEndEvent, MoveEvent, HoverEvent, HoverEvents, FocusEvents, KeyboardEvents} from '@react-aria/interactions';
-export type {AriaFieldProps, FieldAria, LabelAria, LabelAriaProps} from '@react-aria/label';
-export type {AriaLandmarkRole, AriaLandmarkProps, LandmarkAria, LandmarkController} from '@react-aria/landmark';
-export type {AriaLinkOptions, LinkAria} from '@react-aria/link';
-export type {AriaListBoxOptions, AriaListBoxProps, AriaListBoxSectionProps, AriaOptionProps, ListBoxAria, ListBoxSectionAria, OptionAria} from '@react-aria/listbox';
-export type {AriaGridListOptions, GridListProps, AriaGridListProps, GridListAria, AriaGridListItemOptions, GridListItemAria, AriaGridSelectionCheckboxProps, GridSelectionCheckboxAria, AriaGridListSectionProps, GridListSectionAria} from '@react-aria/gridlist';
-export type {AriaMenuProps, AriaMenuItemProps, AriaMenuOptions, AriaMenuSectionProps, AriaMenuTriggerProps, MenuAria, MenuItemAria, MenuSectionAria, MenuTriggerAria, SubmenuTriggerAria, AriaSubmenuTriggerProps} from '@react-aria/menu';
-export type {AriaMeterProps, MeterAria} from '@react-aria/meter';
-export type {AriaNumberFieldProps, NumberFieldAria} from '@react-aria/numberfield';
-export type {AriaModalOptions, AriaModalOverlayProps, AriaOverlayProps, AriaPopoverProps, AriaPositionProps, DismissButtonProps, ModalAria, ModalOverlayAria, ModalProviderAria, ModalProviderProps, OverlayAria, OverlayContainerProps, OverlayProps, OverlayTriggerAria, OverlayTriggerProps, PopoverAria, PositionAria, Placement, PlacementAxis, PositionProps, PortalProviderProps, PortalProviderContextValue} from '@react-aria/overlays';
-export type {AriaProgressBarProps, ProgressBarAria} from '@react-aria/progress';
-export type {AriaRadioGroupProps, AriaRadioProps, RadioAria, RadioGroupAria} from '@react-aria/radio';
-export type {AriaSearchFieldProps, SearchFieldAria} from '@react-aria/searchfield';
-export type {AriaHiddenSelectProps, AriaHiddenSelectOptions, HiddenSelectAria, AriaSelectProps, AriaSelectOptions, HiddenSelectProps, SelectAria} from '@react-aria/select';
-export type {SeparatorAria, SeparatorProps} from '@react-aria/separator';
-export type {SSRProviderProps} from '@react-aria/ssr';
-export type {AriaSliderProps, AriaSliderThumbProps, AriaSliderThumbOptions, SliderAria, SliderThumbAria} from '@react-aria/slider';
-export type {AriaSwitchProps, SwitchAria} from '@react-aria/switch';
-export type {AriaTableCellProps, AriaTableColumnHeaderProps, AriaTableColumnResizeProps, AriaTableProps, AriaTableSelectionCheckboxProps, GridAria, GridRowAria, GridRowProps, TableCellAria, TableColumnHeaderAria, TableColumnResizeAria, TableHeaderRowAria, TableSelectAllCheckboxAria, TableSelectionCheckboxAria} from '@react-aria/table';
-export type {AriaTabListProps, AriaTabListOptions, AriaTabPanelProps, AriaTabProps, TabAria, TabListAria, TabPanelAria} from '@react-aria/tabs';
-export type {AriaTagGroupProps, AriaTagGroupOptions, AriaTagProps, TagAria, TagGroupAria} from '@react-aria/tag';
-export type {AriaTextFieldOptions, AriaTextFieldProps, TextFieldAria} from '@react-aria/textfield';
-export type {AriaToastRegionProps, AriaToastProps, ToastAria, ToastRegionAria} from '@react-aria/toast';
-export type {AriaTooltipProps, TooltipAria, TooltipTriggerAria, TooltipTriggerProps} from '@react-aria/tooltip';
-export type {AriaTreeProps, AriaTreeItemOptions, TreeProps, TreeAria, TreeItemAria} from '@react-aria/tree';
-export type {VisuallyHiddenAria, VisuallyHiddenProps} from '@react-aria/visually-hidden';
-export type {Key, Orientation, RangeValue} from '@react-types/shared';
diff --git a/packages/@react-aria/interactions/src/PressResponder.tsx b/packages/react-aria/src/interactions/PressResponder.tsx
similarity index 94%
rename from packages/@react-aria/interactions/src/PressResponder.tsx
rename to packages/react-aria/src/interactions/PressResponder.tsx
index f6a598a7a68..4cdbd68ccc5 100644
--- a/packages/@react-aria/interactions/src/PressResponder.tsx
+++ b/packages/react-aria/src/interactions/PressResponder.tsx
@@ -11,10 +11,12 @@
  */
 
 import {FocusableElement} from '@react-types/shared';
-import {mergeProps, useObjectRef, useSyncRef} from '@react-aria/utils';
+import {mergeProps} from '../utils/mergeProps';
 import {PressProps} from './usePress';
 import {PressResponderContext} from './context';
 import React, {ForwardedRef, JSX, ReactNode, useContext, useEffect, useMemo, useRef} from 'react';
+import {useObjectRef} from '../utils/useObjectRef';
+import {useSyncRef} from '../utils/useSyncRef';
 
 interface PressResponderProps extends PressProps {
   children: ReactNode
diff --git a/packages/@react-aria/interactions/src/Pressable.tsx b/packages/react-aria/src/interactions/Pressable.tsx
similarity index 92%
rename from packages/@react-aria/interactions/src/Pressable.tsx
rename to packages/react-aria/src/interactions/Pressable.tsx
index 58499bed341..a5cfe57a8de 100644
--- a/packages/@react-aria/interactions/src/Pressable.tsx
+++ b/packages/react-aria/src/interactions/Pressable.tsx
@@ -11,10 +11,14 @@
  */
 
 import {DOMAttributes, FocusableElement} from '@react-types/shared';
-import {getOwnerWindow, isFocusable, mergeProps, mergeRefs, useObjectRef} from '@react-aria/utils';
+import {getOwnerWindow} from '../utils/domHelpers';
+import {isFocusable} from '../utils/isFocusable';
+import {mergeProps} from '../utils/mergeProps';
+import {mergeRefs} from '../utils/mergeRefs';
 import {PressProps, usePress} from './usePress';
 import React, {ForwardedRef, ReactElement, useEffect} from 'react';
 import {useFocusable} from './useFocusable';
+import {useObjectRef} from '../utils/useObjectRef';
 
 interface PressableProps extends PressProps {
   children: ReactElement<DOMAttributes, string>
diff --git a/packages/@react-aria/interactions/src/context.ts b/packages/react-aria/src/interactions/context.ts
similarity index 100%
rename from packages/@react-aria/interactions/src/context.ts
rename to packages/react-aria/src/interactions/context.ts
diff --git a/packages/@react-aria/interactions/src/createEventHandler.ts b/packages/react-aria/src/interactions/createEventHandler.ts
similarity index 100%
rename from packages/@react-aria/interactions/src/createEventHandler.ts
rename to packages/react-aria/src/interactions/createEventHandler.ts
diff --git a/packages/@react-aria/interactions/src/focusSafely.ts b/packages/react-aria/src/interactions/focusSafely.ts
similarity index 88%
rename from packages/@react-aria/interactions/src/focusSafely.ts
rename to packages/react-aria/src/interactions/focusSafely.ts
index 8164ad90893..2156e12d28e 100644
--- a/packages/@react-aria/interactions/src/focusSafely.ts
+++ b/packages/react-aria/src/interactions/focusSafely.ts
@@ -11,13 +11,11 @@
  */
 
 import {FocusableElement} from '@react-types/shared';
-import {
-  focusWithoutScrolling,
-  getActiveElement,
-  getOwnerDocument,
-  runAfterTransition
-} from '@react-aria/utils';
+import {focusWithoutScrolling} from '../utils/focusWithoutScrolling';
+import {getActiveElement} from '../utils/shadowdom/DOMFunctions';
 import {getInteractionModality} from './useFocusVisible';
+import {getOwnerDocument} from '../utils/domHelpers';
+import {runAfterTransition} from '../utils/runAfterTransition';
 
 /**
  * A utility function that focuses an element while avoiding undesired side effects such
diff --git a/packages/@react-aria/interactions/src/textSelection.ts b/packages/react-aria/src/interactions/textSelection.ts
similarity index 96%
rename from packages/@react-aria/interactions/src/textSelection.ts
rename to packages/react-aria/src/interactions/textSelection.ts
index e0b792cdfea..98fdc37af21 100644
--- a/packages/@react-aria/interactions/src/textSelection.ts
+++ b/packages/react-aria/src/interactions/textSelection.ts
@@ -10,7 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {getOwnerDocument, isIOS, runAfterTransition} from '@react-aria/utils';
+import {getOwnerDocument} from '../utils/domHelpers';
+
+import {isIOS} from '../utils/platform';
+import {runAfterTransition} from '../utils/runAfterTransition';
 
 // Safari on iOS starts selecting text on long press. The only way to avoid this, it seems,
 // is to add user-select: none to the entire page. Adding it to the pressable element prevents
diff --git a/packages/@react-aria/interactions/src/useFocus.ts b/packages/react-aria/src/interactions/useFocus.ts
similarity index 95%
rename from packages/@react-aria/interactions/src/useFocus.ts
rename to packages/react-aria/src/interactions/useFocus.ts
index 5cb574d662f..ab0acd06efd 100644
--- a/packages/@react-aria/interactions/src/useFocus.ts
+++ b/packages/react-aria/src/interactions/useFocus.ts
@@ -17,7 +17,8 @@
 
 import {DOMAttributes, FocusableElement, FocusEvents} from '@react-types/shared';
 import {FocusEvent, useCallback} from 'react';
-import {getActiveElement, getEventTarget, getOwnerDocument} from '@react-aria/utils';
+import {getActiveElement, getEventTarget} from '../utils/shadowdom/DOMFunctions';
+import {getOwnerDocument} from '../utils/domHelpers';
 import {useSyntheticBlurEvent} from './utils';
 
 export interface FocusProps<Target = FocusableElement> extends FocusEvents<Target> {
diff --git a/packages/@react-aria/interactions/src/useFocusVisible.ts b/packages/react-aria/src/interactions/useFocusVisible.ts
similarity index 97%
rename from packages/@react-aria/interactions/src/useFocusVisible.ts
rename to packages/react-aria/src/interactions/useFocusVisible.ts
index ba6912ff239..e981af6a270 100644
--- a/packages/@react-aria/interactions/src/useFocusVisible.ts
+++ b/packages/react-aria/src/interactions/useFocusVisible.ts
@@ -15,11 +15,16 @@
 // NOTICE file in the root directory of this source tree.
 // See https://github.com/facebook/react/tree/cc7c1aece46a6b69b41958d731e0fd27c94bfc6c/packages/react-interactions
 
-import {getActiveElement, getEventTarget, getOwnerDocument, getOwnerWindow, isMac, isVirtualClick, openLink} from '@react-aria/utils';
+import {getActiveElement, getEventTarget} from '../utils/shadowdom/DOMFunctions';
+
+import {getOwnerDocument, getOwnerWindow} from '../utils/domHelpers';
 import {ignoreFocusEvent} from './utils';
+import {isMac} from '../utils/platform';
+import {isVirtualClick} from '../utils/isVirtualEvent';
+import {openLink} from '../utils/openLink';
 import {PointerType} from '@react-types/shared';
 import {useEffect, useState} from 'react';
-import {useIsSSR} from '@react-aria/ssr';
+import {useIsSSR} from '../ssr/SSRProvider';
 
 export type Modality = 'keyboard' | 'pointer' | 'virtual';
 type HandlerEvent = PointerEvent | MouseEvent | KeyboardEvent | FocusEvent | null;
@@ -237,7 +242,7 @@ export function addWindowFocusTracking(element?: HTMLElement | null): () => void
 }
 
 // Server-side rendering does not have the document object defined
-// eslint-disable-next-line no-restricted-globals
+ 
 if (typeof document !== 'undefined') {
   addWindowFocusTracking();
 }
diff --git a/packages/@react-aria/interactions/src/useFocusWithin.ts b/packages/react-aria/src/interactions/useFocusWithin.ts
similarity index 95%
rename from packages/@react-aria/interactions/src/useFocusWithin.ts
rename to packages/react-aria/src/interactions/useFocusWithin.ts
index 5f32dba0a11..d501bc49ab2 100644
--- a/packages/@react-aria/interactions/src/useFocusWithin.ts
+++ b/packages/react-aria/src/interactions/useFocusWithin.ts
@@ -18,7 +18,9 @@
 import {createSyntheticEvent, setEventTarget, useSyntheticBlurEvent} from './utils';
 import {DOMAttributes} from '@react-types/shared';
 import {FocusEvent, useCallback, useRef} from 'react';
-import {getActiveElement, getEventTarget, getOwnerDocument, nodeContains, useGlobalListeners} from '@react-aria/utils';
+import {getActiveElement, getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {getOwnerDocument} from '../utils/domHelpers';
+import {useGlobalListeners} from '../utils/useGlobalListeners';
 
 export interface FocusWithinProps {
   /** Whether the focus within events should be disabled. */
diff --git a/packages/@react-aria/interactions/src/useFocusable.tsx b/packages/react-aria/src/interactions/useFocusable.tsx
similarity index 94%
rename from packages/@react-aria/interactions/src/useFocusable.tsx
rename to packages/react-aria/src/interactions/useFocusable.tsx
index ac9f81251c6..c8794bac2b4 100644
--- a/packages/@react-aria/interactions/src/useFocusable.tsx
+++ b/packages/react-aria/src/interactions/useFocusable.tsx
@@ -11,11 +11,16 @@
  */
 
 import {DOMAttributes, FocusableDOMProps, FocusableElement, FocusableProps, RefObject} from '@react-types/shared';
-import {focusSafely} from './';
-import {getOwnerWindow, isFocusable, mergeProps, mergeRefs, useObjectRef, useSyncRef} from '@react-aria/utils';
+import {focusSafely} from './focusSafely';
+import {getOwnerWindow} from '../utils/domHelpers';
+import {isFocusable} from '../utils/isFocusable';
+import {mergeProps} from '../utils/mergeProps';
+import {mergeRefs} from '../utils/mergeRefs';
 import React, {ForwardedRef, forwardRef, MutableRefObject, ReactElement, ReactNode, useContext, useEffect, useRef} from 'react';
 import {useFocus} from './useFocus';
 import {useKeyboard} from './useKeyboard';
+import {useObjectRef} from '../utils/useObjectRef';
+import {useSyncRef} from '../utils/useSyncRef';
 
 export interface FocusableOptions<T = FocusableElement> extends FocusableProps<T>, FocusableDOMProps {
   /** Whether focus should be disabled. */
diff --git a/packages/@react-aria/interactions/src/useHover.ts b/packages/react-aria/src/interactions/useHover.ts
similarity index 97%
rename from packages/@react-aria/interactions/src/useHover.ts
rename to packages/react-aria/src/interactions/useHover.ts
index 5a1d94c4eee..39b4a933912 100644
--- a/packages/@react-aria/interactions/src/useHover.ts
+++ b/packages/react-aria/src/interactions/useHover.ts
@@ -16,8 +16,10 @@
 // See https://github.com/facebook/react/tree/cc7c1aece46a6b69b41958d731e0fd27c94bfc6c/packages/react-interactions
 
 import {DOMAttributes, HoverEvents} from '@react-types/shared';
-import {getEventTarget, getOwnerDocument, nodeContains, useGlobalListeners} from '@react-aria/utils';
+import {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {getOwnerDocument} from '../utils/domHelpers';
 import {useEffect, useMemo, useRef, useState} from 'react';
+import {useGlobalListeners} from '../utils/useGlobalListeners';
 
 export interface HoverProps extends HoverEvents {
   /** Whether the hover events should be disabled. */
diff --git a/packages/@react-aria/interactions/src/useInteractOutside.ts b/packages/react-aria/src/interactions/useInteractOutside.ts
similarity index 96%
rename from packages/@react-aria/interactions/src/useInteractOutside.ts
rename to packages/react-aria/src/interactions/useInteractOutside.ts
index 309899d9a92..31dd6696b80 100644
--- a/packages/@react-aria/interactions/src/useInteractOutside.ts
+++ b/packages/react-aria/src/interactions/useInteractOutside.ts
@@ -15,9 +15,12 @@
 // NOTICE file in the root directory of this source tree.
 // See https://github.com/facebook/react/tree/cc7c1aece46a6b69b41958d731e0fd27c94bfc6c/packages/react-interactions
 
-import {getEventTarget, getOwnerDocument, nodeContains, useEffectEvent} from '@react-aria/utils';
+import {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
+
+import {getOwnerDocument} from '../utils/domHelpers';
 import {RefObject} from '@react-types/shared';
 import {useEffect, useRef} from 'react';
+import {useEffectEvent} from '../utils/useEffectEvent';
 
 export interface InteractOutsideProps {
   ref: RefObject<Element | null>,
diff --git a/packages/@react-aria/interactions/src/useKeyboard.ts b/packages/react-aria/src/interactions/useKeyboard.ts
similarity index 100%
rename from packages/@react-aria/interactions/src/useKeyboard.ts
rename to packages/react-aria/src/interactions/useKeyboard.ts
diff --git a/packages/@react-aria/interactions/src/useLongPress.ts b/packages/react-aria/src/interactions/useLongPress.ts
similarity index 93%
rename from packages/@react-aria/interactions/src/useLongPress.ts
rename to packages/react-aria/src/interactions/useLongPress.ts
index 1f910e487f5..e797a617675 100644
--- a/packages/@react-aria/interactions/src/useLongPress.ts
+++ b/packages/react-aria/src/interactions/useLongPress.ts
@@ -11,7 +11,11 @@
  */
 
 import {DOMAttributes, FocusableElement, LongPressEvent} from '@react-types/shared';
-import {focusWithoutScrolling, getOwnerDocument, mergeProps, useDescription, useGlobalListeners} from '@react-aria/utils';
+import {focusWithoutScrolling} from '../utils/focusWithoutScrolling';
+import {getOwnerDocument} from '../utils/domHelpers';
+import {mergeProps} from '../utils/mergeProps';
+import {useDescription} from '../utils/useDescription';
+import {useGlobalListeners} from '../utils/useGlobalListeners';
 import {usePress} from './usePress';
 import {useRef} from 'react';
 
diff --git a/packages/@react-aria/interactions/src/useMove.ts b/packages/react-aria/src/interactions/useMove.ts
similarity index 98%
rename from packages/@react-aria/interactions/src/useMove.ts
rename to packages/react-aria/src/interactions/useMove.ts
index c8158b4f9c3..8bb59e2c4d6 100644
--- a/packages/@react-aria/interactions/src/useMove.ts
+++ b/packages/react-aria/src/interactions/useMove.ts
@@ -13,7 +13,9 @@
 import {disableTextSelection, restoreTextSelection}  from './textSelection';
 import {DOMAttributes, MoveEvents, PointerType} from '@react-types/shared';
 import React, {useCallback, useMemo, useRef, useState} from 'react';
-import {useEffectEvent, useGlobalListeners, useLayoutEffect} from '@react-aria/utils';
+import {useEffectEvent} from '../utils/useEffectEvent';
+import {useGlobalListeners} from '../utils/useGlobalListeners';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
 
 export interface MoveResult {
   /** Props to spread on the target element. */
diff --git a/packages/@react-aria/interactions/src/usePress.ts b/packages/react-aria/src/interactions/usePress.ts
similarity index 98%
rename from packages/@react-aria/interactions/src/usePress.ts
rename to packages/react-aria/src/interactions/usePress.ts
index 46630ea9389..22d492502f5 100644
--- a/packages/@react-aria/interactions/src/usePress.ts
+++ b/packages/react-aria/src/interactions/usePress.ts
@@ -15,30 +15,26 @@
 // NOTICE file in the root directory of this source tree.
 // See https://github.com/facebook/react/tree/cc7c1aece46a6b69b41958d731e0fd27c94bfc6c/packages/react-interactions
 
-import {
-  chain,
-  focusWithoutScrolling,
-  getEventTarget,
-  getNonce,
-  getOwnerDocument,
-  getOwnerWindow,
-  isMac,
-  isVirtualClick,
-  isVirtualPointerEvent,
-  mergeProps,
-  nodeContains,
-  openLink,
-  useEffectEvent,
-  useGlobalListeners,
-  useLayoutEffect,
-  useSyncRef
-} from '@react-aria/utils';
+import {chain} from '../utils/chain';
+
 import {createSyntheticEvent, preventFocus, setEventTarget} from './utils';
 import {disableTextSelection, restoreTextSelection} from './textSelection';
 import {DOMAttributes, FocusableElement, PressEvent as IPressEvent, PointerType, PressEvents, RefObject} from '@react-types/shared';
 import {flushSync} from 'react-dom';
+import {focusWithoutScrolling} from '../utils/focusWithoutScrolling';
+import {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {getNonce} from '../utils/getNonce';
+import {getOwnerDocument, getOwnerWindow} from '../utils/domHelpers';
+import {isMac} from '../utils/platform';
+import {isVirtualClick, isVirtualPointerEvent} from '../utils/isVirtualEvent';
+import {mergeProps} from '../utils/mergeProps';
+import {openLink} from '../utils/openLink';
 import {PressResponderContext} from './context';
 import {MouseEvent as RMouseEvent, TouchEvent as RTouchEvent, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
+import {useEffectEvent} from '../utils/useEffectEvent';
+import {useGlobalListeners} from '../utils/useGlobalListeners';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
+import {useSyncRef} from '../utils/useSyncRef';
 
 export interface PressProps extends PressEvents {
   /** Whether the target is in a controlled press state (e.g. an overlay it triggers is open). */
diff --git a/packages/@react-aria/interactions/src/useScrollWheel.ts b/packages/react-aria/src/interactions/useScrollWheel.ts
similarity index 97%
rename from packages/@react-aria/interactions/src/useScrollWheel.ts
rename to packages/react-aria/src/interactions/useScrollWheel.ts
index ccfbacad91b..f517d8e4784 100644
--- a/packages/@react-aria/interactions/src/useScrollWheel.ts
+++ b/packages/react-aria/src/interactions/useScrollWheel.ts
@@ -12,7 +12,7 @@
 
 import {RefObject, ScrollEvents} from '@react-types/shared';
 import {useCallback} from 'react';
-import {useEvent} from '@react-aria/utils';
+import {useEvent} from '../utils/useEvent';
 
 export interface ScrollWheelProps extends ScrollEvents {
   /** Whether the scroll listener should be disabled. */
diff --git a/packages/@react-aria/interactions/src/utils.ts b/packages/react-aria/src/interactions/utils.ts
similarity index 95%
rename from packages/@react-aria/interactions/src/utils.ts
rename to packages/react-aria/src/interactions/utils.ts
index 10eeca42bf5..54d10330d02 100644
--- a/packages/@react-aria/interactions/src/utils.ts
+++ b/packages/react-aria/src/interactions/utils.ts
@@ -11,8 +11,12 @@
  */
 
 import {FocusableElement} from '@react-types/shared';
-import {focusWithoutScrolling, getActiveElement, getEventTarget, getOwnerWindow, isFocusable, useLayoutEffect} from '@react-aria/utils';
+import {focusWithoutScrolling} from '../utils/focusWithoutScrolling';
+import {getActiveElement, getEventTarget} from '../utils/shadowdom/DOMFunctions';
+import {getOwnerWindow} from '../utils/domHelpers';
+import {isFocusable} from '../utils/isFocusable';
 import {FocusEvent as ReactFocusEvent, SyntheticEvent, useCallback, useRef} from 'react';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
 
 // Turn a native event into a React synthetic event.
 export function createSyntheticEvent<E extends SyntheticEvent>(nativeEvent: Event): E {
diff --git a/packages/@react-aria/label/src/useField.ts b/packages/react-aria/src/label/useField.ts
similarity index 96%
rename from packages/@react-aria/label/src/useField.ts
rename to packages/react-aria/src/label/useField.ts
index 6f27e5f5edd..1aa928b24e9 100644
--- a/packages/@react-aria/label/src/useField.ts
+++ b/packages/react-aria/src/label/useField.ts
@@ -12,7 +12,8 @@
 
 import {DOMAttributes, HelpTextProps, Validation} from '@react-types/shared';
 import {LabelAria, LabelAriaProps, useLabel} from './useLabel';
-import {mergeProps, useSlotId} from '@react-aria/utils';
+import {mergeProps} from '../utils/mergeProps';
+import {useSlotId} from '../utils/useId';
 
 export interface AriaFieldProps extends LabelAriaProps, HelpTextProps, Omit<Validation<any>, 'isRequired'> {}
 
diff --git a/packages/@react-aria/label/src/useLabel.ts b/packages/react-aria/src/label/useLabel.ts
similarity index 96%
rename from packages/@react-aria/label/src/useLabel.ts
rename to packages/react-aria/src/label/useLabel.ts
index 3a3e801c116..256bbccc653 100644
--- a/packages/@react-aria/label/src/useLabel.ts
+++ b/packages/react-aria/src/label/useLabel.ts
@@ -12,7 +12,8 @@
 
 import {AriaLabelingProps, DOMAttributes, DOMProps, LabelableProps} from '@react-types/shared';
 import {ElementType, LabelHTMLAttributes} from 'react';
-import {useId, useLabels} from '@react-aria/utils';
+import {useId} from '../utils/useId';
+import {useLabels} from '../utils/useLabels';
 
 export interface LabelAriaProps extends LabelableProps, DOMProps, AriaLabelingProps {
   /**
diff --git a/packages/@react-aria/landmark/src/useLandmark.ts b/packages/react-aria/src/landmark/useLandmark.ts
similarity index 99%
rename from packages/@react-aria/landmark/src/useLandmark.ts
rename to packages/react-aria/src/landmark/useLandmark.ts
index ce701232693..4e5815ccd0e 100644
--- a/packages/@react-aria/landmark/src/useLandmark.ts
+++ b/packages/react-aria/src/landmark/useLandmark.ts
@@ -11,8 +11,9 @@
  */
 
 import {AriaLabelingProps, DOMAttributes, FocusableElement, RefObject} from '@react-types/shared';
-import {getEventTarget, nodeContains, useLayoutEffect} from '@react-aria/utils';
+import {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
 import {useCallback, useEffect, useState} from 'react';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
 import {useSyncExternalStore} from 'use-sync-external-store/shim/index.js';
 
 export type AriaLandmarkRole = 'main' | 'region' | 'search' | 'navigation' | 'form' | 'banner' | 'contentinfo' | 'complementary';
diff --git a/packages/@react-aria/link/src/useLink.ts b/packages/react-aria/src/link/useLink.ts
similarity index 89%
rename from packages/@react-aria/link/src/useLink.ts
rename to packages/react-aria/src/link/useLink.ts
index f4098b25939..7f0272d740c 100644
--- a/packages/@react-aria/link/src/useLink.ts
+++ b/packages/react-aria/src/link/useLink.ts
@@ -12,9 +12,12 @@
 
 import {AriaLinkProps} from '@react-types/link';
 import {DOMAttributes, FocusableElement, RefObject} from '@react-types/shared';
-import {filterDOMProps, handleLinkClick, mergeProps, useLinkProps, useRouter} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import {handleLinkClick, useLinkProps, useRouter} from '../utils/openLink';
+import {mergeProps} from '../utils/mergeProps';
 import React from 'react';
-import {useFocusable, usePress} from '@react-aria/interactions';
+import {useFocusable} from '../interactions/useFocusable';
+import {usePress} from '../interactions/usePress';
 
 export interface AriaLinkOptions extends AriaLinkProps {
   /** Whether the link is disabled. */
diff --git a/packages/@react-aria/listbox/src/useListBox.ts b/packages/react-aria/src/listbox/useListBox.ts
similarity index 92%
rename from packages/@react-aria/listbox/src/useListBox.ts
rename to packages/react-aria/src/listbox/useListBox.ts
index c5ac0984bbf..0dc5b581ab3 100644
--- a/packages/@react-aria/listbox/src/useListBox.ts
+++ b/packages/react-aria/src/listbox/useListBox.ts
@@ -12,12 +12,14 @@
 
 import {AriaListBoxProps} from '@react-types/listbox';
 import {DOMAttributes, KeyboardDelegate, LayoutDelegate, RefObject} from '@react-types/shared';
-import {filterDOMProps, mergeProps, useId} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {listData} from './utils';
-import {ListState} from '@react-stately/list';
-import {useFocusWithin} from '@react-aria/interactions';
-import {useLabel} from '@react-aria/label';
-import {useSelectableList} from '@react-aria/selection';
+import {ListState} from 'react-stately/useListState';
+import {mergeProps} from '../utils/mergeProps';
+import {useFocusWithin} from '../interactions/useFocusWithin';
+import {useId} from '../utils/useId';
+import {useLabel} from '../label/useLabel';
+import {useSelectableList} from '../selection/useSelectableList';
 
 export interface ListBoxAria {
   /** Props for the listbox element. */
diff --git a/packages/@react-aria/listbox/src/useListBoxSection.ts b/packages/react-aria/src/listbox/useListBoxSection.ts
similarity index 98%
rename from packages/@react-aria/listbox/src/useListBoxSection.ts
rename to packages/react-aria/src/listbox/useListBoxSection.ts
index 1b0a045cf4c..dbf44369d97 100644
--- a/packages/@react-aria/listbox/src/useListBoxSection.ts
+++ b/packages/react-aria/src/listbox/useListBoxSection.ts
@@ -12,7 +12,7 @@
 
 import {DOMAttributes} from '@react-types/shared';
 import {ReactNode} from 'react';
-import {useId} from '@react-aria/utils';
+import {useId} from '../utils/useId';
 
 export interface AriaListBoxSectionProps {
   /** The heading for the section. */
diff --git a/packages/@react-aria/listbox/src/useOption.ts b/packages/react-aria/src/listbox/useOption.ts
similarity index 90%
rename from packages/@react-aria/listbox/src/useOption.ts
rename to packages/react-aria/src/listbox/useOption.ts
index f1e2628cee7..0b6cc215fdf 100644
--- a/packages/@react-aria/listbox/src/useOption.ts
+++ b/packages/react-aria/src/listbox/useOption.ts
@@ -10,13 +10,19 @@
  * governing permissions and limitations under the License.
  */
 
-import {chain, filterDOMProps, mergeProps, useLinkProps, useSlotId} from '@react-aria/utils';
+import {chain} from '../utils/chain';
+
 import {DOMAttributes, FocusableElement, Key, RefObject} from '@react-types/shared';
-import {getItemCount} from '@react-stately/collections';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import {getItemCount} from 'react-stately/private/collections/getItemCount';
 import {getItemId, listData} from './utils';
-import {isFocusVisible, useHover} from '@react-aria/interactions';
-import {ListState} from '@react-stately/list';
-import {SelectableItemStates, useSelectableItem} from '@react-aria/selection';
+import {isFocusVisible} from '../interactions/useFocusVisible';
+import {ListState} from 'react-stately/useListState';
+import {mergeProps} from '../utils/mergeProps';
+import {SelectableItemStates, useSelectableItem} from '../selection/useSelectableItem';
+import {useHover} from '../interactions/useHover';
+import {useLinkProps} from '../utils/openLink';
+import {useSlotId} from '../utils/useId';
 
 export interface OptionAria extends SelectableItemStates {
   /** Props for the option element. */
diff --git a/packages/@react-aria/listbox/src/utils.ts b/packages/react-aria/src/listbox/utils.ts
similarity index 96%
rename from packages/@react-aria/listbox/src/utils.ts
rename to packages/react-aria/src/listbox/utils.ts
index 0c3f653e00a..6eab75986c2 100644
--- a/packages/@react-aria/listbox/src/utils.ts
+++ b/packages/react-aria/src/listbox/utils.ts
@@ -11,7 +11,7 @@
  */
 
 import {Key} from '@react-types/shared';
-import {ListState} from '@react-stately/list';
+import {ListState} from 'react-stately/useListState';
 
 interface ListData {
   id?: string,
diff --git a/packages/@react-aria/live-announcer/src/LiveAnnouncer.tsx b/packages/react-aria/src/live-announcer/LiveAnnouncer.tsx
similarity index 100%
rename from packages/@react-aria/live-announcer/src/LiveAnnouncer.tsx
rename to packages/react-aria/src/live-announcer/LiveAnnouncer.tsx
diff --git a/packages/@react-aria/menu/src/useMenu.ts b/packages/react-aria/src/menu/useMenu.ts
similarity index 92%
rename from packages/@react-aria/menu/src/useMenu.ts
rename to packages/react-aria/src/menu/useMenu.ts
index efcb39784e7..d3d7c1b2316 100644
--- a/packages/@react-aria/menu/src/useMenu.ts
+++ b/packages/react-aria/src/menu/useMenu.ts
@@ -12,10 +12,11 @@
 
 import {AriaMenuProps} from '@react-types/menu';
 import {DOMAttributes, KeyboardDelegate, KeyboardEvents, RefObject} from '@react-types/shared';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {menuData} from './utils';
-import {TreeState} from '@react-stately/tree';
-import {useSelectableList} from '@react-aria/selection';
+import {mergeProps} from '../utils/mergeProps';
+import {TreeState} from 'react-stately/useTreeState';
+import {useSelectableList} from '../selection/useSelectableList';
 
 export interface MenuAria {
   /** Props for the menu element. */
diff --git a/packages/@react-aria/menu/src/useMenuItem.ts b/packages/react-aria/src/menu/useMenuItem.ts
similarity index 92%
rename from packages/@react-aria/menu/src/useMenuItem.ts
rename to packages/react-aria/src/menu/useMenuItem.ts
index cb0dee4a184..0133b5ca7b6 100644
--- a/packages/@react-aria/menu/src/useMenuItem.ts
+++ b/packages/react-aria/src/menu/useMenuItem.ts
@@ -11,14 +11,22 @@
  */
 
 import {DOMAttributes, DOMProps, FocusableElement, FocusEvents, HoverEvents, Key, KeyboardEvents, PressEvent, PressEvents, RefObject} from '@react-types/shared';
-import {filterDOMProps, getEventTarget, handleLinkClick, mergeProps, useLinkProps, useRouter, useSlotId} from '@react-aria/utils';
-import {getItemCount} from '@react-stately/collections';
-import {isFocusVisible, setInteractionModality, useFocusable, useHover, useKeyboard, usePress} from '@react-aria/interactions';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import {getEventTarget} from '../utils/shadowdom/DOMFunctions';
+import {getItemCount} from 'react-stately/private/collections/getItemCount';
+import {handleLinkClick, useLinkProps, useRouter} from '../utils/openLink';
+import {isFocusVisible, setInteractionModality} from '../interactions/useFocusVisible';
 import {menuData} from './utils';
+import {mergeProps} from '../utils/mergeProps';
 import {MouseEvent, useRef} from 'react';
-import {SelectionManager} from '@react-stately/selection';
-import {TreeState} from '@react-stately/tree';
-import {useSelectableItem} from '@react-aria/selection';
+import {SelectionManager} from 'react-stately/private/selection/SelectionManager';
+import {TreeState} from 'react-stately/useTreeState';
+import {useFocusable} from '../interactions/useFocusable';
+import {useHover} from '../interactions/useHover';
+import {useKeyboard} from '../interactions/useKeyboard';
+import {usePress} from '../interactions/usePress';
+import {useSelectableItem} from '../selection/useSelectableItem';
+import {useSlotId} from '../utils/useId';
 
 export interface MenuItemAria {
   /** Props for the menu item element. */
diff --git a/packages/@react-aria/menu/src/useMenuSection.ts b/packages/react-aria/src/menu/useMenuSection.ts
similarity index 98%
rename from packages/@react-aria/menu/src/useMenuSection.ts
rename to packages/react-aria/src/menu/useMenuSection.ts
index fc2c8d445b6..0c7161774a9 100644
--- a/packages/@react-aria/menu/src/useMenuSection.ts
+++ b/packages/react-aria/src/menu/useMenuSection.ts
@@ -12,7 +12,7 @@
 
 import {DOMAttributes} from '@react-types/shared';
 import {ReactNode} from 'react';
-import {useId} from '@react-aria/utils';
+import {useId} from '../utils/useId';
 
 export interface AriaMenuSectionProps {
   /** The heading for the section. */
diff --git a/packages/@react-aria/menu/src/useMenuTrigger.ts b/packages/react-aria/src/menu/useMenuTrigger.ts
similarity index 91%
rename from packages/@react-aria/menu/src/useMenuTrigger.ts
rename to packages/react-aria/src/menu/useMenuTrigger.ts
index 2d2227276a3..ce2eb30c668 100644
--- a/packages/@react-aria/menu/src/useMenuTrigger.ts
+++ b/packages/react-aria/src/menu/useMenuTrigger.ts
@@ -13,14 +13,16 @@
 import {AriaButtonProps} from '@react-types/button';
 import {AriaMenuOptions} from './useMenu';
 import {FocusableElement, RefObject} from '@react-types/shared';
-import {focusWithoutScrolling, useId} from '@react-aria/utils';
+import {focusWithoutScrolling} from '../utils/focusWithoutScrolling';
+import intlMessages from '../../intl/menu/*.json';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {MenuTriggerState} from '@react-stately/menu';
+import {MenuTriggerState} from 'react-stately/useMenuTriggerState';
 import {MenuTriggerType} from '@react-types/menu';
-import {PressProps, useLongPress} from '@react-aria/interactions';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useOverlayTrigger} from '@react-aria/overlays';
+import {PressProps} from '../interactions/usePress';
+import {useId} from '../utils/useId';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
+import {useLongPress} from '../interactions/useLongPress';
+import {useOverlayTrigger} from '../overlays/useOverlayTrigger';
 
 export interface AriaMenuTriggerProps {
   /** The type of menu that the menu trigger opens. */
diff --git a/packages/@react-aria/menu/src/useSafelyMouseToSubmenu.ts b/packages/react-aria/src/menu/useSafelyMouseToSubmenu.ts
similarity index 95%
rename from packages/@react-aria/menu/src/useSafelyMouseToSubmenu.ts
rename to packages/react-aria/src/menu/useSafelyMouseToSubmenu.ts
index fd0503cd621..3918999627f 100644
--- a/packages/@react-aria/menu/src/useSafelyMouseToSubmenu.ts
+++ b/packages/react-aria/src/menu/useSafelyMouseToSubmenu.ts
@@ -1,8 +1,11 @@
 
-import {nodeContains, useEffectEvent, useLayoutEffect, useResizeObserver} from '@react-aria/utils';
+import {nodeContains} from '../utils/shadowdom/DOMFunctions';
 import {RefObject} from '@react-types/shared';
 import {useEffect, useRef, useState} from 'react';
-import {useInteractionModality} from '@react-aria/interactions';
+import {useEffectEvent} from '../utils/useEffectEvent';
+import {useInteractionModality} from '../interactions/useFocusVisible';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
+import {useResizeObserver} from '../utils/useResizeObserver';
 
 interface SafelyMouseToSubmenuOptions {
   /** Ref for the parent menu. */
diff --git a/packages/@react-aria/menu/src/useSubmenuTrigger.ts b/packages/react-aria/src/menu/useSubmenuTrigger.ts
similarity index 94%
rename from packages/@react-aria/menu/src/useSubmenuTrigger.ts
rename to packages/react-aria/src/menu/useSubmenuTrigger.ts
index 85ec91e8999..48c7fae457b 100644
--- a/packages/@react-aria/menu/src/useSubmenuTrigger.ts
+++ b/packages/react-aria/src/menu/useSubmenuTrigger.ts
@@ -12,12 +12,17 @@
 
 import {AriaMenuItemProps} from './useMenuItem';
 import {AriaMenuOptions} from './useMenu';
-import type {AriaPopoverProps, OverlayProps} from '@react-aria/overlays';
+import type {AriaPopoverProps} from '../overlays/usePopover';
 import {FocusableElement, FocusStrategy, KeyboardEvent, Node, PressEvent, RefObject} from '@react-types/shared';
-import {focusWithoutScrolling, getActiveElement, getEventTarget, isFocusWithin, nodeContains, useEvent, useId, useLayoutEffect} from '@react-aria/utils';
-import type {SubmenuTriggerState} from '@react-stately/menu';
+import {focusWithoutScrolling} from '../utils/focusWithoutScrolling';
+import {getActiveElement, getEventTarget, isFocusWithin, nodeContains} from '../utils/shadowdom/DOMFunctions';
+import type {OverlayProps} from '../overlays/Overlay';
+import type {SubmenuTriggerState} from 'react-stately/useMenuTriggerState';
 import {useCallback, useRef} from 'react';
-import {useLocale} from '@react-aria/i18n';
+import {useEvent} from '../utils/useEvent';
+import {useId} from '../utils/useId';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
+import {useLocale} from '../i18n/I18nProvider';
 import {useSafelyMouseToSubmenu} from './useSafelyMouseToSubmenu';
 
 export interface AriaSubmenuTriggerProps {
diff --git a/packages/@react-aria/menu/src/utils.ts b/packages/react-aria/src/menu/utils.ts
similarity index 94%
rename from packages/@react-aria/menu/src/utils.ts
rename to packages/react-aria/src/menu/utils.ts
index 5da30916cbb..d4b9efecd57 100644
--- a/packages/@react-aria/menu/src/utils.ts
+++ b/packages/react-aria/src/menu/utils.ts
@@ -11,7 +11,7 @@
  */
 
 import {Key} from '@react-types/shared';
-import {TreeState} from '@react-stately/tree';
+import {TreeState} from 'react-stately/useTreeState';
 
 interface MenuData {
   onClose?: () => void,
diff --git a/packages/@react-aria/meter/src/useMeter.ts b/packages/react-aria/src/meter/useMeter.ts
similarity index 96%
rename from packages/@react-aria/meter/src/useMeter.ts
rename to packages/react-aria/src/meter/useMeter.ts
index ddacce2dacb..28150ade7ea 100644
--- a/packages/@react-aria/meter/src/useMeter.ts
+++ b/packages/react-aria/src/meter/useMeter.ts
@@ -12,7 +12,7 @@
 
 import {AriaMeterProps} from '@react-types/meter';
 import {DOMAttributes} from '@react-types/shared';
-import {useProgressBar} from '@react-aria/progress';
+import {useProgressBar} from '../progress/useProgressBar';
 
 export interface MeterAria {
   /** Props for the meter container element. */
diff --git a/packages/@react-aria/numberfield/src/useNumberField.ts b/packages/react-aria/src/numberfield/useNumberField.ts
similarity index 92%
rename from packages/@react-aria/numberfield/src/useNumberField.ts
rename to packages/react-aria/src/numberfield/useNumberField.ts
index 06e5d42e526..ebc31834a08 100644
--- a/packages/@react-aria/numberfield/src/useNumberField.ts
+++ b/packages/react-aria/src/numberfield/useNumberField.ts
@@ -10,10 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {announce} from '@react-aria/live-announcer';
+import {announce} from '../live-announcer/LiveAnnouncer';
+
 import {AriaButtonProps} from '@react-types/button';
 import {AriaNumberFieldProps} from '@react-types/numberfield';
-import {chain, filterDOMProps, getActiveElement, getEventTarget, isAndroid, isIOS, isIPhone, mergeProps, useFormReset, useId} from '@react-aria/utils';
+import {chain} from '../utils/chain';
 import {
   type ClipboardEvent,
   type ClipboardEventHandler,
@@ -25,18 +26,24 @@ import {
   useState
 } from 'react';
 import {DOMAttributes, GroupDOMAttributes, TextInputDOMProps, ValidationResult} from '@react-types/shared';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {flushSync} from 'react-dom';
+import {getActiveElement, getEventTarget} from '../utils/shadowdom/DOMFunctions';
+import intlMessages from '../../intl/numberfield/*.json';
+import {isAndroid, isIOS, isIPhone} from '../utils/platform';
+import {mergeProps} from '../utils/mergeProps';
+import {NumberFieldState} from 'react-stately/useNumberFieldState';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {NumberFieldState} from '@react-stately/numberfield';
-import {privateValidationStateProp} from '@react-stately/form';
-import {useFocus, useFocusWithin, useScrollWheel} from '@react-aria/interactions';
-import {useFormattedTextField} from '@react-aria/textfield';
-import {
-  useLocalizedStringFormatter,
-  useNumberFormatter
-} from '@react-aria/i18n';
-import {useSpinButton} from '@react-aria/spinbutton';
+import {privateValidationStateProp} from 'react-stately/private/form/useFormValidationState';
+import {useFocus} from '../interactions/useFocus';
+import {useFocusWithin} from '../interactions/useFocusWithin';
+import {useFormattedTextField} from '../textfield/useFormattedTextField';
+import {useFormReset} from '../utils/useFormReset';
+import {useId} from '../utils/useId';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
+import {useNumberFormatter} from '../i18n/useNumberFormatter';
+import {useScrollWheel} from '../interactions/useScrollWheel';
+import {useSpinButton} from '../spinbutton/useSpinButton';
 
 export interface NumberFieldAria extends ValidationResult {
   /** Props for the label element. */
diff --git a/packages/@react-aria/overlays/src/DismissButton.tsx b/packages/react-aria/src/overlays/DismissButton.tsx
similarity index 86%
rename from packages/@react-aria/overlays/src/DismissButton.tsx
rename to packages/react-aria/src/overlays/DismissButton.tsx
index a3edd6ef82c..2ba14fb8cac 100644
--- a/packages/@react-aria/overlays/src/DismissButton.tsx
+++ b/packages/react-aria/src/overlays/DismissButton.tsx
@@ -12,11 +12,11 @@
 
 import {AriaLabelingProps, DOMProps} from '@react-types/shared';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/overlays/*.json';
 import React, {JSX} from 'react';
-import {useLabels} from '@react-aria/utils';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {VisuallyHidden} from '@react-aria/visually-hidden';
+import {useLabels} from '../utils/useLabels';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
+import {VisuallyHidden} from '../visually-hidden/VisuallyHidden';
 
 export interface DismissButtonProps extends AriaLabelingProps, DOMProps {
   /** Called when the dismiss button is activated. */
diff --git a/packages/@react-aria/overlays/src/Overlay.tsx b/packages/react-aria/src/overlays/Overlay.tsx
similarity index 93%
rename from packages/@react-aria/overlays/src/Overlay.tsx
rename to packages/react-aria/src/overlays/Overlay.tsx
index 0c1a1365880..66a1fd3634e 100644
--- a/packages/@react-aria/overlays/src/Overlay.tsx
+++ b/packages/react-aria/src/overlays/Overlay.tsx
@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {ClearPressResponder} from '@react-aria/interactions';
-import {FocusScope} from '@react-aria/focus';
+import {ClearPressResponder} from '../interactions/PressResponder';
+import {FocusScope} from '../focus/FocusScope';
 import React, {ReactNode, useContext, useMemo, useState} from 'react';
 import ReactDOM from 'react-dom';
-import {useIsSSR} from '@react-aria/ssr';
-import {useLayoutEffect} from '@react-aria/utils';
+import {useIsSSR} from '../ssr/SSRProvider';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
 import {useUNSAFE_PortalContext} from './PortalProvider';
 
 export interface OverlayProps {
diff --git a/packages/@react-aria/overlays/src/PortalProvider.tsx b/packages/react-aria/src/overlays/PortalProvider.tsx
similarity index 100%
rename from packages/@react-aria/overlays/src/PortalProvider.tsx
rename to packages/react-aria/src/overlays/PortalProvider.tsx
diff --git a/packages/@react-aria/overlays/src/ariaHideOutside.ts b/packages/react-aria/src/overlays/ariaHideOutside.ts
similarity index 97%
rename from packages/@react-aria/overlays/src/ariaHideOutside.ts
rename to packages/react-aria/src/overlays/ariaHideOutside.ts
index ad0bdeaee33..3cc19f9757c 100644
--- a/packages/@react-aria/overlays/src/ariaHideOutside.ts
+++ b/packages/react-aria/src/overlays/ariaHideOutside.ts
@@ -10,8 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {createShadowTreeWalker, getOwnerDocument, getOwnerWindow, nodeContains} from '@react-aria/utils';
-import {shadowDOM} from '@react-stately/flags';
+import {createShadowTreeWalker} from '../utils/shadowdom/ShadowTreeWalker';
+
+import {getOwnerDocument, getOwnerWindow} from '../utils/domHelpers';
+import {nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {shadowDOM} from 'react-stately/private/flags/flags';
 
 const supportsInert = typeof HTMLElement !== 'undefined' && 'inert' in HTMLElement.prototype;
 
diff --git a/packages/@react-aria/overlays/src/calculatePosition.ts b/packages/react-aria/src/overlays/calculatePosition.ts
similarity index 98%
rename from packages/@react-aria/overlays/src/calculatePosition.ts
rename to packages/react-aria/src/overlays/calculatePosition.ts
index b93667f0f69..b77adb9e842 100644
--- a/packages/@react-aria/overlays/src/calculatePosition.ts
+++ b/packages/react-aria/src/overlays/calculatePosition.ts
@@ -11,7 +11,9 @@
  */
 
 import {Axis, Placement, PlacementAxis, SizeAxis} from '@react-types/overlays';
-import {clamp, isWebKit, nodeContains} from '@react-aria/utils';
+import {clamp} from 'react-stately/private/utils/number';
+import {isWebKit} from '../utils/platform';
+import {nodeContains} from '../utils/shadowdom/DOMFunctions';
 
 interface Position {
   top?: number,
@@ -691,12 +693,9 @@ function getContainingBlock(node: HTMLElement): Element {
 // https://developer.mozilla.org/en-US/docs/Web/CSS/Containing_block#identifying_the_containing_block
 function isContainingBlock(node: Element): boolean {
   let style = window.getComputedStyle(node);
-  return (
-    style.transform !== 'none' ||
-    /transform|perspective/.test(style.willChange) ||
-    style.filter !== 'none' ||
-    style.contain === 'paint' ||
-    ('backdropFilter' in style && style.backdropFilter !== 'none') ||
-    ('WebkitBackdropFilter' in style && style.WebkitBackdropFilter !== 'none')
-  );
+  return (style.transform !== 'none' ||
+  /transform|perspective/.test(style.willChange) ||
+  style.filter !== 'none' ||
+  style.contain === 'paint' ||
+  ('backdropFilter' in style && style.backdropFilter !== 'none') || ('WebkitBackdropFilter' in style && style.WebkitBackdropFilter !== 'none'));
 }
diff --git a/packages/@react-aria/overlays/src/useCloseOnScroll.ts b/packages/react-aria/src/overlays/useCloseOnScroll.ts
similarity index 97%
rename from packages/@react-aria/overlays/src/useCloseOnScroll.ts
rename to packages/react-aria/src/overlays/useCloseOnScroll.ts
index 539df203212..2c241676a57 100644
--- a/packages/@react-aria/overlays/src/useCloseOnScroll.ts
+++ b/packages/react-aria/src/overlays/useCloseOnScroll.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {getEventTarget, nodeContains} from '@react-aria/utils';
+import {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
 import {RefObject} from '@react-types/shared';
 import {useEffect} from 'react';
 
diff --git a/packages/@react-aria/overlays/src/useModal.tsx b/packages/react-aria/src/overlays/useModal.tsx
similarity index 99%
rename from packages/@react-aria/overlays/src/useModal.tsx
rename to packages/react-aria/src/overlays/useModal.tsx
index 0f922d19b9e..e2c9861e23a 100644
--- a/packages/@react-aria/overlays/src/useModal.tsx
+++ b/packages/react-aria/src/overlays/useModal.tsx
@@ -13,7 +13,7 @@
 import {DOMAttributes} from '@react-types/shared';
 import React, {AriaAttributes, JSX, ReactNode, useContext, useEffect, useMemo, useState} from 'react';
 import ReactDOM from 'react-dom';
-import {useIsSSR} from '@react-aria/ssr';
+import {useIsSSR} from '../ssr/SSRProvider';
 import {useUNSAFE_PortalContext} from './PortalProvider';
 
 export interface ModalProviderProps extends DOMAttributes {
diff --git a/packages/@react-aria/overlays/src/useModalOverlay.ts b/packages/react-aria/src/overlays/useModalOverlay.ts
similarity index 94%
rename from packages/@react-aria/overlays/src/useModalOverlay.ts
rename to packages/react-aria/src/overlays/useModalOverlay.ts
index c0fbb70a0b1..82f96d7800e 100644
--- a/packages/@react-aria/overlays/src/useModalOverlay.ts
+++ b/packages/react-aria/src/overlays/useModalOverlay.ts
@@ -13,8 +13,8 @@
 import {ariaHideOutside} from './ariaHideOutside';
 import {AriaOverlayProps, useOverlay} from './useOverlay';
 import {DOMAttributes, RefObject} from '@react-types/shared';
-import {mergeProps} from '@react-aria/utils';
-import {OverlayTriggerState} from '@react-stately/overlays';
+import {mergeProps} from '../utils/mergeProps';
+import {OverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 import {useEffect} from 'react';
 import {useOverlayFocusContain} from './Overlay';
 import {usePreventScroll} from './usePreventScroll';
diff --git a/packages/@react-aria/overlays/src/useOverlay.ts b/packages/react-aria/src/overlays/useOverlay.ts
similarity index 95%
rename from packages/@react-aria/overlays/src/useOverlay.ts
rename to packages/react-aria/src/overlays/useOverlay.ts
index 08a129880bc..e660df06116 100644
--- a/packages/@react-aria/overlays/src/useOverlay.ts
+++ b/packages/react-aria/src/overlays/useOverlay.ts
@@ -11,10 +11,11 @@
  */
 
 import {DOMAttributes, RefObject} from '@react-types/shared';
-import {getEventTarget} from '@react-aria/utils';
-import {isElementInChildOfActiveScope} from '@react-aria/focus';
+import {getEventTarget} from '../utils/shadowdom/DOMFunctions';
+import {isElementInChildOfActiveScope} from '../focus/FocusScope';
 import {useEffect, useRef} from 'react';
-import {useFocusWithin, useInteractOutside} from '@react-aria/interactions';
+import {useFocusWithin} from '../interactions/useFocusWithin';
+import {useInteractOutside} from '../interactions/useInteractOutside';
 
 export interface AriaOverlayProps {
   /** Whether the overlay is currently open. */
diff --git a/packages/@react-aria/overlays/src/useOverlayPosition.ts b/packages/react-aria/src/overlays/useOverlayPosition.ts
similarity index 97%
rename from packages/@react-aria/overlays/src/useOverlayPosition.ts
rename to packages/react-aria/src/overlays/useOverlayPosition.ts
index de180f94c9e..466a093aa10 100644
--- a/packages/@react-aria/overlays/src/useOverlayPosition.ts
+++ b/packages/react-aria/src/overlays/useOverlayPosition.ts
@@ -12,11 +12,13 @@
 
 import {calculatePosition, getRect, PositionResult} from './calculatePosition';
 import {DOMAttributes, RefObject} from '@react-types/shared';
-import {getActiveElement, isFocusWithin, useLayoutEffect, useResizeObserver} from '@react-aria/utils';
+import {getActiveElement, isFocusWithin} from '../utils/shadowdom/DOMFunctions';
 import {Placement, PlacementAxis, PositionProps} from '@react-types/overlays';
 import {useCallback, useEffect, useRef, useState} from 'react';
 import {useCloseOnScroll} from './useCloseOnScroll';
-import {useLocale} from '@react-aria/i18n';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
+import {useLocale} from '../i18n/I18nProvider';
+import {useResizeObserver} from '../utils/useResizeObserver';
 
 export interface AriaPositionProps extends PositionProps {
   /**
diff --git a/packages/@react-aria/overlays/src/useOverlayTrigger.ts b/packages/react-aria/src/overlays/useOverlayTrigger.ts
similarity index 95%
rename from packages/@react-aria/overlays/src/useOverlayTrigger.ts
rename to packages/react-aria/src/overlays/useOverlayTrigger.ts
index 0608b368470..0725fc8e91c 100644
--- a/packages/@react-aria/overlays/src/useOverlayTrigger.ts
+++ b/packages/react-aria/src/overlays/useOverlayTrigger.ts
@@ -13,9 +13,9 @@
 import {AriaButtonProps} from '@react-types/button';
 import {DOMProps, RefObject} from '@react-types/shared';
 import {onCloseMap} from './useCloseOnScroll';
-import {OverlayTriggerState} from '@react-stately/overlays';
+import {OverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 import {useEffect} from 'react';
-import {useId} from '@react-aria/utils';
+import {useId} from '../utils/useId';
 
 export interface OverlayTriggerProps {
   /** Type of overlay that is opened by the trigger. */
diff --git a/packages/@react-aria/overlays/src/usePopover.ts b/packages/react-aria/src/overlays/usePopover.ts
similarity index 97%
rename from packages/@react-aria/overlays/src/usePopover.ts
rename to packages/react-aria/src/overlays/usePopover.ts
index 3263932e978..56a8267e9b8 100644
--- a/packages/@react-aria/overlays/src/usePopover.ts
+++ b/packages/react-aria/src/overlays/usePopover.ts
@@ -13,8 +13,8 @@
 import {ariaHideOutside, keepVisible} from './ariaHideOutside';
 import {AriaPositionProps, useOverlayPosition} from './useOverlayPosition';
 import {DOMAttributes, RefObject} from '@react-types/shared';
-import {mergeProps} from '@react-aria/utils';
-import {OverlayTriggerState} from '@react-stately/overlays';
+import {mergeProps} from '../utils/mergeProps';
+import {OverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 import {PlacementAxis} from '@react-types/overlays';
 import {useEffect} from 'react';
 import {useOverlay} from './useOverlay';
diff --git a/packages/@react-aria/overlays/src/usePreventScroll.ts b/packages/react-aria/src/overlays/usePreventScroll.ts
similarity index 96%
rename from packages/@react-aria/overlays/src/usePreventScroll.ts
rename to packages/react-aria/src/overlays/usePreventScroll.ts
index d0cfe1d0c95..3fa27dda3fd 100644
--- a/packages/@react-aria/overlays/src/usePreventScroll.ts
+++ b/packages/react-aria/src/overlays/usePreventScroll.ts
@@ -10,7 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {chain, getActiveElement, getEventTarget, getNonce, getScrollParent, isIOS, isScrollable, useLayoutEffect, willOpenKeyboard} from '@react-aria/utils';
+import {chain} from '../utils/chain';
+
+import {getActiveElement, getEventTarget} from '../utils/shadowdom/DOMFunctions';
+import {getNonce} from '../utils/getNonce';
+import {getScrollParent} from '../utils/getScrollParent';
+import {isIOS} from '../utils/platform';
+import {isScrollable} from '../utils/isScrollable';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
+import {willOpenKeyboard} from '../utils/keyboard';
 
 interface PreventScrollOptions {
   /** Whether the scroll lock is disabled. */
diff --git a/packages/@react-aria/progress/src/useProgressBar.ts b/packages/react-aria/src/progress/useProgressBar.ts
similarity index 89%
rename from packages/@react-aria/progress/src/useProgressBar.ts
rename to packages/react-aria/src/progress/useProgressBar.ts
index e754677366e..f6d3556118a 100644
--- a/packages/@react-aria/progress/src/useProgressBar.ts
+++ b/packages/react-aria/src/progress/useProgressBar.ts
@@ -11,10 +11,12 @@
  */
 
 import {AriaProgressBarProps} from '@react-types/progress';
-import {clamp, filterDOMProps, mergeProps} from '@react-aria/utils';
+import {clamp} from 'react-stately/private/utils/number';
 import {DOMAttributes} from '@react-types/shared';
-import {useLabel} from '@react-aria/label';
-import {useNumberFormatter} from '@react-aria/i18n';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import {mergeProps} from '../utils/mergeProps';
+import {useLabel} from '../label/useLabel';
+import {useNumberFormatter} from '../i18n/useNumberFormatter';
 
 export interface ProgressBarAria {
   /** Props for the progress bar container element. */
diff --git a/packages/@react-aria/radio/src/useRadio.ts b/packages/react-aria/src/radio/useRadio.ts
similarity index 92%
rename from packages/@react-aria/radio/src/useRadio.ts
rename to packages/react-aria/src/radio/useRadio.ts
index 59a7287a1ef..c3686f12c5c 100644
--- a/packages/@react-aria/radio/src/useRadio.ts
+++ b/packages/react-aria/src/radio/useRadio.ts
@@ -11,13 +11,16 @@
  */
 
 import {AriaRadioProps} from '@react-types/radio';
-import {filterDOMProps, mergeProps, useFormReset} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {InputHTMLAttributes, LabelHTMLAttributes, useMemo} from 'react';
+import {mergeProps} from '../utils/mergeProps';
 import {radioGroupData} from './utils';
-import {RadioGroupState} from '@react-stately/radio';
+import {RadioGroupState} from 'react-stately/useRadioGroupState';
 import {RefObject} from '@react-types/shared';
-import {useFocusable, usePress} from '@react-aria/interactions';
-import {useFormValidation} from '@react-aria/form';
+import {useFocusable} from '../interactions/useFocusable';
+import {useFormReset} from '../utils/useFormReset';
+import {useFormValidation} from '../form/useFormValidation';
+import {usePress} from '../interactions/usePress';
 
 export interface RadioAria {
   /** Props for the label wrapper element. */
diff --git a/packages/@react-aria/radio/src/useRadioGroup.ts b/packages/react-aria/src/radio/useRadioGroup.ts
similarity index 90%
rename from packages/@react-aria/radio/src/useRadioGroup.ts
rename to packages/react-aria/src/radio/useRadioGroup.ts
index 47034b23d8f..9bf3c81cadc 100644
--- a/packages/@react-aria/radio/src/useRadioGroup.ts
+++ b/packages/react-aria/src/radio/useRadioGroup.ts
@@ -12,13 +12,17 @@
 
 import {AriaRadioGroupProps} from '@react-types/radio';
 import {DOMAttributes, ValidationResult} from '@react-types/shared';
-import {filterDOMProps, getEventTarget, getOwnerWindow, mergeProps, useId} from '@react-aria/utils';
-import {getFocusableTreeWalker} from '@react-aria/focus';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import {getEventTarget} from '../utils/shadowdom/DOMFunctions';
+import {getFocusableTreeWalker} from '../focus/FocusScope';
+import {getOwnerWindow} from '../utils/domHelpers';
+import {mergeProps} from '../utils/mergeProps';
 import {radioGroupData} from './utils';
-import {RadioGroupState} from '@react-stately/radio';
-import {useField} from '@react-aria/label';
-import {useFocusWithin} from '@react-aria/interactions';
-import {useLocale} from '@react-aria/i18n';
+import {RadioGroupState} from 'react-stately/useRadioGroupState';
+import {useField} from '../label/useField';
+import {useFocusWithin} from '../interactions/useFocusWithin';
+import {useId} from '../utils/useId';
+import {useLocale} from '../i18n/I18nProvider';
 
 export interface RadioGroupAria extends ValidationResult {
   /** Props for the radio group wrapper element. */
diff --git a/packages/@react-aria/radio/src/utils.ts b/packages/react-aria/src/radio/utils.ts
similarity index 93%
rename from packages/@react-aria/radio/src/utils.ts
rename to packages/react-aria/src/radio/utils.ts
index 8529685e9e2..57c61750b76 100644
--- a/packages/@react-aria/radio/src/utils.ts
+++ b/packages/react-aria/src/radio/utils.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {RadioGroupState} from '@react-stately/radio';
+import {RadioGroupState} from 'react-stately/useRadioGroupState';
 
 interface RadioGroupData {
   name: string,
diff --git a/packages/@react-aria/searchfield/src/useSearchField.ts b/packages/react-aria/src/searchfield/useSearchField.ts
similarity index 93%
rename from packages/@react-aria/searchfield/src/useSearchField.ts
rename to packages/react-aria/src/searchfield/useSearchField.ts
index 15aae4a1a67..5267a910a77 100644
--- a/packages/@react-aria/searchfield/src/useSearchField.ts
+++ b/packages/react-aria/src/searchfield/useSearchField.ts
@@ -12,14 +12,14 @@
 
 import {AriaButtonProps} from '@react-types/button';
 import {AriaSearchFieldProps} from '@react-types/searchfield';
-import {chain} from '@react-aria/utils';
+import {chain} from '../utils/chain';
 import {DOMAttributes, RefObject, ValidationResult} from '@react-types/shared';
 import {InputHTMLAttributes, LabelHTMLAttributes} from 'react';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {SearchFieldState} from '@react-stately/searchfield';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useTextField} from '@react-aria/textfield';
+import intlMessages from '../../intl/searchfield/*.json';
+import {SearchFieldState} from 'react-stately/useSearchFieldState';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
+import {useTextField} from '../textfield/useTextField';
 
 export interface SearchFieldAria extends ValidationResult {
   /** Props for the text field's visible label element (if any). */
diff --git a/packages/@react-aria/select/src/HiddenSelect.tsx b/packages/react-aria/src/select/HiddenSelect.tsx
similarity index 96%
rename from packages/@react-aria/select/src/HiddenSelect.tsx
rename to packages/react-aria/src/select/HiddenSelect.tsx
index 07efe254bc5..99d6ea53778 100644
--- a/packages/@react-aria/select/src/HiddenSelect.tsx
+++ b/packages/react-aria/src/select/HiddenSelect.tsx
@@ -11,13 +11,14 @@
  */
 
 import {FocusableElement, Key, RefObject} from '@react-types/shared';
-import {getEventTarget, useFormReset} from '@react-aria/utils';
+import {getEventTarget} from '../utils/shadowdom/DOMFunctions';
 import React, {InputHTMLAttributes, JSX, ReactNode, useCallback, useRef} from 'react';
 import {selectData} from './useSelect';
 import {SelectionMode} from '@react-types/select';
-import {SelectState} from '@react-stately/select';
-import {useFormValidation} from '@react-aria/form';
-import {useVisuallyHidden} from '@react-aria/visually-hidden';
+import {SelectState} from 'react-stately/useSelectState';
+import {useFormReset} from '../utils/useFormReset';
+import {useFormValidation} from '../form/useFormValidation';
+import {useVisuallyHidden} from '../visually-hidden/VisuallyHidden';
 
 export interface AriaHiddenSelectProps {
   /**
diff --git a/packages/@react-aria/select/src/useSelect.ts b/packages/react-aria/src/select/useSelect.ts
similarity index 91%
rename from packages/@react-aria/select/src/useSelect.ts
rename to packages/react-aria/src/select/useSelect.ts
index 11dc057176e..fb923b10f50 100644
--- a/packages/@react-aria/select/src/useSelect.ts
+++ b/packages/react-aria/src/select/useSelect.ts
@@ -11,18 +11,23 @@
  */
 
 import {AriaButtonProps} from '@react-types/button';
-import {AriaListBoxOptions} from '@react-aria/listbox';
+import {AriaListBoxOptions} from '../listbox/useListBox';
 import {AriaSelectProps, SelectionMode} from '@react-types/select';
-import {chain, filterDOMProps, mergeProps, nodeContains, useId} from '@react-aria/utils';
+import {chain} from '../utils/chain';
 import {DOMAttributes, KeyboardDelegate, RefObject, ValidationResult} from '@react-types/shared';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {FocusEvent, useMemo} from 'react';
 import {HiddenSelectProps} from './HiddenSelect';
-import {ListKeyboardDelegate, useTypeSelect} from '@react-aria/selection';
-import {SelectState} from '@react-stately/select';
-import {setInteractionModality} from '@react-aria/interactions';
-import {useCollator} from '@react-aria/i18n';
-import {useField} from '@react-aria/label';
-import {useMenuTrigger} from '@react-aria/menu';
+import {ListKeyboardDelegate} from '../selection/ListKeyboardDelegate';
+import {mergeProps} from '../utils/mergeProps';
+import {nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {SelectState} from 'react-stately/useSelectState';
+import {setInteractionModality} from '../interactions/useFocusVisible';
+import {useCollator} from '../i18n/useCollator';
+import {useField} from '../label/useField';
+import {useId} from '../utils/useId';
+import {useMenuTrigger} from '../menu/useMenuTrigger';
+import {useTypeSelect} from '../selection/useTypeSelect';
 
 export interface AriaSelectOptions<T, M extends SelectionMode = 'single'> extends Omit<AriaSelectProps<T, M>, 'children'> {
   /**
diff --git a/packages/@react-aria/selection/src/DOMLayoutDelegate.ts b/packages/react-aria/src/selection/DOMLayoutDelegate.ts
similarity index 100%
rename from packages/@react-aria/selection/src/DOMLayoutDelegate.ts
rename to packages/react-aria/src/selection/DOMLayoutDelegate.ts
diff --git a/packages/@react-aria/selection/src/ListKeyboardDelegate.ts b/packages/react-aria/src/selection/ListKeyboardDelegate.ts
similarity index 99%
rename from packages/@react-aria/selection/src/ListKeyboardDelegate.ts
rename to packages/react-aria/src/selection/ListKeyboardDelegate.ts
index 21239d23dad..e083da21f28 100644
--- a/packages/@react-aria/selection/src/ListKeyboardDelegate.ts
+++ b/packages/react-aria/src/selection/ListKeyboardDelegate.ts
@@ -12,7 +12,7 @@
 
 import {Collection, Direction, DisabledBehavior, Key, KeyboardDelegate, LayoutDelegate, Node, Orientation, Rect, RefObject} from '@react-types/shared';
 import {DOMLayoutDelegate} from './DOMLayoutDelegate';
-import {isScrollable} from '@react-aria/utils';
+import {isScrollable} from '../utils/isScrollable';
 
 interface ListKeyboardDelegateOptions<T> {
   collection: Collection<Node<T>>,
diff --git a/packages/@react-aria/selection/src/useSelectableCollection.ts b/packages/react-aria/src/selection/useSelectableCollection.ts
similarity index 95%
rename from packages/@react-aria/selection/src/useSelectableCollection.ts
rename to packages/react-aria/src/selection/useSelectableCollection.ts
index 8646efb427c..1628873baac 100644
--- a/packages/@react-aria/selection/src/useSelectableCollection.ts
+++ b/packages/react-aria/src/selection/useSelectableCollection.ts
@@ -10,16 +10,28 @@
  * governing permissions and limitations under the License.
  */
 
-import {CLEAR_FOCUS_EVENT, FOCUS_EVENT, focusWithoutScrolling, getActiveElement, getEventTarget, isCtrlKeyPressed, isFocusWithin, isTabbable, mergeProps, nodeContains, scrollIntoView, scrollIntoViewport, useEvent, useRouter, useUpdateLayoutEffect} from '@react-aria/utils';
-import {dispatchVirtualFocus, getFocusableTreeWalker, moveVirtualFocus} from '@react-aria/focus';
+import {CLEAR_FOCUS_EVENT, FOCUS_EVENT} from '../utils/constants';
+
+import {dispatchVirtualFocus, moveVirtualFocus} from '../focus/virtualFocus';
 import {DOMAttributes, FocusableElement, FocusStrategy, Key, KeyboardDelegate, RefObject} from '@react-types/shared';
 import {flushSync} from 'react-dom';
 import {FocusEvent, KeyboardEvent, useEffect, useRef} from 'react';
-import {focusSafely, getInteractionModality} from '@react-aria/interactions';
+import {focusSafely} from '../interactions/focusSafely';
+import {focusWithoutScrolling} from '../utils/focusWithoutScrolling';
+import {getActiveElement, getEventTarget, isFocusWithin, nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {getFocusableTreeWalker} from '../focus/FocusScope';
+import {getInteractionModality} from '../interactions/useFocusVisible';
 import {getItemElement, isNonContiguousSelectionModifier, useCollectionId} from './utils';
-import {MultipleSelectionManager} from '@react-stately/selection';
-import {useLocale} from '@react-aria/i18n';
+import {isCtrlKeyPressed} from '../utils/keyboard';
+import {isTabbable} from '../utils/isFocusable';
+import {mergeProps} from '../utils/mergeProps';
+import {MultipleSelectionManager} from 'react-stately/private/selection/types';
+import {scrollIntoView, scrollIntoViewport} from '../utils/scrollIntoView';
+import {useEvent} from '../utils/useEvent';
+import {useLocale} from '../i18n/I18nProvider';
+import {useRouter} from '../utils/openLink';
 import {useTypeSelect} from './useTypeSelect';
+import {useUpdateLayoutEffect} from '../utils/useUpdateLayoutEffect';
 
 export interface AriaSelectableCollectionOptions {
   /**
diff --git a/packages/@react-aria/selection/src/useSelectableItem.ts b/packages/react-aria/src/selection/useSelectableItem.ts
similarity index 96%
rename from packages/@react-aria/selection/src/useSelectableItem.ts
rename to packages/react-aria/src/selection/useSelectableItem.ts
index 2eb6d3211af..7c67876c4c2 100644
--- a/packages/@react-aria/selection/src/useSelectableItem.ts
+++ b/packages/react-aria/src/selection/useSelectableItem.ts
@@ -10,13 +10,21 @@
  * governing permissions and limitations under the License.
  */
 
-import {chain, getActiveElement, getEventTarget, isCtrlKeyPressed, mergeProps, openLink, useId, useRouter} from '@react-aria/utils';
+import {chain} from '../utils/chain';
+
 import {DOMAttributes, DOMProps, FocusableElement, Key, LongPressEvent, PointerType, PressEvent, RefObject} from '@react-types/shared';
-import {focusSafely, PressHookProps, useLongPress, usePress} from '@react-aria/interactions';
+import {focusSafely} from '../interactions/focusSafely';
+import {getActiveElement, getEventTarget} from '../utils/shadowdom/DOMFunctions';
 import {getCollectionId, isNonContiguousSelectionModifier} from './utils';
-import {moveVirtualFocus} from '@react-aria/focus';
-import {MultipleSelectionManager} from '@react-stately/selection';
+import {isCtrlKeyPressed} from '../utils/keyboard';
+import {mergeProps} from '../utils/mergeProps';
+import {moveVirtualFocus} from '../focus/virtualFocus';
+import {MultipleSelectionManager} from 'react-stately/private/selection/types';
+import {openLink, useRouter} from '../utils/openLink';
+import {PressHookProps, usePress} from '../interactions/usePress';
 import {useEffect, useRef} from 'react';
+import {useId} from '../utils/useId';
+import {useLongPress} from '../interactions/useLongPress';
 
 export interface SelectableItemOptions extends DOMProps {
   /**
diff --git a/packages/@react-aria/selection/src/useSelectableList.ts b/packages/react-aria/src/selection/useSelectableList.ts
similarity index 98%
rename from packages/@react-aria/selection/src/useSelectableList.ts
rename to packages/react-aria/src/selection/useSelectableList.ts
index 98072b7c3ee..202fd8b1e20 100644
--- a/packages/@react-aria/selection/src/useSelectableList.ts
+++ b/packages/react-aria/src/selection/useSelectableList.ts
@@ -13,7 +13,7 @@
 import {AriaSelectableCollectionOptions, useSelectableCollection} from './useSelectableCollection';
 import {Collection, DOMAttributes, Key, KeyboardDelegate, LayoutDelegate, Node} from '@react-types/shared';
 import {ListKeyboardDelegate} from './ListKeyboardDelegate';
-import {useCollator} from '@react-aria/i18n';
+import {useCollator} from '../i18n/useCollator';
 import {useMemo} from 'react';
 
 export interface AriaSelectableListOptions extends Omit<AriaSelectableCollectionOptions, 'keyboardDelegate'> {
diff --git a/packages/@react-aria/selection/src/useTypeSelect.ts b/packages/react-aria/src/selection/useTypeSelect.ts
similarity index 96%
rename from packages/@react-aria/selection/src/useTypeSelect.ts
rename to packages/react-aria/src/selection/useTypeSelect.ts
index 5d40d747d7f..1bc798938a0 100644
--- a/packages/@react-aria/selection/src/useTypeSelect.ts
+++ b/packages/react-aria/src/selection/useTypeSelect.ts
@@ -11,9 +11,9 @@
  */
 
 import {DOMAttributes, Key, KeyboardDelegate} from '@react-types/shared';
-import {getEventTarget, nodeContains} from '@react-aria/utils';
+import {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
 import {KeyboardEvent, useRef} from 'react';
-import {MultipleSelectionManager} from '@react-stately/selection';
+import {MultipleSelectionManager} from 'react-stately/private/selection/types';
 
 /**
  * Controls how long to wait before clearing the typeahead buffer.
diff --git a/packages/@react-aria/selection/src/utils.ts b/packages/react-aria/src/selection/utils.ts
similarity index 95%
rename from packages/@react-aria/selection/src/utils.ts
rename to packages/react-aria/src/selection/utils.ts
index f9edf555d32..b8b3498310f 100644
--- a/packages/@react-aria/selection/src/utils.ts
+++ b/packages/react-aria/src/selection/utils.ts
@@ -11,8 +11,9 @@
  */
 
 import {Collection, Key} from '@react-types/shared';
-import {isAppleDevice, useId} from '@react-aria/utils';
+import {isAppleDevice} from '../utils/platform';
 import {RefObject} from 'react';
+import {useId} from '../utils/useId';
 
 interface Event {
   altKey: boolean,
diff --git a/packages/@react-aria/separator/src/useSeparator.ts b/packages/react-aria/src/separator/useSeparator.ts
similarity index 97%
rename from packages/@react-aria/separator/src/useSeparator.ts
rename to packages/react-aria/src/separator/useSeparator.ts
index a43660f0519..ffe29c635ea 100644
--- a/packages/@react-aria/separator/src/useSeparator.ts
+++ b/packages/react-aria/src/separator/useSeparator.ts
@@ -11,7 +11,7 @@
  */
 
 import {AriaLabelingProps, DOMAttributes, DOMProps, Orientation} from '@react-types/shared';
-import {filterDOMProps} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
 
 export interface SeparatorProps extends DOMProps, AriaLabelingProps {
   /**
diff --git a/packages/@react-aria/slider/src/useSlider.ts b/packages/react-aria/src/slider/useSlider.ts
similarity index 95%
rename from packages/@react-aria/slider/src/useSlider.ts
rename to packages/react-aria/src/slider/useSlider.ts
index e9c45c18411..96c156146fe 100644
--- a/packages/@react-aria/slider/src/useSlider.ts
+++ b/packages/react-aria/src/slider/useSlider.ts
@@ -11,14 +11,17 @@
  */
 
 import {AriaSliderProps} from '@react-types/slider';
-import {clamp, mergeProps, useGlobalListeners} from '@react-aria/utils';
+import {clamp} from 'react-stately/private/utils/number';
 import {DOMAttributes, RefObject} from '@react-types/shared';
 import {getSliderThumbId, sliderData} from './utils';
+import {mergeProps} from '../utils/mergeProps';
 import React, {LabelHTMLAttributes, OutputHTMLAttributes, useRef} from 'react';
-import {setInteractionModality, useMove} from '@react-aria/interactions';
-import {SliderState} from '@react-stately/slider';
-import {useLabel} from '@react-aria/label';
-import {useLocale} from '@react-aria/i18n';
+import {setInteractionModality} from '../interactions/useFocusVisible';
+import {SliderState} from 'react-stately/useSliderState';
+import {useGlobalListeners} from '../utils/useGlobalListeners';
+import {useLabel} from '../label/useLabel';
+import {useLocale} from '../i18n/I18nProvider';
+import {useMove} from '../interactions/useMove';
 
 export interface SliderAria {
   /** Props for the label element. */
diff --git a/packages/@react-aria/slider/src/useSliderThumb.ts b/packages/react-aria/src/slider/useSliderThumb.ts
similarity index 92%
rename from packages/@react-aria/slider/src/useSliderThumb.ts
rename to packages/react-aria/src/slider/useSliderThumb.ts
index 28f61055999..58f8672a427 100644
--- a/packages/@react-aria/slider/src/useSliderThumb.ts
+++ b/packages/react-aria/src/slider/useSliderThumb.ts
@@ -1,12 +1,19 @@
 import {AriaSliderThumbProps} from '@react-types/slider';
-import {clamp, focusWithoutScrolling, getEventTarget, mergeProps, useFormReset, useGlobalListeners} from '@react-aria/utils';
+import {clamp} from 'react-stately/private/utils/number';
 import {DOMAttributes, RefObject} from '@react-types/shared';
+import {focusWithoutScrolling} from '../utils/focusWithoutScrolling';
+import {getEventTarget} from '../utils/shadowdom/DOMFunctions';
 import {getSliderThumbId, sliderData} from './utils';
+import {mergeProps} from '../utils/mergeProps';
 import React, {ChangeEvent, InputHTMLAttributes, LabelHTMLAttributes, useCallback, useEffect, useRef} from 'react';
-import {SliderState} from '@react-stately/slider';
-import {useFocusable, useKeyboard, useMove} from '@react-aria/interactions';
-import {useLabel} from '@react-aria/label';
-import {useLocale} from '@react-aria/i18n';
+import {SliderState} from 'react-stately/useSliderState';
+import {useFocusable} from '../interactions/useFocusable';
+import {useFormReset} from '../utils/useFormReset';
+import {useGlobalListeners} from '../utils/useGlobalListeners';
+import {useKeyboard} from '../interactions/useKeyboard';
+import {useLabel} from '../label/useLabel';
+import {useLocale} from '../i18n/I18nProvider';
+import {useMove} from '../interactions/useMove';
 
 export interface SliderThumbAria {
   /** Props for the root thumb element; handles the dragging motion. */
diff --git a/packages/@react-aria/slider/src/utils.ts b/packages/react-aria/src/slider/utils.ts
similarity index 87%
rename from packages/@react-aria/slider/src/utils.ts
rename to packages/react-aria/src/slider/utils.ts
index 3631cbdd342..7711299ce81 100644
--- a/packages/@react-aria/slider/src/utils.ts
+++ b/packages/react-aria/src/slider/utils.ts
@@ -1,4 +1,4 @@
-import {SliderState} from '@react-stately/slider';
+import {SliderState} from 'react-stately/useSliderState';
 
 interface SliderData {
   id: string,
diff --git a/packages/@react-aria/spinbutton/src/useSpinButton.ts b/packages/react-aria/src/spinbutton/useSpinButton.ts
similarity index 96%
rename from packages/@react-aria/spinbutton/src/useSpinButton.ts
rename to packages/react-aria/src/spinbutton/useSpinButton.ts
index c07f82f0821..7ab74bcd797 100644
--- a/packages/@react-aria/spinbutton/src/useSpinButton.ts
+++ b/packages/react-aria/src/spinbutton/useSpinButton.ts
@@ -10,14 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {announce, clearAnnouncer} from '@react-aria/live-announcer';
+import {announce, clearAnnouncer} from '../live-announcer/LiveAnnouncer';
+
 import {AriaButtonProps} from '@react-types/button';
 import {DOMAttributes, InputBase, RangeInputBase, Validation, ValueBase} from '@react-types/shared';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/spinbutton/*.json';
 import {useCallback, useEffect, useRef, useState} from 'react';
-import {useEffectEvent, useGlobalListeners} from '@react-aria/utils';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useEffectEvent} from '../utils/useEffectEvent';
+import {useGlobalListeners} from '../utils/useGlobalListeners';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 
 
 const noop = () => {};
diff --git a/packages/@react-aria/ssr/src/SSRProvider.tsx b/packages/react-aria/src/ssr/SSRProvider.tsx
similarity index 100%
rename from packages/@react-aria/ssr/src/SSRProvider.tsx
rename to packages/react-aria/src/ssr/SSRProvider.tsx
diff --git a/packages/@react-aria/steplist/src/useStepList.ts b/packages/react-aria/src/steplist/useStepList.ts
similarity index 79%
rename from packages/@react-aria/steplist/src/useStepList.ts
rename to packages/react-aria/src/steplist/useStepList.ts
index 894a12868b8..efb415c8adf 100644
--- a/packages/@react-aria/steplist/src/useStepList.ts
+++ b/packages/react-aria/src/steplist/useStepList.ts
@@ -11,13 +11,14 @@
  */
 
 import {AriaLabelingProps, DOMProps, RefObject} from '@react-types/shared';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {HTMLAttributes} from 'react';
+import intlMessages from '../../intl/steplist/*.json';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {StepListProps, StepListState} from '@react-stately/steplist';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useSelectableList} from '@react-aria/selection';
+import {mergeProps} from '../utils/mergeProps';
+import {StepListProps, StepListState} from 'react-stately/private/steplist/useStepListState';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
+import {useSelectableList} from '../selection/useSelectableList';
 
 export interface AriaStepListProps<T> extends StepListProps<T>, AriaLabelingProps, DOMProps {}
 
diff --git a/packages/@react-aria/steplist/src/useStepListItem.ts b/packages/react-aria/src/steplist/useStepListItem.ts
similarity index 93%
rename from packages/@react-aria/steplist/src/useStepListItem.ts
rename to packages/react-aria/src/steplist/useStepListItem.ts
index d627e11a4d0..a9284a824a3 100644
--- a/packages/@react-aria/steplist/src/useStepListItem.ts
+++ b/packages/react-aria/src/steplist/useStepListItem.ts
@@ -12,8 +12,8 @@
 
 import {HTMLAttributes} from 'react';
 import {Key, RefObject} from '@react-types/shared';
-import {StepListState} from '@react-stately/steplist';
-import {useSelectableItem} from '@react-aria/selection';
+import {StepListState} from 'react-stately/private/steplist/useStepListState';
+import {useSelectableItem} from '../selection/useSelectableItem';
 
 export interface AriaStepListItemProps {
   key: Key
diff --git a/packages/@react-aria/switch/src/useSwitch.ts b/packages/react-aria/src/switch/useSwitch.ts
similarity index 95%
rename from packages/@react-aria/switch/src/useSwitch.ts
rename to packages/react-aria/src/switch/useSwitch.ts
index dd37604088c..cde0300588f 100644
--- a/packages/@react-aria/switch/src/useSwitch.ts
+++ b/packages/react-aria/src/switch/useSwitch.ts
@@ -13,8 +13,8 @@
 import {AriaSwitchProps} from '@react-types/switch';
 import {InputHTMLAttributes, LabelHTMLAttributes} from 'react';
 import {RefObject} from '@react-types/shared';
-import {ToggleState} from '@react-stately/toggle';
-import {useToggle} from '@react-aria/toggle';
+import {ToggleState} from 'react-stately/useToggleState';
+import {useToggle} from '../toggle/useToggle';
 
 export interface SwitchAria {
   /** Props for the label wrapper element. */
diff --git a/packages/@react-aria/table/src/TableKeyboardDelegate.ts b/packages/react-aria/src/table/TableKeyboardDelegate.ts
similarity index 97%
rename from packages/@react-aria/table/src/TableKeyboardDelegate.ts
rename to packages/react-aria/src/table/TableKeyboardDelegate.ts
index 79bda883bf0..455284a7323 100644
--- a/packages/@react-aria/table/src/TableKeyboardDelegate.ts
+++ b/packages/react-aria/src/table/TableKeyboardDelegate.ts
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {getChildNodes, getFirstItem} from '@react-stately/collections';
-import {GridKeyboardDelegate} from '@react-aria/grid';
+import {getChildNodes, getFirstItem} from 'react-stately/private/collections/getChildNodes';
+import {GridKeyboardDelegate} from '../grid/GridKeyboardDelegate';
 import {Key, Node} from '@react-types/shared';
 import {TableCollection} from '@react-types/table';
 
diff --git a/packages/@react-aria/table/src/useTable.ts b/packages/react-aria/src/table/useTable.ts
similarity index 86%
rename from packages/@react-aria/table/src/useTable.ts
rename to packages/react-aria/src/table/useTable.ts
index 115a532fc99..8c7e37311b2 100644
--- a/packages/@react-aria/table/src/useTable.ts
+++ b/packages/react-aria/src/table/useTable.ts
@@ -10,17 +10,24 @@
  * governing permissions and limitations under the License.
  */
 
-import {announce} from '@react-aria/live-announcer';
-import {GridAria, GridProps, useGrid} from '@react-aria/grid';
+import {announce} from '../live-announcer/LiveAnnouncer';
+
+import {GridAria, GridProps, useGrid} from '../grid/useGrid';
 import {gridIds} from './utils';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/table/*.json';
 import {Key, LayoutDelegate, Rect, RefObject, Size} from '@react-types/shared';
-import {mergeProps, useDescription, useId, useUpdateEffect} from '@react-aria/utils';
+import {mergeProps} from '../utils/mergeProps';
 import {TableKeyboardDelegate} from './TableKeyboardDelegate';
-import {TableState, TreeGridState} from '@react-stately/table';
-import {useCollator, useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
+import {TableState} from 'react-stately/useTableState';
+import {TreeGridState} from 'react-stately/private/table/useTreeGridState';
+import {useCollator} from '../i18n/useCollator';
+import {useDescription} from '../utils/useDescription';
+import {useId} from '../utils/useId';
+import {useLocale} from '../i18n/I18nProvider';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 import {useMemo} from 'react';
+import {useUpdateEffect} from '../utils/useUpdateEffect';
 
 export interface AriaTableProps extends GridProps {
   /** The layout object for the table. Computes what content is visible and how to position and style them. */
diff --git a/packages/@react-aria/table/src/useTableCell.ts b/packages/react-aria/src/table/useTableCell.ts
similarity index 95%
rename from packages/@react-aria/table/src/useTableCell.ts
rename to packages/react-aria/src/table/useTableCell.ts
index 1016cc13297..0f2b5c3b3a7 100644
--- a/packages/@react-aria/table/src/useTableCell.ts
+++ b/packages/react-aria/src/table/useTableCell.ts
@@ -13,8 +13,8 @@
 import {DOMAttributes, FocusableElement, RefObject} from '@react-types/shared';
 import {getCellId} from './utils';
 import {GridNode} from '@react-types/grid';
-import {TableState} from '@react-stately/table';
-import {useGridCell} from '@react-aria/grid';
+import {TableState} from 'react-stately/useTableState';
+import {useGridCell} from '../grid/useGridCell';
 
 export interface AriaTableCellProps {
   /** An object representing the table cell. Contains all the relevant information that makes up the row header. */
diff --git a/packages/@react-aria/table/src/useTableColumnHeader.ts b/packages/react-aria/src/table/useTableColumnHeader.ts
similarity index 89%
rename from packages/@react-aria/table/src/useTableColumnHeader.ts
rename to packages/react-aria/src/table/useTableColumnHeader.ts
index e6ac331c1cd..9f9479e40e0 100644
--- a/packages/@react-aria/table/src/useTableColumnHeader.ts
+++ b/packages/react-aria/src/table/useTableColumnHeader.ts
@@ -14,13 +14,16 @@ import {DOMAttributes, FocusableElement, RefObject} from '@react-types/shared';
 import {getColumnHeaderId} from './utils';
 import {GridNode} from '@react-types/grid';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {isAndroid, mergeProps, useDescription} from '@react-aria/utils';
-import {TableState} from '@react-stately/table';
+import intlMessages from '../../intl/table/*.json';
+import {isAndroid} from '../utils/platform';
+import {mergeProps} from '../utils/mergeProps';
+import {TableState} from 'react-stately/useTableState';
+import {useDescription} from '../utils/useDescription';
 import {useEffect} from 'react';
-import {useFocusable, usePress} from '@react-aria/interactions';
-import {useGridCell} from '@react-aria/grid';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useFocusable} from '../interactions/useFocusable';
+import {useGridCell} from '../grid/useGridCell';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
+import {usePress} from '../interactions/usePress';
 
 export interface AriaTableColumnHeaderProps<T> {
   /** An object representing the [column header](https://www.w3.org/TR/wai-aria-1.1/#columnheader). Contains all the relevant information that makes up the column header. */
diff --git a/packages/@react-aria/table/src/useTableColumnResize.ts b/packages/react-aria/src/table/useTableColumnResize.ts
similarity index 91%
rename from packages/@react-aria/table/src/useTableColumnResize.ts
rename to packages/react-aria/src/table/useTableColumnResize.ts
index 21e462e7937..f817b5cac7e 100644
--- a/packages/@react-aria/table/src/useTableColumnResize.ts
+++ b/packages/react-aria/src/table/useTableColumnResize.ts
@@ -13,15 +13,24 @@
 import {ChangeEvent, useCallback, useEffect, useRef} from 'react';
 import {ColumnSize} from '@react-types/table';
 import {DOMAttributes, FocusableElement, Key, RefObject} from '@react-types/shared';
-import {focusSafely, useInteractionModality, useKeyboard, useMove, usePress} from '@react-aria/interactions';
-import {getActiveElement, getEventTarget, mergeProps, useDescription, useEffectEvent, useId} from '@react-aria/utils';
+import {focusSafely} from '../interactions/focusSafely';
+import {getActiveElement, getEventTarget} from '../utils/shadowdom/DOMFunctions';
 import {getColumnHeaderId} from './utils';
 import {GridNode} from '@react-types/grid';
+import intlMessages from '../../intl/table/*.json';
+import {mergeProps} from '../utils/mergeProps';
+import {TableColumnResizeState} from 'react-stately/useTableState';
+import {useDescription} from '../utils/useDescription';
+import {useEffectEvent} from '../utils/useEffectEvent';
+import {useId} from '../utils/useId';
+import {useInteractionModality} from '../interactions/useFocusVisible';
+import {useKeyboard} from '../interactions/useKeyboard';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {TableColumnResizeState} from '@react-stately/table';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
-import {useVisuallyHidden} from '@react-aria/visually-hidden';
+import {useLocale} from '../i18n/I18nProvider';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
+import {useMove} from '../interactions/useMove';
+import {usePress} from '../interactions/usePress';
+import {useVisuallyHidden} from '../visually-hidden/VisuallyHidden';
 
 export interface TableColumnResizeAria {
   /** Props for the visually hidden input element. */
diff --git a/packages/@react-aria/table/src/useTableHeaderRow.ts b/packages/react-aria/src/table/useTableHeaderRow.ts
similarity index 93%
rename from packages/@react-aria/table/src/useTableHeaderRow.ts
rename to packages/react-aria/src/table/useTableHeaderRow.ts
index 71b3bc90aef..8d80e9b00d2 100644
--- a/packages/@react-aria/table/src/useTableHeaderRow.ts
+++ b/packages/react-aria/src/table/useTableHeaderRow.ts
@@ -11,8 +11,8 @@
  */
 
 import {DOMAttributes, RefObject} from '@react-types/shared';
-import {GridRowProps} from '@react-aria/grid';
-import {TableState} from '@react-stately/table';
+import {GridRowProps} from '../grid/useGridRow';
+import {TableState} from 'react-stately/useTableState';
 
 export interface TableHeaderRowAria {
   /** Props for the grid row element. */
diff --git a/packages/@react-aria/table/src/useTableRow.ts b/packages/react-aria/src/table/useTableRow.ts
similarity index 89%
rename from packages/@react-aria/table/src/useTableRow.ts
rename to packages/react-aria/src/table/useTableRow.ts
index 082fbaf61b4..d21a05bbb3a 100644
--- a/packages/@react-aria/table/src/useTableRow.ts
+++ b/packages/react-aria/src/table/useTableRow.ts
@@ -10,17 +10,22 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaButtonProps} from '@react-aria/button';
+import {AriaButtonProps} from '@react-types/button';
+
 import {Collection, FocusableElement, Node, RefObject} from '@react-types/shared';
 import {getRowLabelledBy} from './utils';
-import {GridRowAria, GridRowProps, useGridRow} from '@react-aria/grid';
+import {GridRowAria, GridRowProps, useGridRow} from '../grid/useGridRow';
 import {HTMLAttributes} from 'react';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {mergeProps, useLabels, useSyntheticLinkProps} from '@react-aria/utils';
+import intlMessages from '../../intl/table/*.json';
+import {mergeProps} from '../utils/mergeProps';
 import {TableCollection} from '@react-types/table';
-import {TableState, TreeGridState} from '@react-stately/table';
-import {useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
+import {TableState} from 'react-stately/useTableState';
+import {TreeGridState} from 'react-stately/private/table/useTreeGridState';
+import {useLabels} from '../utils/useLabels';
+import {useLocale} from '../i18n/I18nProvider';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
+import {useSyntheticLinkProps} from '../utils/openLink';
 
 const EXPANSION_KEYS = {
   expand: {
diff --git a/packages/@react-aria/table/src/useTableRowGroup.ts b/packages/react-aria/src/table/useTableRowGroup.ts
similarity index 90%
rename from packages/@react-aria/table/src/useTableRowGroup.ts
rename to packages/react-aria/src/table/useTableRowGroup.ts
index 05554de20a3..c624ce81a3b 100644
--- a/packages/@react-aria/table/src/useTableRowGroup.ts
+++ b/packages/react-aria/src/table/useTableRowGroup.ts
@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {GridRowGroupAria, useGridRowGroup} from '@react-aria/grid';
+import {GridRowGroupAria, useGridRowGroup} from '../grid/useGridRowGroup';
 
 export function useTableRowGroup(): GridRowGroupAria {
   return useGridRowGroup();
diff --git a/packages/@react-aria/table/src/useTableSelectionCheckbox.ts b/packages/react-aria/src/table/useTableSelectionCheckbox.ts
similarity index 91%
rename from packages/@react-aria/table/src/useTableSelectionCheckbox.ts
rename to packages/react-aria/src/table/useTableSelectionCheckbox.ts
index d9cd021532a..245746a9264 100644
--- a/packages/@react-aria/table/src/useTableSelectionCheckbox.ts
+++ b/packages/react-aria/src/table/useTableSelectionCheckbox.ts
@@ -13,11 +13,11 @@
 import {AriaCheckboxProps} from '@react-types/checkbox';
 import {getRowLabelledBy} from './utils';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/table/*.json';
 import {Key} from '@react-types/shared';
-import {TableState} from '@react-stately/table';
-import {useGridSelectionCheckbox} from '@react-aria/grid';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {TableState} from 'react-stately/useTableState';
+import {useGridSelectionCheckbox} from '../grid/useGridSelectionCheckbox';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 
 export interface AriaTableSelectionCheckboxProps {
   /** A unique key for the checkbox. */
diff --git a/packages/@react-aria/table/src/utils.ts b/packages/react-aria/src/table/utils.ts
similarity index 96%
rename from packages/@react-aria/table/src/utils.ts
rename to packages/react-aria/src/table/utils.ts
index 8951c0a826c..963704a1078 100644
--- a/packages/@react-aria/table/src/utils.ts
+++ b/packages/react-aria/src/table/utils.ts
@@ -11,7 +11,7 @@
  */
 
 import {Key} from '@react-types/shared';
-import {TableState} from '@react-stately/table';
+import {TableState} from 'react-stately/useTableState';
 
 export const gridIds: WeakMap<TableState<unknown>, string> = new WeakMap<TableState<unknown>, string>();
 
diff --git a/packages/@react-aria/tabs/src/TabsKeyboardDelegate.ts b/packages/react-aria/src/tabs/TabsKeyboardDelegate.ts
similarity index 100%
rename from packages/@react-aria/tabs/src/TabsKeyboardDelegate.ts
rename to packages/react-aria/src/tabs/TabsKeyboardDelegate.ts
diff --git a/packages/@react-aria/tabs/src/useTab.ts b/packages/react-aria/src/tabs/useTab.ts
similarity index 88%
rename from packages/@react-aria/tabs/src/useTab.ts
rename to packages/react-aria/src/tabs/useTab.ts
index 21f2a9e5f2e..c2bdc4d7370 100644
--- a/packages/@react-aria/tabs/src/useTab.ts
+++ b/packages/react-aria/src/tabs/useTab.ts
@@ -12,11 +12,13 @@
 
 import {AriaTabProps} from '@react-types/tabs';
 import {DOMAttributes, FocusableElement, RefObject} from '@react-types/shared';
-import {filterDOMProps, mergeProps, useLinkProps} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {generateId} from './utils';
-import {TabListState} from '@react-stately/tabs';
-import {useFocusable} from '@react-aria/focus';
-import {useSelectableItem} from '@react-aria/selection';
+import {mergeProps} from '../utils/mergeProps';
+import {TabListState} from 'react-stately/useTabListState';
+import {useFocusable} from '../interactions/useFocusable';
+import {useLinkProps} from '../utils/openLink';
+import {useSelectableItem} from '../selection/useSelectableItem';
 
 export interface TabAria {
   /** Props for the tab element. */
diff --git a/packages/@react-aria/tabs/src/useTabList.ts b/packages/react-aria/src/tabs/useTabList.ts
similarity index 88%
rename from packages/@react-aria/tabs/src/useTabList.ts
rename to packages/react-aria/src/tabs/useTabList.ts
index 04a4b52c8ab..4c8648759d2 100644
--- a/packages/@react-aria/tabs/src/useTabList.ts
+++ b/packages/react-aria/src/tabs/useTabList.ts
@@ -12,13 +12,15 @@
 
 import {AriaTabListProps} from '@react-types/tabs';
 import {DOMAttributes, RefObject} from '@react-types/shared';
-import {mergeProps, useId, useLabels} from '@react-aria/utils';
-import {TabListState} from '@react-stately/tabs';
+import {mergeProps} from '../utils/mergeProps';
+import {TabListState} from 'react-stately/useTabListState';
 import {tabsIds} from './utils';
 import {TabsKeyboardDelegate} from './TabsKeyboardDelegate';
-import {useLocale} from '@react-aria/i18n';
+import {useId} from '../utils/useId';
+import {useLabels} from '../utils/useLabels';
+import {useLocale} from '../i18n/I18nProvider';
 import {useMemo} from 'react';
-import {useSelectableCollection} from '@react-aria/selection';
+import {useSelectableCollection} from '../selection/useSelectableCollection';
 
 export interface AriaTabListOptions<T> extends Omit<AriaTabListProps<T>, 'children'> {}
 
diff --git a/packages/@react-aria/tabs/src/useTabPanel.ts b/packages/react-aria/src/tabs/useTabPanel.ts
similarity index 89%
rename from packages/@react-aria/tabs/src/useTabPanel.ts
rename to packages/react-aria/src/tabs/useTabPanel.ts
index fb2c42cce0e..a1e062be927 100644
--- a/packages/@react-aria/tabs/src/useTabPanel.ts
+++ b/packages/react-aria/src/tabs/useTabPanel.ts
@@ -13,9 +13,10 @@
 import {AriaTabPanelProps} from '@react-types/tabs';
 import {DOMAttributes, RefObject} from '@react-types/shared';
 import {generateId} from './utils';
-import {mergeProps, useLabels} from '@react-aria/utils';
-import {TabListState} from '@react-stately/tabs';
-import {useHasTabbableChild} from '@react-aria/focus';
+import {mergeProps} from '../utils/mergeProps';
+import {TabListState} from 'react-stately/useTabListState';
+import {useHasTabbableChild} from '../focus/useHasTabbableChild';
+import {useLabels} from '../utils/useLabels';
 
 export interface TabPanelAria {
   /** Props for the tab panel element. */
diff --git a/packages/@react-aria/tabs/src/utils.ts b/packages/react-aria/src/tabs/utils.ts
similarity index 95%
rename from packages/@react-aria/tabs/src/utils.ts
rename to packages/react-aria/src/tabs/utils.ts
index 2cb9ce1e0cb..522709028ac 100644
--- a/packages/@react-aria/tabs/src/utils.ts
+++ b/packages/react-aria/src/tabs/utils.ts
@@ -11,7 +11,7 @@
  */
 
 import {Key} from '@react-types/shared';
-import {TabListState} from '@react-stately/tabs';
+import {TabListState} from 'react-stately/useTabListState';
 
 export const tabsIds: WeakMap<TabListState<unknown>, string> = new WeakMap<TabListState<unknown>, string>();
 
diff --git a/packages/@react-aria/tag/src/useTag.ts b/packages/react-aria/src/tag/useTag.ts
similarity index 85%
rename from packages/@react-aria/tag/src/useTag.ts
rename to packages/react-aria/src/tag/useTag.ts
index 266e0d95128..675faf120c9 100644
--- a/packages/@react-aria/tag/src/useTag.ts
+++ b/packages/react-aria/src/tag/useTag.ts
@@ -12,16 +12,21 @@
 
 import {AriaButtonProps} from '@react-types/button';
 import {DOMAttributes, FocusableElement, Node, RefObject} from '@react-types/shared';
-import {filterDOMProps, mergeProps, useDescription, useId, useSyntheticLinkProps} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {hookData} from './useTagGroup';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/tag/*.json';
 import {KeyboardEvent} from 'react';
-import type {ListState} from '@react-stately/list';
-import {SelectableItemStates} from '@react-aria/selection';
-import {useFocusable, useInteractionModality} from '@react-aria/interactions';
-import {useGridListItem} from '@react-aria/gridlist';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import type {ListState} from 'react-stately/useListState';
+import {mergeProps} from '../utils/mergeProps';
+// @ts-ignore
+import {SelectableItemStates} from '../selection/useSelectableItem';
+import {useDescription} from '../utils/useDescription';
+import {useFocusable} from '../interactions/useFocusable';
+import {useGridListItem} from '../gridlist/useGridListItem';
+import {useId} from '../utils/useId';
+import {useInteractionModality} from '../interactions/useFocusVisible';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
+import {useSyntheticLinkProps} from '../utils/openLink';
 
 
 export interface TagAria extends SelectableItemStates {
diff --git a/packages/@react-aria/tag/src/useTagGroup.ts b/packages/react-aria/src/tag/useTagGroup.ts
similarity index 91%
rename from packages/@react-aria/tag/src/useTagGroup.ts
rename to packages/react-aria/src/tag/useTagGroup.ts
index 11b32c9508a..44c7b0d6ac5 100644
--- a/packages/@react-aria/tag/src/useTagGroup.ts
+++ b/packages/react-aria/src/tag/useTagGroup.ts
@@ -10,15 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaGridListProps, useGridList} from '@react-aria/gridlist';
+import {AriaGridListProps, useGridList} from '../gridlist/useGridList';
+
 import {AriaLabelingProps, CollectionBase, DOMAttributes, DOMProps, HelpTextProps, Key, KeyboardDelegate, LabelableProps, MultipleSelection, RefObject, SelectionBehavior} from '@react-types/shared';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
-import {ListKeyboardDelegate} from '@react-aria/selection';
-import type {ListState} from '@react-stately/list';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import {ListKeyboardDelegate} from '../selection/ListKeyboardDelegate';
+import type {ListState} from 'react-stately/useListState';
+import {mergeProps} from '../utils/mergeProps';
 import {ReactNode, useEffect, useRef, useState} from 'react';
-import {useField} from '@react-aria/label';
-import {useFocusWithin} from '@react-aria/interactions';
-import {useLocale} from '@react-aria/i18n';
+import {useField} from '../label/useField';
+import {useFocusWithin} from '../interactions/useFocusWithin';
+import {useLocale} from '../i18n/I18nProvider';
 
 export interface TagGroupAria {
   /** Props for the tag grouping element. */
diff --git a/packages/@react-aria/textfield/src/useFormattedTextField.ts b/packages/react-aria/src/textfield/useFormattedTextField.ts
similarity index 97%
rename from packages/@react-aria/textfield/src/useFormattedTextField.ts
rename to packages/react-aria/src/textfield/useFormattedTextField.ts
index 30325c5c9e3..af0ce06e900 100644
--- a/packages/@react-aria/textfield/src/useFormattedTextField.ts
+++ b/packages/react-aria/src/textfield/useFormattedTextField.ts
@@ -11,10 +11,12 @@
  */
 
 import {AriaTextFieldProps} from '@react-types/textfield';
-import {getEventTarget, mergeProps, useEffectEvent} from '@react-aria/utils';
+import {getEventTarget} from '../utils/shadowdom/DOMFunctions';
 import {InputEventHandler, useEffect, useRef} from 'react';
+import {mergeProps} from '../utils/mergeProps';
 import {RefObject} from '@react-types/shared';
 import {TextFieldAria, useTextField} from './useTextField';
+import {useEffectEvent} from '../utils/useEffectEvent';
 
 interface FormattedTextFieldState {
   validate: (val: string) => boolean,
diff --git a/packages/@react-aria/textfield/src/useTextField.ts b/packages/react-aria/src/textfield/useTextField.ts
similarity index 93%
rename from packages/@react-aria/textfield/src/useTextField.ts
rename to packages/react-aria/src/textfield/useTextField.ts
index e82f0293238..42e3ab3dbb4 100644
--- a/packages/@react-aria/textfield/src/useTextField.ts
+++ b/packages/react-aria/src/textfield/useTextField.ts
@@ -12,7 +12,9 @@
 
 import {AriaTextFieldProps} from '@react-types/textfield';
 import {DOMAttributes, ValidationResult} from '@react-types/shared';
-import {filterDOMProps, getEventTarget, mergeProps, useFormReset} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import {getEventTarget} from '../utils/shadowdom/DOMFunctions';
+import {mergeProps} from '../utils/mergeProps';
 import React, {
   ChangeEvent,
   HTMLAttributes,
@@ -21,11 +23,12 @@ import React, {
   RefObject,
   useState
 } from 'react';
-import {useControlledState} from '@react-stately/utils';
-import {useField} from '@react-aria/label';
-import {useFocusable} from '@react-aria/interactions';
-import {useFormValidation} from '@react-aria/form';
-import {useFormValidationState} from '@react-stately/form';
+import {useControlledState} from 'react-stately/private/utils/useControlledState';
+import {useField} from '../label/useField';
+import {useFocusable} from '../interactions/useFocusable';
+import {useFormReset} from '../utils/useFormReset';
+import {useFormValidation} from '../form/useFormValidation';
+import {useFormValidationState} from 'react-stately/private/form/useFormValidationState';
 
 /**
  * A map of HTML element names and their interface types.
diff --git a/packages/@react-aria/toast/src/useToast.ts b/packages/react-aria/src/toast/useToast.ts
similarity index 89%
rename from packages/@react-aria/toast/src/useToast.ts
rename to packages/react-aria/src/toast/useToast.ts
index 33c408606db..7b19156d3ea 100644
--- a/packages/@react-aria/toast/src/useToast.ts
+++ b/packages/react-aria/src/toast/useToast.ts
@@ -12,12 +12,14 @@
 
 import {AriaButtonProps} from '@react-types/button';
 import {AriaLabelingProps, DOMAttributes, FocusableElement, RefObject} from '@react-types/shared';
-import {filterDOMProps, useId, useLayoutEffect, useSlotId} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import intlMessages from '../../intl/toast/*.json';
+import {QueuedToast, ToastState} from 'react-stately/useToastState';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {QueuedToast, ToastState} from '@react-stately/toast';
 import {useEffect, useState} from 'react';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import {useId, useSlotId} from '../utils/useId';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 
 export interface AriaToastProps<T> extends AriaLabelingProps {
   /** The toast object. */
diff --git a/packages/@react-aria/toast/src/useToastRegion.ts b/packages/react-aria/src/toast/useToastRegion.ts
similarity index 91%
rename from packages/@react-aria/toast/src/useToastRegion.ts
rename to packages/react-aria/src/toast/useToastRegion.ts
index 16adbd38e0f..171d13cdc81 100644
--- a/packages/@react-aria/toast/src/useToastRegion.ts
+++ b/packages/react-aria/src/toast/useToastRegion.ts
@@ -11,14 +11,19 @@
  */
 
 import {AriaLabelingProps, DOMAttributes, FocusableElement, RefObject} from '@react-types/shared';
-import {focusWithoutScrolling, getEventTarget, mergeProps, useLayoutEffect} from '@react-aria/utils';
-import {getInteractionModality, useFocusWithin, useHover} from '@react-aria/interactions';
-// @ts-ignore
-import intlMessages from '../intl/*.json';
-import {ToastState} from '@react-stately/toast';
+import {focusWithoutScrolling} from '../utils/focusWithoutScrolling';
+import {getEventTarget} from '../utils/shadowdom/DOMFunctions';
+import {getInteractionModality} from '../interactions/useFocusVisible';
+import intlMessages from '../../intl/toast/*.json';
+import {mergeProps} from '../utils/mergeProps';
+import {ToastState} from 'react-stately/useToastState';
 import {useCallback, useEffect, useRef} from 'react';
-import {useLandmark} from '@react-aria/landmark';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+// @ts-ignore
+import {useFocusWithin} from '../interactions/useFocusWithin';
+import {useHover} from '../interactions/useHover';
+import {useLandmark} from '../landmark/useLandmark';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 
 export interface AriaToastRegionProps extends AriaLabelingProps {
   /**
diff --git a/packages/@react-aria/toggle/src/useToggle.ts b/packages/react-aria/src/toggle/useToggle.ts
similarity index 91%
rename from packages/@react-aria/toggle/src/useToggle.ts
rename to packages/react-aria/src/toggle/useToggle.ts
index 511d9abea53..bba8e04f044 100644
--- a/packages/@react-aria/toggle/src/useToggle.ts
+++ b/packages/react-aria/src/toggle/useToggle.ts
@@ -12,10 +12,14 @@
 
 import {AriaToggleProps} from '@react-types/checkbox';
 import {ChangeEventHandler, InputHTMLAttributes, LabelHTMLAttributes} from 'react';
-import {filterDOMProps, getEventTarget, mergeProps, useFormReset} from '@react-aria/utils';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import {getEventTarget} from '../utils/shadowdom/DOMFunctions';
+import {mergeProps} from '../utils/mergeProps';
 import {RefObject} from '@react-types/shared';
-import {ToggleState} from '@react-stately/toggle';
-import {useFocusable, usePress} from '@react-aria/interactions';
+import {ToggleState} from 'react-stately/useToggleState';
+import {useFocusable} from '../interactions/useFocusable';
+import {useFormReset} from '../utils/useFormReset';
+import {usePress} from '../interactions/usePress';
 
 export interface ToggleAria {
   /** Props to be spread on the label element. */
diff --git a/packages/@react-aria/toolbar/src/useToolbar.ts b/packages/react-aria/src/toolbar/useToolbar.ts
similarity index 94%
rename from packages/@react-aria/toolbar/src/useToolbar.ts
rename to packages/react-aria/src/toolbar/useToolbar.ts
index 28f249b9a02..f84048f91a2 100644
--- a/packages/@react-aria/toolbar/src/useToolbar.ts
+++ b/packages/react-aria/src/toolbar/useToolbar.ts
@@ -11,10 +11,12 @@
  */
 
 import {AriaLabelingProps, Orientation, RefObject} from '@react-types/shared';
-import {createFocusManager} from '@react-aria/focus';
-import {filterDOMProps, getActiveElement, getEventTarget, nodeContains, useLayoutEffect} from '@react-aria/utils';
+import {createFocusManager} from '../focus/FocusScope';
+import {filterDOMProps} from '../utils/filterDOMProps';
 import {FocusEventHandler, HTMLAttributes, KeyboardEventHandler, useRef, useState} from 'react';
-import {useLocale} from '@react-aria/i18n';
+import {getActiveElement, getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
+import {useLocale} from '../i18n/I18nProvider';
 
 export interface AriaToolbarProps extends AriaLabelingProps {
   /**
diff --git a/packages/@react-aria/tooltip/src/useTooltip.ts b/packages/react-aria/src/tooltip/useTooltip.ts
similarity index 84%
rename from packages/@react-aria/tooltip/src/useTooltip.ts
rename to packages/react-aria/src/tooltip/useTooltip.ts
index a900c741503..182336d47e4 100644
--- a/packages/@react-aria/tooltip/src/useTooltip.ts
+++ b/packages/react-aria/src/tooltip/useTooltip.ts
@@ -12,9 +12,10 @@
 
 import {AriaTooltipProps} from '@react-types/tooltip';
 import {DOMAttributes} from '@react-types/shared';
-import {filterDOMProps, mergeProps} from '@react-aria/utils';
-import {TooltipTriggerState} from '@react-stately/tooltip';
-import {useHover} from '@react-aria/interactions';
+import {filterDOMProps} from '../utils/filterDOMProps';
+import {mergeProps} from '../utils/mergeProps';
+import {TooltipTriggerState} from 'react-stately/useTooltipTriggerState';
+import {useHover} from '../interactions/useHover';
 
 export interface TooltipAria {
   /**
diff --git a/packages/@react-aria/tooltip/src/useTooltipTrigger.ts b/packages/react-aria/src/tooltip/useTooltipTrigger.ts
similarity index 92%
rename from packages/@react-aria/tooltip/src/useTooltipTrigger.ts
rename to packages/react-aria/src/tooltip/useTooltipTrigger.ts
index cacef8ec890..49d50286888 100644
--- a/packages/@react-aria/tooltip/src/useTooltipTrigger.ts
+++ b/packages/react-aria/src/tooltip/useTooltipTrigger.ts
@@ -11,11 +11,14 @@
  */
 
 import {DOMAttributes, FocusableElement, RefObject} from '@react-types/shared';
-import {getInteractionModality, isFocusVisible, useFocusable, useHover} from '@react-aria/interactions';
-import {mergeProps, useId} from '@react-aria/utils';
+import {getInteractionModality, isFocusVisible} from '../interactions/useFocusVisible';
+import {mergeProps} from '../utils/mergeProps';
 import {TooltipTriggerProps} from '@react-types/tooltip';
-import {TooltipTriggerState} from '@react-stately/tooltip';
+import {TooltipTriggerState} from 'react-stately/useTooltipTriggerState';
 import {useEffect, useRef} from 'react';
+import {useFocusable} from '../interactions/useFocusable';
+import {useHover} from '../interactions/useHover';
+import {useId} from '../utils/useId';
 
 export interface TooltipTriggerAria {
   /**
diff --git a/packages/@react-aria/tree/src/useTree.ts b/packages/react-aria/src/tree/useTree.ts
similarity index 95%
rename from packages/@react-aria/tree/src/useTree.ts
rename to packages/react-aria/src/tree/useTree.ts
index 8936e026757..633ceac9a03 100644
--- a/packages/@react-aria/tree/src/useTree.ts
+++ b/packages/react-aria/src/tree/useTree.ts
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaGridListOptions, AriaGridListProps, GridListProps, useGridList} from '@react-aria/gridlist';
+import {AriaGridListOptions, AriaGridListProps, GridListProps, useGridList} from '../gridlist/useGridList';
 import {
   DOMAttributes,
   KeyboardDelegate,
   RefObject
 } from '@react-types/shared';
-import {TreeState} from '@react-stately/tree';
+import {TreeState} from 'react-stately/useTreeState';
 
 export interface TreeProps<T> extends GridListProps<T> {}
 
diff --git a/packages/@react-aria/tree/src/useTreeItem.ts b/packages/react-aria/src/tree/useTreeItem.ts
similarity index 91%
rename from packages/@react-aria/tree/src/useTreeItem.ts
rename to packages/react-aria/src/tree/useTreeItem.ts
index f16c2d8b43c..9994274bfd5 100644
--- a/packages/@react-aria/tree/src/useTreeItem.ts
+++ b/packages/react-aria/src/tree/useTreeItem.ts
@@ -11,13 +11,13 @@
  */
 
 import {AriaButtonProps} from '@react-types/button';
-import {AriaGridListItemOptions, GridListItemAria, useGridListItem} from '@react-aria/gridlist';
+import {AriaGridListItemOptions, GridListItemAria, useGridListItem} from '../gridlist/useGridListItem';
 import {DOMAttributes, FocusableElement, Node, RefObject} from '@react-types/shared';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {TreeState} from '@react-stately/tree';
-import {useLabels} from '@react-aria/utils';
-import {useLocalizedStringFormatter} from '@react-aria/i18n';
+import intlMessages from '../../intl/tree/*.json';
+import {TreeState} from 'react-stately/useTreeState';
+import {useLabels} from '../utils/useLabels';
+import {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';
 
 export interface AriaTreeItemOptions extends Omit<AriaGridListItemOptions, 'isVirtualized'> {
   /** An object representing the treegrid item. Contains all the relevant information that makes up the treegrid row. */
diff --git a/packages/@react-aria/utils/src/animation.ts b/packages/react-aria/src/utils/animation.ts
similarity index 100%
rename from packages/@react-aria/utils/src/animation.ts
rename to packages/react-aria/src/utils/animation.ts
diff --git a/packages/@react-aria/utils/src/chain.ts b/packages/react-aria/src/utils/chain.ts
similarity index 100%
rename from packages/@react-aria/utils/src/chain.ts
rename to packages/react-aria/src/utils/chain.ts
diff --git a/packages/@react-aria/utils/src/constants.ts b/packages/react-aria/src/utils/constants.ts
similarity index 100%
rename from packages/@react-aria/utils/src/constants.ts
rename to packages/react-aria/src/utils/constants.ts
diff --git a/packages/@react-aria/utils/src/domHelpers.ts b/packages/react-aria/src/utils/domHelpers.ts
similarity index 100%
rename from packages/@react-aria/utils/src/domHelpers.ts
rename to packages/react-aria/src/utils/domHelpers.ts
diff --git a/packages/@react-aria/utils/src/filterDOMProps.ts b/packages/react-aria/src/utils/filterDOMProps.ts
similarity index 100%
rename from packages/@react-aria/utils/src/filterDOMProps.ts
rename to packages/react-aria/src/utils/filterDOMProps.ts
diff --git a/packages/@react-aria/utils/src/focusWithoutScrolling.ts b/packages/react-aria/src/utils/focusWithoutScrolling.ts
similarity index 100%
rename from packages/@react-aria/utils/src/focusWithoutScrolling.ts
rename to packages/react-aria/src/utils/focusWithoutScrolling.ts
diff --git a/packages/@react-aria/utils/src/getNonce.ts b/packages/react-aria/src/utils/getNonce.ts
similarity index 100%
rename from packages/@react-aria/utils/src/getNonce.ts
rename to packages/react-aria/src/utils/getNonce.ts
diff --git a/packages/@react-aria/utils/src/getOffset.ts b/packages/react-aria/src/utils/getOffset.ts
similarity index 100%
rename from packages/@react-aria/utils/src/getOffset.ts
rename to packages/react-aria/src/utils/getOffset.ts
diff --git a/packages/@react-aria/utils/src/getScrollParent.ts b/packages/react-aria/src/utils/getScrollParent.ts
similarity index 100%
rename from packages/@react-aria/utils/src/getScrollParent.ts
rename to packages/react-aria/src/utils/getScrollParent.ts
diff --git a/packages/@react-aria/utils/src/getScrollParents.ts b/packages/react-aria/src/utils/getScrollParents.ts
similarity index 100%
rename from packages/@react-aria/utils/src/getScrollParents.ts
rename to packages/react-aria/src/utils/getScrollParents.ts
diff --git a/packages/@react-aria/utils/src/inertValue.ts b/packages/react-aria/src/utils/inertValue.ts
similarity index 100%
rename from packages/@react-aria/utils/src/inertValue.ts
rename to packages/react-aria/src/utils/inertValue.ts
diff --git a/packages/@react-aria/utils/src/isElementVisible.ts b/packages/react-aria/src/utils/isElementVisible.ts
similarity index 100%
rename from packages/@react-aria/utils/src/isElementVisible.ts
rename to packages/react-aria/src/utils/isElementVisible.ts
diff --git a/packages/@react-aria/utils/src/isFocusable.ts b/packages/react-aria/src/utils/isFocusable.ts
similarity index 100%
rename from packages/@react-aria/utils/src/isFocusable.ts
rename to packages/react-aria/src/utils/isFocusable.ts
diff --git a/packages/@react-aria/utils/src/isScrollable.ts b/packages/react-aria/src/utils/isScrollable.ts
similarity index 100%
rename from packages/@react-aria/utils/src/isScrollable.ts
rename to packages/react-aria/src/utils/isScrollable.ts
diff --git a/packages/@react-aria/utils/src/isVirtualEvent.ts b/packages/react-aria/src/utils/isVirtualEvent.ts
similarity index 100%
rename from packages/@react-aria/utils/src/isVirtualEvent.ts
rename to packages/react-aria/src/utils/isVirtualEvent.ts
diff --git a/packages/@react-aria/utils/src/keyboard.tsx b/packages/react-aria/src/utils/keyboard.tsx
similarity index 100%
rename from packages/@react-aria/utils/src/keyboard.tsx
rename to packages/react-aria/src/utils/keyboard.tsx
diff --git a/packages/@react-aria/utils/src/mergeProps.ts b/packages/react-aria/src/utils/mergeProps.ts
similarity index 100%
rename from packages/@react-aria/utils/src/mergeProps.ts
rename to packages/react-aria/src/utils/mergeProps.ts
diff --git a/packages/@react-aria/utils/src/mergeRefs.ts b/packages/react-aria/src/utils/mergeRefs.ts
similarity index 100%
rename from packages/@react-aria/utils/src/mergeRefs.ts
rename to packages/react-aria/src/utils/mergeRefs.ts
diff --git a/packages/@react-aria/utils/src/openLink.tsx b/packages/react-aria/src/utils/openLink.tsx
similarity index 100%
rename from packages/@react-aria/utils/src/openLink.tsx
rename to packages/react-aria/src/utils/openLink.tsx
diff --git a/packages/@react-aria/utils/src/platform.ts b/packages/react-aria/src/utils/platform.ts
similarity index 100%
rename from packages/@react-aria/utils/src/platform.ts
rename to packages/react-aria/src/utils/platform.ts
diff --git a/packages/@react-aria/utils/src/runAfterTransition.ts b/packages/react-aria/src/utils/runAfterTransition.ts
similarity index 100%
rename from packages/@react-aria/utils/src/runAfterTransition.ts
rename to packages/react-aria/src/utils/runAfterTransition.ts
diff --git a/packages/@react-aria/utils/src/scrollIntoView.ts b/packages/react-aria/src/utils/scrollIntoView.ts
similarity index 100%
rename from packages/@react-aria/utils/src/scrollIntoView.ts
rename to packages/react-aria/src/utils/scrollIntoView.ts
diff --git a/packages/@react-aria/utils/src/shadowdom/DOMFunctions.ts b/packages/react-aria/src/utils/shadowdom/DOMFunctions.ts
similarity index 98%
rename from packages/@react-aria/utils/src/shadowdom/DOMFunctions.ts
rename to packages/react-aria/src/utils/shadowdom/DOMFunctions.ts
index e9b540a344a..2acc74976e5 100644
--- a/packages/@react-aria/utils/src/shadowdom/DOMFunctions.ts
+++ b/packages/react-aria/src/utils/shadowdom/DOMFunctions.ts
@@ -2,7 +2,7 @@
 /* eslint-disable rsp-rules/no-non-shadow-contains, rsp-rules/safe-event-target */
 
 import {getOwnerWindow, isShadowRoot} from '../domHelpers';
-import {shadowDOM} from '@react-stately/flags';
+import {shadowDOM} from 'react-stately/private/flags/flags';
 import type {SyntheticEvent} from 'react';
 
 /**
diff --git a/packages/@react-aria/utils/src/shadowdom/ShadowTreeWalker.ts b/packages/react-aria/src/utils/shadowdom/ShadowTreeWalker.ts
similarity index 99%
rename from packages/@react-aria/utils/src/shadowdom/ShadowTreeWalker.ts
rename to packages/react-aria/src/utils/shadowdom/ShadowTreeWalker.ts
index f1ae3d96585..a3a4c1f879b 100644
--- a/packages/@react-aria/utils/src/shadowdom/ShadowTreeWalker.ts
+++ b/packages/react-aria/src/utils/shadowdom/ShadowTreeWalker.ts
@@ -1,7 +1,7 @@
 // https://github.com/microsoft/tabster/blob/a89fc5d7e332d48f68d03b1ca6e344489d1c3898/src/Shadowdomize/ShadowTreeWalker.ts
 
 import {nodeContains} from './DOMFunctions';
-import {shadowDOM} from '@react-stately/flags';
+import {shadowDOM} from 'react-stately/private/flags/flags';
 
 export class ShadowTreeWalker implements TreeWalker {
   public readonly filter: NodeFilter | null;
diff --git a/packages/@react-aria/utils/src/useDeepMemo.ts b/packages/react-aria/src/utils/useDeepMemo.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useDeepMemo.ts
rename to packages/react-aria/src/utils/useDeepMemo.ts
diff --git a/packages/@react-aria/utils/src/useDescription.ts b/packages/react-aria/src/utils/useDescription.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useDescription.ts
rename to packages/react-aria/src/utils/useDescription.ts
diff --git a/packages/@react-aria/utils/src/useDrag1D.ts b/packages/react-aria/src/utils/useDrag1D.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useDrag1D.ts
rename to packages/react-aria/src/utils/useDrag1D.ts
diff --git a/packages/@react-aria/utils/src/useEffectEvent.ts b/packages/react-aria/src/utils/useEffectEvent.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useEffectEvent.ts
rename to packages/react-aria/src/utils/useEffectEvent.ts
diff --git a/packages/@react-aria/utils/src/useEvent.ts b/packages/react-aria/src/utils/useEvent.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useEvent.ts
rename to packages/react-aria/src/utils/useEvent.ts
diff --git a/packages/@react-aria/utils/src/useFormReset.ts b/packages/react-aria/src/utils/useFormReset.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useFormReset.ts
rename to packages/react-aria/src/utils/useFormReset.ts
diff --git a/packages/@react-aria/utils/src/useGlobalListeners.ts b/packages/react-aria/src/utils/useGlobalListeners.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useGlobalListeners.ts
rename to packages/react-aria/src/utils/useGlobalListeners.ts
diff --git a/packages/@react-aria/utils/src/useId.ts b/packages/react-aria/src/utils/useId.ts
similarity index 98%
rename from packages/@react-aria/utils/src/useId.ts
rename to packages/react-aria/src/utils/useId.ts
index cbca0f41387..693f3ba901e 100644
--- a/packages/@react-aria/utils/src/useId.ts
+++ b/packages/react-aria/src/utils/useId.ts
@@ -12,7 +12,7 @@
 
 import {useCallback, useEffect, useRef, useState} from 'react';
 import {useLayoutEffect} from './useLayoutEffect';
-import {useSSRSafeId} from '@react-aria/ssr';
+import {useSSRSafeId} from '../ssr/SSRProvider';
 import {useValueEffect} from './useValueEffect';
 
 // copied from SSRProvider.tsx to reduce exports, if needed again, consider sharing
diff --git a/packages/@react-aria/utils/src/useLabels.ts b/packages/react-aria/src/utils/useLabels.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useLabels.ts
rename to packages/react-aria/src/utils/useLabels.ts
diff --git a/packages/@react-aria/utils/src/useLayoutEffect.ts b/packages/react-aria/src/utils/useLayoutEffect.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useLayoutEffect.ts
rename to packages/react-aria/src/utils/useLayoutEffect.ts
diff --git a/packages/@react-aria/utils/src/useLoadMore.ts b/packages/react-aria/src/utils/useLoadMore.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useLoadMore.ts
rename to packages/react-aria/src/utils/useLoadMore.ts
diff --git a/packages/@react-aria/utils/src/useLoadMoreSentinel.ts b/packages/react-aria/src/utils/useLoadMoreSentinel.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useLoadMoreSentinel.ts
rename to packages/react-aria/src/utils/useLoadMoreSentinel.ts
diff --git a/packages/@react-aria/utils/src/useObjectRef.ts b/packages/react-aria/src/utils/useObjectRef.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useObjectRef.ts
rename to packages/react-aria/src/utils/useObjectRef.ts
diff --git a/packages/@react-aria/utils/src/useResizeObserver.ts b/packages/react-aria/src/utils/useResizeObserver.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useResizeObserver.ts
rename to packages/react-aria/src/utils/useResizeObserver.ts
diff --git a/packages/@react-aria/utils/src/useSyncRef.ts b/packages/react-aria/src/utils/useSyncRef.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useSyncRef.ts
rename to packages/react-aria/src/utils/useSyncRef.ts
diff --git a/packages/@react-aria/utils/src/useUpdateEffect.ts b/packages/react-aria/src/utils/useUpdateEffect.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useUpdateEffect.ts
rename to packages/react-aria/src/utils/useUpdateEffect.ts
diff --git a/packages/@react-aria/utils/src/useUpdateLayoutEffect.ts b/packages/react-aria/src/utils/useUpdateLayoutEffect.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useUpdateLayoutEffect.ts
rename to packages/react-aria/src/utils/useUpdateLayoutEffect.ts
diff --git a/packages/@react-aria/utils/src/useValueEffect.ts b/packages/react-aria/src/utils/useValueEffect.ts
similarity index 100%
rename from packages/@react-aria/utils/src/useValueEffect.ts
rename to packages/react-aria/src/utils/useValueEffect.ts
diff --git a/packages/@react-aria/utils/src/useViewportSize.ts b/packages/react-aria/src/utils/useViewportSize.ts
similarity index 98%
rename from packages/@react-aria/utils/src/useViewportSize.ts
rename to packages/react-aria/src/utils/useViewportSize.ts
index fa27847c032..66d6ac56f98 100644
--- a/packages/@react-aria/utils/src/useViewportSize.ts
+++ b/packages/react-aria/src/utils/useViewportSize.ts
@@ -13,7 +13,7 @@
 import {getActiveElement, getEventTarget} from './shadowdom/DOMFunctions';
 import {isIOS} from './platform';
 import {useEffect, useState} from 'react';
-import {useIsSSR} from '@react-aria/ssr';
+import {useIsSSR} from '../ssr/SSRProvider';
 import {willOpenKeyboard} from './keyboard';
 
 interface ViewportSize {
diff --git a/packages/@react-aria/virtualizer/src/ScrollView.tsx b/packages/react-aria/src/virtualizer/ScrollView.tsx
similarity index 95%
rename from packages/@react-aria/virtualizer/src/ScrollView.tsx
rename to packages/react-aria/src/virtualizer/ScrollView.tsx
index ba6c460104f..9645941a184 100644
--- a/packages/@react-aria/virtualizer/src/ScrollView.tsx
+++ b/packages/react-aria/src/virtualizer/ScrollView.tsx
@@ -12,7 +12,7 @@
 
 // @ts-ignore
 import {flushSync} from 'react-dom';
-import {getEventTarget, useEffectEvent, useEvent, useLayoutEffect, useObjectRef, useResizeObserver} from '@react-aria/utils';
+import {getEventTarget} from '../utils/shadowdom/DOMFunctions';
 import {getScrollLeft} from './utils';
 import React, {
   CSSProperties,
@@ -25,8 +25,14 @@ import React, {
   useRef,
   useState
 } from 'react';
-import {Rect, Size} from '@react-stately/virtualizer';
-import {useLocale} from '@react-aria/i18n';
+import {Rect} from 'react-stately/private/virtualizer/Rect';
+import {Size} from 'react-stately/private/virtualizer/Size';
+import {useEffectEvent} from '../utils/useEffectEvent';
+import {useEvent} from '../utils/useEvent';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
+import {useLocale} from '../i18n/I18nProvider';
+import {useObjectRef} from '../utils/useObjectRef';
+import {useResizeObserver} from '../utils/useResizeObserver';
 
 interface ScrollViewProps extends HTMLAttributes<HTMLElement> {
   contentSize: Size,
diff --git a/packages/@react-aria/virtualizer/src/Virtualizer.tsx b/packages/react-aria/src/virtualizer/Virtualizer.tsx
similarity index 89%
rename from packages/@react-aria/virtualizer/src/Virtualizer.tsx
rename to packages/react-aria/src/virtualizer/Virtualizer.tsx
index 0bbd0e56e90..f6eddc64788 100644
--- a/packages/@react-aria/virtualizer/src/Virtualizer.tsx
+++ b/packages/react-aria/src/virtualizer/Virtualizer.tsx
@@ -11,10 +11,15 @@
  */
 
 import {Collection, Key, RefObject} from '@react-types/shared';
-import {Layout, Rect, ReusableView, useVirtualizerState} from '@react-stately/virtualizer';
-import {mergeProps, useLoadMore, useObjectRef} from '@react-aria/utils';
+import {Layout} from 'react-stately/private/virtualizer/Layout';
+import {mergeProps} from '../utils/mergeProps';
 import React, {ForwardedRef, HTMLAttributes, ReactElement, ReactNode, useCallback} from 'react';
+import {Rect} from 'react-stately/private/virtualizer/Rect';
+import {ReusableView} from 'react-stately/private/virtualizer/ReusableView';
 import {ScrollView} from './ScrollView';
+import {useLoadMore} from '../utils/useLoadMore';
+import {useObjectRef} from '../utils/useObjectRef';
+import {useVirtualizerState} from 'react-stately/private/virtualizer/useVirtualizerState';
 import {VirtualizerItem} from './VirtualizerItem';
 
 type RenderWrapper<T extends object, V> = (
diff --git a/packages/@react-aria/virtualizer/src/VirtualizerItem.tsx b/packages/react-aria/src/virtualizer/VirtualizerItem.tsx
similarity index 96%
rename from packages/@react-aria/virtualizer/src/VirtualizerItem.tsx
rename to packages/react-aria/src/virtualizer/VirtualizerItem.tsx
index feb14e50d76..5075301b634 100644
--- a/packages/@react-aria/virtualizer/src/VirtualizerItem.tsx
+++ b/packages/react-aria/src/virtualizer/VirtualizerItem.tsx
@@ -11,9 +11,9 @@
  */
 
 import {Direction} from '@react-types/shared';
-import {LayoutInfo} from '@react-stately/virtualizer';
+import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
 import React, {CSSProperties, JSX, ReactNode, useRef} from 'react';
-import {useLocale} from '@react-aria/i18n';
+import {useLocale} from '../i18n/I18nProvider';
 import {useVirtualizerItem, VirtualizerItemOptions} from './useVirtualizerItem';
 
 interface VirtualizerItemProps extends Omit<VirtualizerItemOptions, 'ref'> {
diff --git a/packages/@react-aria/virtualizer/src/useVirtualizerItem.ts b/packages/react-aria/src/virtualizer/useVirtualizerItem.ts
similarity index 89%
rename from packages/@react-aria/virtualizer/src/useVirtualizerItem.ts
rename to packages/react-aria/src/virtualizer/useVirtualizerItem.ts
index a2a18222dfd..20cf2c69a76 100644
--- a/packages/@react-aria/virtualizer/src/useVirtualizerItem.ts
+++ b/packages/react-aria/src/virtualizer/useVirtualizerItem.ts
@@ -11,9 +11,10 @@
  */
 
 import {Key, RefObject} from '@react-types/shared';
-import {LayoutInfo, Size} from '@react-stately/virtualizer';
+import {LayoutInfo} from 'react-stately/private/virtualizer/LayoutInfo';
+import {Size} from 'react-stately/private/virtualizer/Size';
 import {useCallback} from 'react';
-import {useLayoutEffect} from '@react-aria/utils';
+import {useLayoutEffect} from '../utils/useLayoutEffect';
 
 interface IVirtualizer {
   updateItemSize(key: Key, size: Size): void
diff --git a/packages/@react-aria/virtualizer/src/utils.ts b/packages/react-aria/src/virtualizer/utils.ts
similarity index 100%
rename from packages/@react-aria/virtualizer/src/utils.ts
rename to packages/react-aria/src/virtualizer/utils.ts
diff --git a/packages/@react-aria/visually-hidden/src/VisuallyHidden.tsx b/packages/react-aria/src/visually-hidden/VisuallyHidden.tsx
similarity index 96%
rename from packages/@react-aria/visually-hidden/src/VisuallyHidden.tsx
rename to packages/react-aria/src/visually-hidden/VisuallyHidden.tsx
index 35fd53580ec..6ae258c59a4 100644
--- a/packages/@react-aria/visually-hidden/src/VisuallyHidden.tsx
+++ b/packages/react-aria/src/visually-hidden/VisuallyHidden.tsx
@@ -11,9 +11,9 @@
  */
 
 import {DOMAttributes} from '@react-types/shared';
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from '../utils/mergeProps';
 import React, {CSSProperties, JSX, JSXElementConstructor, ReactNode, useMemo, useState} from 'react';
-import {useFocusWithin} from '@react-aria/interactions';
+import {useFocusWithin} from '../interactions/useFocusWithin';
 
 export interface VisuallyHiddenProps extends DOMAttributes {
   /** The content to visually hide. */
diff --git a/packages/@react-aria/button/stories/useButton.stories.tsx b/packages/react-aria/stories/button/useButton.stories.tsx
similarity index 96%
rename from packages/@react-aria/button/stories/useButton.stories.tsx
rename to packages/react-aria/stories/button/useButton.stories.tsx
index e5bdb154f4f..ad5ed5b494a 100644
--- a/packages/@react-aria/button/stories/useButton.stories.tsx
+++ b/packages/react-aria/stories/button/useButton.stories.tsx
@@ -13,7 +13,7 @@
 import {AriaButtonProps} from '@react-types/button';
 import React, {JSX, useRef} from 'react';
 import {StoryObj} from '@storybook/react';
-import {useButton} from '../';
+import {useButton} from '../../src/button/useButton';
 
 export default {
   title: 'useButton'
diff --git a/packages/@react-aria/calendar/stories/Example.tsx b/packages/react-aria/stories/calendar/Example.tsx
similarity index 89%
rename from packages/@react-aria/calendar/stories/Example.tsx
rename to packages/react-aria/stories/calendar/Example.tsx
index 9243fd55c1f..86b60ea3efc 100644
--- a/packages/@react-aria/calendar/stories/Example.tsx
+++ b/packages/react-aria/stories/calendar/Example.tsx
@@ -9,12 +9,18 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {AriaCalendarProps, DateValue, useCalendar, useCalendarCell, useCalendarGrid} from '../src';
-import {Button} from '@react-spectrum/button';
+import {AriaCalendarProps, DateValue} from '@react-types/calendar';
+
+import {Button} from '@adobe/react-spectrum/Button';
 import {CalendarDate, createCalendar, DateDuration, startOfWeek} from '@internationalized/date';
-import {CalendarState, RangeCalendarState, useCalendarState} from '@react-stately/calendar';
+import {CalendarState, RangeCalendarState} from 'react-stately/private/calendar/types';
 import React, {JSX, ReactElement, useMemo, useRef} from 'react';
-import {useDateFormatter, useLocale} from '@react-aria/i18n';
+import {useCalendar} from '../../src/calendar/useCalendar';
+import {useCalendarCell} from '../../src/calendar/useCalendarCell';
+import {useCalendarGrid} from '../../src/calendar/useCalendarGrid';
+import {useCalendarState} from 'react-stately/useCalendarState';
+import {useDateFormatter} from '../../src/i18n/useDateFormatter';
+import {useLocale} from '../../src/i18n/I18nProvider';
 
 
 export function Example<T extends DateValue | CalendarDate>(props: AriaCalendarProps<T> & {visibleDuration: DateDuration}): JSX.Element {
diff --git a/packages/@react-aria/calendar/stories/useCalendar.stories.tsx b/packages/react-aria/stories/calendar/useCalendar.stories.tsx
similarity index 100%
rename from packages/@react-aria/calendar/stories/useCalendar.stories.tsx
rename to packages/react-aria/stories/calendar/useCalendar.stories.tsx
diff --git a/packages/@react-aria/checkbox/stories/useCheckbox.stories.tsx b/packages/react-aria/stories/checkbox/useCheckbox.stories.tsx
similarity index 88%
rename from packages/@react-aria/checkbox/stories/useCheckbox.stories.tsx
rename to packages/react-aria/stories/checkbox/useCheckbox.stories.tsx
index 683106c4040..0525724cc0c 100644
--- a/packages/@react-aria/checkbox/stories/useCheckbox.stories.tsx
+++ b/packages/react-aria/stories/checkbox/useCheckbox.stories.tsx
@@ -11,10 +11,11 @@
  */
 
 import {action} from 'storybook/actions';
-import {AriaCheckboxProps, useCheckbox} from '../';
+import {AriaCheckboxProps} from '@react-types/checkbox';
 import React from 'react';
 import {StoryObj} from '@storybook/react';
-import {useToggleState} from '@react-stately/toggle';
+import {useCheckbox} from '../../src/checkbox/useCheckbox';
+import {useToggleState} from 'react-stately/useToggleState';
 
 export default {
   title: 'useCheckbox'
diff --git a/packages/@react-aria/combobox/stories/example.tsx b/packages/react-aria/stories/combobox/example.tsx
similarity index 89%
rename from packages/@react-aria/combobox/stories/example.tsx
rename to packages/react-aria/stories/combobox/example.tsx
index 168cf9e5b67..3f20413f7f9 100644
--- a/packages/@react-aria/combobox/stories/example.tsx
+++ b/packages/react-aria/stories/combobox/example.tsx
@@ -10,14 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaComboBoxProps, useComboBox} from '@react-aria/combobox';
-import {DismissButton, useOverlay} from '@react-aria/overlays';
-import {FocusScope} from '@react-aria/focus';
+import {AriaComboBoxProps} from '@react-types/combobox';
+
+import {DismissButton} from '../../src/overlays/DismissButton';
+import {FocusScope} from '../../src/focus/FocusScope';
 import React, {JSX} from 'react';
-import {useButton} from '@react-aria/button';
-import {useComboBoxState} from '@react-stately/combobox';
-import {useFilter} from '@react-aria/i18n';
-import {useListBox, useOption} from '@react-aria/listbox';
+import {useButton} from '../../src/button/useButton';
+import {useComboBox} from '../../src/combobox/useComboBox';
+import {useComboBoxState} from 'react-stately/useComboBoxState';
+import {useFilter} from '../../src/i18n/useFilter';
+import {useListBox} from '../../src/listbox/useListBox';
+import {useOption} from '../../src/listbox/useOption';
+import {useOverlay} from '../../src/overlays/useOverlay';
 
 export function ComboBox(props: AriaComboBoxProps<any>): JSX.Element {
   // Setup filter function and state.
diff --git a/packages/@react-aria/combobox/stories/useComboBox.stories.tsx b/packages/react-aria/stories/combobox/useComboBox.stories.tsx
similarity index 93%
rename from packages/@react-aria/combobox/stories/useComboBox.stories.tsx
rename to packages/react-aria/stories/combobox/useComboBox.stories.tsx
index 9a9367d32a8..a66a7e1aff3 100644
--- a/packages/@react-aria/combobox/stories/useComboBox.stories.tsx
+++ b/packages/react-aria/stories/combobox/useComboBox.stories.tsx
@@ -10,9 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaComboBoxProps} from '@react-aria/combobox';
+import {AriaComboBoxProps} from '@react-types/combobox';
 import {ComboBox} from './example';
-import {Item} from '@react-stately/collections';
+import {Item} from 'react-stately/Item';
 import React, {JSX} from 'react';
 import {StoryObj} from '@storybook/react';
 
diff --git a/packages/@react-aria/datepicker/stories/useDatePicker.stories.tsx b/packages/react-aria/stories/datepicker/useDatePicker.stories.tsx
similarity index 90%
rename from packages/@react-aria/datepicker/stories/useDatePicker.stories.tsx
rename to packages/react-aria/stories/datepicker/useDatePicker.stories.tsx
index 9defc667a9c..ba2bf422d8a 100644
--- a/packages/@react-aria/datepicker/stories/useDatePicker.stories.tsx
+++ b/packages/react-aria/stories/datepicker/useDatePicker.stories.tsx
@@ -13,9 +13,9 @@
 import {createCalendar, parseDate} from '@internationalized/date';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {ReactElement, useRef} from 'react';
-import {useDateField} from '../src';
-import {useDateFieldState} from '@react-stately/datepicker';
-import {useLocale} from '@react-aria/i18n';
+import {useDateField} from '../../src/datepicker/useDateField';
+import {useDateFieldState} from 'react-stately/useDateFieldState';
+import {useLocale} from '../../src/i18n/I18nProvider';
 
 export function ProgrammaticSetValueExampleRender(): ReactElement {
   let {locale} = useLocale();
diff --git a/packages/@react-aria/dnd/stories/DraggableCollection.tsx b/packages/react-aria/stories/dnd/DraggableCollection.tsx
similarity index 84%
rename from packages/@react-aria/dnd/stories/DraggableCollection.tsx
rename to packages/react-aria/stories/dnd/DraggableCollection.tsx
index 75a06aee855..7e0b701fc1f 100644
--- a/packages/@react-aria/dnd/stories/DraggableCollection.tsx
+++ b/packages/react-aria/stories/dnd/DraggableCollection.tsx
@@ -9,22 +9,29 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {chain, mergeProps, useId} from '@react-aria/utils';
-import {classNames} from '@react-spectrum/utils';
+import {chain} from '../../src/utils/chain';
+
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
 import dndStyles from './dnd.css';
-import {DragPreview} from '../src';
-import {FocusRing} from '@react-aria/focus';
+import {DragPreview} from '../../src/dnd/DragPreview';
+import {FocusRing} from '../../src/focus/FocusRing';
 import Folder from '@spectrum-icons/workflow/Folder';
-import {GridCollection, useGridState} from '@react-stately/grid';
-import {Item} from '@react-stately/collections';
+import {GridCollection} from 'react-stately/private/grid/GridCollection';
+import {Item} from 'react-stately/Item';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {JSX, useRef} from 'react';
 import ShowMenu from '@spectrum-icons/workflow/ShowMenu';
-import {useButton} from '@react-aria/button';
-import {useDraggableCollection, useDraggableItem} from '..';
-import {useDraggableCollectionState} from '@react-stately/dnd';
-import {useGrid, useGridCell, useGridRow} from '@react-aria/grid';
-import {useListData} from '@react-stately/data';
-import {useListState} from '@react-stately/list';
+import {useButton} from '../../src/button/useButton';
+import {useDraggableCollection} from '../../src/dnd/useDraggableCollection';
+import {useDraggableCollectionState} from 'react-stately/useDraggableCollectionState';
+import {useDraggableItem} from '../../src/dnd/useDraggableItem';
+import {useGrid} from '../../src/grid/useGrid';
+import {useGridCell} from '../../src/grid/useGridCell';
+import {useGridRow} from '../../src/grid/useGridRow';
+import {useGridState} from 'react-stately/private/grid/useGridState';
+import {useId} from '../../src/utils/useId';
+import {useListData} from 'react-stately/useListData';
+import {useListState} from 'react-stately/useListState';
 
 interface ItemValue {
   id: string,
diff --git a/packages/@react-aria/dnd/stories/DraggableListBox.tsx b/packages/react-aria/stories/dnd/DraggableListBox.tsx
similarity index 74%
rename from packages/@react-aria/dnd/stories/DraggableListBox.tsx
rename to packages/react-aria/stories/dnd/DraggableListBox.tsx
index 443b8f2b6ac..d2887ed3e56 100644
--- a/packages/@react-aria/dnd/stories/DraggableListBox.tsx
+++ b/packages/react-aria/stories/dnd/DraggableListBox.tsx
@@ -1,12 +1,14 @@
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
 import dndStyles from './dnd.css';
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {JSX} from 'react';
-import {useDraggableCollection, useDraggableItem} from '@react-aria/dnd';
-import {useDraggableCollectionState} from '@react-stately/dnd';
-import {useFocusRing} from '@react-aria/focus';
-import {useListBox, useOption} from '@react-aria/listbox';
-import {useListState} from '@react-stately/list';
+import {useDraggableCollection} from '../../src/dnd/useDraggableCollection';
+import {useDraggableCollectionState} from 'react-stately/useDraggableCollectionState';
+import {useDraggableItem} from '../../src/dnd/useDraggableItem';
+import {useFocusRing} from '../../src/focus/useFocusRing';
+import {useListBox} from '../../src/listbox/useListBox';
+import {useListState} from 'react-stately/useListState';
+import {useOption} from '../../src/listbox/useOption';
 
 export function DraggableListBox(props: any): JSX.Element {
   let state = useListState(props);
diff --git a/packages/@react-aria/dnd/stories/DroppableGrid.tsx b/packages/react-aria/stories/dnd/DroppableGrid.tsx
similarity index 89%
rename from packages/@react-aria/dnd/stories/DroppableGrid.tsx
rename to packages/react-aria/stories/dnd/DroppableGrid.tsx
index 5b41b1d01c5..a7552761696 100644
--- a/packages/@react-aria/dnd/stories/DroppableGrid.tsx
+++ b/packages/react-aria/stories/dnd/DroppableGrid.tsx
@@ -10,24 +10,30 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
+
 import dndStyles from './dnd.css';
 import dropIndicatorStyles from '@adobe/spectrum-css-temp/components/dropindicator/vars.css';
 import {DroppableCollectionDropEvent} from '@react-types/shared';
-import {FocusRing} from '@react-aria/focus';
+import {FocusRing} from '../../src/focus/FocusRing';
 import Folder from '@spectrum-icons/workflow/Folder';
-import {GridCollection, useGridState} from '@react-stately/grid';
-import {Item} from '@react-stately/collections';
-import {ListDropTargetDelegate} from '@react-aria/dnd';
-import {ListKeyboardDelegate} from '@react-aria/selection';
-import {mergeProps} from '@react-aria/utils';
+import {GridCollection} from 'react-stately/private/grid/GridCollection';
+import {Item} from 'react-stately/Item';
+import {ListDropTargetDelegate} from '../../src/dnd/ListDropTargetDelegate';
+import {ListKeyboardDelegate} from '../../src/selection/ListKeyboardDelegate';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {JSX} from 'react';
-import {useClipboard, useDropIndicator, useDroppableCollection} from '..';
-import {useDroppableCollectionState} from '@react-stately/dnd';
-import {useGrid, useGridCell, useGridRow} from '@react-aria/grid';
-import {useListData} from '@react-stately/data';
-import {useListState} from '@react-stately/list';
-import {useVisuallyHidden} from '@react-aria/visually-hidden';
+import {useClipboard} from '../../src/dnd/useClipboard';
+import {useDropIndicator} from '../../src/dnd/useDropIndicator';
+import {useDroppableCollection} from '../../src/dnd/useDroppableCollection';
+import {useDroppableCollectionState} from 'react-stately/useDroppableCollectionState';
+import {useGrid} from '../../src/grid/useGrid';
+import {useGridCell} from '../../src/grid/useGridCell';
+import {useGridRow} from '../../src/grid/useGridRow';
+import {useGridState} from 'react-stately/private/grid/useGridState';
+import {useListData} from 'react-stately/useListData';
+import {useListState} from 'react-stately/useListState';
+import {useVisuallyHidden} from '../../src/visually-hidden/VisuallyHidden';
 
 interface ListItem {
   id: string,
diff --git a/packages/@react-aria/dnd/stories/DroppableListBox.tsx b/packages/react-aria/stories/dnd/DroppableListBox.tsx
similarity index 87%
rename from packages/@react-aria/dnd/stories/DroppableListBox.tsx
rename to packages/react-aria/stories/dnd/DroppableListBox.tsx
index bc3dcf0580b..402d1be0ffa 100644
--- a/packages/@react-aria/dnd/stories/DroppableListBox.tsx
+++ b/packages/react-aria/stories/dnd/DroppableListBox.tsx
@@ -11,23 +11,27 @@
  */
 
 import {action} from 'storybook/actions';
-import {chain, mergeProps} from '@react-aria/utils';
-import {classNames} from '@react-spectrum/utils';
+import {chain} from '../../src/utils/chain';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
 import dndStyles from './dnd.css';
 import dropIndicatorStyles from '@adobe/spectrum-css-temp/components/dropindicator/vars.css';
 import {DroppableCollectionDropEvent} from '@react-types/shared';
-import {FocusRing} from '@react-aria/focus';
+import {FocusRing} from '../../src/focus/FocusRing';
 import Folder from '@spectrum-icons/workflow/Folder';
-import {Item} from '@react-stately/collections';
-import {ListDropTargetDelegate} from '@react-aria/dnd';
-import {ListKeyboardDelegate} from '@react-aria/selection';
+import {Item} from 'react-stately/Item';
+import {ListDropTargetDelegate} from '../../src/dnd/ListDropTargetDelegate';
+import {ListKeyboardDelegate} from '../../src/selection/ListKeyboardDelegate';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {JSX} from 'react';
-import {useDropIndicator, useDroppableCollection, useDroppableItem} from '..';
-import {useDroppableCollectionState} from '@react-stately/dnd';
-import {useListBox, useOption} from '@react-aria/listbox';
-import {useListData} from '@react-stately/data';
-import {useListState} from '@react-stately/list';
-import {useVisuallyHidden} from '@react-aria/visually-hidden';
+import {useDropIndicator} from '../../src/dnd/useDropIndicator';
+import {useDroppableCollection} from '../../src/dnd/useDroppableCollection';
+import {useDroppableCollectionState} from 'react-stately/useDroppableCollectionState';
+import {useDroppableItem} from '../../src/dnd/useDroppableItem';
+import {useListBox} from '../../src/listbox/useListBox';
+import {useListData} from 'react-stately/useListData';
+import {useListState} from 'react-stately/useListState';
+import {useOption} from '../../src/listbox/useOption';
+import {useVisuallyHidden} from '../../src/visually-hidden/VisuallyHidden';
 
 interface ItemValue {
   id: string,
diff --git a/packages/@react-aria/dnd/stories/Reorderable.tsx b/packages/react-aria/stories/dnd/Reorderable.tsx
similarity index 86%
rename from packages/@react-aria/dnd/stories/Reorderable.tsx
rename to packages/react-aria/stories/dnd/Reorderable.tsx
index f87938d96bd..ffdcec36584 100644
--- a/packages/@react-aria/dnd/stories/Reorderable.tsx
+++ b/packages/react-aria/stories/dnd/Reorderable.tsx
@@ -11,27 +11,36 @@
  */
 
 import {action} from 'storybook/actions';
-import {chain, mergeProps, useId} from '@react-aria/utils';
-import {classNames} from '@react-spectrum/utils';
+import {chain} from '../../src/utils/chain';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
 import dndStyles from './dnd.css';
-import {DragPreview} from '../src';
+import {DragPreview} from '../../src/dnd/DragPreview';
 import dropIndicatorStyles from '@adobe/spectrum-css-temp/components/dropindicator/vars.css';
-import {FocusRing} from '@react-aria/focus';
+import {FocusRing} from '../../src/focus/FocusRing';
 import Folder from '@spectrum-icons/workflow/Folder';
-import {GridCollection, useGridState} from '@react-stately/grid';
-import {Item} from '@react-stately/collections';
+import {GridCollection} from 'react-stately/private/grid/GridCollection';
+import {Item} from 'react-stately/Item';
 import {ItemDropTarget, Key} from '@react-types/shared';
-import {ListDropTargetDelegate} from '@react-aria/dnd';
-import {ListKeyboardDelegate} from '@react-aria/selection';
+import {ListDropTargetDelegate} from '../../src/dnd/ListDropTargetDelegate';
+import {ListKeyboardDelegate} from '../../src/selection/ListKeyboardDelegate';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {JSX, useRef} from 'react';
 import ShowMenu from '@spectrum-icons/workflow/ShowMenu';
-import {useButton} from '@react-aria/button';
-import {useDraggableCollection, useDraggableItem, useDropIndicator, useDroppableCollection} from '..';
-import {useDraggableCollectionState, useDroppableCollectionState} from '@react-stately/dnd';
-import {useGrid, useGridCell, useGridRow} from '@react-aria/grid';
-import {useListData} from '@react-stately/data';
-import {useListState} from '@react-stately/list';
-import {useVisuallyHidden} from '@react-aria/visually-hidden';
+import {useButton} from '../../src/button/useButton';
+import {useDraggableCollection} from '../../src/dnd/useDraggableCollection';
+import {useDraggableCollectionState} from 'react-stately/useDraggableCollectionState';
+import {useDraggableItem} from '../../src/dnd/useDraggableItem';
+import {useDropIndicator} from '../../src/dnd/useDropIndicator';
+import {useDroppableCollection} from '../../src/dnd/useDroppableCollection';
+import {useDroppableCollectionState} from 'react-stately/useDroppableCollectionState';
+import {useGrid} from '../../src/grid/useGrid';
+import {useGridCell} from '../../src/grid/useGridCell';
+import {useGridRow} from '../../src/grid/useGridRow';
+import {useGridState} from 'react-stately/private/grid/useGridState';
+import {useId} from '../../src/utils/useId';
+import {useListData} from 'react-stately/useListData';
+import {useListState} from 'react-stately/useListState';
+import {useVisuallyHidden} from '../../src/visually-hidden/VisuallyHidden';
 
 export function ReorderableGridExample(props: any): JSX.Element {
   let list = useListData({
diff --git a/packages/@react-aria/dnd/stories/VirtualizedListBox.tsx b/packages/react-aria/stories/dnd/VirtualizedListBox.tsx
similarity index 89%
rename from packages/@react-aria/dnd/stories/VirtualizedListBox.tsx
rename to packages/react-aria/stories/dnd/VirtualizedListBox.tsx
index eff3a097032..c83a438e36d 100644
--- a/packages/@react-aria/dnd/stories/VirtualizedListBox.tsx
+++ b/packages/react-aria/stories/dnd/VirtualizedListBox.tsx
@@ -11,24 +11,28 @@
  */
 
 import {action} from 'storybook/actions';
-import {chain, mergeProps} from '@react-aria/utils';
-import {classNames} from '@react-spectrum/utils';
+import {chain} from '../../src/utils/chain';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
 import dndStyles from './dnd.css';
 import dropIndicatorStyles from '@adobe/spectrum-css-temp/components/dropindicator/vars.css';
 import {DroppableCollectionDropEvent} from '@react-types/shared';
-import {DroppableCollectionState, useDroppableCollectionState} from '@react-stately/dnd';
-import {FocusRing} from '@react-aria/focus';
+import {DroppableCollectionState, useDroppableCollectionState} from 'react-stately/useDroppableCollectionState';
+import {FocusRing} from '../../src/focus/FocusRing';
 import Folder from '@spectrum-icons/workflow/Folder';
-import {Item} from '@react-stately/collections';
-import {ListKeyboardDelegate} from '@react-aria/selection';
-import {ListLayout} from '@react-stately/layout';
-import {ListState, useListState} from '@react-stately/list';
+import {Item} from 'react-stately/Item';
+import {ListKeyboardDelegate} from '../../src/selection/ListKeyboardDelegate';
+import {ListLayout} from 'react-stately/private/layout/ListLayout';
+import {ListState, useListState} from 'react-stately/useListState';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {JSX, useMemo} from 'react';
-import {useDropIndicator, useDroppableCollection, useDroppableItem} from '..';
-import {useListBox, useOption} from '@react-aria/listbox';
-import {useListData} from '@react-stately/data';
-import {useVisuallyHidden} from '@react-aria/visually-hidden';
-import {Virtualizer} from '@react-aria/virtualizer';
+import {useDropIndicator} from '../../src/dnd/useDropIndicator';
+import {useDroppableCollection} from '../../src/dnd/useDroppableCollection';
+import {useDroppableItem} from '../../src/dnd/useDroppableItem';
+import {useListBox} from '../../src/listbox/useListBox';
+import {useListData} from 'react-stately/useListData';
+import {useOption} from '../../src/listbox/useOption';
+import {useVisuallyHidden} from '../../src/visually-hidden/VisuallyHidden';
+import {Virtualizer} from '../../src/virtualizer/Virtualizer';
 
 interface ItemValue {
   id: string,
diff --git a/packages/@react-aria/dnd/stories/dnd.css b/packages/react-aria/stories/dnd/dnd.css
similarity index 100%
rename from packages/@react-aria/dnd/stories/dnd.css
rename to packages/react-aria/stories/dnd/dnd.css
diff --git a/packages/@react-aria/dnd/stories/dnd.stories.tsx b/packages/react-aria/stories/dnd/dnd.stories.tsx
similarity index 91%
rename from packages/@react-aria/dnd/stories/dnd.stories.tsx
rename to packages/react-aria/stories/dnd/dnd.stories.tsx
index acdb96265a7..42cec810025 100644
--- a/packages/@react-aria/dnd/stories/dnd.stories.tsx
+++ b/packages/react-aria/stories/dnd/dnd.stories.tsx
@@ -11,38 +11,49 @@
  */
 
 import {action} from 'storybook/actions';
-import {ActionButton} from '@react-spectrum/button';
-import {ActionGroup} from '@react-spectrum/actiongroup';
-import {chain, mergeProps, useId} from '@react-aria/utils';
-import {classNames, unwrapDOMRef} from '@react-spectrum/utils';
-import {Content} from '@react-spectrum/view';
+import {ActionButton} from '@adobe/react-spectrum/ActionButton';
+import {ActionGroup} from '@adobe/react-spectrum/ActionGroup';
+import {chain} from '../../src/utils/chain';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
+import {Content} from '@adobe/react-spectrum/Content';
 import Copy from '@spectrum-icons/workflow/Copy';
 import Cut from '@spectrum-icons/workflow/Cut';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
+import {Dialog} from '@adobe/react-spectrum/Dialog';
+import {DialogTrigger} from '@adobe/react-spectrum/DialogTrigger';
 import dndStyles from './dnd.css';
 import {DraggableListBox} from './DraggableListBox';
-import {DragPreview} from '../src/DragPreview';
+import {DragPreview} from '../../src/dnd/DragPreview';
 import {DroppableGridExample} from './DroppableGrid';
 import {DroppableListBox, DroppableListBoxExample} from './DroppableListBox';
 import dropzoneStyles from '@adobe/spectrum-css-temp/components/dnd/vars.css';
-import {Flex} from '@react-spectrum/layout';
-import {FocusRing} from '@react-aria/focus';
+import {Flex} from '@adobe/react-spectrum/Flex';
+import {FocusRing} from '../../src/focus/FocusRing';
 import Folder from '@spectrum-icons/workflow/Folder';
-import {GridCollection, useGridState} from '@react-stately/grid';
-import {Heading} from '@react-spectrum/text';
-import {Item} from '@react-stately/collections';
+import {GridCollection} from 'react-stately/private/grid/GridCollection';
+import {Heading} from '@adobe/react-spectrum/Heading';
+import {Item} from 'react-stately/Item';
+import {mergeProps} from '../../src/utils/mergeProps';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
 import Paste from '@spectrum-icons/workflow/Paste';
-import {PressResponder} from '@react-aria/interactions';
+import {PressResponder} from '../../src/interactions/PressResponder';
 import React, {JSX, useRef} from 'react';
 import {ReorderableGridExample} from './Reorderable';
 import ShowMenu from '@spectrum-icons/workflow/ShowMenu';
-import {useButton} from '@react-aria/button';
-import {useClipboard, useDrag, useDraggableCollection, useDraggableItem, useDrop} from '..';
-import {useDraggableCollectionState} from '@react-stately/dnd';
-import {useGrid, useGridCell, useGridRow} from '@react-aria/grid';
-import {useListData} from '@react-stately/data';
-import {useListState} from '@react-stately/list';
+import {unwrapDOMRef} from '@adobe/react-spectrum/private/utils/useDOMRef';
+import {useButton} from '../../src/button/useButton';
+import {useClipboard} from '../../src/dnd/useClipboard';
+import {useDrag} from '../../src/dnd/useDrag';
+import {useDraggableCollection} from '../../src/dnd/useDraggableCollection';
+import {useDraggableCollectionState} from 'react-stately/useDraggableCollectionState';
+import {useDraggableItem} from '../../src/dnd/useDraggableItem';
+import {useDrop} from '../../src/dnd/useDrop';
+import {useGrid} from '../../src/grid/useGrid';
+import {useGridCell} from '../../src/grid/useGridCell';
+import {useGridRow} from '../../src/grid/useGridRow';
+import {useGridState} from 'react-stately/private/grid/useGridState';
+import {useId} from '../../src/utils/useId';
+import {useListData} from 'react-stately/useListData';
+import {useListState} from 'react-stately/useListState';
 import {VirtualizedListBoxExample} from './VirtualizedListBox';
 
 interface ItemValue {
diff --git a/packages/@react-aria/focus/stories/FocusScope.stories.tsx b/packages/react-aria/stories/focus/FocusScope.stories.tsx
similarity index 96%
rename from packages/@react-aria/focus/stories/FocusScope.stories.tsx
rename to packages/react-aria/stories/focus/FocusScope.stories.tsx
index e8beb3b7d93..f27873f6389 100644
--- a/packages/@react-aria/focus/stories/FocusScope.stories.tsx
+++ b/packages/react-aria/stories/focus/FocusScope.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {FocusScope, FocusScopeProps} from '../';
+import {FocusScope, FocusScopeProps} from '../../src/focus/FocusScope';
 import {Meta, StoryFn, StoryObj} from '@storybook/react';
 import React, {JSX, ReactNode, useEffect, useState} from 'react';
 import ReactDOM from 'react-dom';
@@ -59,11 +59,11 @@ function NestedDialog({onClose, isPortaled, contain}: {onClose: VoidFunction, is
   };
 
   return (
-    <MaybePortal isPortaled={isPortaled}>
+    (<MaybePortal isPortaled={isPortaled}>
       <FocusScope contain={contain} restoreFocus autoFocus>
         {!showNew && (
           // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
-          <div role="dialog" onKeyDown={onKeyDown}>
+          (<div role="dialog" onKeyDown={onKeyDown}>
             <input />
             <input />
             <input />
@@ -75,18 +75,18 @@ function NestedDialog({onClose, isPortaled, contain}: {onClose: VoidFunction, is
               close
             </button>
             {open && <NestedDialog contain={contain} onClose={() => setOpen(false)} isPortaled={isPortaled} />}
-          </div>
+          </div>)
         )}
         {showNew && (
           // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
-          <div role="dialog" onKeyDown={onKeyDown}>
+          (<div role="dialog" onKeyDown={onKeyDown}>
             <input />
             <input autoFocus />
             <input />
-          </div>
+          </div>)
         )}
       </FocusScope>
-    </MaybePortal>
+    </MaybePortal>)
   );
 }
 
diff --git a/packages/@react-aria/grid/stories/example.tsx b/packages/react-aria/stories/grid/example.tsx
similarity index 84%
rename from packages/@react-aria/grid/stories/example.tsx
rename to packages/react-aria/stories/grid/example.tsx
index 258ea89e2d7..0ad145fdc6a 100644
--- a/packages/@react-aria/grid/stories/example.tsx
+++ b/packages/react-aria/stories/grid/example.tsx
@@ -10,12 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {GridCollection, useGridState} from '@react-stately/grid';
-import {mergeProps} from '@react-aria/utils';
+import {GridCollection} from 'react-stately/private/grid/GridCollection';
+
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {JSX} from 'react';
-import {useFocus} from '@react-aria/interactions';
-import {useGrid, useGridCell, useGridRow} from '../';
-import {useListState} from '@react-stately/list';
+import {useFocus} from '../../src/interactions/useFocus';
+import {useGrid} from '../../src/grid/useGrid';
+import {useGridCell} from '../../src/grid/useGridCell';
+import {useGridRow} from '../../src/grid/useGridRow';
+import {useGridState} from 'react-stately/private/grid/useGridState';
+import {useListState} from 'react-stately/useListState';
 
 export function Grid(props: any): JSX.Element {
   let {gridFocusMode = 'row', cellFocusMode = 'child'} = props;
diff --git a/packages/@react-aria/grid/stories/useGrid.stories.tsx b/packages/react-aria/stories/grid/useGrid.stories.tsx
similarity index 95%
rename from packages/@react-aria/grid/stories/useGrid.stories.tsx
rename to packages/react-aria/stories/grid/useGrid.stories.tsx
index d14179becc2..6b01c4522a4 100644
--- a/packages/@react-aria/grid/stories/useGrid.stories.tsx
+++ b/packages/react-aria/stories/grid/useGrid.stories.tsx
@@ -11,10 +11,10 @@
  */
 
 import {Grid} from './example';
-import {Item} from '@react-stately/collections';
+import {Item} from 'react-stately/Item';
 import {Meta, StoryObj} from '@storybook/react';
 import React from 'react';
-import {Switch} from '@react-spectrum/switch';
+import {Switch} from '@adobe/react-spectrum/Switch';
 
 export default {
   title: 'useGrid',
diff --git a/packages/@react-aria/interactions/stories/useFocusRing.stories.tsx b/packages/react-aria/stories/interactions/useFocusRing.stories.tsx
similarity index 91%
rename from packages/@react-aria/interactions/stories/useFocusRing.stories.tsx
rename to packages/react-aria/stories/interactions/useFocusRing.stories.tsx
index 468cb581582..92aa7e7529f 100644
--- a/packages/@react-aria/interactions/stories/useFocusRing.stories.tsx
+++ b/packages/react-aria/stories/interactions/useFocusRing.stories.tsx
@@ -10,16 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {addWindowFocusTracking} from '../src';
-import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@react-spectrum/table';
+import {addWindowFocusTracking} from '../../src/interactions/useFocusVisible';
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@adobe/react-spectrum/TableView';
 import Frame from 'react-frame-component';
 import {Key} from '@react-types/shared';
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {JSX, useEffect, useRef, useState} from 'react';
-import {SearchField} from '@react-spectrum/searchfield';
+import {SearchField} from '@adobe/react-spectrum/SearchField';
 import {StoryObj} from '@storybook/react';
-import {useButton} from '@react-aria/button';
-import {useFocusRing} from '@react-aria/focus';
+import {useButton} from '../../src/button/useButton';
+import {useFocusRing} from '../../src/focus/useFocusRing';
 
 interface IColumn {
   name: string,
diff --git a/packages/@react-aria/interactions/stories/useHover.stories.tsx b/packages/react-aria/stories/interactions/useHover.stories.tsx
similarity index 88%
rename from packages/@react-aria/interactions/stories/useHover.stories.tsx
rename to packages/react-aria/stories/interactions/useHover.stories.tsx
index 471850b1d0d..be751d3d1fa 100644
--- a/packages/@react-aria/interactions/stories/useHover.stories.tsx
+++ b/packages/react-aria/stories/interactions/useHover.stories.tsx
@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 import {AriaButtonProps} from '@react-types/button';
-import {classNames} from '@react-spectrum/utils';
-import {mergeProps} from '@react-aria/utils';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {JSX, useRef, useState} from 'react';
 import {StoryObj} from '@storybook/react';
-import {useButton} from '@react-aria/button';
-import {useHover} from '../';
+import {useButton} from '../../src/button/useButton';
+import {useHover} from '../../src/interactions/useHover';
 
 export default {
   title: 'useHover'
diff --git a/packages/@react-aria/interactions/stories/useInteractOutside.stories.tsx b/packages/react-aria/stories/interactions/useInteractOutside.stories.tsx
similarity index 95%
rename from packages/@react-aria/interactions/stories/useInteractOutside.stories.tsx
rename to packages/react-aria/stories/interactions/useInteractOutside.stories.tsx
index 1d43a1429c3..1e2e31d7b42 100644
--- a/packages/@react-aria/interactions/stories/useInteractOutside.stories.tsx
+++ b/packages/react-aria/stories/interactions/useInteractOutside.stories.tsx
@@ -13,7 +13,8 @@
 import {action} from 'storybook/actions';
 import React, {JSX, useEffect, useRef} from 'react';
 import {StoryObj} from '@storybook/react';
-import {useInteractOutside, usePress} from '../';
+import {useInteractOutside} from '../../src/interactions/useInteractOutside';
+import {usePress} from '../../src/interactions/usePress';
 
 export default {
   title: 'useInteractOutside'
diff --git a/packages/@react-aria/interactions/stories/useMove.stories.tsx b/packages/react-aria/stories/interactions/useMove.stories.tsx
similarity index 97%
rename from packages/@react-aria/interactions/stories/useMove.stories.tsx
rename to packages/react-aria/stories/interactions/useMove.stories.tsx
index fd6de2e9b96..ae79b70842e 100644
--- a/packages/@react-aria/interactions/stories/useMove.stories.tsx
+++ b/packages/react-aria/stories/interactions/useMove.stories.tsx
@@ -13,11 +13,11 @@
 /* eslint-disable jsx-a11y/no-noninteractive-tabindex */
 
 import {action} from 'storybook/actions';
-import {clamp} from '@react-aria/utils';
-import {Flex} from '@react-spectrum/layout';
+import {clamp} from 'react-stately/private/utils/number';
+import {Flex} from '@adobe/react-spectrum/Flex';
 import React, {JSX, useRef, useState} from 'react';
 import {StoryObj} from '@storybook/react';
-import {useMove} from '../';
+import {useMove} from '../../src/interactions/useMove';
 
 interface IPosition {
   x: number,
diff --git a/packages/@react-aria/interactions/stories/usePress-stories.css b/packages/react-aria/stories/interactions/usePress-stories.css
similarity index 100%
rename from packages/@react-aria/interactions/stories/usePress-stories.css
rename to packages/react-aria/stories/interactions/usePress-stories.css
diff --git a/packages/@react-aria/interactions/stories/usePress.stories.tsx b/packages/react-aria/stories/interactions/usePress.stories.tsx
similarity index 96%
rename from packages/@react-aria/interactions/stories/usePress.stories.tsx
rename to packages/react-aria/stories/interactions/usePress.stories.tsx
index ceff2bca0ef..2f2b02a65aa 100644
--- a/packages/@react-aria/interactions/stories/usePress.stories.tsx
+++ b/packages/react-aria/stories/interactions/usePress.stories.tsx
@@ -10,19 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import {
-  Button,
-  Dialog,
-  DialogTrigger,
-  Heading,
-  Link,
-  Modal,
-  ModalOverlay
-} from 'react-aria-components';
+import {Button} from 'react-aria-components/Button';
+
+import {Dialog, DialogTrigger} from 'react-aria-components/Dialog';
+import {Heading} from 'react-aria-components/Heading';
+import {Link} from 'react-aria-components/Link';
+import {Modal, ModalOverlay} from 'react-aria-components/Modal';
 import React, {JSX, useState} from 'react';
 import {StoryObj} from '@storybook/react';
 import styles from './usePress-stories.css';
-import {usePress} from '@react-aria/interactions';
+import {usePress} from '../../src/interactions/usePress';
 
 export default {
   title: 'usePress'
diff --git a/packages/@react-aria/label/stories/useField.stories.tsx b/packages/react-aria/stories/label/useField.stories.tsx
similarity index 96%
rename from packages/@react-aria/label/stories/useField.stories.tsx
rename to packages/react-aria/stories/label/useField.stories.tsx
index df1657cc5d0..1fd1d3adee2 100644
--- a/packages/@react-aria/label/stories/useField.stories.tsx
+++ b/packages/react-aria/stories/label/useField.stories.tsx
@@ -1,6 +1,6 @@
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX, useRef} from 'react';
-import {useField} from '../';
+import {useField} from '../../src/label/useField';
 import {ValidationState} from '@react-types/shared';
 
 interface TextFieldProps {
diff --git a/packages/@react-aria/landmark/stories/Landmark.stories.tsx b/packages/react-aria/stories/landmark/Landmark.stories.tsx
similarity index 95%
rename from packages/@react-aria/landmark/stories/Landmark.stories.tsx
rename to packages/react-aria/stories/landmark/Landmark.stories.tsx
index 8861677c1bd..f76e1ec66dc 100644
--- a/packages/@react-aria/landmark/stories/Landmark.stories.tsx
+++ b/packages/react-aria/stories/landmark/Landmark.stories.tsx
@@ -10,19 +10,23 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionGroup, Item} from '@react-spectrum/actiongroup';
-import {AriaLandmarkProps, UNSTABLE_createLandmarkController, useLandmark} from '../';
-import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@react-spectrum/table';
-import {Checkbox} from '@react-spectrum/checkbox';
-import {classNames, useFocusableRef, useStyleProps} from '@react-spectrum/utils';
-import {Flex} from '@react-spectrum/layout';
-import {Link} from '@react-spectrum/link';
+import {ActionGroup} from '@adobe/react-spectrum/ActionGroup';
+
+import {AriaLandmarkProps, UNSTABLE_createLandmarkController, useLandmark} from '../../src/landmark/useLandmark';
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@adobe/react-spectrum/TableView';
+import {Checkbox} from '@adobe/react-spectrum/Checkbox';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
+import {Flex} from '@adobe/react-spectrum/Flex';
+import {Item} from 'react-stately/Item';
+import {Link} from '@adobe/react-spectrum/Link';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX, SyntheticEvent, useEffect, useMemo, useRef} from 'react';
-import {SearchField} from '@react-spectrum/searchfield';
+import {SearchField} from '@adobe/react-spectrum/SearchField';
 import {StyleProps} from '@react-types/shared';
 import styles from './index.css';
-import {TextField} from '@react-spectrum/textfield';
+import {TextField} from '@adobe/react-spectrum/TextField';
+import {useFocusableRef} from '@adobe/react-spectrum/private/utils/useDOMRef';
+import {useStyleProps} from '@adobe/react-spectrum/private/utils/styleProps';
 
 interface StoryProps {}
 
diff --git a/packages/@react-aria/landmark/stories/index.css b/packages/react-aria/stories/landmark/index.css
similarity index 100%
rename from packages/@react-aria/landmark/stories/index.css
rename to packages/react-aria/stories/landmark/index.css
diff --git a/packages/@react-aria/menu/stories/useMenu.stories.tsx b/packages/react-aria/stories/menu/useMenu.stories.tsx
similarity index 86%
rename from packages/@react-aria/menu/stories/useMenu.stories.tsx
rename to packages/react-aria/stories/menu/useMenu.stories.tsx
index 42769958d3f..e62bb8c78c1 100644
--- a/packages/@react-aria/menu/stories/useMenu.stories.tsx
+++ b/packages/react-aria/stories/menu/useMenu.stories.tsx
@@ -11,18 +11,22 @@
  */
 
 import {action} from 'storybook/actions';
-import {AriaMenuTriggerProps, useMenu, useMenuItem, useMenuTrigger} from '@react-aria/menu';
+import {AriaMenuTriggerProps, useMenuTrigger} from '../../src/menu/useMenuTrigger';
 import {CollectionBase} from '@react-types/shared';
-import {DismissButton, useOverlay} from '@react-aria/overlays';
-import {FocusScope} from '@react-aria/focus';
-import {Item} from '@react-stately/collections';
-import {mergeProps} from '@react-aria/utils';
+import {DismissButton} from '../../src/overlays/DismissButton';
+import {FocusScope} from '../../src/focus/FocusScope';
+import {Item} from 'react-stately/Item';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {JSX} from 'react';
 import {StoryObj} from '@storybook/react';
-import {useButton} from '@react-aria/button';
-import {useFocus, useInteractOutside} from '@react-aria/interactions';
-import {useMenuTriggerState} from '@react-stately/menu';
-import {useTreeState} from '@react-stately/tree';
+import {useButton} from '../../src/button/useButton';
+import {useFocus} from '../../src/interactions/useFocus';
+import {useInteractOutside} from '../../src/interactions/useInteractOutside';
+import {useMenu} from '../../src/menu/useMenu';
+import {useMenuItem} from '../../src/menu/useMenuItem';
+import {useMenuTriggerState} from 'react-stately/useMenuTriggerState';
+import {useOverlay} from '../../src/overlays/useOverlay';
+import {useTreeState} from 'react-stately/useTreeState';
 
 export default {
   title: 'useMenu'
diff --git a/packages/@react-aria/overlays/stories/UseOverlayPosition.stories.tsx b/packages/react-aria/stories/overlays/UseOverlayPosition.stories.tsx
similarity index 93%
rename from packages/@react-aria/overlays/stories/UseOverlayPosition.stories.tsx
rename to packages/react-aria/stories/overlays/UseOverlayPosition.stories.tsx
index 194b4be09ab..ea3989630bd 100644
--- a/packages/@react-aria/overlays/stories/UseOverlayPosition.stories.tsx
+++ b/packages/react-aria/stories/overlays/UseOverlayPosition.stories.tsx
@@ -10,13 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from '../../src/utils/mergeProps';
+
 import {Placement} from '@react-types/overlays';
 import React, {JSX} from 'react';
 import ReactDOM from 'react-dom';
 import {StoryFn} from '@storybook/react';
-import {useOverlayPosition, useOverlayTrigger} from '../src';
-import {useOverlayTriggerState} from '@react-stately/overlays';
+import {useOverlayPosition} from '../../src/overlays/useOverlayPosition';
+import {useOverlayTrigger} from '../../src/overlays/useOverlayTrigger';
+import {useOverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 
 function Trigger(props: {
   withPortal: boolean,
diff --git a/packages/@react-aria/overlays/stories/useModal.stories.tsx b/packages/react-aria/stories/overlays/useModal.stories.tsx
similarity index 95%
rename from packages/@react-aria/overlays/stories/useModal.stories.tsx
rename to packages/react-aria/stories/overlays/useModal.stories.tsx
index 15f678bb8fd..75a390b0a69 100644
--- a/packages/@react-aria/overlays/stories/useModal.stories.tsx
+++ b/packages/react-aria/stories/overlays/useModal.stories.tsx
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
-import {OverlayContainer, OverlayProvider, useModal} from '../src';
+import {ActionButton} from '@adobe/react-spectrum/ActionButton';
+import {OverlayContainer, OverlayProvider, useModal} from '../../src/overlays/useModal';
 import React, {JSX, useState} from 'react';
 import {StoryObj} from '@storybook/react';
 
diff --git a/packages/@react-aria/overlays/stories/usePreventScroll.stories.tsx b/packages/react-aria/stories/overlays/usePreventScroll.stories.tsx
similarity index 92%
rename from packages/@react-aria/overlays/stories/usePreventScroll.stories.tsx
rename to packages/react-aria/stories/overlays/usePreventScroll.stories.tsx
index 09002fd1e93..54acad4ca9e 100644
--- a/packages/@react-aria/overlays/stories/usePreventScroll.stories.tsx
+++ b/packages/react-aria/stories/overlays/usePreventScroll.stories.tsx
@@ -10,10 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {ActionButton} from '@react-spectrum/button';
+import {ActionButton} from '@adobe/react-spectrum/ActionButton';
 import React, {JSX, useState} from 'react';
 import {StoryObj} from '@storybook/react';
-import {usePreventScroll} from '../src';
+import {usePreventScroll} from '../../src/overlays/usePreventScroll';
 
 export default {
   title: 'usePreventScroll'
diff --git a/packages/@react-aria/select/stories/example.tsx b/packages/react-aria/stories/select/example.tsx
similarity index 87%
rename from packages/@react-aria/select/stories/example.tsx
rename to packages/react-aria/stories/select/example.tsx
index f7efa2239a2..4d14b4e662d 100644
--- a/packages/@react-aria/select/stories/example.tsx
+++ b/packages/react-aria/stories/select/example.tsx
@@ -10,13 +10,18 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaSelectProps, HiddenSelect, useSelect} from '@react-aria/select';
-import {DismissButton, useOverlay} from '@react-aria/overlays';
-import {FocusScope} from '@react-aria/focus';
+import {AriaSelectProps} from '@react-types/select';
+
+import {DismissButton} from '../../src/overlays/DismissButton';
+import {FocusScope} from '../../src/focus/FocusScope';
+import {HiddenSelect} from '../../src/select/HiddenSelect';
 import React, {JSX} from 'react';
-import {useButton} from '@react-aria/button';
-import {useListBox, useOption} from '@react-aria/listbox';
-import {useSelectState} from '@react-stately/select';
+import {useButton} from '../../src/button/useButton';
+import {useListBox} from '../../src/listbox/useListBox';
+import {useOption} from '../../src/listbox/useOption';
+import {useOverlay} from '../../src/overlays/useOverlay';
+import {useSelect} from '../../src/select/useSelect';
+import {useSelectState} from 'react-stately/useSelectState';
 
 export function Select<T extends object>(props: AriaSelectProps<T>): JSX.Element {
   // Create state based on the incoming props
diff --git a/packages/@react-aria/select/stories/useSelect.stories.tsx b/packages/react-aria/stories/select/useSelect.stories.tsx
similarity index 96%
rename from packages/@react-aria/select/stories/useSelect.stories.tsx
rename to packages/react-aria/stories/select/useSelect.stories.tsx
index 515f4e95c6a..078420a04e0 100644
--- a/packages/@react-aria/select/stories/useSelect.stories.tsx
+++ b/packages/react-aria/stories/select/useSelect.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Item} from '@react-stately/collections';
+import {Item} from 'react-stately/Item';
 import React, {JSX} from 'react';
 import {Select} from './example';
 import {StoryObj} from '@storybook/react';
diff --git a/packages/@react-aria/selection/stories/List.tsx b/packages/react-aria/stories/selection/List.tsx
similarity index 87%
rename from packages/@react-aria/selection/stories/List.tsx
rename to packages/react-aria/stories/selection/List.tsx
index 6c022bbe60b..17709fc453d 100644
--- a/packages/@react-aria/selection/stories/List.tsx
+++ b/packages/react-aria/stories/selection/List.tsx
@@ -5,9 +5,10 @@ import {
   Node,
   SelectionBehavior
 } from '@react-types/shared';
-import {ListState, useListState} from '@react-stately/list';
+import {ListState, useListState} from 'react-stately/useListState';
 import React, {JSX, useRef} from 'react';
-import {useSelectableItem, useSelectableList} from '@react-aria/selection';
+import {useSelectableItem} from '../../src/selection/useSelectableItem';
+import {useSelectableList} from '../../src/selection/useSelectableList';
 
 function ListItem<T>({item, state}: {item: Node<T>, state: ListState<T>}) {
   const ref = useRef(null);
diff --git a/packages/@react-aria/selection/stories/styles.css b/packages/react-aria/stories/selection/styles.css
similarity index 100%
rename from packages/@react-aria/selection/stories/styles.css
rename to packages/react-aria/stories/selection/styles.css
diff --git a/packages/@react-aria/selection/stories/useSelectableList.stories.tsx b/packages/react-aria/stories/selection/useSelectableList.stories.tsx
similarity index 95%
rename from packages/@react-aria/selection/stories/useSelectableList.stories.tsx
rename to packages/react-aria/stories/selection/useSelectableList.stories.tsx
index 34652f85bf2..36865c22ade 100644
--- a/packages/@react-aria/selection/stories/useSelectableList.stories.tsx
+++ b/packages/react-aria/stories/selection/useSelectableList.stories.tsx
@@ -11,14 +11,15 @@
  */
 
 import {CollectionBase, Node} from '@react-types/shared';
-import {Item} from '@react-spectrum/actiongroup';
+import {Item} from 'react-stately/Item';
 import {List} from './List';
-import {ListState, useListState} from '@react-stately/list';
+import {ListState, useListState} from 'react-stately/useListState';
 import {Meta, StoryFn} from '@storybook/react';
 import React, {JSX} from 'react';
-import {Section} from '@react-spectrum/menu';
+import {Section} from 'react-stately/Section';
 import styles from './styles.css';
-import {useSelectableItem, useSelectableList} from '../src';
+import {useSelectableItem} from '../../src/selection/useSelectableItem';
+import {useSelectableList} from '../../src/selection/useSelectableList';
 
 function SelectableList(props: CollectionBase<any> & {
   isSubUlRelativelyPositioned: boolean,
diff --git a/packages/@react-aria/slider/stories/Slider.stories.tsx b/packages/react-aria/stories/slider/Slider.stories.tsx
similarity index 100%
rename from packages/@react-aria/slider/stories/Slider.stories.tsx
rename to packages/react-aria/stories/slider/Slider.stories.tsx
diff --git a/packages/@react-aria/slider/stories/StoryMultiSlider.tsx b/packages/react-aria/stories/slider/StoryMultiSlider.tsx
similarity index 89%
rename from packages/@react-aria/slider/stories/StoryMultiSlider.tsx
rename to packages/react-aria/stories/slider/StoryMultiSlider.tsx
index f925c5aadfc..98ba29e8281 100644
--- a/packages/@react-aria/slider/stories/StoryMultiSlider.tsx
+++ b/packages/react-aria/stories/slider/StoryMultiSlider.tsx
@@ -10,15 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-import {classNames} from '@react-spectrum/utils';
-import {FocusRing} from '@react-aria/focus';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
+
+import {FocusRing} from '../../src/focus/FocusRing';
 import React, {JSX} from 'react';
 import {SliderProps, SliderThumbProps} from '@react-types/slider';
-import {SliderState, useSliderState} from '@react-stately/slider';
+import {SliderState, useSliderState} from 'react-stately/useSliderState';
 import styles from './story-slider.css';
-import {useNumberFormatter} from '@react-aria/i18n';
-import {useSlider, useSliderThumb} from '@react-aria/slider';
-import {VisuallyHidden} from '@react-aria/visually-hidden';
+import {useNumberFormatter} from '../../src/i18n/useNumberFormatter';
+import {useSlider} from '../../src/slider/useSlider';
+import {useSliderThumb} from '../../src/slider/useSliderThumb';
+import {VisuallyHidden} from '../../src/visually-hidden/VisuallyHidden';
 
 
 interface StoryMultiSliderProps extends SliderProps {
diff --git a/packages/@react-aria/slider/stories/StoryRangeSlider.tsx b/packages/react-aria/stories/slider/StoryRangeSlider.tsx
similarity index 90%
rename from packages/@react-aria/slider/stories/StoryRangeSlider.tsx
rename to packages/react-aria/stories/slider/StoryRangeSlider.tsx
index 1e4e3c0ef5a..a959f95e4a3 100644
--- a/packages/@react-aria/slider/stories/StoryRangeSlider.tsx
+++ b/packages/react-aria/stories/slider/StoryRangeSlider.tsx
@@ -1,11 +1,12 @@
 import {AriaSliderProps} from '@react-types/slider';
-import {FocusRing} from '@react-aria/focus';
+import {FocusRing} from '../../src/focus/FocusRing';
 import React, {JSX} from 'react';
 import styles from './story-slider.css';
-import {useNumberFormatter} from '@react-aria/i18n';
-import {useSlider, useSliderThumb} from '@react-aria/slider';
-import {useSliderState} from '@react-stately/slider';
-import {VisuallyHidden} from '@react-aria/visually-hidden';
+import {useNumberFormatter} from '../../src/i18n/useNumberFormatter';
+import {useSlider} from '../../src/slider/useSlider';
+import {useSliderState} from 'react-stately/useSliderState';
+import {useSliderThumb} from '../../src/slider/useSliderThumb';
+import {VisuallyHidden} from '../../src/visually-hidden/VisuallyHidden';
 
 
 interface StoryRangeSliderProps extends AriaSliderProps {
diff --git a/packages/@react-aria/slider/stories/StorySlider.tsx b/packages/react-aria/stories/slider/StorySlider.tsx
similarity index 90%
rename from packages/@react-aria/slider/stories/StorySlider.tsx
rename to packages/react-aria/stories/slider/StorySlider.tsx
index 0884247501c..9e12807f0d0 100644
--- a/packages/@react-aria/slider/stories/StorySlider.tsx
+++ b/packages/react-aria/stories/slider/StorySlider.tsx
@@ -11,13 +11,14 @@
  */
 
 import {AriaSliderProps} from '@react-types/slider';
-import {FocusRing} from '@react-aria/focus';
+import {FocusRing} from '../../src/focus/FocusRing';
 import React, {JSX} from 'react';
 import styles from './story-slider.css';
-import {useNumberFormatter} from '@react-aria/i18n';
-import {useSlider, useSliderThumb} from '@react-aria/slider';
-import {useSliderState} from '@react-stately/slider';
-import {VisuallyHidden} from '@react-aria/visually-hidden';
+import {useNumberFormatter} from '../../src/i18n/useNumberFormatter';
+import {useSlider} from '../../src/slider/useSlider';
+import {useSliderState} from 'react-stately/useSliderState';
+import {useSliderThumb} from '../../src/slider/useSliderThumb';
+import {VisuallyHidden} from '../../src/visually-hidden/VisuallyHidden';
 
 interface StorySliderProps extends AriaSliderProps<number> {
   origin?: number,
diff --git a/packages/@react-aria/slider/stories/story-slider.css b/packages/react-aria/stories/slider/story-slider.css
similarity index 100%
rename from packages/@react-aria/slider/stories/story-slider.css
rename to packages/react-aria/stories/slider/story-slider.css
diff --git a/packages/@react-aria/table/stories/docs-example.css b/packages/react-aria/stories/table/docs-example.css
similarity index 100%
rename from packages/@react-aria/table/stories/docs-example.css
rename to packages/react-aria/stories/table/docs-example.css
diff --git a/packages/@react-aria/table/stories/example-backwards-compat.tsx b/packages/react-aria/stories/table/example-backwards-compat.tsx
similarity index 90%
rename from packages/@react-aria/table/stories/example-backwards-compat.tsx
rename to packages/react-aria/stories/table/example-backwards-compat.tsx
index 83c949ee8ec..cc1dbd27004 100644
--- a/packages/@react-aria/table/stories/example-backwards-compat.tsx
+++ b/packages/react-aria/stories/table/example-backwards-compat.tsx
@@ -10,24 +10,23 @@
  * governing permissions and limitations under the License.
  */
 
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from '../../src/utils/mergeProps';
+
 import React, {JSX, ReactNode, useRef, useState} from 'react';
 import {SelectionBehavior} from '@react-types/shared';
 import {TableProps} from '@react-types/table';
-import {useCheckbox} from '@react-aria/checkbox';
-import {useFocusRing} from '@react-aria/focus';
-import {
-  useTable,
-  useTableCell,
-  useTableColumnHeader,
-  useTableHeaderRow,
-  useTableRow,
-  useTableRowGroup, useTableSelectAllCheckbox,
-  useTableSelectionCheckbox
-} from '../src';
-import {useTableState} from '@react-stately/table';
-import {useToggleState} from '@react-stately/toggle';
-import {VisuallyHidden} from '@react-aria/visually-hidden';
+import {useCheckbox} from '../../src/checkbox/useCheckbox';
+import {useFocusRing} from '../../src/focus/useFocusRing';
+import {useTable} from '../../src/table/useTable';
+import {useTableCell} from '../../src/table/useTableCell';
+import {useTableColumnHeader} from '../../src/table/useTableColumnHeader';
+import {useTableHeaderRow} from '../../src/table/useTableHeaderRow';
+import {useTableRow} from '../../src/table/useTableRow';
+import {useTableRowGroup} from '../../src/table/useTableRowGroup';
+import {useTableSelectAllCheckbox, useTableSelectionCheckbox} from '../../src/table/useTableSelectionCheckbox';
+import {useTableState} from 'react-stately/useTableState';
+import {useToggleState} from 'react-stately/useToggleState';
+import {VisuallyHidden} from '../../src/visually-hidden/VisuallyHidden';
 
 export function Table<T extends object>(props: TableProps<T> & {onAction?: (key: string) => void, selectionStyle?: 'highlight' | 'checkbox', selectionBehavior?: SelectionBehavior}): JSX.Element {
   let {onAction} = props;
diff --git a/packages/@react-aria/table/stories/example-docs.tsx b/packages/react-aria/stories/table/example-docs.tsx
similarity index 90%
rename from packages/@react-aria/table/stories/example-docs.tsx
rename to packages/react-aria/stories/table/example-docs.tsx
index 6d528bca5e4..de7d5833c73 100644
--- a/packages/@react-aria/table/stories/example-docs.tsx
+++ b/packages/react-aria/stories/table/example-docs.tsx
@@ -11,14 +11,20 @@
  */
 
 import ariaStyles from './docs-example.css';
-import {classNames} from '@react-spectrum/utils';
-import {mergeProps} from '@react-aria/utils';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {JSX, useCallback, useRef} from 'react';
 import {TableProps} from '@react-types/table';
-import {useButton} from 'react-aria';
-import {useFocusRing} from '@react-aria/focus';
-import {useTable, useTableCell, useTableColumnHeader, useTableColumnResize, useTableHeaderRow, useTableRow, useTableRowGroup} from '@react-aria/table';
-import {useTableColumnResizeState, useTableState} from '@react-stately/table';
+import {useButton} from '../../src/button/useButton';
+import {useFocusRing} from '../../src/focus/useFocusRing';
+import {useTable} from '../../src/table/useTable';
+import {useTableCell} from '../../src/table/useTableCell';
+import {useTableColumnHeader} from '../../src/table/useTableColumnHeader';
+import {useTableColumnResize} from '../../src/table/useTableColumnResize';
+import {useTableColumnResizeState, useTableState} from 'react-stately/useTableState';
+import {useTableHeaderRow} from '../../src/table/useTableHeaderRow';
+import {useTableRow} from '../../src/table/useTableRow';
+import {useTableRowGroup} from '../../src/table/useTableRowGroup';
 
 export function Table<T extends object>(props: TableProps<T> & {
   onResizeStart?: (columnKey: string) => void,
diff --git a/packages/@react-aria/table/stories/example-resizing.tsx b/packages/react-aria/stories/table/example-resizing.tsx
similarity index 90%
rename from packages/@react-aria/table/stories/example-resizing.tsx
rename to packages/react-aria/stories/table/example-resizing.tsx
index 36a0bdad38d..75bdfe5ca63 100644
--- a/packages/@react-aria/table/stories/example-resizing.tsx
+++ b/packages/react-aria/stories/table/example-resizing.tsx
@@ -11,29 +11,28 @@
 */
 
 import ariaStyles from './resizing.css';
-import {
-  AriaTableColumnResizeProps,
-  useTable,
-  useTableCell,
-  useTableColumnHeader,
-  useTableColumnResize,
-  useTableHeaderRow,
-  useTableRow,
-  useTableRowGroup,
-  useTableSelectAllCheckbox,
-  useTableSelectionCheckbox
-} from '@react-aria/table';
-import {classNames} from '@react-spectrum/utils';
+import {AriaTableColumnResizeProps, useTableColumnResize} from '../../src/table/useTableColumnResize';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
 import {ColumnSize, TableProps} from '@react-types/table';
-import {FocusRing, useFocusRing} from '@react-aria/focus';
+import {FocusRing} from '../../src/focus/FocusRing';
 import {Key} from '@react-types/shared';
-import {mergeProps, useLayoutEffect, useResizeObserver} from '@react-aria/utils';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {JSX, ReactNode, useCallback, useMemo, useRef, useState} from 'react';
 import styles from '@adobe/spectrum-css-temp/components/table/vars.css';
-import {useCheckbox} from '@react-aria/checkbox';
-import {useTableColumnResizeState, useTableState} from '@react-stately/table';
-import {useToggleState} from '@react-stately/toggle';
-import {VisuallyHidden} from '@react-aria/visually-hidden';
+import {useCheckbox} from '../../src/checkbox/useCheckbox';
+import {useFocusRing} from '../../src/focus/useFocusRing';
+import {useLayoutEffect} from '../../src/utils/useLayoutEffect';
+import {useResizeObserver} from '../../src/utils/useResizeObserver';
+import {useTable} from '../../src/table/useTable';
+import {useTableCell} from '../../src/table/useTableCell';
+import {useTableColumnHeader} from '../../src/table/useTableColumnHeader';
+import {useTableColumnResizeState, useTableState} from 'react-stately/useTableState';
+import {useTableHeaderRow} from '../../src/table/useTableHeaderRow';
+import {useTableRow} from '../../src/table/useTableRow';
+import {useTableRowGroup} from '../../src/table/useTableRowGroup';
+import {useTableSelectAllCheckbox, useTableSelectionCheckbox} from '../../src/table/useTableSelectionCheckbox';
+import {useToggleState} from 'react-stately/useToggleState';
+import {VisuallyHidden} from '../../src/visually-hidden/VisuallyHidden';
 
 export function Table<T extends object>(props: TableProps<T> & {
   selectionStyle?: 'highlight' | 'checkbox' | 'none',
diff --git a/packages/@react-aria/table/stories/example.tsx b/packages/react-aria/stories/table/example.tsx
similarity index 89%
rename from packages/@react-aria/table/stories/example.tsx
rename to packages/react-aria/stories/table/example.tsx
index 35d43ac6e09..2b6beb78b94 100644
--- a/packages/@react-aria/table/stories/example.tsx
+++ b/packages/react-aria/stories/table/example.tsx
@@ -11,15 +11,21 @@
  */
 
 import {Key, SelectionBehavior} from '@react-types/shared';
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {JSX, ReactNode, useRef, useState} from 'react';
 import {TableProps} from '@react-types/table';
-import {useCheckbox} from '@react-aria/checkbox';
-import {useFocusRing} from '@react-aria/focus';
-import {useTable, useTableCell, useTableColumnHeader, useTableHeaderRow, useTableRow, useTableRowGroup, useTableSelectAllCheckbox, useTableSelectionCheckbox} from '@react-aria/table';
-import {useTableState} from '@react-stately/table';
-import {useToggleState} from '@react-stately/toggle';
-import {VisuallyHidden} from '@react-aria/visually-hidden';
+import {useCheckbox} from '../../src/checkbox/useCheckbox';
+import {useFocusRing} from '../../src/focus/useFocusRing';
+import {useTable} from '../../src/table/useTable';
+import {useTableCell} from '../../src/table/useTableCell';
+import {useTableColumnHeader} from '../../src/table/useTableColumnHeader';
+import {useTableHeaderRow} from '../../src/table/useTableHeaderRow';
+import {useTableRow} from '../../src/table/useTableRow';
+import {useTableRowGroup} from '../../src/table/useTableRowGroup';
+import {useTableSelectAllCheckbox, useTableSelectionCheckbox} from '../../src/table/useTableSelectionCheckbox';
+import {useTableState} from 'react-stately/useTableState';
+import {useToggleState} from 'react-stately/useToggleState';
+import {VisuallyHidden} from '../../src/visually-hidden/VisuallyHidden';
 
 export function Table<T extends object>(props: TableProps<T> & {selectionStyle?: 'highlight' | 'checkbox', selectionBehavior?: SelectionBehavior, onAction?: (key: Key) => void}): JSX.Element {
   let [showSelectionCheckboxes, setShowSelectionCheckboxes] = useState(props.selectionStyle !== 'highlight');
diff --git a/packages/@react-aria/table/stories/resizing.css b/packages/react-aria/stories/table/resizing.css
similarity index 100%
rename from packages/@react-aria/table/stories/resizing.css
rename to packages/react-aria/stories/table/resizing.css
diff --git a/packages/@react-aria/table/stories/useTable.stories.tsx b/packages/react-aria/stories/table/useTable.stories.tsx
similarity index 97%
rename from packages/@react-aria/table/stories/useTable.stories.tsx
rename to packages/react-aria/stories/table/useTable.stories.tsx
index f82a488ac0b..a9836a717d0 100644
--- a/packages/@react-aria/table/stories/useTable.stories.tsx
+++ b/packages/react-aria/stories/table/useTable.stories.tsx
@@ -12,15 +12,19 @@
 
 import {action} from 'storybook/actions';
 import {Table as BackwardCompatTable} from './example-backwards-compat';
-import {Cell, Column, Row, TableBody, TableHeader} from '@react-stately/table';
+import {Cell} from 'react-stately/Cell';
+import {Column} from 'react-stately/Column';
 import {ColumnSize} from '@react-types/table';
 import {Table as DocsTable} from './example-docs';
 import {Key} from '@react-types/shared';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX, useCallback, useMemo, useState} from 'react';
 import {Table as ResizingTable} from './example-resizing';
-import {SpectrumTableProps} from '@react-spectrum/table';
+import {Row} from 'react-stately/Row';
+import {SpectrumTableProps} from '@adobe/react-spectrum/TableView';
 import {Table} from './example';
+import {TableBody} from 'react-stately/TableBody';
+import {TableHeader} from 'react-stately/TableHeader';
 
 const meta: Meta<SpectrumTableProps<any>> = {
   title: 'useTable'
diff --git a/packages/@react-aria/tabs/stories/example.tsx b/packages/react-aria/stories/tabs/example.tsx
similarity index 89%
rename from packages/@react-aria/tabs/stories/example.tsx
rename to packages/react-aria/stories/tabs/example.tsx
index 5331a15caf4..8ef08e6a451 100644
--- a/packages/@react-aria/tabs/stories/example.tsx
+++ b/packages/react-aria/stories/tabs/example.tsx
@@ -10,9 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {AriaTabListProps, useTab, useTabList, useTabPanel} from '@react-aria/tabs';
+import {AriaTabListProps} from '@react-types/tabs';
+
 import React, {JSX} from 'react';
-import {useTabListState} from '@react-stately/tabs';
+import {useTab} from '../../src/tabs/useTab';
+import {useTabList} from '../../src/tabs/useTabList';
+import {useTabListState} from 'react-stately/useTabListState';
+import {useTabPanel} from '../../src/tabs/useTabPanel';
 
 export interface TabProps extends AriaTabListProps<any> {
   shouldSelectOnPressUp?: boolean
diff --git a/packages/@react-aria/tabs/stories/useTabList.stories.tsx b/packages/react-aria/stories/tabs/useTabList.stories.tsx
similarity index 96%
rename from packages/@react-aria/tabs/stories/useTabList.stories.tsx
rename to packages/react-aria/stories/tabs/useTabList.stories.tsx
index 1b05d7154e0..2995c389663 100644
--- a/packages/@react-aria/tabs/stories/useTabList.stories.tsx
+++ b/packages/react-aria/stories/tabs/useTabList.stories.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Item} from '@react-stately/collections';
+import {Item} from 'react-stately/Item';
 import React, {JSX} from 'react';
 import {StoryObj} from '@storybook/react';
 import {TabProps, Tabs} from './example';
diff --git a/packages/@react-aria/textfield/stories/useTextField.stories.tsx b/packages/react-aria/stories/textfield/useTextField.stories.tsx
similarity index 96%
rename from packages/@react-aria/textfield/stories/useTextField.stories.tsx
rename to packages/react-aria/stories/textfield/useTextField.stories.tsx
index 341b928cca1..84ace3bfdd6 100644
--- a/packages/@react-aria/textfield/stories/useTextField.stories.tsx
+++ b/packages/react-aria/stories/textfield/useTextField.stories.tsx
@@ -1,6 +1,6 @@
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX, useRef} from 'react';
-import {useTextField} from '../';
+import {useTextField} from '../../src/textfield/useTextField';
 
 interface TextFieldProps {
   label: string,
diff --git a/packages/@react-aria/toast/stories/Example.tsx b/packages/react-aria/stories/toast/Example.tsx
similarity index 88%
rename from packages/@react-aria/toast/stories/Example.tsx
rename to packages/react-aria/stories/toast/Example.tsx
index 3ef1fc77ae0..64a19d3963a 100644
--- a/packages/@react-aria/toast/stories/Example.tsx
+++ b/packages/react-aria/stories/toast/Example.tsx
@@ -11,9 +11,10 @@
  */
 
 import React, {createContext, JSX, useContext, useRef} from 'react';
-import {ToastState, ToastStateProps, useToastState} from '@react-stately/toast';
-import {useButton} from 'react-aria';
-import {useToast, useToastRegion} from '../src';
+import {ToastState, ToastStateProps, useToastState} from 'react-stately/useToastState';
+import {useButton} from '../../src/button/useButton';
+import {useToast} from '../../src/toast/useToast';
+import {useToastRegion} from '../../src/toast/useToastRegion';
 
 const ToastContext = createContext<ToastState<string> | null>(null);
 
diff --git a/packages/@react-aria/toast/stories/useToast.stories.tsx b/packages/react-aria/stories/toast/useToast.stories.tsx
similarity index 95%
rename from packages/@react-aria/toast/stories/useToast.stories.tsx
rename to packages/react-aria/stories/toast/useToast.stories.tsx
index f69573be5ff..31f65345810 100644
--- a/packages/@react-aria/toast/stories/useToast.stories.tsx
+++ b/packages/react-aria/stories/toast/useToast.stories.tsx
@@ -13,7 +13,7 @@
 import React, {JSX} from 'react';
 import {StoryFn} from '@storybook/react';
 import {ToastContainer} from './Example';
-import {ToastStateProps} from '@react-stately/toast';
+import {ToastStateProps} from 'react-stately/useToastState';
 
 export default {
   title: 'useToast',
diff --git a/packages/@react-aria/utils/stories/platform.stories.tsx b/packages/react-aria/stories/utils/platform.stories.tsx
similarity index 97%
rename from packages/@react-aria/utils/stories/platform.stories.tsx
rename to packages/react-aria/stories/utils/platform.stories.tsx
index 13ca42d008c..3181e548314 100644
--- a/packages/@react-aria/utils/stories/platform.stories.tsx
+++ b/packages/react-aria/stories/utils/platform.stories.tsx
@@ -19,7 +19,7 @@ import {
   isIPhone,
   isMac,
   isWebKit
-} from '../src';
+} from '../../src/utils/platform';
 import {Meta, StoryObj} from '@storybook/react';
 import React, {JSX} from 'react';
 
diff --git a/packages/@react-aria/utils/stories/useId.stories.tsx b/packages/react-aria/stories/utils/useId.stories.tsx
similarity index 95%
rename from packages/@react-aria/utils/stories/useId.stories.tsx
rename to packages/react-aria/stories/utils/useId.stories.tsx
index f101f7e7d0e..5c21710fdf6 100644
--- a/packages/@react-aria/utils/stories/useId.stories.tsx
+++ b/packages/react-aria/stories/utils/useId.stories.tsx
@@ -10,10 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {idsUpdaterMap} from '../src/useId';
+import {idsUpdaterMap} from '../../src/utils/useId';
 import React, {JSX, Suspense, useState} from 'react';
 import {StoryObj} from '@storybook/react';
-import {useId} from '../';
+import {useId} from '../../src/utils/useId';
 
 export default {
   title: 'useId'
diff --git a/packages/@react-aria/utils/stories/useViewportSize.stories.tsx b/packages/react-aria/stories/utils/useViewportSize.stories.tsx
similarity index 94%
rename from packages/@react-aria/utils/stories/useViewportSize.stories.tsx
rename to packages/react-aria/stories/utils/useViewportSize.stories.tsx
index e66bd12f629..0062b472e92 100644
--- a/packages/@react-aria/utils/stories/useViewportSize.stories.tsx
+++ b/packages/react-aria/stories/utils/useViewportSize.stories.tsx
@@ -12,7 +12,7 @@
 
 import {Meta} from '@storybook/react';
 import React from 'react';
-import {useViewportSize} from '@react-aria/utils';
+import {useViewportSize} from '../../src/utils/useViewportSize';
 
 export default {
   title: 'useViewportSize',
diff --git a/packages/@react-aria/actiongroup/test/useActionGroup.test.ts b/packages/react-aria/test/actiongroup/useActionGroup.test.ts
similarity index 94%
rename from packages/@react-aria/actiongroup/test/useActionGroup.test.ts
rename to packages/react-aria/test/actiongroup/useActionGroup.test.ts
index 47ed9679fc7..14e455a5beb 100644
--- a/packages/@react-aria/actiongroup/test/useActionGroup.test.ts
+++ b/packages/react-aria/test/actiongroup/useActionGroup.test.ts
@@ -13,8 +13,8 @@
 import {createRef} from 'react';
 import {FocusableElement} from '@react-types/shared';
 import {renderHook} from '@react-spectrum/test-utils-internal';
-import {useActionGroup} from '../';
-import {useListState} from '@react-stately/list';
+import {useActionGroup} from '../../src/actiongroup/useActionGroup';
+import {useListState} from 'react-stately/useListState';
 
 describe('useActionGroup', function () {
   let renderActionGroupHook = (props) => {
diff --git a/packages/@react-aria/aria-modal-polyfill/test/index.test.tsx b/packages/react-aria/test/aria-modal-polyfill/index.test.tsx
similarity index 91%
rename from packages/@react-aria/aria-modal-polyfill/test/index.test.tsx
rename to packages/react-aria/test/aria-modal-polyfill/index.test.tsx
index 162cbbe9a4d..19ab6f75897 100644
--- a/packages/@react-aria/aria-modal-polyfill/test/index.test.tsx
+++ b/packages/react-aria/test/aria-modal-polyfill/index.test.tsx
@@ -11,15 +11,20 @@
  */
 
 import {act, pointerMap, render, simulateMobile, waitFor} from '@react-spectrum/test-utils-internal';
-import {ActionButton, Button} from '@react-spectrum/button';
-import {Content} from '@react-spectrum/view';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
-import {Item, Menu, MenuTrigger, Section} from '@react-spectrum/menu';
-import {Provider} from '@react-spectrum/provider';
+import {ActionButton} from '@adobe/react-spectrum/ActionButton';
+import {Button} from '@adobe/react-spectrum/Button';
+import {Content} from '@adobe/react-spectrum/Content';
+import {Dialog} from '@adobe/react-spectrum/Dialog';
+import {DialogTrigger} from '@adobe/react-spectrum/DialogTrigger';
+import {Item} from 'react-stately/Item';
+import {Menu} from '@adobe/react-spectrum/Menu';
+import {MenuTrigger} from '@adobe/react-spectrum/MenuTrigger';
+import {Provider} from '@adobe/react-spectrum/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {Section} from 'react-stately/Section';
+import {defaultTheme as theme} from '@adobe/react-spectrum/defaultTheme';
 import userEvent from '@testing-library/user-event';
-import {watchModals} from '../';
+import {watchModals} from '../../src/aria-modal-polyfill/ariaModalPolyfill';
 
 describe('watchModals', () => {
   let user;
diff --git a/packages/@react-aria/autocomplete/test/useSearchAutocomplete.test.js b/packages/react-aria/test/autocomplete/useSearchAutocomplete.test.js
similarity index 94%
rename from packages/@react-aria/autocomplete/test/useSearchAutocomplete.test.js
rename to packages/react-aria/test/autocomplete/useSearchAutocomplete.test.js
index 1ff0745bb64..c84a9075e31 100644
--- a/packages/@react-aria/autocomplete/test/useSearchAutocomplete.test.js
+++ b/packages/react-aria/test/autocomplete/useSearchAutocomplete.test.js
@@ -10,11 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {Item} from '@react-stately/collections';
+import {Item} from 'react-stately/Item';
 import React from 'react';
 import {renderHook} from '@react-spectrum/test-utils-internal';
-import {useComboBoxState} from '@react-stately/combobox';
-import {useSearchAutocomplete} from '../';
+import {useComboBoxState} from 'react-stately/useComboBoxState';
+import {useSearchAutocomplete} from '../../src/autocomplete/useSearchAutocomplete';
 
 describe('useSearchAutocomplete', function () {
   let preventDefault = jest.fn();
diff --git a/packages/@react-aria/breadcrumbs/test/useBreadcrumbItem.test.js b/packages/react-aria/test/breadcrumbs/useBreadcrumbItem.test.js
similarity index 96%
rename from packages/@react-aria/breadcrumbs/test/useBreadcrumbItem.test.js
rename to packages/react-aria/test/breadcrumbs/useBreadcrumbItem.test.js
index 3aadc9dbd85..ba81260e10c 100644
--- a/packages/@react-aria/breadcrumbs/test/useBreadcrumbItem.test.js
+++ b/packages/react-aria/test/breadcrumbs/useBreadcrumbItem.test.js
@@ -12,7 +12,7 @@
 
 import React from 'react';
 import {renderHook} from '@react-spectrum/test-utils-internal';
-import {useBreadcrumbItem} from '../';
+import {useBreadcrumbItem} from '../../src/breadcrumbs/useBreadcrumbItem';
 
 describe('useBreadcrumbItem', function () {
   let renderLinkHook = (props) => {
diff --git a/packages/@react-aria/breadcrumbs/test/useBreadcrumbs.test.js b/packages/react-aria/test/breadcrumbs/useBreadcrumbs.test.js
similarity index 94%
rename from packages/@react-aria/breadcrumbs/test/useBreadcrumbs.test.js
rename to packages/react-aria/test/breadcrumbs/useBreadcrumbs.test.js
index 7c208d6cfad..83537f2474c 100644
--- a/packages/@react-aria/breadcrumbs/test/useBreadcrumbs.test.js
+++ b/packages/react-aria/test/breadcrumbs/useBreadcrumbs.test.js
@@ -12,7 +12,7 @@
 
 import React from 'react';
 import {renderHook} from '@react-spectrum/test-utils-internal';
-import {useBreadcrumbs} from '../';
+import {useBreadcrumbs} from '../../src/breadcrumbs/useBreadcrumbs';
 
 describe('useBreadcrumbs', function () {
   let renderLinkHook = (props) => {
diff --git a/packages/@react-aria/button/test/useButton.test.js b/packages/react-aria/test/button/useButton.test.js
similarity index 98%
rename from packages/@react-aria/button/test/useButton.test.js
rename to packages/react-aria/test/button/useButton.test.js
index 0a9492e0553..b58a11b2922 100644
--- a/packages/@react-aria/button/test/useButton.test.js
+++ b/packages/react-aria/test/button/useButton.test.js
@@ -12,7 +12,7 @@
 
 import React from 'react';
 import {renderHook} from '@react-spectrum/test-utils-internal';
-import {useButton} from '../';
+import {useButton} from '../../src/button/useButton';
 
 describe('useButton tests', function () {
   it('handles defaults', function () {
diff --git a/packages/@react-aria/calendar/test/useCalendar.test.js b/packages/react-aria/test/calendar/useCalendar.test.js
similarity index 99%
rename from packages/@react-aria/calendar/test/useCalendar.test.js
rename to packages/react-aria/test/calendar/useCalendar.test.js
index 2d9c8d4e7e3..110c726039b 100644
--- a/packages/@react-aria/calendar/test/useCalendar.test.js
+++ b/packages/react-aria/test/calendar/useCalendar.test.js
@@ -13,8 +13,8 @@
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
 import {CalendarDate} from '@internationalized/date';
 import {Custom454Calendar} from '@internationalized/date/tests/customCalendarImpl';
-import {Example, ExampleCustomFirstDay} from '../stories/Example';
-import {I18nProvider} from '@react-aria/i18n';
+import {Example, ExampleCustomFirstDay} from '../../stories/calendar/Example';
+import {I18nProvider} from '../../src/i18n/I18nProvider';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-aria/checkbox/test/useCheckboxGroup.test.tsx b/packages/react-aria/test/checkbox/useCheckboxGroup.test.tsx
similarity index 97%
rename from packages/@react-aria/checkbox/test/useCheckboxGroup.test.tsx
rename to packages/react-aria/test/checkbox/useCheckboxGroup.test.tsx
index 7d904b87cab..8c75e415af2 100644
--- a/packages/@react-aria/checkbox/test/useCheckboxGroup.test.tsx
+++ b/packages/react-aria/test/checkbox/useCheckboxGroup.test.tsx
@@ -11,10 +11,11 @@
  */
 
 import {AriaCheckboxGroupItemProps, AriaCheckboxGroupProps} from '@react-types/checkbox';
-import {CheckboxGroupState, useCheckboxGroupState} from '@react-stately/checkbox';
+import {CheckboxGroupState, useCheckboxGroupState} from 'react-stately/useCheckboxGroupState';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React, {useRef} from 'react';
-import {useCheckboxGroup, useCheckboxGroupItem} from '../';
+import {useCheckboxGroup} from '../../src/checkbox/useCheckboxGroup';
+import {useCheckboxGroupItem} from '../../src/checkbox/useCheckboxGroupItem';
 import userEvent from '@testing-library/user-event';
 
 function Checkbox({checkboxGroupState, ...props}: AriaCheckboxGroupItemProps & { checkboxGroupState: CheckboxGroupState }) {
diff --git a/packages/@react-aria/collections/test/CollectionBuilder.test.js b/packages/react-aria/test/collections/CollectionBuilder.test.js
similarity index 91%
rename from packages/@react-aria/collections/test/CollectionBuilder.test.js
rename to packages/react-aria/test/collections/CollectionBuilder.test.js
index 74664dbfc3c..7114417205c 100644
--- a/packages/@react-aria/collections/test/CollectionBuilder.test.js
+++ b/packages/react-aria/test/collections/CollectionBuilder.test.js
@@ -1,4 +1,5 @@
-import {Collection, CollectionBuilder, CollectionNode, createBranchComponent, createLeafComponent} from '../src';
+import {Collection, CollectionBuilder, createBranchComponent, createLeafComponent} from '../../src/collections/CollectionBuilder';
+import {CollectionNode} from '../../src/collections/BaseCollection';
 import React from 'react';
 import {render} from '@testing-library/react';
 
diff --git a/packages/@react-aria/color/test/useColorField.test.js b/packages/react-aria/test/color/useColorField.test.js
similarity index 95%
rename from packages/@react-aria/color/test/useColorField.test.js
rename to packages/react-aria/test/color/useColorField.test.js
index c1604f323cb..eea7f2650f7 100644
--- a/packages/@react-aria/color/test/useColorField.test.js
+++ b/packages/react-aria/test/color/useColorField.test.js
@@ -10,10 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {parseColor, useColorFieldState} from '@react-stately/color';
+import {parseColor} from 'react-stately/Color';
+
 import React from 'react';
 import {renderHook} from '@react-spectrum/test-utils-internal';
-import {useColorField} from '../';
+import {useColorField} from '../../src/color/useColorField';
+import {useColorFieldState} from 'react-stately/useColorFieldState';
 
 describe('useColorField', function () {
   let ref;
diff --git a/packages/@react-aria/color/test/useColorWheel.test.tsx b/packages/react-aria/test/color/useColorWheel.test.tsx
similarity index 98%
rename from packages/@react-aria/color/test/useColorWheel.test.tsx
rename to packages/react-aria/test/color/useColorWheel.test.tsx
index 03d343be3f5..c64adf0e234 100644
--- a/packages/@react-aria/color/test/useColorWheel.test.tsx
+++ b/packages/react-aria/test/color/useColorWheel.test.tsx
@@ -12,9 +12,10 @@
 
 import {act, fireEvent, installMouseEvent, installPointerEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
 import {ColorWheelProps} from '@react-types/color';
-import {parseColor, useColorWheelState} from '@react-stately/color';
+import {parseColor} from 'react-stately/Color';
 import React, {useRef} from 'react';
-import {useColorWheel} from '../';
+import {useColorWheel} from '../../src/color/useColorWheel';
+import {useColorWheelState} from 'react-stately/useColorWheelState';
 import userEvent from '@testing-library/user-event';
 
 const SIZE = 24;
diff --git a/packages/@react-aria/combobox/test/useComboBox.test.js b/packages/react-aria/test/combobox/useComboBox.test.js
similarity index 97%
rename from packages/@react-aria/combobox/test/useComboBox.test.js
rename to packages/react-aria/test/combobox/useComboBox.test.js
index 2d2508a1848..8eb47c93aae 100644
--- a/packages/@react-aria/combobox/test/useComboBox.test.js
+++ b/packages/react-aria/test/combobox/useComboBox.test.js
@@ -11,10 +11,10 @@
  */
 
 import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
-import {Item} from '@react-stately/collections';
+import {Item} from 'react-stately/Item';
 import React from 'react';
-import {useComboBox} from '../';
-import {useComboBoxState} from '@react-stately/combobox';
+import {useComboBox} from '../../src/combobox/useComboBox';
+import {useComboBoxState} from 'react-stately/useComboBoxState';
 
 describe('useComboBox', function () {
   let preventDefault = jest.fn();
diff --git a/packages/@react-aria/datepicker/test/useDatePicker.test.tsx b/packages/react-aria/test/datepicker/useDatePicker.test.tsx
similarity index 92%
rename from packages/@react-aria/datepicker/test/useDatePicker.test.tsx
rename to packages/react-aria/test/datepicker/useDatePicker.test.tsx
index 888f2e299cd..e270c16522a 100644
--- a/packages/@react-aria/datepicker/test/useDatePicker.test.tsx
+++ b/packages/react-aria/test/datepicker/useDatePicker.test.tsx
@@ -11,7 +11,7 @@
  */
 
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {ProgrammaticSetValueExampleRender} from '../stories/useDatePicker.stories';
+import {ProgrammaticSetValueExampleRender} from '../../stories/datepicker/useDatePicker.stories';
 import React, {} from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-aria/dialog/test/useDialog.test.js b/packages/react-aria/test/dialog/useDialog.test.js
similarity index 97%
rename from packages/@react-aria/dialog/test/useDialog.test.js
rename to packages/react-aria/test/dialog/useDialog.test.js
index 7678c25b1c7..3d824a65a68 100644
--- a/packages/@react-aria/dialog/test/useDialog.test.js
+++ b/packages/react-aria/test/dialog/useDialog.test.js
@@ -12,7 +12,7 @@
 
 import React, {useRef} from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
-import {useDialog} from '../';
+import {useDialog} from '../../src/dialog/useDialog';
 
 function Example(props) {
   let ref = useRef();
diff --git a/packages/@react-aria/disclosure/test/useDisclosure.test.ts b/packages/react-aria/test/disclosure/useDisclosure.test.ts
similarity index 97%
rename from packages/@react-aria/disclosure/test/useDisclosure.test.ts
rename to packages/react-aria/test/disclosure/useDisclosure.test.ts
index 9f2932acc93..9db7cff94e4 100644
--- a/packages/@react-aria/disclosure/test/useDisclosure.test.ts
+++ b/packages/react-aria/test/disclosure/useDisclosure.test.ts
@@ -11,8 +11,8 @@
  */
 import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
 import {PressEvent} from '@react-types/shared';
-import {useDisclosure} from '../src/useDisclosure';
-import {useDisclosureState} from '@react-stately/disclosure';
+import {useDisclosure} from '../../src/disclosure/useDisclosure';
+import {useDisclosureState} from 'react-stately/useDisclosureState';
 
 describe('useDisclosure', () => {
   let defaultProps = {};
diff --git a/packages/@react-aria/dnd/test/DropTargetKeyboardNavigation.test.tsx b/packages/react-aria/test/dnd/DropTargetKeyboardNavigation.test.tsx
similarity index 98%
rename from packages/@react-aria/dnd/test/DropTargetKeyboardNavigation.test.tsx
rename to packages/react-aria/test/dnd/DropTargetKeyboardNavigation.test.tsx
index 1fddd436602..4d3713cb9bf 100644
--- a/packages/@react-aria/dnd/test/DropTargetKeyboardNavigation.test.tsx
+++ b/packages/react-aria/test/dnd/DropTargetKeyboardNavigation.test.tsx
@@ -1,7 +1,7 @@
 import {Collection, DropTarget, Key, KeyboardDelegate, Node} from '@react-types/shared';
 import {createRef} from 'react';
-import {ListKeyboardDelegate} from 'react-aria';
-import {navigate} from '../src/DropTargetKeyboardNavigation';
+import {ListKeyboardDelegate} from '../../src/selection/ListKeyboardDelegate';
+import {navigate} from '../../src/dnd/DropTargetKeyboardNavigation';
 
 interface Item {
   id: string,
diff --git a/packages/@react-aria/dnd/test/dnd.ssr.test.js b/packages/react-aria/test/dnd/dnd.ssr.test.js
similarity index 100%
rename from packages/@react-aria/dnd/test/dnd.ssr.test.js
rename to packages/react-aria/test/dnd/dnd.ssr.test.js
diff --git a/packages/@react-aria/dnd/test/dnd.test.js b/packages/react-aria/test/dnd/dnd.test.js
similarity index 99%
rename from packages/@react-aria/dnd/test/dnd.test.js
rename to packages/react-aria/test/dnd/dnd.test.js
index 36f984c5179..22f31deaac8 100644
--- a/packages/@react-aria/dnd/test/dnd.test.js
+++ b/packages/react-aria/test/dnd/dnd.test.js
@@ -10,13 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
+jest.mock('../../src/live-announcer/LiveAnnouncer');
 import {act, fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {announce} from '@react-aria/live-announcer';
-import {CUSTOM_DRAG_TYPE} from '../src/constants';
+import {announce} from '../../src/live-announcer/LiveAnnouncer';
+import {CUSTOM_DRAG_TYPE} from '../../src/dnd/constants';
 import {DataTransfer, DataTransferItem, DragEvent, FileSystemDirectoryEntry, FileSystemFileEntry} from './mocks';
 import {Draggable, Droppable} from './examples';
-import {DragTypes} from '../src/utils';
+import {DragTypes} from '../../src/dnd/utils';
 import React, {useEffect} from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-aria/dnd/test/examples.js b/packages/react-aria/test/dnd/examples.js
similarity index 85%
rename from packages/@react-aria/dnd/test/examples.js
rename to packages/react-aria/test/dnd/examples.js
index 1bc0d74ec9b..2389d081beb 100644
--- a/packages/@react-aria/dnd/test/examples.js
+++ b/packages/react-aria/test/dnd/examples.js
@@ -10,11 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {DragPreview} from '../src';
-import {mergeProps} from '@react-aria/utils';
+import {DragPreview} from '../../src/dnd/DragPreview';
+
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {useRef} from 'react';
-import {useButton} from '@react-aria/button';
-import {useDrag, useDrop} from '../';
+import {useButton} from '../../src/button/useButton';
+import {useDrag} from '../../src/dnd/useDrag';
+import {useDrop} from '../../src/dnd/useDrop';
 
 export function Draggable(props) {
   let preview = useRef(null);
diff --git a/packages/@react-aria/dnd/test/mocks.js b/packages/react-aria/test/dnd/mocks.js
similarity index 100%
rename from packages/@react-aria/dnd/test/mocks.js
rename to packages/react-aria/test/dnd/mocks.js
diff --git a/packages/@react-aria/dnd/test/useClipboard.test.js b/packages/react-aria/test/dnd/useClipboard.test.js
similarity index 99%
rename from packages/@react-aria/dnd/test/useClipboard.test.js
rename to packages/react-aria/test/dnd/useClipboard.test.js
index 20d93949bd9..08ffbb60520 100644
--- a/packages/@react-aria/dnd/test/useClipboard.test.js
+++ b/packages/react-aria/test/dnd/useClipboard.test.js
@@ -13,7 +13,7 @@
 import {ClipboardEvent, DataTransfer, DataTransferItem} from './mocks';
 import {fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {useClipboard} from '../';
+import {useClipboard} from '../../src/dnd/useClipboard';
 import userEvent from '@testing-library/user-event';
 
 function Copyable(props) {
diff --git a/packages/@react-aria/dnd/test/useDraggableCollection.test.js b/packages/react-aria/test/dnd/useDraggableCollection.test.js
similarity index 99%
rename from packages/@react-aria/dnd/test/useDraggableCollection.test.js
rename to packages/react-aria/test/dnd/useDraggableCollection.test.js
index 378a076913c..f5ea78732d6 100644
--- a/packages/@react-aria/dnd/test/useDraggableCollection.test.js
+++ b/packages/react-aria/test/dnd/useDraggableCollection.test.js
@@ -12,13 +12,13 @@
 
 import {act, fireEvent, installPointerEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
 import {DataTransfer, DataTransferItem, DragEvent} from './mocks';
-import {DraggableCollectionExample} from '../stories/DraggableCollection';
-import {DraggableListBox} from '../stories/DraggableListBox';
+import {DraggableCollectionExample} from '../../stories/dnd/DraggableCollection';
+import {DraggableListBox} from '../../stories/dnd/DraggableListBox';
 import {Droppable} from './examples';
-import {Item} from '@react-stately/collections';
-import {Provider} from '@react-spectrum/provider';
+import {Item} from 'react-stately/Item';
+import {Provider} from '@adobe/react-spectrum/Provider';
 import React from 'react';
-import {theme} from '@react-spectrum/theme-default';
+import {defaultTheme as theme} from '@adobe/react-spectrum/defaultTheme';
 import userEvent from '@testing-library/user-event';
 
 describe('useDraggableCollection', () => {
diff --git a/packages/@react-aria/dnd/test/useDroppableCollection.test.js b/packages/react-aria/test/dnd/useDroppableCollection.test.js
similarity index 99%
rename from packages/@react-aria/dnd/test/useDroppableCollection.test.js
rename to packages/react-aria/test/dnd/useDroppableCollection.test.js
index 9eded156702..acd61eff983 100644
--- a/packages/@react-aria/dnd/test/useDroppableCollection.test.js
+++ b/packages/react-aria/test/dnd/useDroppableCollection.test.js
@@ -13,7 +13,7 @@
 import {act, fireEvent, pointerMap, render, waitFor, within} from '@react-spectrum/test-utils-internal';
 import {DataTransfer, DragEvent} from './mocks';
 import {Draggable} from './examples';
-import {DroppableGridExample} from '../stories/DroppableGrid';
+import {DroppableGridExample} from '../../stories/dnd/DroppableGrid';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-aria/focus/test/FocusScope.test.js b/packages/react-aria/test/focus/FocusScope.test.js
similarity index 99%
rename from packages/@react-aria/focus/test/FocusScope.test.js
rename to packages/react-aria/test/focus/FocusScope.test.js
index 38648c12635..eadb5cfd072 100644
--- a/packages/@react-aria/focus/test/FocusScope.test.js
+++ b/packages/react-aria/test/focus/FocusScope.test.js
@@ -11,16 +11,16 @@
  */
 
 import {act, createShadowRoot, fireEvent, pointerMap, render, waitFor} from '@react-spectrum/test-utils-internal';
-import {defaultTheme} from '@adobe/react-spectrum';
-import {DialogContainer} from '@react-spectrum/dialog';
-import {enableShadowDOM} from '@react-stately/flags';
-import {FocusScope, useFocusManager} from '../';
-import {focusScopeTree} from '../src/FocusScope';
-import {Provider} from '@react-spectrum/provider';
+import {defaultTheme} from '@adobe/react-spectrum/defaultTheme';
+import {DialogContainer} from '@adobe/react-spectrum/DialogContainer';
+import {enableShadowDOM} from 'react-stately/private/flags/flags';
+import {FocusScope, useFocusManager} from '../../src/focus/FocusScope';
+import {focusScopeTree} from '../../src/focus/FocusScope';
+import {Provider} from '@adobe/react-spectrum/Provider';
 import React, {useEffect, useState} from 'react';
 import ReactDOM from 'react-dom';
-import {Example as StorybookExample} from '../stories/FocusScope.stories';
-import {useEvent} from '@react-aria/utils';
+import {Example as StorybookExample} from '../../stories/focus/FocusScope.stories';
+import {useEvent} from '../../src/utils/useEvent';
 import userEvent from '@testing-library/user-event';
 
 describe('FocusScope', function () {
diff --git a/packages/@react-aria/focus/test/FocusScopeOwnerDocument.test.js b/packages/react-aria/test/focus/FocusScopeOwnerDocument.test.js
similarity index 99%
rename from packages/@react-aria/focus/test/FocusScopeOwnerDocument.test.js
rename to packages/react-aria/test/focus/FocusScopeOwnerDocument.test.js
index 07181967c54..ded65cfb5c1 100644
--- a/packages/@react-aria/focus/test/FocusScopeOwnerDocument.test.js
+++ b/packages/react-aria/test/focus/FocusScopeOwnerDocument.test.js
@@ -12,7 +12,7 @@
 
 import {act, fireEvent, pointerMap, render, waitFor} from '@react-spectrum/test-utils-internal';
 import {createPortal} from 'react-dom';
-import {FocusScope, useFocusManager} from '../';
+import {FocusScope, useFocusManager} from '../../src/focus/FocusScope';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-aria/grid/test/useGrid.test.js b/packages/react-aria/test/grid/useGrid.test.js
similarity index 97%
rename from packages/@react-aria/grid/test/useGrid.test.js
rename to packages/react-aria/test/grid/useGrid.test.js
index 8804655b940..ecc8c19631c 100644
--- a/packages/@react-aria/grid/test/useGrid.test.js
+++ b/packages/react-aria/test/grid/useGrid.test.js
@@ -11,10 +11,10 @@
  */
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Grid} from '../stories/example';
-import {Item} from '@react-stately/collections';
+import {Grid} from '../../stories/grid/example';
+import {Item} from 'react-stately/Item';
 import React from 'react';
-import {Switch} from '@react-spectrum/switch';
+import {Switch} from '@adobe/react-spectrum/Switch';
 import userEvent from '@testing-library/user-event';
 
 function renderGrid(props = {}) {
diff --git a/packages/@react-aria/i18n/test/languagechange.test.js b/packages/react-aria/test/i18n/languagechange.test.js
similarity index 98%
rename from packages/@react-aria/i18n/test/languagechange.test.js
rename to packages/react-aria/test/i18n/languagechange.test.js
index 8662cf1e84d..3106641d2b8 100644
--- a/packages/@react-aria/i18n/test/languagechange.test.js
+++ b/packages/react-aria/test/i18n/languagechange.test.js
@@ -11,7 +11,7 @@
  */
 
 import {act, render} from '@react-spectrum/test-utils-internal';
-import {I18nProvider, useLocale} from '../src/I18nProvider';
+import {I18nProvider, useLocale} from '../../src/i18n/I18nProvider';
 import React from 'react';
 
 function TestComponent() {
diff --git a/packages/@react-aria/i18n/test/server.test.js b/packages/react-aria/test/i18n/server.test.js
similarity index 94%
rename from packages/@react-aria/i18n/test/server.test.js
rename to packages/react-aria/test/i18n/server.test.js
index ce8c58515b0..99c6e042b23 100644
--- a/packages/@react-aria/i18n/test/server.test.js
+++ b/packages/react-aria/test/i18n/server.test.js
@@ -9,7 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import {getPackageLocalizationScript} from '../src/server';
+import {getPackageLocalizationScript} from '../../src/i18n/server';
 
 describe('i18n server', () => {
   it('should generate a script with localized strings', () => {
diff --git a/packages/@react-aria/interactions/test/Focusable.test.js b/packages/react-aria/test/interactions/Focusable.test.js
similarity index 98%
rename from packages/@react-aria/interactions/test/Focusable.test.js
rename to packages/react-aria/test/interactions/Focusable.test.js
index 01bbdc68c07..48ab4911eaa 100644
--- a/packages/@react-aria/interactions/test/Focusable.test.js
+++ b/packages/react-aria/test/interactions/Focusable.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {Focusable} from '../';
+import {Focusable} from '../../src/interactions/useFocusable';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React, {useImperativeHandle} from 'react';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/@react-aria/interactions/test/PressResponder.test.js b/packages/react-aria/test/interactions/PressResponder.test.js
similarity index 95%
rename from packages/@react-aria/interactions/test/PressResponder.test.js
rename to packages/react-aria/test/interactions/PressResponder.test.js
index b00099ab405..135652a5a33 100644
--- a/packages/@react-aria/interactions/test/PressResponder.test.js
+++ b/packages/react-aria/test/interactions/PressResponder.test.js
@@ -11,7 +11,8 @@
  */
 
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Pressable, PressResponder} from '../';
+import {Pressable} from '../../src/interactions/Pressable';
+import {PressResponder} from '../../src/interactions/PressResponder';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-aria/interactions/test/Pressable.test.js b/packages/react-aria/test/interactions/Pressable.test.js
similarity index 98%
rename from packages/@react-aria/interactions/test/Pressable.test.js
rename to packages/react-aria/test/interactions/Pressable.test.js
index a60548fa7b8..e5afafb5db6 100644
--- a/packages/@react-aria/interactions/test/Pressable.test.js
+++ b/packages/react-aria/test/interactions/Pressable.test.js
@@ -11,7 +11,7 @@
  */
 
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {Pressable} from '../';
+import {Pressable} from '../../src/interactions/Pressable';
 import React, {useImperativeHandle} from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-aria/interactions/test/focusSafely.test.js b/packages/react-aria/test/interactions/focusSafely.test.js
similarity index 89%
rename from packages/@react-aria/interactions/test/focusSafely.test.js
rename to packages/react-aria/test/interactions/focusSafely.test.js
index 0edba860cd8..66e25ed1f67 100644
--- a/packages/@react-aria/interactions/test/focusSafely.test.js
+++ b/packages/react-aria/test/interactions/focusSafely.test.js
@@ -12,14 +12,14 @@
 
 
 import {act, createShadowRoot, render} from '@react-spectrum/test-utils-internal';
-import {focusSafely} from '../';
-import {focusWithoutScrolling} from '@react-aria/utils';
+import {focusSafely} from '../../src/interactions/focusSafely';
+import {focusWithoutScrolling} from '../../src/utils/focusWithoutScrolling';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import {setInteractionModality} from '@react-aria/interactions';
+import {setInteractionModality} from '../../src/interactions/useFocusVisible';
 
-jest.mock('@react-aria/utils', () => {
-  let original = jest.requireActual('@react-aria/utils');
+jest.mock('../../src/utils/focusWithoutScrolling', () => {
+  let original = jest.requireActual('../../src/utils/focusWithoutScrolling');
   return {
     ...original,
     focusWithoutScrolling: jest.fn()
diff --git a/packages/@react-aria/interactions/test/useFocus.test.js b/packages/react-aria/test/interactions/useFocus.test.js
similarity index 98%
rename from packages/@react-aria/interactions/test/useFocus.test.js
rename to packages/react-aria/test/interactions/useFocus.test.js
index 0d9a279bdcb..133d31ba621 100644
--- a/packages/@react-aria/interactions/test/useFocus.test.js
+++ b/packages/react-aria/test/interactions/useFocus.test.js
@@ -11,10 +11,10 @@
  */
 
 import {act, createShadowRoot, render, waitFor} from '@react-spectrum/test-utils-internal';
-import {enableShadowDOM} from '@react-stately/flags';
+import {enableShadowDOM} from 'react-stately/private/flags/flags';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import {useFocus} from '../';
+import {useFocus} from '../../src/interactions/useFocus';
 
 function Example(props) {
   let {focusProps} = useFocus(props);
diff --git a/packages/@react-aria/interactions/test/useFocusVisible.test.js b/packages/react-aria/test/interactions/useFocusVisible.test.js
similarity index 98%
rename from packages/@react-aria/interactions/test/useFocusVisible.test.js
rename to packages/react-aria/test/interactions/useFocusVisible.test.js
index 4bca6e5705d..aed2a2cb57c 100644
--- a/packages/@react-aria/interactions/test/useFocusVisible.test.js
+++ b/packages/react-aria/test/interactions/useFocusVisible.test.js
@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 import {act, fireEvent, pointerMap, render, renderHook, screen, waitFor} from '@react-spectrum/test-utils-internal';
-import {addWindowFocusTracking, useFocusVisible, useFocusVisibleListener} from '../';
-import {changeHandlers, hasSetupGlobalListeners} from '../src/useFocusVisible';
-import {mergeProps} from '@react-aria/utils';
+import {addWindowFocusTracking, useFocusVisible, useFocusVisibleListener} from '../../src/interactions/useFocusVisible';
+import {changeHandlers, hasSetupGlobalListeners} from '../../src/interactions/useFocusVisible';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React from 'react';
-import {useButton} from '@react-aria/button';
-import {useFocusRing} from '@react-aria/focus';
+import {useButton} from '../../src/button/useButton';
+import {useFocusRing} from '../../src/focus/useFocusRing';
 import userEvent from '@testing-library/user-event';
 
 function Example(props) {
diff --git a/packages/@react-aria/interactions/test/useFocusWithin.test.js b/packages/react-aria/test/interactions/useFocusWithin.test.js
similarity index 98%
rename from packages/@react-aria/interactions/test/useFocusWithin.test.js
rename to packages/react-aria/test/interactions/useFocusWithin.test.js
index a5cd33a45b0..15134ea4336 100644
--- a/packages/@react-aria/interactions/test/useFocusWithin.test.js
+++ b/packages/react-aria/test/interactions/useFocusWithin.test.js
@@ -12,7 +12,7 @@
 
 import {act, render, waitFor} from '@react-spectrum/test-utils-internal';
 import React, {useState} from 'react';
-import {useFocusWithin} from '../';
+import {useFocusWithin} from '../../src/interactions/useFocusWithin';
 
 function Example(props) {
   let {focusWithinProps} = useFocusWithin(props);
diff --git a/packages/@react-aria/interactions/test/useHover.test.js b/packages/react-aria/test/interactions/useHover.test.js
similarity index 98%
rename from packages/@react-aria/interactions/test/useHover.test.js
rename to packages/react-aria/test/interactions/useHover.test.js
index 144610513ca..c2930a7ccad 100644
--- a/packages/@react-aria/interactions/test/useHover.test.js
+++ b/packages/react-aria/test/interactions/useHover.test.js
@@ -11,13 +11,14 @@
  */
 
 import {act, fireEvent, installMouseEvent, installPointerEvent, render} from '@react-spectrum/test-utils-internal';
-import {ActionButton} from '@react-spectrum/button';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
+import {ActionButton} from '@adobe/react-spectrum/ActionButton';
+import {Dialog} from '@adobe/react-spectrum/Dialog';
+import {DialogTrigger} from '@adobe/react-spectrum/DialogTrigger';
 import MatchMediaMock from 'jest-matchmedia-mock';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '@adobe/react-spectrum/Provider';
 import React, {useState} from 'react';
-import {theme} from '@react-spectrum/theme-default';
-import {useHover} from '../';
+import {defaultTheme as theme} from '@adobe/react-spectrum/defaultTheme';
+import {useHover} from '../../src/interactions/useHover';
 
 function Example(props) {
   let {hoverProps, isHovered} = useHover(props);
diff --git a/packages/@react-aria/interactions/test/useInteractOutside.test.js b/packages/react-aria/test/interactions/useInteractOutside.test.js
similarity index 99%
rename from packages/@react-aria/interactions/test/useInteractOutside.test.js
rename to packages/react-aria/test/interactions/useInteractOutside.test.js
index cdc2aa07a40..7697ab17769 100644
--- a/packages/@react-aria/interactions/test/useInteractOutside.test.js
+++ b/packages/react-aria/test/interactions/useInteractOutside.test.js
@@ -13,7 +13,7 @@
 import {fireEvent, installPointerEvent, render, waitFor} from '@react-spectrum/test-utils-internal';
 import React, {useEffect, useRef} from 'react';
 import ReactDOM, {createPortal} from 'react-dom';
-import {useInteractOutside} from '../';
+import {useInteractOutside} from '../../src/interactions/useInteractOutside';
 
 function Example(props) {
   let ref = useRef();
diff --git a/packages/@react-aria/interactions/test/useKeyboard.test.js b/packages/react-aria/test/interactions/useKeyboard.test.js
similarity index 98%
rename from packages/@react-aria/interactions/test/useKeyboard.test.js
rename to packages/react-aria/test/interactions/useKeyboard.test.js
index 65c69375f0b..2e918c99477 100644
--- a/packages/@react-aria/interactions/test/useKeyboard.test.js
+++ b/packages/react-aria/test/interactions/useKeyboard.test.js
@@ -12,7 +12,7 @@
 
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {useKeyboard} from '../';
+import {useKeyboard} from '../../src/interactions/useKeyboard';
 import userEvent from '@testing-library/user-event';
 
 function Example(props) {
diff --git a/packages/@react-aria/interactions/test/useLongPress.test.js b/packages/react-aria/test/interactions/useLongPress.test.js
similarity index 98%
rename from packages/@react-aria/interactions/test/useLongPress.test.js
rename to packages/react-aria/test/interactions/useLongPress.test.js
index ecb775cae82..4f52b1a3489 100644
--- a/packages/@react-aria/interactions/test/useLongPress.test.js
+++ b/packages/react-aria/test/interactions/useLongPress.test.js
@@ -11,9 +11,10 @@
  */
 
 import {act, fireEvent, installPointerEvent, render} from '@react-spectrum/test-utils-internal';
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React from 'react';
-import {useLongPress, usePress} from '../';
+import {useLongPress} from '../../src/interactions/useLongPress';
+import {usePress} from '../../src/interactions/usePress';
 
 function Example(props) {
   let {elementType: ElementType = 'div', ...otherProps} = props;
diff --git a/packages/@react-aria/interactions/test/useMove.test.js b/packages/react-aria/test/interactions/useMove.test.js
similarity index 99%
rename from packages/@react-aria/interactions/test/useMove.test.js
rename to packages/react-aria/test/interactions/useMove.test.js
index ef4c0966629..c2d14348922 100644
--- a/packages/@react-aria/interactions/test/useMove.test.js
+++ b/packages/react-aria/test/interactions/useMove.test.js
@@ -12,7 +12,7 @@
 
 import {act, fireEvent, installMouseEvent, installPointerEvent, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {useMove} from '../';
+import {useMove} from '../../src/interactions/useMove';
 
 const EXAMPLE_ELEMENT_TESTID = 'example';
 
diff --git a/packages/@react-aria/interactions/test/usePress.test.js b/packages/react-aria/test/interactions/usePress.test.js
similarity index 99%
rename from packages/@react-aria/interactions/test/usePress.test.js
rename to packages/react-aria/test/interactions/usePress.test.js
index 48647ac57a1..12bf47d5e4d 100644
--- a/packages/@react-aria/interactions/test/usePress.test.js
+++ b/packages/react-aria/test/interactions/usePress.test.js
@@ -11,15 +11,16 @@
  */
 
 import {act, createShadowRoot, fireEvent, installMouseEvent, installPointerEvent, render, waitFor} from '@react-spectrum/test-utils-internal';
-import {ActionButton} from '@react-spectrum/button';
-import {Dialog, DialogTrigger} from '@react-spectrum/dialog';
-import {enableShadowDOM} from '@react-stately/flags';
+import {ActionButton} from '@adobe/react-spectrum/ActionButton';
+import {Dialog} from '@adobe/react-spectrum/Dialog';
+import {DialogTrigger} from '@adobe/react-spectrum/DialogTrigger';
+import {enableShadowDOM} from 'react-stately/private/flags/flags';
 import MatchMediaMock from 'jest-matchmedia-mock';
-import {Provider} from '@react-spectrum/provider';
+import {Provider} from '@adobe/react-spectrum/Provider';
 import React from 'react';
 import ReactDOM, {createPortal} from 'react-dom';
-import {theme} from '@react-spectrum/theme-default';
-import {usePress} from '../';
+import {defaultTheme as theme} from '@adobe/react-spectrum/defaultTheme';
+import {usePress} from '../../src/interactions/usePress';
 
 function Example(props) {
   let {elementType: ElementType = 'div', style, draggable, ...otherProps} = props;
diff --git a/packages/@react-aria/label/test/useField.test.js b/packages/react-aria/test/label/useField.test.js
similarity index 95%
rename from packages/@react-aria/label/test/useField.test.js
rename to packages/react-aria/test/label/useField.test.js
index 7a23f8318d4..46e47b9a83c 100644
--- a/packages/@react-aria/label/test/useField.test.js
+++ b/packages/react-aria/test/label/useField.test.js
@@ -13,8 +13,8 @@
 import {composeStories} from '@storybook/react';
 import React from 'react';
 import {render, renderHook} from '@react-spectrum/test-utils-internal';
-import * as stories from '../stories/useField.stories';
-import {useField} from '../';
+import * as stories from '../../stories/label/useField.stories';
+import {useField} from '../../src/label/useField';
 
 let {WithError} = composeStories(stories);
 
diff --git a/packages/@react-aria/label/test/useLabel.test.js b/packages/react-aria/test/label/useLabel.test.js
similarity index 98%
rename from packages/@react-aria/label/test/useLabel.test.js
rename to packages/react-aria/test/label/useLabel.test.js
index 38831799b48..bbd36822830 100644
--- a/packages/@react-aria/label/test/useLabel.test.js
+++ b/packages/react-aria/test/label/useLabel.test.js
@@ -12,7 +12,7 @@
 
 import React from 'react';
 import {renderHook} from '@react-spectrum/test-utils-internal';
-import {useLabel} from '../';
+import {useLabel} from '../../src/label/useLabel';
 
 describe('useLabel hook', () => {
   let renderLabelHook = (labelProps) => {
diff --git a/packages/@react-aria/landmark/test/useLandmark.ssr.test.js b/packages/react-aria/test/landmark/useLandmark.ssr.test.js
similarity index 100%
rename from packages/@react-aria/landmark/test/useLandmark.ssr.test.js
rename to packages/react-aria/test/landmark/useLandmark.ssr.test.js
diff --git a/packages/@react-aria/landmark/test/useLandmark.test.tsx b/packages/react-aria/test/landmark/useLandmark.test.tsx
similarity index 98%
rename from packages/@react-aria/landmark/test/useLandmark.test.tsx
rename to packages/react-aria/test/landmark/useLandmark.test.tsx
index 2aaf60e9b31..126524e12d3 100644
--- a/packages/@react-aria/landmark/test/useLandmark.test.tsx
+++ b/packages/react-aria/test/landmark/useLandmark.test.tsx
@@ -11,16 +11,17 @@
  */
 
 import {act, fireEvent, pointerMap, render, within} from '@react-spectrum/test-utils-internal';
-import {ActionGroup, Item} from '@react-spectrum/actiongroup';
-import {Button} from '@react-spectrum/button';
-import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@react-spectrum/table';
-import {Checkbox} from '@react-spectrum/checkbox';
-import {Provider} from '@react-spectrum/provider';
+import {ActionGroup} from '@adobe/react-spectrum/ActionGroup';
+import {Button} from '@adobe/react-spectrum/Button';
+import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@adobe/react-spectrum/TableView';
+import {Checkbox} from '@adobe/react-spectrum/Checkbox';
+import {Item} from 'react-stately/Item';
+import {Provider} from '@adobe/react-spectrum/Provider';
 import React from 'react';
-import {TextField} from '@react-spectrum/textfield';
-import {theme} from '@react-spectrum/theme-default';
-import {UNSTABLE_createLandmarkController, useLandmark} from '../';
-import {useFocusableRef} from '@react-spectrum/utils';
+import {TextField} from '@adobe/react-spectrum/TextField';
+import {defaultTheme as theme} from '@adobe/react-spectrum/defaultTheme';
+import {UNSTABLE_createLandmarkController, useLandmark} from '../../src/landmark/useLandmark';
+import {useFocusableRef} from '@adobe/react-spectrum/private/utils/useDOMRef';
 import userEvent from '@testing-library/user-event';
 
 function Main(props) {
diff --git a/packages/@react-aria/link/test/useLink.test.js b/packages/react-aria/test/link/useLink.test.js
similarity index 97%
rename from packages/@react-aria/link/test/useLink.test.js
rename to packages/react-aria/test/link/useLink.test.js
index 05dd15d0811..66bf7f6328e 100644
--- a/packages/@react-aria/link/test/useLink.test.js
+++ b/packages/react-aria/test/link/useLink.test.js
@@ -12,7 +12,7 @@
 
 import React from 'react';
 import {renderHook} from '@react-spectrum/test-utils-internal';
-import {useLink} from '../';
+import {useLink} from '../../src/link/useLink';
 
 describe('useLink', function () {
   let renderLinkHook = (props) => {
diff --git a/packages/@react-aria/menu/test/useMenu.test.tsx b/packages/react-aria/test/menu/useMenu.test.tsx
similarity index 94%
rename from packages/@react-aria/menu/test/useMenu.test.tsx
rename to packages/react-aria/test/menu/useMenu.test.tsx
index f99047417d3..9b307c439e4 100644
--- a/packages/@react-aria/menu/test/useMenu.test.tsx
+++ b/packages/react-aria/test/menu/useMenu.test.tsx
@@ -11,12 +11,15 @@
  */
 
 
-import {AriaMenuProps, useMenu, useMenuItem} from '../';
-import {Item} from '@react-stately/collections';
+import {AriaMenuProps} from '@react-types/menu';
+
+import {Item} from 'react-stately/Item';
 import {Key} from '@react-types/shared';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {TreeState, useTreeState} from '@react-stately/tree';
+import {TreeState, useTreeState} from 'react-stately/useTreeState';
+import {useMenu} from '../../src/menu/useMenu';
+import {useMenuItem} from '../../src/menu/useMenuItem';
 import userEvent from '@testing-library/user-event';
 
 function Menu<T extends object>(props: AriaMenuProps<T> & {onSelect: () => void}) {
diff --git a/packages/@react-aria/menu/test/useMenuTrigger.test.js b/packages/react-aria/test/menu/useMenuTrigger.test.js
similarity index 98%
rename from packages/@react-aria/menu/test/useMenuTrigger.test.js
rename to packages/react-aria/test/menu/useMenuTrigger.test.js
index 8a5d9038011..a8ec7fe2a71 100644
--- a/packages/@react-aria/menu/test/useMenuTrigger.test.js
+++ b/packages/react-aria/test/menu/useMenuTrigger.test.js
@@ -12,7 +12,7 @@
 
 import React from 'react';
 import {renderHook} from '@react-spectrum/test-utils-internal';
-import {useMenuTrigger} from '../';
+import {useMenuTrigger} from '../../src/menu/useMenuTrigger';
 
 describe('useMenuTrigger', function () {
   let state = {};
diff --git a/packages/@react-aria/numberfield/test/useNumberField.test.ts b/packages/react-aria/test/numberfield/useNumberField.test.ts
similarity index 94%
rename from packages/@react-aria/numberfield/test/useNumberField.test.ts
rename to packages/react-aria/test/numberfield/useNumberField.test.ts
index e594001c5b6..ce829b45e09 100644
--- a/packages/@react-aria/numberfield/test/useNumberField.test.ts
+++ b/packages/react-aria/test/numberfield/useNumberField.test.ts
@@ -1,9 +1,9 @@
 import {AriaNumberFieldProps} from '@react-types/numberfield';
 import React from 'react';
 import {renderHook} from '@react-spectrum/test-utils-internal';
-import {useLocale} from '@react-aria/i18n';
-import {useNumberField} from '../';
-import {useNumberFieldState} from '@react-stately/numberfield';
+import {useLocale} from '../../src/i18n/I18nProvider';
+import {useNumberField} from '../../src/numberfield/useNumberField';
+import {useNumberFieldState} from 'react-stately/useNumberFieldState';
 
 describe('useNumberField hook', () => {
   let ref;
diff --git a/packages/@react-aria/overlays/test/DismissButton.test.tsx b/packages/react-aria/test/overlays/DismissButton.test.tsx
similarity index 96%
rename from packages/@react-aria/overlays/test/DismissButton.test.tsx
rename to packages/react-aria/test/overlays/DismissButton.test.tsx
index 15ac79412a6..ee533624ae6 100644
--- a/packages/@react-aria/overlays/test/DismissButton.test.tsx
+++ b/packages/react-aria/test/overlays/DismissButton.test.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {DismissButton} from '..';
+import {DismissButton} from '../../src/overlays/DismissButton';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/@react-aria/overlays/test/ariaHideOutside.test.js b/packages/react-aria/test/overlays/ariaHideOutside.test.js
similarity index 99%
rename from packages/@react-aria/overlays/test/ariaHideOutside.test.js
rename to packages/react-aria/test/overlays/ariaHideOutside.test.js
index a0c8bd2d198..ff44f4fc0a7 100644
--- a/packages/@react-aria/overlays/test/ariaHideOutside.test.js
+++ b/packages/react-aria/test/overlays/ariaHideOutside.test.js
@@ -11,8 +11,8 @@
  */
 
 import {act, createShadowRoot, render, waitFor} from '@react-spectrum/test-utils-internal';
-import {ariaHideOutside} from '../src';
-import {enableShadowDOM} from '@react-stately/flags';
+import {ariaHideOutside} from '../../src/overlays/ariaHideOutside';
+import {enableShadowDOM} from 'react-stately/private/flags/flags';
 import React, {useRef, useState} from 'react';
 import ReactDOM from 'react-dom';
 import {screen} from 'shadow-dom-testing-library';
diff --git a/packages/@react-aria/overlays/test/calculatePosition.test.ts b/packages/react-aria/test/overlays/calculatePosition.test.ts
similarity index 99%
rename from packages/@react-aria/overlays/test/calculatePosition.test.ts
rename to packages/react-aria/test/overlays/calculatePosition.test.ts
index 3f9b4db7d86..b845be24ce2 100644
--- a/packages/@react-aria/overlays/test/calculatePosition.test.ts
+++ b/packages/react-aria/test/overlays/calculatePosition.test.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {calculatePosition} from '../src/calculatePosition';
+import {calculatePosition} from '../../src/overlays/calculatePosition';
 
 const FLIPPED_DIRECTION = {
   left: 'right'
diff --git a/packages/@react-aria/overlays/test/useModal.ssr.test.js b/packages/react-aria/test/overlays/useModal.ssr.test.js
similarity index 100%
rename from packages/@react-aria/overlays/test/useModal.ssr.test.js
rename to packages/react-aria/test/overlays/useModal.ssr.test.js
diff --git a/packages/@react-aria/overlays/test/useModal.test.js b/packages/react-aria/test/overlays/useModal.test.js
similarity index 98%
rename from packages/@react-aria/overlays/test/useModal.test.js
rename to packages/react-aria/test/overlays/useModal.test.js
index faa1585a5e5..b8664f0d629 100644
--- a/packages/@react-aria/overlays/test/useModal.test.js
+++ b/packages/react-aria/test/overlays/useModal.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {OverlayContainer, OverlayProvider, useModal} from '..';
+import {OverlayContainer, OverlayProvider, useModal} from '../../src/overlays/useModal';
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/@react-aria/overlays/test/useModalOverlay.test.js b/packages/react-aria/test/overlays/useModalOverlay.test.js
similarity index 91%
rename from packages/@react-aria/overlays/test/useModalOverlay.test.js
rename to packages/react-aria/test/overlays/useModalOverlay.test.js
index a6d7466e7f0..49fce287a13 100644
--- a/packages/@react-aria/overlays/test/useModalOverlay.test.js
+++ b/packages/react-aria/test/overlays/useModalOverlay.test.js
@@ -1,8 +1,8 @@
 import {fireEvent, installMouseEvent, installPointerEvent, render} from '@react-spectrum/test-utils-internal';
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {useRef} from 'react';
-import {useModalOverlay} from '..';
-import {useOverlayTriggerState} from '@react-stately/overlays';
+import {useModalOverlay} from '../../src/overlays/useModalOverlay';
+import {useOverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 
 function Example(props) {
   let ref = useRef();
diff --git a/packages/@react-aria/overlays/test/useOverlay.test.js b/packages/react-aria/test/overlays/useOverlay.test.js
similarity index 97%
rename from packages/@react-aria/overlays/test/useOverlay.test.js
rename to packages/react-aria/test/overlays/useOverlay.test.js
index 7535d0554a5..58367686829 100644
--- a/packages/@react-aria/overlays/test/useOverlay.test.js
+++ b/packages/react-aria/test/overlays/useOverlay.test.js
@@ -11,9 +11,9 @@
  */
 
 import {fireEvent, installMouseEvent, installPointerEvent, render} from '@react-spectrum/test-utils-internal';
-import {mergeProps} from '@react-aria/utils';
+import {mergeProps} from '../../src/utils/mergeProps';
 import React, {useRef} from 'react';
-import {useOverlay} from '../';
+import {useOverlay} from '../../src/overlays/useOverlay';
 
 function Example(props) {
   let ref = useRef();
diff --git a/packages/@react-aria/overlays/test/useOverlayPosition.test.tsx b/packages/react-aria/test/overlays/useOverlayPosition.test.tsx
similarity index 99%
rename from packages/@react-aria/overlays/test/useOverlayPosition.test.tsx
rename to packages/react-aria/test/overlays/useOverlayPosition.test.tsx
index 0c2a8dfdf4b..6f86fa1c4e3 100644
--- a/packages/@react-aria/overlays/test/useOverlayPosition.test.tsx
+++ b/packages/react-aria/test/overlays/useOverlayPosition.test.tsx
@@ -12,7 +12,7 @@
 
 import {fireEvent, render} from '@react-spectrum/test-utils-internal';
 import React, {useRef} from 'react';
-import {useOverlayPosition} from '../';
+import {useOverlayPosition} from '../../src/overlays/useOverlayPosition';
 
 
 function Example({triggerTop = 250, containerStyle = {width: 600, height: 600} as React.CSSProperties, ...props}) {
diff --git a/packages/@react-aria/overlays/test/useOverlayTrigger.test.js b/packages/react-aria/test/overlays/useOverlayTrigger.test.js
similarity index 91%
rename from packages/@react-aria/overlays/test/useOverlayTrigger.test.js
rename to packages/react-aria/test/overlays/useOverlayTrigger.test.js
index 869f4adf7b3..be4b691e608 100644
--- a/packages/@react-aria/overlays/test/useOverlayTrigger.test.js
+++ b/packages/react-aria/test/overlays/useOverlayTrigger.test.js
@@ -12,8 +12,9 @@
 
 import {fireEvent, render} from '@react-spectrum/test-utils-internal';
 import React, {useRef} from 'react';
-import {useOverlayPosition, useOverlayTrigger} from '../';
-import {useOverlayTriggerState} from '@react-stately/overlays';
+import {useOverlayPosition} from '../../src/overlays/useOverlayPosition';
+import {useOverlayTrigger} from '../../src/overlays/useOverlayTrigger';
+import {useOverlayTriggerState} from 'react-stately/useOverlayTriggerState';
 
 function Example(props) {
   let ref = useRef();
diff --git a/packages/@react-aria/overlays/test/usePopover.test.tsx b/packages/react-aria/test/overlays/usePopover.test.tsx
similarity index 84%
rename from packages/@react-aria/overlays/test/usePopover.test.tsx
rename to packages/react-aria/test/overlays/usePopover.test.tsx
index 1b65f9edf23..8437543aa2a 100644
--- a/packages/@react-aria/overlays/test/usePopover.test.tsx
+++ b/packages/react-aria/test/overlays/usePopover.test.tsx
@@ -11,9 +11,11 @@
  */
 
 import {fireEvent, render} from '@react-spectrum/test-utils-internal';
-import {type OverlayTriggerProps, useOverlayTriggerState} from '@react-stately/overlays';
+import {OverlayTriggerProps} from '@react-types/overlays';
 import React, {useRef} from 'react';
-import {useOverlayTrigger, usePopover} from '../';
+import {useOverlayTrigger} from '../../src/overlays/useOverlayTrigger';
+import {useOverlayTriggerState} from 'react-stately/useOverlayTriggerState';
+import {usePopover} from '../../src/overlays/usePopover';
 
 function Example(props: OverlayTriggerProps) {
   const triggerRef = useRef(null);
diff --git a/packages/@react-aria/overlays/test/usePreventScroll.test.js b/packages/react-aria/test/overlays/usePreventScroll.test.js
similarity index 97%
rename from packages/@react-aria/overlays/test/usePreventScroll.test.js
rename to packages/react-aria/test/overlays/usePreventScroll.test.js
index 3e198e9f961..a5f159ee0b9 100644
--- a/packages/@react-aria/overlays/test/usePreventScroll.test.js
+++ b/packages/react-aria/test/overlays/usePreventScroll.test.js
@@ -12,7 +12,7 @@
 
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
-import {usePreventScroll} from '..';
+import {usePreventScroll} from '../../src/overlays/usePreventScroll';
 
 function Example(props) {
   usePreventScroll(props);
diff --git a/packages/@react-aria/progress/test/useProgressBar.test.js b/packages/react-aria/test/progress/useProgressBar.test.js
similarity index 97%
rename from packages/@react-aria/progress/test/useProgressBar.test.js
rename to packages/react-aria/test/progress/useProgressBar.test.js
index 833aaf10650..601b4e1f634 100644
--- a/packages/@react-aria/progress/test/useProgressBar.test.js
+++ b/packages/react-aria/test/progress/useProgressBar.test.js
@@ -12,7 +12,7 @@
 
 import React from 'react';
 import {renderHook} from '@react-spectrum/test-utils-internal';
-import {useProgressBar} from '../';
+import {useProgressBar} from '../../src/progress/useProgressBar';
 
 describe('useProgressBar', function () {
   let renderProgressBarHook = (props) => {
diff --git a/packages/@react-aria/searchfield/test/useSearchField.test.js b/packages/react-aria/test/searchfield/useSearchField.test.js
similarity index 96%
rename from packages/@react-aria/searchfield/test/useSearchField.test.js
rename to packages/react-aria/test/searchfield/useSearchField.test.js
index bf24468749e..0abae7e7e11 100644
--- a/packages/@react-aria/searchfield/test/useSearchField.test.js
+++ b/packages/react-aria/test/searchfield/useSearchField.test.js
@@ -11,12 +11,12 @@
  */
 
 // @ts-ignore
-import intlMessages from '../intl/*.json';
-import {Provider} from '@react-spectrum/provider';
+import intlMessages from '../../intl/searchfield/*.json';
+import {Provider} from '@adobe/react-spectrum/Provider';
 import React from 'react';
 import {renderHook} from '@react-spectrum/test-utils-internal';
-import {theme} from '@react-spectrum/theme-default';
-import {useSearchField} from '../';
+import {defaultTheme as theme} from '@adobe/react-spectrum/defaultTheme';
+import {useSearchField} from '../../src/searchfield/useSearchField';
 
 describe('useSearchField hook', () => {
   let state = {};
diff --git a/packages/@react-aria/select/test/HiddenSelect.test.tsx b/packages/react-aria/test/select/HiddenSelect.test.tsx
similarity index 92%
rename from packages/@react-aria/select/test/HiddenSelect.test.tsx
rename to packages/react-aria/test/select/HiddenSelect.test.tsx
index 995adb081f3..d8fa7df2763 100644
--- a/packages/@react-aria/select/test/HiddenSelect.test.tsx
+++ b/packages/react-aria/test/select/HiddenSelect.test.tsx
@@ -1,10 +1,11 @@
-import {HiddenSelect, HiddenSelectProps} from '../src';
-import {Item} from 'react-stately';
+import {HiddenSelect, HiddenSelectProps} from '../../src/select/HiddenSelect';
+import {Item} from 'react-stately/Item';
 import {pointerMap} from '@react-spectrum/test-utils-internal';
 import React, {useRef} from 'react';
 import {render, screen} from '@testing-library/react';
-import {SelectProps, useSelectState} from '@react-stately/select';
+import {SelectProps} from '@react-types/select';
 import userEvent from '@testing-library/user-event';
+import {useSelectState} from 'react-stately/useSelectState';
 
 const HiddenSelectExample = (props: Partial<SelectProps<{ key: number, value: string }>> & { hiddenProps?: Partial<HiddenSelectProps<any>> }) => {
   const triggerRef = useRef(null);
diff --git a/packages/@react-aria/selection/test/useSelectableCollection.test.js b/packages/react-aria/test/selection/useSelectableCollection.test.js
similarity index 98%
rename from packages/@react-aria/selection/test/useSelectableCollection.test.js
rename to packages/react-aria/test/selection/useSelectableCollection.test.js
index b83705e5248..e1eb148a859 100644
--- a/packages/@react-aria/selection/test/useSelectableCollection.test.js
+++ b/packages/react-aria/test/selection/useSelectableCollection.test.js
@@ -11,8 +11,8 @@
  */
 
 import {fireEvent, installPointerEvent, pointerMap, render, simulateDesktop, simulateMobile, within} from '@react-spectrum/test-utils-internal';
-import {Item} from '@react-stately/collections';
-import {List} from '../stories/List';
+import {Item} from 'react-stately/Item';
+import {List} from '../../stories/selection/List';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-aria/slider/test/useSlider.test.js b/packages/react-aria/test/slider/useSlider.test.js
similarity index 98%
rename from packages/@react-aria/slider/test/useSlider.test.js
rename to packages/react-aria/test/slider/useSlider.test.js
index 7bcaed97e0d..92356859d80 100644
--- a/packages/@react-aria/slider/test/useSlider.test.js
+++ b/packages/react-aria/test/slider/useSlider.test.js
@@ -1,8 +1,9 @@
 import {fireEvent, installMouseEvent, installPointerEvent, render, renderHook, screen} from '@react-spectrum/test-utils-internal';
 import * as React from 'react';
 import {useRef} from 'react';
-import {useSlider, useSliderThumb} from '../src';
-import {useSliderState} from '@react-stately/slider';
+import {useSlider} from '../../src/slider/useSlider';
+import {useSliderState} from 'react-stately/useSliderState';
+import {useSliderThumb} from '../../src/slider/useSliderThumb';
 
 describe('useSlider', () => {
   let numberFormatter = new Intl.NumberFormat('en-US', {});
diff --git a/packages/@react-aria/slider/test/useSliderThumb.test.js b/packages/react-aria/test/slider/useSliderThumb.test.js
similarity index 99%
rename from packages/@react-aria/slider/test/useSliderThumb.test.js
rename to packages/react-aria/test/slider/useSliderThumb.test.js
index eefe094d5b6..e8ef4c7d226 100644
--- a/packages/@react-aria/slider/test/useSliderThumb.test.js
+++ b/packages/react-aria/test/slider/useSliderThumb.test.js
@@ -2,8 +2,9 @@ import {fireEvent, installMouseEvent, installPointerEvent, pointerMap, render, r
 import * as React from 'react';
 import {useRef} from 'react';
 import userEvent from '@testing-library/user-event';
-import {useSlider, useSliderThumb} from '../src';
-import {useSliderState} from '@react-stately/slider';
+import {useSlider} from '../../src/slider/useSlider';
+import {useSliderState} from 'react-stately/useSliderState';
+import {useSliderThumb} from '../../src/slider/useSliderThumb';
 
 describe('useSliderThumb', () => {
   let numberFormatter = new Intl.NumberFormat('en-US', {});
diff --git a/packages/@react-aria/spinbutton/test/useSpinButton.test.js b/packages/react-aria/test/spinbutton/useSpinButton.test.js
similarity index 97%
rename from packages/@react-aria/spinbutton/test/useSpinButton.test.js
rename to packages/react-aria/test/spinbutton/useSpinButton.test.js
index 70afbf812a6..c5133ce5670 100644
--- a/packages/@react-aria/spinbutton/test/useSpinButton.test.js
+++ b/packages/react-aria/test/spinbutton/useSpinButton.test.js
@@ -10,12 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
+jest.mock('../../src/live-announcer/LiveAnnouncer');
 import {act, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {announce} from '@react-aria/live-announcer';
+import {announce} from '../../src/live-announcer/LiveAnnouncer';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
-import {useSpinButton} from '../';
+import {useSpinButton} from '../../src/spinbutton/useSpinButton';
 
 function Example(props) {
   let {spinButtonProps} = useSpinButton(props);
diff --git a/packages/@react-aria/ssr/test/SSRProvider.ssr.test.js b/packages/react-aria/test/ssr/SSRProvider.ssr.test.js
similarity index 100%
rename from packages/@react-aria/ssr/test/SSRProvider.ssr.test.js
rename to packages/react-aria/test/ssr/SSRProvider.ssr.test.js
diff --git a/packages/@react-aria/ssr/test/SSRProvider.test.js b/packages/react-aria/test/ssr/SSRProvider.test.js
similarity index 97%
rename from packages/@react-aria/ssr/test/SSRProvider.test.js
rename to packages/react-aria/test/ssr/SSRProvider.test.js
index 494de29ffd2..318fd78162b 100644
--- a/packages/@react-aria/ssr/test/SSRProvider.test.js
+++ b/packages/react-aria/test/ssr/SSRProvider.test.js
@@ -12,8 +12,8 @@
 
 import React from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
-import {SSRProvider} from '../';
-import {useId} from '@react-aria/utils';
+import {SSRProvider} from '../../src/ssr/SSRProvider';
+import {useId} from '../../src/utils/useId';
 
 function Test() {
   return <div data-testid="test" id={useId()} />;
diff --git a/packages/@react-aria/table/test/ariaTableResizing.test.tsx b/packages/react-aria/test/table/ariaTableResizing.test.tsx
similarity index 86%
rename from packages/@react-aria/table/test/ariaTableResizing.test.tsx
rename to packages/react-aria/test/table/ariaTableResizing.test.tsx
index a3a8d8d2f28..ab8a88fd3ae 100644
--- a/packages/@react-aria/table/test/ariaTableResizing.test.tsx
+++ b/packages/react-aria/test/table/ariaTableResizing.test.tsx
@@ -11,15 +11,19 @@
  */
 
 import {act, fireEvent} from '@react-spectrum/test-utils-internal';
-import {Cell, Column, Row, TableBody, TableHeader} from '@react-stately/table';
+import {Cell} from 'react-stately/Cell';
+import {Column} from 'react-stately/Column';
 import {composeStories} from '@storybook/react';
 import {Key} from '@react-types/shared';
 import React from 'react';
 import {render} from '@testing-library/react';
-import {Table as ResizingTable} from '../stories/example-resizing';
+import {Table as ResizingTable} from '../../stories/table/example-resizing';
 import {resizingTests} from './tableResizingTests';
-import {setInteractionModality} from '@react-aria/interactions';
-import * as stories from '../stories/useTable.stories';
+import {Row} from 'react-stately/Row';
+import {setInteractionModality} from '../../src/interactions/useFocusVisible';
+import * as stories from '../../stories/table/useTable.stories';
+import {TableBody} from 'react-stately/TableBody';
+import {TableHeader} from 'react-stately/TableHeader';
 import {within} from '@testing-library/dom';
 
 
diff --git a/packages/@react-aria/table/test/tableResizingTests.tsx b/packages/react-aria/test/table/tableResizingTests.tsx
similarity index 100%
rename from packages/@react-aria/table/test/tableResizingTests.tsx
rename to packages/react-aria/test/table/tableResizingTests.tsx
diff --git a/packages/@react-aria/table/test/useTable.test.tsx b/packages/react-aria/test/table/useTable.test.tsx
similarity index 91%
rename from packages/@react-aria/table/test/useTable.test.tsx
rename to packages/react-aria/test/table/useTable.test.tsx
index 31294738420..ed6fa2bcc82 100644
--- a/packages/@react-aria/table/test/useTable.test.tsx
+++ b/packages/react-aria/test/table/useTable.test.tsx
@@ -10,11 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
-import {announce} from '@react-aria/live-announcer';
-import {Cell, Column, Row, TableBody, TableHeader, useTableState} from '@react-stately/table';
+jest.mock('../../src/live-announcer/LiveAnnouncer');
+import {announce} from '../../src/live-announcer/LiveAnnouncer';
+import {Cell} from 'react-stately/Cell';
+import {Column} from 'react-stately/Column';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React, {useRef} from 'react';
+import {Row} from 'react-stately/Row';
+import {TableBody} from 'react-stately/TableBody';
 import {
   TableCell,
   TableCheckboxCell,
@@ -23,9 +26,11 @@ import {
   TableRow,
   TableRowGroup,
   TableSelectAllCell
-} from '../stories/example';
+} from '../../stories/table/example';
+import {TableHeader} from 'react-stately/TableHeader';
 import userEvent from '@testing-library/user-event';
-import {useTable} from '../src';
+import {useTable} from '../../src/table/useTable';
+import {useTableState} from 'react-stately/useTableState';
 
 let mockAnnounce = announce as jest.MockedFunction<typeof announce>;
 
diff --git a/packages/@react-aria/table/test/useTableBackwardCompat.test.tsx b/packages/react-aria/test/table/useTableBackwardCompat.test.tsx
similarity index 90%
rename from packages/@react-aria/table/test/useTableBackwardCompat.test.tsx
rename to packages/react-aria/test/table/useTableBackwardCompat.test.tsx
index 6a1e39878b3..0fda7301fce 100644
--- a/packages/@react-aria/table/test/useTableBackwardCompat.test.tsx
+++ b/packages/react-aria/test/table/useTableBackwardCompat.test.tsx
@@ -10,11 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-jest.mock('@react-aria/live-announcer');
-import {announce} from '@react-aria/live-announcer';
-import {Cell, Column, Row, TableBody, TableHeader, useTableState} from '@react-stately/table';
+jest.mock('../../src/live-announcer/LiveAnnouncer');
+import {announce} from '../../src/live-announcer/LiveAnnouncer';
+import {Cell} from 'react-stately/Cell';
+import {Column} from 'react-stately/Column';
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React, {useRef} from 'react';
+import {Row} from 'react-stately/Row';
+import {TableBody} from 'react-stately/TableBody';
 import {
   TableCell,
   TableCheckboxCell,
@@ -23,9 +26,11 @@ import {
   TableRow,
   TableRowGroup,
   TableSelectAllCell
-} from '../stories/example-backwards-compat';
+} from '../../stories/table/example-backwards-compat';
+import {TableHeader} from 'react-stately/TableHeader';
 import userEvent from '@testing-library/user-event';
-import {useTable} from '../src';
+import {useTable} from '../../src/table/useTable';
+import {useTableState} from 'react-stately/useTableState';
 
 let mockAnnounce = announce as jest.MockedFunction<typeof announce>;
 
diff --git a/packages/@react-aria/tag/test/useTagGroup.test.js b/packages/react-aria/test/tag/useTagGroup.test.js
similarity index 96%
rename from packages/@react-aria/tag/test/useTagGroup.test.js
rename to packages/react-aria/test/tag/useTagGroup.test.js
index 5a6b7ac52f3..af882467d3d 100644
--- a/packages/@react-aria/tag/test/useTagGroup.test.js
+++ b/packages/react-aria/test/tag/useTagGroup.test.js
@@ -10,13 +10,15 @@
  * governing permissions and limitations under the License.
  */
 
-import {Item} from '@react-stately/collections';
+import {Item} from 'react-stately/Item';
+
 import {pointerMap, render, within} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {useButton} from '@react-aria/button';
-import {useListState} from '@react-stately/list';
+import {useButton} from '../../src/button/useButton';
+import {useListState} from 'react-stately/useListState';
 import userEvent from '@testing-library/user-event';
-import {useTag, useTagGroup} from '../';
+import {useTag} from '../../src/tag/useTag';
+import {useTagGroup} from '../../src/tag/useTagGroup';
 
 function TagGroup(props) {
   let ref = React.useRef(null);
diff --git a/packages/@react-aria/textfield/test/useTextField.test.js b/packages/react-aria/test/textfield/useTextField.test.js
similarity index 98%
rename from packages/@react-aria/textfield/test/useTextField.test.js
rename to packages/react-aria/test/textfield/useTextField.test.js
index 40e3358b817..7889cf4dd8d 100644
--- a/packages/@react-aria/textfield/test/useTextField.test.js
+++ b/packages/react-aria/test/textfield/useTextField.test.js
@@ -12,7 +12,7 @@
 
 import {actHook, renderHook} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {useTextField} from '../';
+import {useTextField} from '../../src/textfield/useTextField';
 
 describe('useTextField hook', () => {
   let renderTextFieldHook = (props) => {
diff --git a/packages/@react-aria/toast/test/useToast.test.js b/packages/react-aria/test/toast/useToast.test.js
similarity index 96%
rename from packages/@react-aria/toast/test/useToast.test.js
rename to packages/react-aria/test/toast/useToast.test.js
index d5238142310..91ac331d602 100644
--- a/packages/@react-aria/toast/test/useToast.test.js
+++ b/packages/react-aria/test/toast/useToast.test.js
@@ -13,9 +13,9 @@
 import {act, pointerMap, render, renderHook, within} from '@react-spectrum/test-utils-internal';
 import {composeStories} from '@storybook/react';
 import React, {useRef} from 'react';
-import * as stories from '../stories/useToast.stories';
+import * as stories from '../../stories/toast/useToast.stories';
 import userEvent from '@testing-library/user-event';
-import {useToast} from '../';
+import {useToast} from '../../src/toast/useToast';
 
 let {Default} = composeStories(stories);
 
diff --git a/packages/@react-aria/tooltip/test/useTooltip.test.js b/packages/react-aria/test/tooltip/useTooltip.test.js
similarity index 95%
rename from packages/@react-aria/tooltip/test/useTooltip.test.js
rename to packages/react-aria/test/tooltip/useTooltip.test.js
index 140ad3ac3c5..f82ff371548 100644
--- a/packages/@react-aria/tooltip/test/useTooltip.test.js
+++ b/packages/react-aria/test/tooltip/useTooltip.test.js
@@ -12,9 +12,10 @@
 
 import {act, fireEvent, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {useInteractionModality} from '@react-aria/interactions';
-import {useTooltip, useTooltipTrigger} from '../';
-import {useTooltipTriggerState} from '@react-stately/tooltip';
+import {useInteractionModality} from '../../src/interactions/useFocusVisible';
+import {useTooltip} from '../../src/tooltip/useTooltip';
+import {useTooltipTrigger} from '../../src/tooltip/useTooltipTrigger';
+import {useTooltipTriggerState} from 'react-stately/useTooltipTriggerState';
 
 describe('useTooltip', function () {
   afterEach(() => {
diff --git a/packages/@react-aria/utils/test/DOMFunctions.test.js b/packages/react-aria/test/utils/DOMFunctions.test.js
similarity index 91%
rename from packages/@react-aria/utils/test/DOMFunctions.test.js
rename to packages/react-aria/test/utils/DOMFunctions.test.js
index b7cf7a4b984..f059126dfb2 100644
--- a/packages/@react-aria/utils/test/DOMFunctions.test.js
+++ b/packages/react-aria/test/utils/DOMFunctions.test.js
@@ -11,8 +11,8 @@
  */
 
 import {createShadowRoot, render} from '@react-spectrum/test-utils-internal';
-import {enableShadowDOM} from '@react-stately/flags';
-import {nodeContains} from '..';
+import {enableShadowDOM} from 'react-stately/private/flags/flags';
+import {nodeContains} from '../../src/utils/shadowdom/DOMFunctions';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import {screen} from 'shadow-dom-testing-library';
diff --git a/packages/@react-aria/utils/test/domHelpers.test.js b/packages/react-aria/test/utils/domHelpers.test.js
similarity index 95%
rename from packages/@react-aria/utils/test/domHelpers.test.js
rename to packages/react-aria/test/utils/domHelpers.test.js
index 8aa315f4ca1..ea3191acb6c 100644
--- a/packages/@react-aria/utils/test/domHelpers.test.js
+++ b/packages/react-aria/test/utils/domHelpers.test.js
@@ -12,8 +12,9 @@
 
 
 import {act} from 'react-dom/test-utils';
-import {enableShadowDOM} from '@react-stately/flags';
-import {getActiveElement, getOwnerWindow} from '../';
+import {enableShadowDOM} from 'react-stately/private/flags/flags';
+import {getActiveElement} from '../../src/utils/shadowdom/DOMFunctions';
+import {getOwnerWindow} from '../../src/utils/domHelpers';
 
 describe('getOwnerWindow', () => {
   beforeAll(() => {
diff --git a/packages/@react-aria/utils/test/getNonce.test.js b/packages/react-aria/test/utils/getNonce.test.js
similarity index 97%
rename from packages/@react-aria/utils/test/getNonce.test.js
rename to packages/react-aria/test/utils/getNonce.test.js
index 2e2e339f9f2..ca35fa119f6 100644
--- a/packages/@react-aria/utils/test/getNonce.test.js
+++ b/packages/react-aria/test/utils/getNonce.test.js
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {getNonce} from '../';
-import {resetNonceCache} from '../src/getNonce';
+import {getNonce} from '../../src/utils/getNonce';
+import {resetNonceCache} from '../../src/utils/getNonce';
 
 describe('getNonce', () => {
   afterEach(() => {
diff --git a/packages/@react-aria/utils/test/mergeProps.test.jsx b/packages/react-aria/test/utils/mergeProps.test.jsx
similarity index 97%
rename from packages/@react-aria/utils/test/mergeProps.test.jsx
rename to packages/react-aria/test/utils/mergeProps.test.jsx
index 1075f65d528..6d5b12cb687 100644
--- a/packages/@react-aria/utils/test/mergeProps.test.jsx
+++ b/packages/react-aria/test/utils/mergeProps.test.jsx
@@ -11,8 +11,8 @@
  */
 
 import clsx from 'clsx';
-import { mergeIds, useId } from '../src/useId';
-import { mergeProps } from '../src/mergeProps';
+import { mergeIds, useId } from '../../src/utils/useId';
+import { mergeProps } from '../../src/utils/mergeProps';
 import { render } from '@react-spectrum/test-utils-internal';
 import { createRef } from 'react';
 
diff --git a/packages/@react-aria/utils/test/mergeRefs.test.tsx b/packages/react-aria/test/utils/mergeRefs.test.tsx
similarity index 97%
rename from packages/@react-aria/utils/test/mergeRefs.test.tsx
rename to packages/react-aria/test/utils/mergeRefs.test.tsx
index a73b3479b90..27bffc97e7d 100644
--- a/packages/@react-aria/utils/test/mergeRefs.test.tsx
+++ b/packages/react-aria/test/utils/mergeRefs.test.tsx
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {mergeRefs} from '../';
+import {mergeRefs} from '../../src/utils/mergeRefs';
 import React, {useCallback, useEffect, useRef} from 'react';
 import {render} from '@react-spectrum/test-utils-internal';
 
diff --git a/packages/@react-aria/utils/test/runAfterTransition.test.ts b/packages/react-aria/test/utils/runAfterTransition.test.ts
similarity index 97%
rename from packages/@react-aria/utils/test/runAfterTransition.test.ts
rename to packages/react-aria/test/utils/runAfterTransition.test.ts
index c0e67b5c260..2d5f18d8af5 100644
--- a/packages/@react-aria/utils/test/runAfterTransition.test.ts
+++ b/packages/react-aria/test/utils/runAfterTransition.test.ts
@@ -1,5 +1,5 @@
 import {act} from '@testing-library/react';
-import {runAfterTransition} from '../src/runAfterTransition';
+import {runAfterTransition} from '../../src/utils/runAfterTransition';
 
 class MockTransitionEvent extends Event {
   propertyName: string;
diff --git a/packages/@react-aria/utils/test/shadowTreeWalker.test.tsx b/packages/react-aria/test/utils/shadowTreeWalker.test.tsx
similarity index 98%
rename from packages/@react-aria/utils/test/shadowTreeWalker.test.tsx
rename to packages/react-aria/test/utils/shadowTreeWalker.test.tsx
index a454e16a1d9..e194ef9a6ea 100644
--- a/packages/@react-aria/utils/test/shadowTreeWalker.test.tsx
+++ b/packages/react-aria/test/utils/shadowTreeWalker.test.tsx
@@ -11,8 +11,8 @@
  */
 
 import {createShadowRoot, render} from '@react-spectrum/test-utils-internal';
-import {createShadowTreeWalker} from '../src';
-import {enableShadowDOM} from '@react-stately/flags';
+import {createShadowTreeWalker} from '../../src/utils/shadowdom/ShadowTreeWalker';
+import {enableShadowDOM} from 'react-stately/private/flags/flags';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
diff --git a/packages/@react-aria/utils/test/useObjectRef.test.js b/packages/react-aria/test/utils/useObjectRef.test.js
similarity index 97%
rename from packages/@react-aria/utils/test/useObjectRef.test.js
rename to packages/react-aria/test/utils/useObjectRef.test.js
index e77e0302267..918ac98a006 100644
--- a/packages/@react-aria/utils/test/useObjectRef.test.js
+++ b/packages/react-aria/test/utils/useObjectRef.test.js
@@ -12,8 +12,11 @@
 
 import React, {useEffect} from 'react';
 import {render, renderHook, screen} from '@react-spectrum/test-utils-internal';
-// eslint-disable-next-line rulesdir/useLayoutEffectRule
-import {useLayoutEffect, useObjectRef} from '../';
+
+ 
+import {useLayoutEffect} from '../../src/utils/useLayoutEffect';
+
+import {useObjectRef} from '../../src/utils/useObjectRef';
 
 describe('useObjectRef', () => {
   it('returns an empty object ref by default', () => {
diff --git a/packages/@react-aria/utils/test/useViewportSize.ssr.test.tsx b/packages/react-aria/test/utils/useViewportSize.ssr.test.tsx
similarity index 100%
rename from packages/@react-aria/utils/test/useViewportSize.ssr.test.tsx
rename to packages/react-aria/test/utils/useViewportSize.ssr.test.tsx
diff --git a/packages/@react-aria/visually-hidden/test/VisuallyHidden.test.tsx b/packages/react-aria/test/visually-hidden/VisuallyHidden.test.tsx
similarity index 97%
rename from packages/@react-aria/visually-hidden/test/VisuallyHidden.test.tsx
rename to packages/react-aria/test/visually-hidden/VisuallyHidden.test.tsx
index 4de7f1d1ba5..720fa072b30 100644
--- a/packages/@react-aria/visually-hidden/test/VisuallyHidden.test.tsx
+++ b/packages/react-aria/test/visually-hidden/VisuallyHidden.test.tsx
@@ -13,7 +13,7 @@
 import {pointerMap, render} from '@react-spectrum/test-utils-internal';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
-import {VisuallyHidden} from '../';
+import {VisuallyHidden} from '../../src/visually-hidden/VisuallyHidden';
 
 describe('VisuallyHidden', function () {
   let user;
diff --git a/packages/@react-stately/autocomplete/docs/useAutocompleteState.mdx b/packages/react-stately/docs/autocomplete/useAutocompleteState.mdx
similarity index 100%
rename from packages/@react-stately/autocomplete/docs/useAutocompleteState.mdx
rename to packages/react-stately/docs/autocomplete/useAutocompleteState.mdx
diff --git a/packages/@react-stately/calendar/docs/useCalendarState.mdx b/packages/react-stately/docs/calendar/useCalendarState.mdx
similarity index 100%
rename from packages/@react-stately/calendar/docs/useCalendarState.mdx
rename to packages/react-stately/docs/calendar/useCalendarState.mdx
diff --git a/packages/@react-stately/calendar/docs/useRangeCalendarState.mdx b/packages/react-stately/docs/calendar/useRangeCalendarState.mdx
similarity index 100%
rename from packages/@react-stately/calendar/docs/useRangeCalendarState.mdx
rename to packages/react-stately/docs/calendar/useRangeCalendarState.mdx
diff --git a/packages/@react-stately/checkbox/docs/useCheckboxGroupState.mdx b/packages/react-stately/docs/checkbox/useCheckboxGroupState.mdx
similarity index 100%
rename from packages/@react-stately/checkbox/docs/useCheckboxGroupState.mdx
rename to packages/react-stately/docs/checkbox/useCheckboxGroupState.mdx
diff --git a/packages/@react-stately/color/docs/useColorAreaState.mdx b/packages/react-stately/docs/color/useColorAreaState.mdx
similarity index 100%
rename from packages/@react-stately/color/docs/useColorAreaState.mdx
rename to packages/react-stately/docs/color/useColorAreaState.mdx
diff --git a/packages/@react-stately/color/docs/useColorFieldState.mdx b/packages/react-stately/docs/color/useColorFieldState.mdx
similarity index 100%
rename from packages/@react-stately/color/docs/useColorFieldState.mdx
rename to packages/react-stately/docs/color/useColorFieldState.mdx
diff --git a/packages/@react-stately/color/docs/useColorSliderState.mdx b/packages/react-stately/docs/color/useColorSliderState.mdx
similarity index 100%
rename from packages/@react-stately/color/docs/useColorSliderState.mdx
rename to packages/react-stately/docs/color/useColorSliderState.mdx
diff --git a/packages/@react-stately/color/docs/useColorWheelState.mdx b/packages/react-stately/docs/color/useColorWheelState.mdx
similarity index 100%
rename from packages/@react-stately/color/docs/useColorWheelState.mdx
rename to packages/react-stately/docs/color/useColorWheelState.mdx
diff --git a/packages/@react-stately/combobox/docs/useComboBoxState.mdx b/packages/react-stately/docs/combobox/useComboBoxState.mdx
similarity index 100%
rename from packages/@react-stately/combobox/docs/useComboBoxState.mdx
rename to packages/react-stately/docs/combobox/useComboBoxState.mdx
diff --git a/packages/@react-stately/data/docs/useAsyncList.mdx b/packages/react-stately/docs/data/useAsyncList.mdx
similarity index 100%
rename from packages/@react-stately/data/docs/useAsyncList.mdx
rename to packages/react-stately/docs/data/useAsyncList.mdx
diff --git a/packages/@react-stately/data/docs/useListData.mdx b/packages/react-stately/docs/data/useListData.mdx
similarity index 100%
rename from packages/@react-stately/data/docs/useListData.mdx
rename to packages/react-stately/docs/data/useListData.mdx
diff --git a/packages/@react-stately/data/docs/useTreeData.mdx b/packages/react-stately/docs/data/useTreeData.mdx
similarity index 100%
rename from packages/@react-stately/data/docs/useTreeData.mdx
rename to packages/react-stately/docs/data/useTreeData.mdx
diff --git a/packages/@react-stately/datepicker/docs/useDateFieldState.mdx b/packages/react-stately/docs/datepicker/useDateFieldState.mdx
similarity index 100%
rename from packages/@react-stately/datepicker/docs/useDateFieldState.mdx
rename to packages/react-stately/docs/datepicker/useDateFieldState.mdx
diff --git a/packages/@react-stately/datepicker/docs/useDatePickerState.mdx b/packages/react-stately/docs/datepicker/useDatePickerState.mdx
similarity index 100%
rename from packages/@react-stately/datepicker/docs/useDatePickerState.mdx
rename to packages/react-stately/docs/datepicker/useDatePickerState.mdx
diff --git a/packages/@react-stately/datepicker/docs/useDateRangePickerState.mdx b/packages/react-stately/docs/datepicker/useDateRangePickerState.mdx
similarity index 100%
rename from packages/@react-stately/datepicker/docs/useDateRangePickerState.mdx
rename to packages/react-stately/docs/datepicker/useDateRangePickerState.mdx
diff --git a/packages/@react-stately/datepicker/docs/useTimeFieldState.mdx b/packages/react-stately/docs/datepicker/useTimeFieldState.mdx
similarity index 100%
rename from packages/@react-stately/datepicker/docs/useTimeFieldState.mdx
rename to packages/react-stately/docs/datepicker/useTimeFieldState.mdx
diff --git a/packages/@react-stately/disclosure/docs/useDisclosureGroupState.mdx b/packages/react-stately/docs/disclosure/useDisclosureGroupState.mdx
similarity index 100%
rename from packages/@react-stately/disclosure/docs/useDisclosureGroupState.mdx
rename to packages/react-stately/docs/disclosure/useDisclosureGroupState.mdx
diff --git a/packages/@react-stately/disclosure/docs/useDisclosureState.mdx b/packages/react-stately/docs/disclosure/useDisclosureState.mdx
similarity index 100%
rename from packages/@react-stately/disclosure/docs/useDisclosureState.mdx
rename to packages/react-stately/docs/disclosure/useDisclosureState.mdx
diff --git a/packages/@react-stately/dnd/docs/useDraggableCollectionState.mdx b/packages/react-stately/docs/dnd/useDraggableCollectionState.mdx
similarity index 100%
rename from packages/@react-stately/dnd/docs/useDraggableCollectionState.mdx
rename to packages/react-stately/docs/dnd/useDraggableCollectionState.mdx
diff --git a/packages/@react-stately/dnd/docs/useDroppableCollectionState.mdx b/packages/react-stately/docs/dnd/useDroppableCollectionState.mdx
similarity index 100%
rename from packages/@react-stately/dnd/docs/useDroppableCollectionState.mdx
rename to packages/react-stately/docs/dnd/useDroppableCollectionState.mdx
diff --git a/packages/@react-stately/list/docs/useListState.mdx b/packages/react-stately/docs/list/useListState.mdx
similarity index 100%
rename from packages/@react-stately/list/docs/useListState.mdx
rename to packages/react-stately/docs/list/useListState.mdx
diff --git a/packages/@react-stately/list/docs/useSingleSelectListState.mdx b/packages/react-stately/docs/list/useSingleSelectListState.mdx
similarity index 100%
rename from packages/@react-stately/list/docs/useSingleSelectListState.mdx
rename to packages/react-stately/docs/list/useSingleSelectListState.mdx
diff --git a/packages/@react-stately/menu/docs/useMenuTriggerState.mdx b/packages/react-stately/docs/menu/useMenuTriggerState.mdx
similarity index 100%
rename from packages/@react-stately/menu/docs/useMenuTriggerState.mdx
rename to packages/react-stately/docs/menu/useMenuTriggerState.mdx
diff --git a/packages/@react-stately/numberfield/docs/useNumberFieldState.mdx b/packages/react-stately/docs/numberfield/useNumberFieldState.mdx
similarity index 100%
rename from packages/@react-stately/numberfield/docs/useNumberFieldState.mdx
rename to packages/react-stately/docs/numberfield/useNumberFieldState.mdx
diff --git a/packages/@react-stately/overlays/docs/useOverlayTriggerState.mdx b/packages/react-stately/docs/overlays/useOverlayTriggerState.mdx
similarity index 100%
rename from packages/@react-stately/overlays/docs/useOverlayTriggerState.mdx
rename to packages/react-stately/docs/overlays/useOverlayTriggerState.mdx
diff --git a/packages/@react-stately/radio/docs/useRadioGroupState.mdx b/packages/react-stately/docs/radio/useRadioGroupState.mdx
similarity index 100%
rename from packages/@react-stately/radio/docs/useRadioGroupState.mdx
rename to packages/react-stately/docs/radio/useRadioGroupState.mdx
diff --git a/packages/@react-stately/searchfield/docs/useSearchFieldState.mdx b/packages/react-stately/docs/searchfield/useSearchFieldState.mdx
similarity index 100%
rename from packages/@react-stately/searchfield/docs/useSearchFieldState.mdx
rename to packages/react-stately/docs/searchfield/useSearchFieldState.mdx
diff --git a/packages/@react-stately/select/docs/useSelectState.mdx b/packages/react-stately/docs/select/useSelectState.mdx
similarity index 100%
rename from packages/@react-stately/select/docs/useSelectState.mdx
rename to packages/react-stately/docs/select/useSelectState.mdx
diff --git a/packages/@react-stately/selection/docs/useMultipleSelectionState.mdx b/packages/react-stately/docs/selection/useMultipleSelectionState.mdx
similarity index 100%
rename from packages/@react-stately/selection/docs/useMultipleSelectionState.mdx
rename to packages/react-stately/docs/selection/useMultipleSelectionState.mdx
diff --git a/packages/@react-stately/slider/docs/useSliderState.mdx b/packages/react-stately/docs/slider/useSliderState.mdx
similarity index 100%
rename from packages/@react-stately/slider/docs/useSliderState.mdx
rename to packages/react-stately/docs/slider/useSliderState.mdx
diff --git a/packages/@react-stately/table/docs/useTableState.mdx b/packages/react-stately/docs/table/useTableState.mdx
similarity index 100%
rename from packages/@react-stately/table/docs/useTableState.mdx
rename to packages/react-stately/docs/table/useTableState.mdx
diff --git a/packages/@react-stately/tabs/docs/useTabListState.mdx b/packages/react-stately/docs/tabs/useTabListState.mdx
similarity index 100%
rename from packages/@react-stately/tabs/docs/useTabListState.mdx
rename to packages/react-stately/docs/tabs/useTabListState.mdx
diff --git a/packages/@react-stately/toast/docs/useToastState.mdx b/packages/react-stately/docs/toast/useToastState.mdx
similarity index 100%
rename from packages/@react-stately/toast/docs/useToastState.mdx
rename to packages/react-stately/docs/toast/useToastState.mdx
diff --git a/packages/@react-stately/toggle/docs/useToggleState.mdx b/packages/react-stately/docs/toggle/useToggleState.mdx
similarity index 100%
rename from packages/@react-stately/toggle/docs/useToggleState.mdx
rename to packages/react-stately/docs/toggle/useToggleState.mdx
diff --git a/packages/@react-stately/tooltip/docs/useTooltipTriggerState.mdx b/packages/react-stately/docs/tooltip/useTooltipTriggerState.mdx
similarity index 100%
rename from packages/@react-stately/tooltip/docs/useTooltipTriggerState.mdx
rename to packages/react-stately/docs/tooltip/useTooltipTriggerState.mdx
diff --git a/packages/@react-stately/tree/docs/useTreeState.mdx b/packages/react-stately/docs/tree/useTreeState.mdx
similarity index 100%
rename from packages/@react-stately/tree/docs/useTreeState.mdx
rename to packages/react-stately/docs/tree/useTreeState.mdx
diff --git a/packages/react-stately/exports/Cell.ts b/packages/react-stately/exports/Cell.ts
new file mode 100644
index 00000000000..94b8e3f1f56
--- /dev/null
+++ b/packages/react-stately/exports/Cell.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {Cell} from '../src/table/Cell';
+export type {TableHeaderProps, TableBodyProps, ColumnProps, RowProps, CellProps} from '@react-types/table';
+export {Section} from '../src/collections/Section';
diff --git a/packages/react-stately/exports/Color.ts b/packages/react-stately/exports/Color.ts
new file mode 100644
index 00000000000..ecddd9faa38
--- /dev/null
+++ b/packages/react-stately/exports/Color.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {parseColor, getColorChannels} from '../src/color/Color';
+
+export type {Color, ColorChannel, ColorFormat, ColorSpace, ColorAreaProps, ColorFieldProps, ColorWheelProps} from '@react-types/color';
diff --git a/packages/react-stately/exports/Column.ts b/packages/react-stately/exports/Column.ts
new file mode 100644
index 00000000000..764bf5e2233
--- /dev/null
+++ b/packages/react-stately/exports/Column.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {Column} from '../src/table/Column';
+export type {TableHeaderProps, TableBodyProps, ColumnProps, RowProps, CellProps} from '@react-types/table';
+export {Section} from '../src/collections/Section';
diff --git a/packages/@adobe/react-spectrum/index.ts b/packages/react-stately/exports/Item.ts
similarity index 93%
rename from packages/@adobe/react-spectrum/index.ts
rename to packages/react-stately/exports/Item.ts
index 1210ae1e402..61b4ceba75c 100644
--- a/packages/@adobe/react-spectrum/index.ts
+++ b/packages/react-stately/exports/Item.ts
@@ -10,4 +10,4 @@
  * governing permissions and limitations under the License.
  */
 
-export * from './src';
+export {Item} from '../src/collections/Item';
diff --git a/packages/react-stately/exports/Row.ts b/packages/react-stately/exports/Row.ts
new file mode 100644
index 00000000000..37bb2fa9407
--- /dev/null
+++ b/packages/react-stately/exports/Row.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {Row} from '../src/table/Row';
+export type {TableHeaderProps, TableBodyProps, ColumnProps, RowProps, CellProps} from '@react-types/table';
+export {Section} from '../src/collections/Section';
diff --git a/packages/@react-aria/aria-modal-polyfill/index.ts b/packages/react-stately/exports/Section.ts
similarity index 92%
rename from packages/@react-aria/aria-modal-polyfill/index.ts
rename to packages/react-stately/exports/Section.ts
index 1210ae1e402..ffc2389f956 100644
--- a/packages/@react-aria/aria-modal-polyfill/index.ts
+++ b/packages/react-stately/exports/Section.ts
@@ -10,4 +10,4 @@
  * governing permissions and limitations under the License.
  */
 
-export * from './src';
+export {Section} from '../src/collections/Section';
diff --git a/packages/react-stately/exports/TableBody.ts b/packages/react-stately/exports/TableBody.ts
new file mode 100644
index 00000000000..2357cafd56e
--- /dev/null
+++ b/packages/react-stately/exports/TableBody.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {TableBody} from '../src/table/TableBody';
+export type {TableHeaderProps, TableBodyProps, ColumnProps, RowProps, CellProps} from '@react-types/table';
+export {Section} from '../src/collections/Section';
diff --git a/packages/react-stately/exports/TableHeader.ts b/packages/react-stately/exports/TableHeader.ts
new file mode 100644
index 00000000000..09e873c18a7
--- /dev/null
+++ b/packages/react-stately/exports/TableHeader.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {TableHeader} from '../src/table/TableHeader';
+export type {TableHeaderProps, TableBodyProps, ColumnProps, RowProps, CellProps} from '@react-types/table';
+export {Section} from '../src/collections/Section';
diff --git a/packages/react-stately/exports/index.ts b/packages/react-stately/exports/index.ts
new file mode 100644
index 00000000000..30f10b85588
--- /dev/null
+++ b/packages/react-stately/exports/index.ts
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {CalendarState, RangeCalendarState} from '../src/calendar/types';
+
+export type {CalendarStateOptions} from '../src/calendar/useCalendarState';
+export type {RangeCalendarStateOptions} from '../src/calendar/useRangeCalendarState';
+export type {CheckboxGroupProps} from '@react-types/checkbox';
+export type {CheckboxGroupState} from '../src/checkbox/useCheckboxGroupState';
+export type {Color, ColorChannel, ColorFormat, ColorSpace, ColorAreaProps, ColorFieldProps, ColorWheelProps} from '@react-types/color';
+export type {ColorAreaState} from '../src/color/useColorAreaState';
+export type {ColorChannelFieldProps, ColorChannelFieldState, ColorChannelFieldStateOptions} from '../src/color/useColorChannelFieldState';
+export type {ColorFieldState} from '../src/color/useColorFieldState';
+export type {ColorPickerProps, ColorPickerState} from '../src/color/useColorPickerState';
+export type {ColorSliderState, ColorSliderStateOptions} from '../src/color/useColorSliderState';
+export type {ColorWheelState} from '../src/color/useColorWheelState';
+export type {ComboBoxState, ComboBoxStateOptions} from '../src/combobox/useComboBoxState';
+export type {DateFieldState, DateFieldStateOptions, DateSegment, DateSegmentType, DateSegmentType as SegmentType} from '../src/datepicker/useDateFieldState';
+export type {DatePickerState, DatePickerStateOptions} from '../src/datepicker/useDatePickerState';
+export type {DateRangePickerState, DateRangePickerStateOptions} from '../src/datepicker/useDateRangePickerState';
+export type {TimeFieldStateOptions, TimeFieldState} from '../src/datepicker/useTimeFieldState';
+export type {DisclosureState, DisclosureProps} from '../src/disclosure/useDisclosureState';
+export type {DisclosureGroupState, DisclosureGroupProps} from '../src/disclosure/useDisclosureGroupState';
+export type {DraggableCollectionStateOptions, DraggableCollectionState} from '../src/dnd/useDraggableCollectionState';
+export type {DroppableCollectionStateOptions, DroppableCollectionState} from '../src/dnd/useDroppableCollectionState';
+export type {AsyncListData, AsyncListOptions} from '../src/data/useAsyncList';
+export type {ListData, ListOptions} from '../src/data/useListData';
+export type {TreeData, TreeOptions} from '../src/data/useTreeData';
+export type {ListProps, ListState} from '../src/list/useListState';
+export type {SingleSelectListProps, SingleSelectListState} from '../src/list/useSingleSelectListState';
+export type {MenuTriggerProps} from '@react-types/menu';
+export type {MenuTriggerState, RootMenuTriggerState} from '../src/menu/useMenuTriggerState';
+export type {SubmenuTriggerState, SubmenuTriggerProps} from '../src/menu/useSubmenuTriggerState';
+export type {OverlayTriggerProps} from '@react-types/overlays';
+export type {OverlayTriggerState} from '../src/overlays/useOverlayTriggerState';
+export type {RadioGroupProps} from '@react-types/radio';
+export type {RadioGroupState} from '../src/radio/useRadioGroupState';
+export type {SearchFieldProps} from '@react-types/searchfield';
+export type {SearchFieldState} from '../src/searchfield/useSearchFieldState';
+export type {SelectProps} from '@react-types/select';
+export type {SelectState, SelectStateOptions} from '../src/select/useSelectState';
+export type {SliderState, SliderStateOptions} from '../src/slider/useSliderState';
+export type {MultipleSelectionManager, MultipleSelectionState, SingleSelectionState} from '../src/selection/types';
+export type {MultipleSelectionStateProps} from '../src/selection/useMultipleSelectionState';
+export type {NumberFieldState, NumberFieldStateOptions} from '../src/numberfield/useNumberFieldState';
+export type {TableState, TableStateProps} from '../src/table/useTableState';
+export type {TableHeaderProps, TableBodyProps, ColumnProps, RowProps, CellProps} from '@react-types/table';
+export type {TableColumnResizeState, TableColumnResizeStateProps} from '../src/table/useTableColumnResizeState';
+export type {TabListProps} from '@react-types/tabs';
+export type {TabListStateOptions, TabListState} from '../src/tabs/useTabListState';
+export type {ToastState, QueuedToast, ToastStateProps, ToastOptions} from '../src/toast/useToastState';
+export type {ToggleProps} from '@react-types/checkbox';
+export type {ToggleState, ToggleStateOptions} from '../src/toggle/useToggleState';
+export type {ToggleGroupProps, ToggleGroupState} from '../src/toggle/useToggleGroupState';
+export type {TooltipTriggerProps} from '@react-types/tooltip';
+export type {TooltipTriggerState} from '../src/tooltip/useTooltipTriggerState';
+export type {TreeProps, TreeState} from '../src/tree/useTreeState';
+export type {ItemProps, Key, SectionProps, Collection, Node, Orientation, DisabledBehavior, Selection, SelectionBehavior, SelectionMode, SortDescriptor, SortDirection, ValidationState} from '@react-types/shared';
+
+export {useCalendarState} from '../src/calendar/useCalendarState';
+export {useRangeCalendarState} from '../src/calendar/useRangeCalendarState';
+export {useCheckboxGroupState} from '../src/checkbox/useCheckboxGroupState';
+export {getColorChannels, parseColor} from '../src/color/Color';
+export {useColorAreaState} from '../src/color/useColorAreaState';
+export {useColorChannelFieldState} from '../src/color/useColorChannelFieldState';
+export {useColorFieldState} from '../src/color/useColorFieldState';
+export {useColorPickerState} from '../src/color/useColorPickerState';
+export {useColorSliderState} from '../src/color/useColorSliderState';
+export {useColorWheelState} from '../src/color/useColorWheelState';
+export {useComboBoxState} from '../src/combobox/useComboBoxState';
+export {useDateFieldState} from '../src/datepicker/useDateFieldState';
+export {useDatePickerState} from '../src/datepicker/useDatePickerState';
+export {useDateRangePickerState} from '../src/datepicker/useDateRangePickerState';
+export {useTimeFieldState} from '../src/datepicker/useTimeFieldState';
+export {useDisclosureState} from '../src/disclosure/useDisclosureState';
+export {useDisclosureGroupState} from '../src/disclosure/useDisclosureGroupState';
+export {useDraggableCollectionState} from '../src/dnd/useDraggableCollectionState';
+export {useDroppableCollectionState} from '../src/dnd/useDroppableCollectionState';
+export {Item} from '../src/collections/Item';
+export {Section} from '../src/collections/Section';
+export {useCollection} from '../src/collections/useCollection';
+export {useAsyncList} from '../src/data/useAsyncList';
+export {useListData} from '../src/data/useListData';
+export {useTreeData} from '../src/data/useTreeData';
+export {useListState, UNSTABLE_useFilteredListState} from '../src/list/useListState';
+export {useSingleSelectListState} from '../src/list/useSingleSelectListState';
+export {useMenuTriggerState} from '../src/menu/useMenuTriggerState';
+export {useSubmenuTriggerState} from '../src/menu/useSubmenuTriggerState';
+export {useNumberFieldState} from '../src/numberfield/useNumberFieldState';
+export {useOverlayTriggerState} from '../src/overlays/useOverlayTriggerState';
+export {useRadioGroupState} from '../src/radio/useRadioGroupState';
+export {useSearchFieldState} from '../src/searchfield/useSearchFieldState';
+export {useSelectState} from '../src/select/useSelectState';
+export {useSliderState} from '../src/slider/useSliderState';
+export {useMultipleSelectionState} from '../src/selection/useMultipleSelectionState';
+export {useTableState, UNSTABLE_useFilteredTableState} from '../src/table/useTableState';
+export {TableHeader} from '../src/table/TableHeader';
+export {TableBody} from '../src/table/TableBody';
+export {Column} from '../src/table/Column';
+export {Row} from '../src/table/Row';
+export {Cell} from '../src/table/Cell';
+export {useTableColumnResizeState} from '../src/table/useTableColumnResizeState';
+export {useTabListState} from '../src/tabs/useTabListState';
+export {useToastState, ToastQueue, useToastQueue} from '../src/toast/useToastState';
+export {useToggleState} from '../src/toggle/useToggleState';
+export {useToggleGroupState} from '../src/toggle/useToggleGroupState';
+export {useTooltipTriggerState} from '../src/tooltip/useTooltipTriggerState';
+export {useTreeState} from '../src/tree/useTreeState';
+export {FormValidationContext} from '../src/form/useFormValidationState';
diff --git a/packages/react-stately/exports/private/autocomplete/useAutocompleteState.ts b/packages/react-stately/exports/private/autocomplete/useAutocompleteState.ts
new file mode 100644
index 00000000000..35b71e15578
--- /dev/null
+++ b/packages/react-stately/exports/private/autocomplete/useAutocompleteState.ts
@@ -0,0 +1 @@
+export {type AutocompleteState, useAutocompleteState, type AutocompleteProps, type AutocompleteStateOptions} from '../../../src/autocomplete/useAutocompleteState';
diff --git a/packages/react-stately/exports/private/calendar/types.ts b/packages/react-stately/exports/private/calendar/types.ts
new file mode 100644
index 00000000000..5ec97a3b3d1
--- /dev/null
+++ b/packages/react-stately/exports/private/calendar/types.ts
@@ -0,0 +1 @@
+export {type CalendarState, type RangeCalendarState} from '../../../src/calendar/types';
diff --git a/packages/react-stately/exports/private/collections/CollectionBuilder.ts b/packages/react-stately/exports/private/collections/CollectionBuilder.ts
new file mode 100644
index 00000000000..57da074d68c
--- /dev/null
+++ b/packages/react-stately/exports/private/collections/CollectionBuilder.ts
@@ -0,0 +1 @@
+export {CollectionBuilder} from '../../../src/collections/CollectionBuilder';
diff --git a/packages/react-stately/exports/private/collections/Section.ts b/packages/react-stately/exports/private/collections/Section.ts
new file mode 100644
index 00000000000..51da6901d51
--- /dev/null
+++ b/packages/react-stately/exports/private/collections/Section.ts
@@ -0,0 +1 @@
+export {Section} from '../../../src/collections/Section';
diff --git a/packages/react-stately/exports/private/collections/getChildNodes.ts b/packages/react-stately/exports/private/collections/getChildNodes.ts
new file mode 100644
index 00000000000..641acb8b4ec
--- /dev/null
+++ b/packages/react-stately/exports/private/collections/getChildNodes.ts
@@ -0,0 +1 @@
+export {getChildNodes, getFirstItem, getLastItem, getNthItem, compareNodeOrder} from '../../../src/collections/getChildNodes';
diff --git a/packages/react-stately/exports/private/collections/getItemCount.ts b/packages/react-stately/exports/private/collections/getItemCount.ts
new file mode 100644
index 00000000000..586c119e788
--- /dev/null
+++ b/packages/react-stately/exports/private/collections/getItemCount.ts
@@ -0,0 +1 @@
+export {getItemCount} from '../../../src/collections/getItemCount';
diff --git a/packages/react-stately/exports/private/collections/types.ts b/packages/react-stately/exports/private/collections/types.ts
new file mode 100644
index 00000000000..62f14aca510
--- /dev/null
+++ b/packages/react-stately/exports/private/collections/types.ts
@@ -0,0 +1 @@
+export {type PartialNode} from '../../../src/collections/types';
diff --git a/packages/react-stately/exports/private/collections/useCollection.ts b/packages/react-stately/exports/private/collections/useCollection.ts
new file mode 100644
index 00000000000..448b4df167b
--- /dev/null
+++ b/packages/react-stately/exports/private/collections/useCollection.ts
@@ -0,0 +1 @@
+export {useCollection} from '../../../src/collections/useCollection';
diff --git a/packages/react-stately/exports/private/datepicker/utils.ts b/packages/react-stately/exports/private/datepicker/utils.ts
new file mode 100644
index 00000000000..ab8b6bc585a
--- /dev/null
+++ b/packages/react-stately/exports/private/datepicker/utils.ts
@@ -0,0 +1 @@
+export {type FormatterOptions} from '../../../src/datepicker/utils';
diff --git a/packages/react-stately/exports/private/flags/flags.ts b/packages/react-stately/exports/private/flags/flags.ts
new file mode 100644
index 00000000000..8d22ea60942
--- /dev/null
+++ b/packages/react-stately/exports/private/flags/flags.ts
@@ -0,0 +1 @@
+export {enableShadowDOM, shadowDOM, enableTableNestedRows, tableNestedRows} from '../../../src/flags/flags';
diff --git a/packages/react-stately/exports/private/form/useFormValidationState.ts b/packages/react-stately/exports/private/form/useFormValidationState.ts
new file mode 100644
index 00000000000..0ca91b375ca
--- /dev/null
+++ b/packages/react-stately/exports/private/form/useFormValidationState.ts
@@ -0,0 +1 @@
+export {FormValidationContext, useFormValidationState, privateValidationStateProp, type FormValidationState, DEFAULT_VALIDATION_RESULT, mergeValidation, VALID_VALIDITY_STATE} from '../../../src/form/useFormValidationState';
diff --git a/packages/react-stately/exports/private/grid/GridCollection.ts b/packages/react-stately/exports/private/grid/GridCollection.ts
new file mode 100644
index 00000000000..55fa032d25f
--- /dev/null
+++ b/packages/react-stately/exports/private/grid/GridCollection.ts
@@ -0,0 +1 @@
+export {GridCollection} from '../../../src/grid/GridCollection';
diff --git a/packages/react-stately/exports/private/grid/useGridState.ts b/packages/react-stately/exports/private/grid/useGridState.ts
new file mode 100644
index 00000000000..33f21e7d8a3
--- /dev/null
+++ b/packages/react-stately/exports/private/grid/useGridState.ts
@@ -0,0 +1 @@
+export {useGridState, type GridState, type GridStateOptions} from '../../../src/grid/useGridState';
diff --git a/packages/react-stately/exports/private/layout/GridLayout.ts b/packages/react-stately/exports/private/layout/GridLayout.ts
new file mode 100644
index 00000000000..e233f594296
--- /dev/null
+++ b/packages/react-stately/exports/private/layout/GridLayout.ts
@@ -0,0 +1 @@
+export {GridLayout, type GridLayoutOptions} from '../../../src/layout/GridLayout';
diff --git a/packages/react-stately/exports/private/layout/ListLayout.ts b/packages/react-stately/exports/private/layout/ListLayout.ts
new file mode 100644
index 00000000000..0140e88f01d
--- /dev/null
+++ b/packages/react-stately/exports/private/layout/ListLayout.ts
@@ -0,0 +1 @@
+export {ListLayout, type ListLayoutOptions, type LayoutNode} from '../../../src/layout/ListLayout';
diff --git a/packages/react-stately/exports/private/layout/TableLayout.ts b/packages/react-stately/exports/private/layout/TableLayout.ts
new file mode 100644
index 00000000000..de613caea76
--- /dev/null
+++ b/packages/react-stately/exports/private/layout/TableLayout.ts
@@ -0,0 +1 @@
+export {TableLayout, type TableLayoutProps} from '../../../src/layout/TableLayout';
diff --git a/packages/react-stately/exports/private/layout/WaterfallLayout.ts b/packages/react-stately/exports/private/layout/WaterfallLayout.ts
new file mode 100644
index 00000000000..9ef5e40eb79
--- /dev/null
+++ b/packages/react-stately/exports/private/layout/WaterfallLayout.ts
@@ -0,0 +1 @@
+export {WaterfallLayout, type WaterfallLayoutOptions} from '../../../src/layout/WaterfallLayout';
diff --git a/packages/react-stately/exports/private/list/ListCollection.ts b/packages/react-stately/exports/private/list/ListCollection.ts
new file mode 100644
index 00000000000..6b321ca899d
--- /dev/null
+++ b/packages/react-stately/exports/private/list/ListCollection.ts
@@ -0,0 +1 @@
+export {ListCollection} from '../../../src/list/ListCollection';
diff --git a/packages/react-stately/exports/private/selection/SelectionManager.ts b/packages/react-stately/exports/private/selection/SelectionManager.ts
new file mode 100644
index 00000000000..873419f9bf5
--- /dev/null
+++ b/packages/react-stately/exports/private/selection/SelectionManager.ts
@@ -0,0 +1 @@
+export {SelectionManager} from '../../../src/selection/SelectionManager';
diff --git a/packages/react-stately/exports/private/selection/types.ts b/packages/react-stately/exports/private/selection/types.ts
new file mode 100644
index 00000000000..dbe90def9c9
--- /dev/null
+++ b/packages/react-stately/exports/private/selection/types.ts
@@ -0,0 +1 @@
+export {type MultipleSelectionManager, type MultipleSelectionState, type FocusState, type SingleSelectionState} from '../../../src/selection/types';
diff --git a/packages/react-stately/exports/private/steplist/useStepListState.ts b/packages/react-stately/exports/private/steplist/useStepListState.ts
new file mode 100644
index 00000000000..49b205ffaff
--- /dev/null
+++ b/packages/react-stately/exports/private/steplist/useStepListState.ts
@@ -0,0 +1 @@
+export {type StepListProps, type StepListState, useStepListState} from '../../../src/steplist/useStepListState';
diff --git a/packages/react-stately/exports/private/table/TableCollection.ts b/packages/react-stately/exports/private/table/TableCollection.ts
new file mode 100644
index 00000000000..81990ba59cb
--- /dev/null
+++ b/packages/react-stately/exports/private/table/TableCollection.ts
@@ -0,0 +1 @@
+export {buildHeaderRows, TableCollection} from '../../../src/table/TableCollection';
diff --git a/packages/react-stately/exports/private/table/TableColumnLayout.ts b/packages/react-stately/exports/private/table/TableColumnLayout.ts
new file mode 100644
index 00000000000..1d2002f1605
--- /dev/null
+++ b/packages/react-stately/exports/private/table/TableColumnLayout.ts
@@ -0,0 +1 @@
+export {TableColumnLayout} from '../../../src/table/TableColumnLayout';
diff --git a/packages/react-stately/exports/private/table/useTableState.ts b/packages/react-stately/exports/private/table/useTableState.ts
new file mode 100644
index 00000000000..9a9c98ae2fb
--- /dev/null
+++ b/packages/react-stately/exports/private/table/useTableState.ts
@@ -0,0 +1 @@
+export {type CollectionBuilderContext} from '../../../src/table/useTableState';
diff --git a/packages/react-stately/exports/private/table/useTreeGridState.ts b/packages/react-stately/exports/private/table/useTreeGridState.ts
new file mode 100644
index 00000000000..5a16efeadac
--- /dev/null
+++ b/packages/react-stately/exports/private/table/useTreeGridState.ts
@@ -0,0 +1 @@
+export {type TreeGridState, UNSTABLE_useTreeGridState, type TreeGridStateProps} from '../../../src/table/useTreeGridState';
diff --git a/packages/react-stately/exports/private/tree/TreeCollection.ts b/packages/react-stately/exports/private/tree/TreeCollection.ts
new file mode 100644
index 00000000000..17824790ce1
--- /dev/null
+++ b/packages/react-stately/exports/private/tree/TreeCollection.ts
@@ -0,0 +1 @@
+export {TreeCollection} from '../../../src/tree/TreeCollection';
diff --git a/packages/react-stately/exports/private/utils/number.ts b/packages/react-stately/exports/private/utils/number.ts
new file mode 100644
index 00000000000..a3a163430e4
--- /dev/null
+++ b/packages/react-stately/exports/private/utils/number.ts
@@ -0,0 +1 @@
+export {clamp, snapValueToStep, toFixedNumber} from '../../../src/utils/number';
diff --git a/packages/react-stately/exports/private/utils/useControlledState.ts b/packages/react-stately/exports/private/utils/useControlledState.ts
new file mode 100644
index 00000000000..c0f73f75fe8
--- /dev/null
+++ b/packages/react-stately/exports/private/utils/useControlledState.ts
@@ -0,0 +1 @@
+export {useControlledState} from '../../../src/utils/useControlledState';
diff --git a/packages/react-stately/exports/private/virtualizer/Layout.ts b/packages/react-stately/exports/private/virtualizer/Layout.ts
new file mode 100644
index 00000000000..115a7e3e80d
--- /dev/null
+++ b/packages/react-stately/exports/private/virtualizer/Layout.ts
@@ -0,0 +1 @@
+export {Layout} from '../../../src/virtualizer/Layout';
diff --git a/packages/react-stately/exports/private/virtualizer/LayoutInfo.ts b/packages/react-stately/exports/private/virtualizer/LayoutInfo.ts
new file mode 100644
index 00000000000..d18d8b6841b
--- /dev/null
+++ b/packages/react-stately/exports/private/virtualizer/LayoutInfo.ts
@@ -0,0 +1 @@
+export {LayoutInfo} from '../../../src/virtualizer/LayoutInfo';
diff --git a/packages/react-stately/exports/private/virtualizer/Point.ts b/packages/react-stately/exports/private/virtualizer/Point.ts
new file mode 100644
index 00000000000..0e736e4ee52
--- /dev/null
+++ b/packages/react-stately/exports/private/virtualizer/Point.ts
@@ -0,0 +1 @@
+export {Point} from '../../../src/virtualizer/Point';
diff --git a/packages/react-stately/exports/private/virtualizer/Rect.ts b/packages/react-stately/exports/private/virtualizer/Rect.ts
new file mode 100644
index 00000000000..4296c3a71ad
--- /dev/null
+++ b/packages/react-stately/exports/private/virtualizer/Rect.ts
@@ -0,0 +1 @@
+export {Rect, type RectCorner} from '../../../src/virtualizer/Rect';
diff --git a/packages/react-stately/exports/private/virtualizer/ReusableView.ts b/packages/react-stately/exports/private/virtualizer/ReusableView.ts
new file mode 100644
index 00000000000..8f4c816d41a
--- /dev/null
+++ b/packages/react-stately/exports/private/virtualizer/ReusableView.ts
@@ -0,0 +1 @@
+export {ReusableView} from '../../../src/virtualizer/ReusableView';
diff --git a/packages/react-stately/exports/private/virtualizer/Size.ts b/packages/react-stately/exports/private/virtualizer/Size.ts
new file mode 100644
index 00000000000..b2e8f0cdbc0
--- /dev/null
+++ b/packages/react-stately/exports/private/virtualizer/Size.ts
@@ -0,0 +1 @@
+export {Size} from '../../../src/virtualizer/Size';
diff --git a/packages/react-stately/exports/private/virtualizer/types.ts b/packages/react-stately/exports/private/virtualizer/types.ts
new file mode 100644
index 00000000000..7de941cfb27
--- /dev/null
+++ b/packages/react-stately/exports/private/virtualizer/types.ts
@@ -0,0 +1 @@
+export {type InvalidationContext} from '../../../src/virtualizer/types';
diff --git a/packages/react-stately/exports/private/virtualizer/useVirtualizerState.ts b/packages/react-stately/exports/private/virtualizer/useVirtualizerState.ts
new file mode 100644
index 00000000000..9dccd08f5c0
--- /dev/null
+++ b/packages/react-stately/exports/private/virtualizer/useVirtualizerState.ts
@@ -0,0 +1 @@
+export {useVirtualizerState, type VirtualizerState} from '../../../src/virtualizer/useVirtualizerState';
diff --git a/packages/react-stately/exports/useAsyncList.ts b/packages/react-stately/exports/useAsyncList.ts
new file mode 100644
index 00000000000..44f2b577478
--- /dev/null
+++ b/packages/react-stately/exports/useAsyncList.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useAsyncList} from '../src/data/useAsyncList';
+export type {AsyncListOptions, AsyncListData} from '../src/data/useAsyncList';
diff --git a/packages/react-stately/exports/useCalendarState.ts b/packages/react-stately/exports/useCalendarState.ts
new file mode 100644
index 00000000000..98aa608f323
--- /dev/null
+++ b/packages/react-stately/exports/useCalendarState.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useCalendarState} from '../src/calendar/useCalendarState';
+
+export type {CalendarStateOptions} from '../src/calendar/useCalendarState';
diff --git a/packages/react-stately/exports/useCheckboxGroupState.ts b/packages/react-stately/exports/useCheckboxGroupState.ts
new file mode 100644
index 00000000000..28a60e9451b
--- /dev/null
+++ b/packages/react-stately/exports/useCheckboxGroupState.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useCheckboxGroupState} from '../src/checkbox/useCheckboxGroupState';
+
+export type {CheckboxGroupState} from '../src/checkbox/useCheckboxGroupState';
+
+export type {CheckboxGroupProps} from '@react-types/checkbox';
diff --git a/packages/react-stately/exports/useColorAreaState.ts b/packages/react-stately/exports/useColorAreaState.ts
new file mode 100644
index 00000000000..b054f514d60
--- /dev/null
+++ b/packages/react-stately/exports/useColorAreaState.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {ColorAreaState} from '../src/color/useColorAreaState';
+export {useColorAreaState} from '../src/color/useColorAreaState';
+
+export type {Color, ColorChannel, ColorFormat, ColorSpace, ColorAreaProps, ColorFieldProps, ColorWheelProps} from '@react-types/color';
diff --git a/packages/react-stately/exports/useColorFieldState.ts b/packages/react-stately/exports/useColorFieldState.ts
new file mode 100644
index 00000000000..8c883421c73
--- /dev/null
+++ b/packages/react-stately/exports/useColorFieldState.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {ColorFieldState} from '../src/color/useColorFieldState';
+export type {ColorChannelFieldProps, ColorChannelFieldState, ColorChannelFieldStateOptions} from '../src/color/useColorChannelFieldState';
+export {useColorFieldState} from '../src/color/useColorFieldState';
+export {useColorChannelFieldState} from '../src/color/useColorChannelFieldState';
+
+export type {Color, ColorChannel, ColorFormat, ColorSpace, ColorAreaProps, ColorFieldProps, ColorWheelProps} from '@react-types/color';
diff --git a/packages/react-stately/exports/useColorPickerState.ts b/packages/react-stately/exports/useColorPickerState.ts
new file mode 100644
index 00000000000..5e63a10b3ae
--- /dev/null
+++ b/packages/react-stately/exports/useColorPickerState.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {ColorPickerProps, ColorPickerState} from '../src/color/useColorPickerState';
+
+export {useColorPickerState} from '../src/color/useColorPickerState';
+
+export type {Color, ColorChannel, ColorFormat, ColorSpace, ColorAreaProps, ColorFieldProps, ColorWheelProps} from '@react-types/color';
diff --git a/packages/react-stately/exports/useColorSliderState.ts b/packages/react-stately/exports/useColorSliderState.ts
new file mode 100644
index 00000000000..b0c98e1ace1
--- /dev/null
+++ b/packages/react-stately/exports/useColorSliderState.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {ColorSliderState} from '../src/color/useColorSliderState';
+export {useColorSliderState} from '../src/color/useColorSliderState';
+export type {ColorSliderStateOptions} from '../src/color/useColorSliderState';
+
+export type {Color, ColorChannel, ColorFormat, ColorSpace, ColorAreaProps, ColorFieldProps, ColorWheelProps} from '@react-types/color';
diff --git a/packages/react-stately/exports/useColorWheelState.ts b/packages/react-stately/exports/useColorWheelState.ts
new file mode 100644
index 00000000000..361a1d8e318
--- /dev/null
+++ b/packages/react-stately/exports/useColorWheelState.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {ColorWheelState} from '../src/color/useColorWheelState';
+export {useColorWheelState} from '../src/color/useColorWheelState';
+
+export type {Color, ColorChannel, ColorFormat, ColorSpace, ColorAreaProps, ColorFieldProps, ColorWheelProps} from '@react-types/color';
diff --git a/packages/@react-aria/grid/index.ts b/packages/react-stately/exports/useComboBoxState.ts
similarity index 79%
rename from packages/@react-aria/grid/index.ts
rename to packages/react-stately/exports/useComboBoxState.ts
index bbd9b8c2c84..664b4a5f9f9 100644
--- a/packages/@react-aria/grid/index.ts
+++ b/packages/react-stately/exports/useComboBoxState.ts
@@ -10,4 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-export * from './src';
+export {useComboBoxState} from '../src/combobox/useComboBoxState';
+
+export type {ComboBoxStateOptions, ComboBoxState} from '../src/combobox/useComboBoxState';
diff --git a/packages/react-stately/exports/useDateFieldState.ts b/packages/react-stately/exports/useDateFieldState.ts
new file mode 100644
index 00000000000..5a43076b676
--- /dev/null
+++ b/packages/react-stately/exports/useDateFieldState.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useDateFieldState} from '../src/datepicker/useDateFieldState';
+
+export type {DateFieldStateOptions, DateFieldState, DateSegment, DateSegmentType, DateSegmentType as SegmentType} from '../src/datepicker/useDateFieldState';
diff --git a/packages/react-stately/exports/useDatePickerState.ts b/packages/react-stately/exports/useDatePickerState.ts
new file mode 100644
index 00000000000..f433320d366
--- /dev/null
+++ b/packages/react-stately/exports/useDatePickerState.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useDatePickerState} from '../src/datepicker/useDatePickerState';
+export type {DatePickerStateOptions, DatePickerState} from '../src/datepicker/useDatePickerState';
diff --git a/packages/react-stately/exports/useDateRangePickerState.ts b/packages/react-stately/exports/useDateRangePickerState.ts
new file mode 100644
index 00000000000..746eccbe382
--- /dev/null
+++ b/packages/react-stately/exports/useDateRangePickerState.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useDateRangePickerState} from '../src/datepicker/useDateRangePickerState';
+export type {DateRangePickerStateOptions, DateRangePickerState} from '../src/datepicker/useDateRangePickerState';
diff --git a/packages/@react-stately/autocomplete/index.ts b/packages/react-stately/exports/useDisclosureGroupState.ts
similarity index 76%
rename from packages/@react-stately/autocomplete/index.ts
rename to packages/react-stately/exports/useDisclosureGroupState.ts
index dc59658a5da..e78517d1d40 100644
--- a/packages/@react-stately/autocomplete/index.ts
+++ b/packages/react-stately/exports/useDisclosureGroupState.ts
@@ -10,4 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-export * from './src';
+export {useDisclosureGroupState} from '../src/disclosure/useDisclosureGroupState';
+
+export type {DisclosureGroupState, DisclosureGroupProps} from '../src/disclosure/useDisclosureGroupState';
diff --git a/packages/@react-aria/collections/index.ts b/packages/react-stately/exports/useDisclosureState.ts
similarity index 78%
rename from packages/@react-aria/collections/index.ts
rename to packages/react-stately/exports/useDisclosureState.ts
index dc59658a5da..5504dd38233 100644
--- a/packages/@react-aria/collections/index.ts
+++ b/packages/react-stately/exports/useDisclosureState.ts
@@ -10,4 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-export * from './src';
+export {useDisclosureState} from '../src/disclosure/useDisclosureState';
+
+export type {DisclosureState, DisclosureProps} from '../src/disclosure/useDisclosureState';
diff --git a/packages/react-stately/exports/useDraggableCollectionState.ts b/packages/react-stately/exports/useDraggableCollectionState.ts
new file mode 100644
index 00000000000..9a0ab688c98
--- /dev/null
+++ b/packages/react-stately/exports/useDraggableCollectionState.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {DraggableCollectionStateOptions, DraggableCollectionState} from '../src/dnd/useDraggableCollectionState';
+export {useDraggableCollectionState} from '../src/dnd/useDraggableCollectionState';
diff --git a/packages/react-stately/exports/useDroppableCollectionState.ts b/packages/react-stately/exports/useDroppableCollectionState.ts
new file mode 100644
index 00000000000..1ca80cb69ab
--- /dev/null
+++ b/packages/react-stately/exports/useDroppableCollectionState.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {DroppableCollectionStateOptions, DroppableCollectionState} from '../src/dnd/useDroppableCollectionState';
+export {useDroppableCollectionState} from '../src/dnd/useDroppableCollectionState';
diff --git a/packages/react-stately/exports/useListData.ts b/packages/react-stately/exports/useListData.ts
new file mode 100644
index 00000000000..6740bd74b56
--- /dev/null
+++ b/packages/react-stately/exports/useListData.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useListData} from '../src/data/useListData';
+
+export type {ListOptions, ListData} from '../src/data/useListData';
diff --git a/packages/react-stately/exports/useListState.ts b/packages/react-stately/exports/useListState.ts
new file mode 100644
index 00000000000..9c3dc0cc0f1
--- /dev/null
+++ b/packages/react-stately/exports/useListState.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {ListProps, ListState} from '../src/list/useListState';
+export {useListState, UNSTABLE_useFilteredListState} from '../src/list/useListState';
diff --git a/packages/react-stately/exports/useMenuTriggerState.ts b/packages/react-stately/exports/useMenuTriggerState.ts
new file mode 100644
index 00000000000..61b77ff7634
--- /dev/null
+++ b/packages/react-stately/exports/useMenuTriggerState.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useMenuTriggerState} from '../src/menu/useMenuTriggerState';
+export {useSubmenuTriggerState} from '../src/menu/useSubmenuTriggerState';
+
+export type {MenuTriggerState, RootMenuTriggerState} from '../src/menu/useMenuTriggerState';
+export type {SubmenuTriggerProps, SubmenuTriggerState} from '../src/menu/useSubmenuTriggerState';
+
+export type {MenuTriggerProps} from '@react-types/menu';
diff --git a/packages/react-stately/exports/useMultipleSelectionState.ts b/packages/react-stately/exports/useMultipleSelectionState.ts
new file mode 100644
index 00000000000..6ff58a002fb
--- /dev/null
+++ b/packages/react-stately/exports/useMultipleSelectionState.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {MultipleSelectionStateProps} from '../src/selection/useMultipleSelectionState';
+export {useMultipleSelectionState} from '../src/selection/useMultipleSelectionState';
diff --git a/packages/react-stately/exports/useNumberFieldState.ts b/packages/react-stately/exports/useNumberFieldState.ts
new file mode 100644
index 00000000000..91cce5d12ae
--- /dev/null
+++ b/packages/react-stately/exports/useNumberFieldState.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useNumberFieldState} from '../src/numberfield/useNumberFieldState';
+
+export type {NumberFieldStateOptions} from '../src/numberfield/useNumberFieldState';
+export type {NumberFieldState} from '../src/numberfield/useNumberFieldState';
diff --git a/packages/react-stately/exports/useOverlayTriggerState.ts b/packages/react-stately/exports/useOverlayTriggerState.ts
new file mode 100644
index 00000000000..01cf259a9fa
--- /dev/null
+++ b/packages/react-stately/exports/useOverlayTriggerState.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useOverlayTriggerState} from '../src/overlays/useOverlayTriggerState';
+
+export type {OverlayTriggerState} from '../src/overlays/useOverlayTriggerState';
+
+export type {OverlayTriggerProps} from '@react-types/overlays';
diff --git a/packages/react-stately/exports/useRadioGroupState.ts b/packages/react-stately/exports/useRadioGroupState.ts
new file mode 100644
index 00000000000..2de693af47e
--- /dev/null
+++ b/packages/react-stately/exports/useRadioGroupState.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useRadioGroupState} from '../src/radio/useRadioGroupState';
+
+export type {RadioGroupState} from '../src/radio/useRadioGroupState';
+
+export type {RadioGroupProps} from '@react-types/radio';
diff --git a/packages/react-stately/exports/useRangeCalendarState.ts b/packages/react-stately/exports/useRangeCalendarState.ts
new file mode 100644
index 00000000000..4c706ab8c2e
--- /dev/null
+++ b/packages/react-stately/exports/useRangeCalendarState.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useRangeCalendarState} from '../src/calendar/useRangeCalendarState';
+
+export type {RangeCalendarStateOptions} from '../src/calendar/useRangeCalendarState';
diff --git a/packages/react-stately/exports/useSearchFieldState.ts b/packages/react-stately/exports/useSearchFieldState.ts
new file mode 100644
index 00000000000..674df7a2d6e
--- /dev/null
+++ b/packages/react-stately/exports/useSearchFieldState.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useSearchFieldState} from '../src/searchfield/useSearchFieldState';
+
+export type {SearchFieldState} from '../src/searchfield/useSearchFieldState';
+
+export type {SearchFieldProps} from '@react-types/searchfield';
diff --git a/packages/react-stately/exports/useSelectState.ts b/packages/react-stately/exports/useSelectState.ts
new file mode 100644
index 00000000000..5df3bc4ad33
--- /dev/null
+++ b/packages/react-stately/exports/useSelectState.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useSelectState} from '../src/select/useSelectState';
+
+export type {SelectState, SelectStateOptions} from '../src/select/useSelectState';
+
+export type {SelectProps} from '@react-types/select';
diff --git a/packages/react-stately/exports/useSingleSelectListState.ts b/packages/react-stately/exports/useSingleSelectListState.ts
new file mode 100644
index 00000000000..9c919ebeb17
--- /dev/null
+++ b/packages/react-stately/exports/useSingleSelectListState.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {SingleSelectListProps, SingleSelectListState} from '../src/list/useSingleSelectListState';
+export {useSingleSelectListState} from '../src/list/useSingleSelectListState';
diff --git a/packages/react-stately/exports/useSliderState.ts b/packages/react-stately/exports/useSliderState.ts
new file mode 100644
index 00000000000..3f7ae2dc416
--- /dev/null
+++ b/packages/react-stately/exports/useSliderState.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useSliderState} from '../src/slider/useSliderState';
+
+export type {SliderStateOptions} from '../src/slider/useSliderState';
+export type {SliderState} from '../src/slider/useSliderState';
diff --git a/packages/react-stately/exports/useTabListState.ts b/packages/react-stately/exports/useTabListState.ts
new file mode 100644
index 00000000000..5275fd473aa
--- /dev/null
+++ b/packages/react-stately/exports/useTabListState.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useTabListState} from '../src/tabs/useTabListState';
+
+export type {TabListStateOptions, TabListState} from '../src/tabs/useTabListState';
+
+export type {TabListProps} from '@react-types/tabs';
diff --git a/packages/react-stately/exports/useTableState.ts b/packages/react-stately/exports/useTableState.ts
new file mode 100644
index 00000000000..f95f0ae586b
--- /dev/null
+++ b/packages/react-stately/exports/useTableState.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export type {TableColumnResizeState, TableColumnResizeStateProps} from '../src/table/useTableColumnResizeState';
+export type {TableState, TableStateProps} from '../src/table/useTableState';
+
+export {useTableColumnResizeState} from '../src/table/useTableColumnResizeState';
+export {useTableState, UNSTABLE_useFilteredTableState} from '../src/table/useTableState';
+export type {TableHeaderProps, TableBodyProps, ColumnProps, RowProps, CellProps} from '@react-types/table';
+export {Section} from '../src/collections/Section';
diff --git a/packages/react-stately/exports/useTimeFieldState.ts b/packages/react-stately/exports/useTimeFieldState.ts
new file mode 100644
index 00000000000..2c4bab285af
--- /dev/null
+++ b/packages/react-stately/exports/useTimeFieldState.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useTimeFieldState} from '../src/datepicker/useTimeFieldState';
+
+export type {TimeFieldStateOptions, TimeFieldState} from '../src/datepicker/useTimeFieldState';
diff --git a/packages/react-stately/exports/useToastState.ts b/packages/react-stately/exports/useToastState.ts
new file mode 100644
index 00000000000..39d5cfda490
--- /dev/null
+++ b/packages/react-stately/exports/useToastState.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export {useToastState, ToastQueue, useToastQueue} from '../src/toast/useToastState';
+
+export type {ToastState, QueuedToast, ToastStateProps, ToastOptions} from '../src/toast/useToastState';
diff --git a/packages/react-stately/exports/useToggleGroupState.ts b/packages/react-stately/exports/useToggleGroupState.ts
new file mode 100644
index 00000000000..aeba045e71b
--- /dev/null
+++ b/packages/react-stately/exports/useToggleGroupState.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useToggleGroupState} from '../src/toggle/useToggleGroupState';
+
+export type {ToggleGroupProps, ToggleGroupState} from '../src/toggle/useToggleGroupState';
+
+export type {ToggleProps} from '@react-types/checkbox';
diff --git a/packages/react-stately/exports/useToggleState.ts b/packages/react-stately/exports/useToggleState.ts
new file mode 100644
index 00000000000..877a39983d7
--- /dev/null
+++ b/packages/react-stately/exports/useToggleState.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useToggleState} from '../src/toggle/useToggleState';
+export type {ToggleState, ToggleStateOptions} from '../src/toggle/useToggleState';
+
+export type {ToggleProps} from '@react-types/checkbox';
diff --git a/packages/react-stately/exports/useTooltipTriggerState.ts b/packages/react-stately/exports/useTooltipTriggerState.ts
new file mode 100644
index 00000000000..3b7fbe2c69f
--- /dev/null
+++ b/packages/react-stately/exports/useTooltipTriggerState.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useTooltipTriggerState} from '../src/tooltip/useTooltipTriggerState';
+
+export type {TooltipTriggerState} from '../src/tooltip/useTooltipTriggerState';
+
+export type {TooltipTriggerProps} from '@react-types/tooltip';
diff --git a/packages/react-stately/exports/useTreeData.ts b/packages/react-stately/exports/useTreeData.ts
new file mode 100644
index 00000000000..b187b8c93ce
--- /dev/null
+++ b/packages/react-stately/exports/useTreeData.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+export {useTreeData} from '../src/data/useTreeData';
+export type {TreeOptions, TreeData} from '../src/data/useTreeData';
diff --git a/packages/react-stately/exports/useTreeState.ts b/packages/react-stately/exports/useTreeState.ts
new file mode 100644
index 00000000000..eb9493ee5d7
--- /dev/null
+++ b/packages/react-stately/exports/useTreeState.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+export type {TreeProps, TreeState} from '../src/tree/useTreeState';
+export {useTreeState} from '../src/tree/useTreeState';
diff --git a/packages/react-stately/index.ts b/packages/react-stately/index.ts
deleted file mode 100644
index 1210ae1e402..00000000000
--- a/packages/react-stately/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export * from './src';
diff --git a/packages/@react-stately/color/intl/ar-AE.json b/packages/react-stately/intl/color/ar-AE.json
similarity index 100%
rename from packages/@react-stately/color/intl/ar-AE.json
rename to packages/react-stately/intl/color/ar-AE.json
diff --git a/packages/@react-stately/color/intl/bg-BG.json b/packages/react-stately/intl/color/bg-BG.json
similarity index 100%
rename from packages/@react-stately/color/intl/bg-BG.json
rename to packages/react-stately/intl/color/bg-BG.json
diff --git a/packages/@react-stately/color/intl/cs-CZ.json b/packages/react-stately/intl/color/cs-CZ.json
similarity index 100%
rename from packages/@react-stately/color/intl/cs-CZ.json
rename to packages/react-stately/intl/color/cs-CZ.json
diff --git a/packages/@react-stately/color/intl/da-DK.json b/packages/react-stately/intl/color/da-DK.json
similarity index 100%
rename from packages/@react-stately/color/intl/da-DK.json
rename to packages/react-stately/intl/color/da-DK.json
diff --git a/packages/@react-stately/color/intl/de-DE.json b/packages/react-stately/intl/color/de-DE.json
similarity index 100%
rename from packages/@react-stately/color/intl/de-DE.json
rename to packages/react-stately/intl/color/de-DE.json
diff --git a/packages/@react-stately/color/intl/el-GR.json b/packages/react-stately/intl/color/el-GR.json
similarity index 100%
rename from packages/@react-stately/color/intl/el-GR.json
rename to packages/react-stately/intl/color/el-GR.json
diff --git a/packages/@react-stately/color/intl/en-US.json b/packages/react-stately/intl/color/en-US.json
similarity index 100%
rename from packages/@react-stately/color/intl/en-US.json
rename to packages/react-stately/intl/color/en-US.json
diff --git a/packages/@react-stately/color/intl/es-ES.json b/packages/react-stately/intl/color/es-ES.json
similarity index 100%
rename from packages/@react-stately/color/intl/es-ES.json
rename to packages/react-stately/intl/color/es-ES.json
diff --git a/packages/@react-stately/color/intl/et-EE.json b/packages/react-stately/intl/color/et-EE.json
similarity index 100%
rename from packages/@react-stately/color/intl/et-EE.json
rename to packages/react-stately/intl/color/et-EE.json
diff --git a/packages/@react-stately/color/intl/fi-FI.json b/packages/react-stately/intl/color/fi-FI.json
similarity index 100%
rename from packages/@react-stately/color/intl/fi-FI.json
rename to packages/react-stately/intl/color/fi-FI.json
diff --git a/packages/@react-stately/color/intl/fr-FR.json b/packages/react-stately/intl/color/fr-FR.json
similarity index 100%
rename from packages/@react-stately/color/intl/fr-FR.json
rename to packages/react-stately/intl/color/fr-FR.json
diff --git a/packages/@react-stately/color/intl/he-IL.json b/packages/react-stately/intl/color/he-IL.json
similarity index 100%
rename from packages/@react-stately/color/intl/he-IL.json
rename to packages/react-stately/intl/color/he-IL.json
diff --git a/packages/@react-stately/color/intl/hr-HR.json b/packages/react-stately/intl/color/hr-HR.json
similarity index 100%
rename from packages/@react-stately/color/intl/hr-HR.json
rename to packages/react-stately/intl/color/hr-HR.json
diff --git a/packages/@react-stately/color/intl/hu-HU.json b/packages/react-stately/intl/color/hu-HU.json
similarity index 100%
rename from packages/@react-stately/color/intl/hu-HU.json
rename to packages/react-stately/intl/color/hu-HU.json
diff --git a/packages/@react-stately/color/intl/it-IT.json b/packages/react-stately/intl/color/it-IT.json
similarity index 100%
rename from packages/@react-stately/color/intl/it-IT.json
rename to packages/react-stately/intl/color/it-IT.json
diff --git a/packages/@react-stately/color/intl/ja-JP.json b/packages/react-stately/intl/color/ja-JP.json
similarity index 100%
rename from packages/@react-stately/color/intl/ja-JP.json
rename to packages/react-stately/intl/color/ja-JP.json
diff --git a/packages/@react-stately/color/intl/ko-KR.json b/packages/react-stately/intl/color/ko-KR.json
similarity index 100%
rename from packages/@react-stately/color/intl/ko-KR.json
rename to packages/react-stately/intl/color/ko-KR.json
diff --git a/packages/@react-stately/color/intl/lt-LT.json b/packages/react-stately/intl/color/lt-LT.json
similarity index 100%
rename from packages/@react-stately/color/intl/lt-LT.json
rename to packages/react-stately/intl/color/lt-LT.json
diff --git a/packages/@react-stately/color/intl/lv-LV.json b/packages/react-stately/intl/color/lv-LV.json
similarity index 100%
rename from packages/@react-stately/color/intl/lv-LV.json
rename to packages/react-stately/intl/color/lv-LV.json
diff --git a/packages/@react-stately/color/intl/nb-NO.json b/packages/react-stately/intl/color/nb-NO.json
similarity index 100%
rename from packages/@react-stately/color/intl/nb-NO.json
rename to packages/react-stately/intl/color/nb-NO.json
diff --git a/packages/@react-stately/color/intl/nl-NL.json b/packages/react-stately/intl/color/nl-NL.json
similarity index 100%
rename from packages/@react-stately/color/intl/nl-NL.json
rename to packages/react-stately/intl/color/nl-NL.json
diff --git a/packages/@react-stately/color/intl/pl-PL.json b/packages/react-stately/intl/color/pl-PL.json
similarity index 100%
rename from packages/@react-stately/color/intl/pl-PL.json
rename to packages/react-stately/intl/color/pl-PL.json
diff --git a/packages/@react-stately/color/intl/pt-BR.json b/packages/react-stately/intl/color/pt-BR.json
similarity index 100%
rename from packages/@react-stately/color/intl/pt-BR.json
rename to packages/react-stately/intl/color/pt-BR.json
diff --git a/packages/@react-stately/color/intl/pt-PT.json b/packages/react-stately/intl/color/pt-PT.json
similarity index 100%
rename from packages/@react-stately/color/intl/pt-PT.json
rename to packages/react-stately/intl/color/pt-PT.json
diff --git a/packages/@react-stately/color/intl/ro-RO.json b/packages/react-stately/intl/color/ro-RO.json
similarity index 100%
rename from packages/@react-stately/color/intl/ro-RO.json
rename to packages/react-stately/intl/color/ro-RO.json
diff --git a/packages/@react-stately/color/intl/ru-RU.json b/packages/react-stately/intl/color/ru-RU.json
similarity index 100%
rename from packages/@react-stately/color/intl/ru-RU.json
rename to packages/react-stately/intl/color/ru-RU.json
diff --git a/packages/@react-stately/color/intl/sk-SK.json b/packages/react-stately/intl/color/sk-SK.json
similarity index 100%
rename from packages/@react-stately/color/intl/sk-SK.json
rename to packages/react-stately/intl/color/sk-SK.json
diff --git a/packages/@react-stately/color/intl/sl-SI.json b/packages/react-stately/intl/color/sl-SI.json
similarity index 100%
rename from packages/@react-stately/color/intl/sl-SI.json
rename to packages/react-stately/intl/color/sl-SI.json
diff --git a/packages/@react-stately/color/intl/sr-SP.json b/packages/react-stately/intl/color/sr-SP.json
similarity index 100%
rename from packages/@react-stately/color/intl/sr-SP.json
rename to packages/react-stately/intl/color/sr-SP.json
diff --git a/packages/@react-stately/color/intl/sv-SE.json b/packages/react-stately/intl/color/sv-SE.json
similarity index 100%
rename from packages/@react-stately/color/intl/sv-SE.json
rename to packages/react-stately/intl/color/sv-SE.json
diff --git a/packages/@react-stately/color/intl/tr-TR.json b/packages/react-stately/intl/color/tr-TR.json
similarity index 100%
rename from packages/@react-stately/color/intl/tr-TR.json
rename to packages/react-stately/intl/color/tr-TR.json
diff --git a/packages/@react-stately/color/intl/uk-UA.json b/packages/react-stately/intl/color/uk-UA.json
similarity index 100%
rename from packages/@react-stately/color/intl/uk-UA.json
rename to packages/react-stately/intl/color/uk-UA.json
diff --git a/packages/@react-stately/color/intl/zh-CN.json b/packages/react-stately/intl/color/zh-CN.json
similarity index 100%
rename from packages/@react-stately/color/intl/zh-CN.json
rename to packages/react-stately/intl/color/zh-CN.json
diff --git a/packages/@react-stately/color/intl/zh-TW.json b/packages/react-stately/intl/color/zh-TW.json
similarity index 100%
rename from packages/@react-stately/color/intl/zh-TW.json
rename to packages/react-stately/intl/color/zh-TW.json
diff --git a/packages/@react-stately/datepicker/intl/ar-AE.json b/packages/react-stately/intl/datepicker/ar-AE.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/ar-AE.json
rename to packages/react-stately/intl/datepicker/ar-AE.json
diff --git a/packages/@react-stately/datepicker/intl/bg-BG.json b/packages/react-stately/intl/datepicker/bg-BG.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/bg-BG.json
rename to packages/react-stately/intl/datepicker/bg-BG.json
diff --git a/packages/@react-stately/datepicker/intl/cs-CZ.json b/packages/react-stately/intl/datepicker/cs-CZ.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/cs-CZ.json
rename to packages/react-stately/intl/datepicker/cs-CZ.json
diff --git a/packages/@react-stately/datepicker/intl/da-DK.json b/packages/react-stately/intl/datepicker/da-DK.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/da-DK.json
rename to packages/react-stately/intl/datepicker/da-DK.json
diff --git a/packages/@react-stately/datepicker/intl/de-DE.json b/packages/react-stately/intl/datepicker/de-DE.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/de-DE.json
rename to packages/react-stately/intl/datepicker/de-DE.json
diff --git a/packages/@react-stately/datepicker/intl/el-GR.json b/packages/react-stately/intl/datepicker/el-GR.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/el-GR.json
rename to packages/react-stately/intl/datepicker/el-GR.json
diff --git a/packages/@react-stately/datepicker/intl/en-US.json b/packages/react-stately/intl/datepicker/en-US.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/en-US.json
rename to packages/react-stately/intl/datepicker/en-US.json
diff --git a/packages/@react-stately/datepicker/intl/es-ES.json b/packages/react-stately/intl/datepicker/es-ES.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/es-ES.json
rename to packages/react-stately/intl/datepicker/es-ES.json
diff --git a/packages/@react-stately/datepicker/intl/et-EE.json b/packages/react-stately/intl/datepicker/et-EE.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/et-EE.json
rename to packages/react-stately/intl/datepicker/et-EE.json
diff --git a/packages/@react-stately/datepicker/intl/fi-FI.json b/packages/react-stately/intl/datepicker/fi-FI.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/fi-FI.json
rename to packages/react-stately/intl/datepicker/fi-FI.json
diff --git a/packages/@react-stately/datepicker/intl/fr-FR.json b/packages/react-stately/intl/datepicker/fr-FR.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/fr-FR.json
rename to packages/react-stately/intl/datepicker/fr-FR.json
diff --git a/packages/@react-stately/datepicker/intl/he-IL.json b/packages/react-stately/intl/datepicker/he-IL.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/he-IL.json
rename to packages/react-stately/intl/datepicker/he-IL.json
diff --git a/packages/@react-stately/datepicker/intl/hr-HR.json b/packages/react-stately/intl/datepicker/hr-HR.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/hr-HR.json
rename to packages/react-stately/intl/datepicker/hr-HR.json
diff --git a/packages/@react-stately/datepicker/intl/hu-HU.json b/packages/react-stately/intl/datepicker/hu-HU.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/hu-HU.json
rename to packages/react-stately/intl/datepicker/hu-HU.json
diff --git a/packages/@react-stately/datepicker/intl/it-IT.json b/packages/react-stately/intl/datepicker/it-IT.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/it-IT.json
rename to packages/react-stately/intl/datepicker/it-IT.json
diff --git a/packages/@react-stately/datepicker/intl/ja-JP.json b/packages/react-stately/intl/datepicker/ja-JP.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/ja-JP.json
rename to packages/react-stately/intl/datepicker/ja-JP.json
diff --git a/packages/@react-stately/datepicker/intl/ko-KR.json b/packages/react-stately/intl/datepicker/ko-KR.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/ko-KR.json
rename to packages/react-stately/intl/datepicker/ko-KR.json
diff --git a/packages/@react-stately/datepicker/intl/lt-LT.json b/packages/react-stately/intl/datepicker/lt-LT.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/lt-LT.json
rename to packages/react-stately/intl/datepicker/lt-LT.json
diff --git a/packages/@react-stately/datepicker/intl/lv-LV.json b/packages/react-stately/intl/datepicker/lv-LV.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/lv-LV.json
rename to packages/react-stately/intl/datepicker/lv-LV.json
diff --git a/packages/@react-stately/datepicker/intl/nb-NO.json b/packages/react-stately/intl/datepicker/nb-NO.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/nb-NO.json
rename to packages/react-stately/intl/datepicker/nb-NO.json
diff --git a/packages/@react-stately/datepicker/intl/nl-NL.json b/packages/react-stately/intl/datepicker/nl-NL.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/nl-NL.json
rename to packages/react-stately/intl/datepicker/nl-NL.json
diff --git a/packages/@react-stately/datepicker/intl/pl-PL.json b/packages/react-stately/intl/datepicker/pl-PL.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/pl-PL.json
rename to packages/react-stately/intl/datepicker/pl-PL.json
diff --git a/packages/@react-stately/datepicker/intl/pt-BR.json b/packages/react-stately/intl/datepicker/pt-BR.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/pt-BR.json
rename to packages/react-stately/intl/datepicker/pt-BR.json
diff --git a/packages/@react-stately/datepicker/intl/pt-PT.json b/packages/react-stately/intl/datepicker/pt-PT.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/pt-PT.json
rename to packages/react-stately/intl/datepicker/pt-PT.json
diff --git a/packages/@react-stately/datepicker/intl/ro-RO.json b/packages/react-stately/intl/datepicker/ro-RO.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/ro-RO.json
rename to packages/react-stately/intl/datepicker/ro-RO.json
diff --git a/packages/@react-stately/datepicker/intl/ru-RU.json b/packages/react-stately/intl/datepicker/ru-RU.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/ru-RU.json
rename to packages/react-stately/intl/datepicker/ru-RU.json
diff --git a/packages/@react-stately/datepicker/intl/sk-SK.json b/packages/react-stately/intl/datepicker/sk-SK.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/sk-SK.json
rename to packages/react-stately/intl/datepicker/sk-SK.json
diff --git a/packages/@react-stately/datepicker/intl/sl-SI.json b/packages/react-stately/intl/datepicker/sl-SI.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/sl-SI.json
rename to packages/react-stately/intl/datepicker/sl-SI.json
diff --git a/packages/@react-stately/datepicker/intl/sr-SP.json b/packages/react-stately/intl/datepicker/sr-SP.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/sr-SP.json
rename to packages/react-stately/intl/datepicker/sr-SP.json
diff --git a/packages/@react-stately/datepicker/intl/sv-SE.json b/packages/react-stately/intl/datepicker/sv-SE.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/sv-SE.json
rename to packages/react-stately/intl/datepicker/sv-SE.json
diff --git a/packages/@react-stately/datepicker/intl/tr-TR.json b/packages/react-stately/intl/datepicker/tr-TR.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/tr-TR.json
rename to packages/react-stately/intl/datepicker/tr-TR.json
diff --git a/packages/@react-stately/datepicker/intl/uk-UA.json b/packages/react-stately/intl/datepicker/uk-UA.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/uk-UA.json
rename to packages/react-stately/intl/datepicker/uk-UA.json
diff --git a/packages/@react-stately/datepicker/intl/zh-CN.json b/packages/react-stately/intl/datepicker/zh-CN.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/zh-CN.json
rename to packages/react-stately/intl/datepicker/zh-CN.json
diff --git a/packages/@react-stately/datepicker/intl/zh-TW.json b/packages/react-stately/intl/datepicker/zh-TW.json
similarity index 100%
rename from packages/@react-stately/datepicker/intl/zh-TW.json
rename to packages/react-stately/intl/datepicker/zh-TW.json
diff --git a/packages/react-stately/package.json b/packages/react-stately/package.json
index c0c7d70fbba..5de046d9666 100644
--- a/packages/react-stately/package.json
+++ b/packages/react-stately/package.json
@@ -6,16 +6,22 @@
   "main": "dist/main.js",
   "module": "dist/module.js",
   "exports": {
-    "source": "./src/index.ts",
-    "types": [
-      "./dist/types.d.ts",
-      "./src/index.ts"
-    ],
-    "import": "./dist/import.mjs",
-    "require": "./dist/main.js"
+    ".": {
+      "source": "./exports/index.ts",
+      "types": "./dist/types/exports/index.d.ts",
+      "import": "./dist/exports/index.mjs",
+      "require": "./dist/exports/index.cjs"
+    },
+    "./package.json": "./package.json",
+    "./*": {
+      "source": "./exports/*.ts",
+      "types": "./dist/types/exports/*.d.ts",
+      "import": "./dist/exports/*.mjs",
+      "require": "./dist/exports/*.cjs"
+    }
   },
   "types": "dist/types.d.ts",
-  "source": "src/index.ts",
+  "source": "exports/index.ts",
   "files": [
     "dist"
   ],
@@ -28,32 +34,29 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/calendar": "^3.9.3",
-    "@react-stately/checkbox": "^3.7.5",
-    "@react-stately/collections": "^3.12.10",
-    "@react-stately/color": "^3.9.5",
-    "@react-stately/combobox": "^3.13.0",
-    "@react-stately/data": "^3.15.2",
-    "@react-stately/datepicker": "^3.16.1",
-    "@react-stately/disclosure": "^3.0.11",
-    "@react-stately/dnd": "^3.7.4",
-    "@react-stately/form": "^3.2.4",
-    "@react-stately/list": "^3.13.4",
-    "@react-stately/menu": "^3.9.11",
-    "@react-stately/numberfield": "^3.11.0",
-    "@react-stately/overlays": "^3.6.23",
-    "@react-stately/radio": "^3.11.5",
-    "@react-stately/searchfield": "^3.5.19",
-    "@react-stately/select": "^3.9.2",
-    "@react-stately/selection": "^3.20.9",
-    "@react-stately/slider": "^3.7.5",
-    "@react-stately/table": "^3.15.4",
-    "@react-stately/tabs": "^3.8.9",
-    "@react-stately/toast": "^3.1.3",
-    "@react-stately/toggle": "^3.9.5",
-    "@react-stately/tooltip": "^3.5.11",
-    "@react-stately/tree": "^3.9.6",
-    "@react-types/shared": "^3.33.1"
+    "@react-types/shared": "^3.33.1",
+    "react-stately": "3.45.0",
+    "@swc/helpers": "^0.5.0",
+    "@internationalized/date": "^3.12.0",
+    "@react-types/calendar": "^3.8.3",
+    "@react-types/checkbox": "^3.10.4",
+    "@internationalized/number": "^3.6.5",
+    "@internationalized/string": "^3.2.7",
+    "@react-types/color": "^3.1.4",
+    "@react-types/combobox": "^3.14.0",
+    "@react-types/datepicker": "^3.13.5",
+    "@react-types/grid": "^3.3.8",
+    "@react-types/table": "^3.13.6",
+    "@react-types/menu": "^3.10.7",
+    "@react-types/numberfield": "^3.8.18",
+    "@react-types/overlays": "^3.9.4",
+    "@react-types/radio": "^3.9.4",
+    "@react-types/searchfield": "^3.6.8",
+    "@react-types/select": "^3.12.2",
+    "@react-types/slider": "^3.8.4",
+    "@react-types/tabs": "^3.3.22",
+    "use-sync-external-store": "^1.6.0",
+    "@react-types/tooltip": "^3.5.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
@@ -64,5 +67,28 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "targets": {
+    "main": false,
+    "module": false,
+    "types": false,
+    "exports-module": {
+      "source": [
+        "exports/**/*.ts"
+      ],
+      "distDir": "dist",
+      "isLibrary": true,
+      "outputFormat": "esmodule",
+      "includeNodeModules": false
+    },
+    "exports-main": {
+      "source": [
+        "exports/**/*.ts"
+      ],
+      "distDir": "dist",
+      "isLibrary": true,
+      "outputFormat": "commonjs",
+      "includeNodeModules": false
+    }
   }
 }
diff --git a/packages/@react-stately/autocomplete/src/useAutocompleteState.ts b/packages/react-stately/src/autocomplete/useAutocompleteState.ts
similarity index 97%
rename from packages/@react-stately/autocomplete/src/useAutocompleteState.ts
rename to packages/react-stately/src/autocomplete/useAutocompleteState.ts
index e9b4ce28d53..7f6f67c4312 100644
--- a/packages/@react-stately/autocomplete/src/useAutocompleteState.ts
+++ b/packages/react-stately/src/autocomplete/useAutocompleteState.ts
@@ -11,7 +11,7 @@
  */
 
 import {ReactNode, useState} from 'react';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 
 export interface AutocompleteState {
   /** The current value of the autocomplete input. */
diff --git a/packages/@react-stately/calendar/src/types.ts b/packages/react-stately/src/calendar/types.ts
similarity index 100%
rename from packages/@react-stately/calendar/src/types.ts
rename to packages/react-stately/src/calendar/types.ts
diff --git a/packages/@react-stately/calendar/src/useCalendarState.ts b/packages/react-stately/src/calendar/useCalendarState.ts
similarity index 99%
rename from packages/@react-stately/calendar/src/useCalendarState.ts
rename to packages/react-stately/src/calendar/useCalendarState.ts
index 5286f894682..e73d53bb531 100644
--- a/packages/@react-stately/calendar/src/useCalendarState.ts
+++ b/packages/react-stately/src/calendar/useCalendarState.ts
@@ -31,7 +31,7 @@ import {
 } from '@internationalized/date';
 import {CalendarProps, DateValue, MappedDateValue} from '@react-types/calendar';
 import {CalendarState} from './types';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {useMemo, useState} from 'react';
 import {ValidationState} from '@react-types/shared';
 
diff --git a/packages/@react-stately/calendar/src/useRangeCalendarState.ts b/packages/react-stately/src/calendar/useRangeCalendarState.ts
similarity index 99%
rename from packages/@react-stately/calendar/src/useRangeCalendarState.ts
rename to packages/react-stately/src/calendar/useRangeCalendarState.ts
index 284500aa184..4d2a0056395 100644
--- a/packages/@react-stately/calendar/src/useRangeCalendarState.ts
+++ b/packages/react-stately/src/calendar/useRangeCalendarState.ts
@@ -16,7 +16,7 @@ import {CalendarState, RangeCalendarState} from './types';
 import {DateValue, MappedDateValue, RangeCalendarProps} from '@react-types/calendar';
 import {RangeValue, ValidationState} from '@react-types/shared';
 import {useCalendarState} from './useCalendarState';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {useMemo, useRef, useState} from 'react';
 
 export interface RangeCalendarStateOptions<T extends DateValue = DateValue> extends RangeCalendarProps<T> {
diff --git a/packages/@react-stately/calendar/src/utils.ts b/packages/react-stately/src/calendar/utils.ts
similarity index 100%
rename from packages/@react-stately/calendar/src/utils.ts
rename to packages/react-stately/src/calendar/utils.ts
diff --git a/packages/@react-stately/checkbox/src/useCheckboxGroupState.ts b/packages/react-stately/src/checkbox/useCheckboxGroupState.ts
similarity index 97%
rename from packages/@react-stately/checkbox/src/useCheckboxGroupState.ts
rename to packages/react-stately/src/checkbox/useCheckboxGroupState.ts
index 3a06fdd83b4..5a36b3801e9 100644
--- a/packages/@react-stately/checkbox/src/useCheckboxGroupState.ts
+++ b/packages/react-stately/src/checkbox/useCheckboxGroupState.ts
@@ -11,8 +11,8 @@
  */
 
 import {CheckboxGroupProps} from '@react-types/checkbox';
-import {FormValidationState, mergeValidation, useFormValidationState} from '@react-stately/form';
-import {useControlledState} from '@react-stately/utils';
+import {FormValidationState, mergeValidation, useFormValidationState} from '../form/useFormValidationState';
+import {useControlledState} from '../utils/useControlledState';
 import {useRef, useState} from 'react';
 import {ValidationResult, ValidationState} from '@react-types/shared';
 
diff --git a/packages/@react-stately/collections/src/CollectionBuilder.ts b/packages/react-stately/src/collections/CollectionBuilder.ts
similarity index 100%
rename from packages/@react-stately/collections/src/CollectionBuilder.ts
rename to packages/react-stately/src/collections/CollectionBuilder.ts
diff --git a/packages/@react-stately/collections/src/Item.ts b/packages/react-stately/src/collections/Item.ts
similarity index 100%
rename from packages/@react-stately/collections/src/Item.ts
rename to packages/react-stately/src/collections/Item.ts
diff --git a/packages/@react-stately/collections/src/Section.ts b/packages/react-stately/src/collections/Section.ts
similarity index 100%
rename from packages/@react-stately/collections/src/Section.ts
rename to packages/react-stately/src/collections/Section.ts
diff --git a/packages/@react-stately/collections/src/getChildNodes.ts b/packages/react-stately/src/collections/getChildNodes.ts
similarity index 100%
rename from packages/@react-stately/collections/src/getChildNodes.ts
rename to packages/react-stately/src/collections/getChildNodes.ts
diff --git a/packages/@react-stately/collections/src/getItemCount.ts b/packages/react-stately/src/collections/getItemCount.ts
similarity index 100%
rename from packages/@react-stately/collections/src/getItemCount.ts
rename to packages/react-stately/src/collections/getItemCount.ts
diff --git a/packages/@react-stately/collections/src/types.ts b/packages/react-stately/src/collections/types.ts
similarity index 100%
rename from packages/@react-stately/collections/src/types.ts
rename to packages/react-stately/src/collections/types.ts
diff --git a/packages/@react-stately/collections/src/useCollection.ts b/packages/react-stately/src/collections/useCollection.ts
similarity index 100%
rename from packages/@react-stately/collections/src/useCollection.ts
rename to packages/react-stately/src/collections/useCollection.ts
diff --git a/packages/@react-stately/color/src/Color.ts b/packages/react-stately/src/color/Color.ts
similarity index 99%
rename from packages/@react-stately/color/src/Color.ts
rename to packages/react-stately/src/color/Color.ts
index bda7629642e..ff9650fa65b 100644
--- a/packages/@react-stately/color/src/Color.ts
+++ b/packages/react-stately/src/color/Color.ts
@@ -10,10 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import {clamp, toFixedNumber} from '@react-stately/utils';
+import {clamp, toFixedNumber} from '../utils/number';
 import {ColorAxes, ColorChannel, ColorChannelRange, ColorFormat, ColorSpace, Color as IColor} from '@react-types/color';
 // @ts-ignore
-import intlMessages from '../intl/*.json';
+import intlMessages from '../../intl/color/*.json';
 import {LocalizedStringDictionary, LocalizedStringFormatter} from '@internationalized/string';
 import {NumberFormatter} from '@internationalized/number';
 
diff --git a/packages/@react-stately/color/src/useColor.ts b/packages/react-stately/src/color/useColor.ts
similarity index 100%
rename from packages/@react-stately/color/src/useColor.ts
rename to packages/react-stately/src/color/useColor.ts
diff --git a/packages/@react-stately/color/src/useColorAreaState.ts b/packages/react-stately/src/color/useColorAreaState.ts
similarity index 98%
rename from packages/@react-stately/color/src/useColorAreaState.ts
rename to packages/react-stately/src/color/useColorAreaState.ts
index 07884c3a379..23d890afd6a 100644
--- a/packages/@react-stately/color/src/useColorAreaState.ts
+++ b/packages/react-stately/src/color/useColorAreaState.ts
@@ -10,9 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {clamp, snapValueToStep, useControlledState} from '@react-stately/utils';
+import {clamp, snapValueToStep} from '../utils/number';
+
 import {Color, ColorAreaProps, ColorChannel} from '@react-types/color';
 import {normalizeColor, parseColor} from './Color';
+import {useControlledState} from '../utils/useControlledState';
 import {useMemo, useRef, useState} from 'react';
 
 export interface ColorAreaState {
diff --git a/packages/@react-stately/color/src/useColorChannelFieldState.ts b/packages/react-stately/src/color/useColorChannelFieldState.ts
similarity index 94%
rename from packages/@react-stately/color/src/useColorChannelFieldState.ts
rename to packages/react-stately/src/color/useColorChannelFieldState.ts
index 05d10d5dd59..dbc99664e6e 100644
--- a/packages/@react-stately/color/src/useColorChannelFieldState.ts
+++ b/packages/react-stately/src/color/useColorChannelFieldState.ts
@@ -1,7 +1,7 @@
 import {Color, ColorChannel, ColorFieldProps, ColorSpace} from '@react-types/color';
-import {NumberFieldState, useNumberFieldState} from '@react-stately/numberfield';
+import {NumberFieldState, useNumberFieldState} from '../numberfield/useNumberFieldState';
 import {useColor} from './useColor';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {useMemo, useState} from 'react';
 
 export interface ColorChannelFieldProps extends ColorFieldProps {
diff --git a/packages/@react-stately/color/src/useColorFieldState.ts b/packages/react-stately/src/color/useColorFieldState.ts
similarity index 97%
rename from packages/@react-stately/color/src/useColorFieldState.ts
rename to packages/react-stately/src/color/useColorFieldState.ts
index 94371a9bf1b..71cd655ef06 100644
--- a/packages/@react-stately/color/src/useColorFieldState.ts
+++ b/packages/react-stately/src/color/useColorFieldState.ts
@@ -11,10 +11,10 @@
  */
 
 import {Color, ColorFieldProps} from '@react-types/color';
-import {FormValidationState, useFormValidationState} from '@react-stately/form';
+import {FormValidationState, useFormValidationState} from '../form/useFormValidationState';
 import {parseColor} from './Color';
 import {useColor} from './useColor';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {useMemo, useState} from 'react';
 
 export interface ColorFieldState extends FormValidationState {
diff --git a/packages/@react-stately/color/src/useColorPickerState.ts b/packages/react-stately/src/color/useColorPickerState.ts
similarity index 93%
rename from packages/@react-stately/color/src/useColorPickerState.ts
rename to packages/react-stately/src/color/useColorPickerState.ts
index 6592a513c35..6943083d210 100644
--- a/packages/@react-stately/color/src/useColorPickerState.ts
+++ b/packages/react-stately/src/color/useColorPickerState.ts
@@ -1,7 +1,7 @@
 import {Color} from '@react-types/color';
 import {parseColor} from './Color';
 import {useColor} from './useColor';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {ValueBase} from '@react-types/shared';
 
 export interface ColorPickerProps extends ValueBase<string | Color, Color> {}
diff --git a/packages/@react-stately/color/src/useColorSliderState.ts b/packages/react-stately/src/color/useColorSliderState.ts
similarity index 96%
rename from packages/@react-stately/color/src/useColorSliderState.ts
rename to packages/react-stately/src/color/useColorSliderState.ts
index 5c9bbf8feb3..4476b675d81 100644
--- a/packages/@react-stately/color/src/useColorSliderState.ts
+++ b/packages/react-stately/src/color/useColorSliderState.ts
@@ -12,8 +12,8 @@
 
 import {Color, ColorSliderProps} from '@react-types/color';
 import {normalizeColor, parseColor} from './Color';
-import {SliderState, useSliderState} from '@react-stately/slider';
-import {useControlledState} from '@react-stately/utils';
+import {SliderState, useSliderState} from '../slider/useSliderState';
+import {useControlledState} from '../utils/useControlledState';
 import {useMemo, useState} from 'react';
 
 export interface ColorSliderState extends SliderState {
diff --git a/packages/@react-stately/color/src/useColorWheelState.ts b/packages/react-stately/src/color/useColorWheelState.ts
similarity index 99%
rename from packages/@react-stately/color/src/useColorWheelState.ts
rename to packages/react-stately/src/color/useColorWheelState.ts
index 9d9f34bc69e..c168c29779f 100644
--- a/packages/@react-stately/color/src/useColorWheelState.ts
+++ b/packages/react-stately/src/color/useColorWheelState.ts
@@ -12,7 +12,7 @@
 
 import {Color, ColorWheelProps} from '@react-types/color';
 import {normalizeColor, parseColor} from './Color';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {useMemo, useRef, useState} from 'react';
 
 export interface ColorWheelState {
diff --git a/packages/@react-stately/combobox/src/useComboBoxState.ts b/packages/react-stately/src/combobox/useComboBoxState.ts
similarity index 97%
rename from packages/@react-stately/combobox/src/useComboBoxState.ts
rename to packages/react-stately/src/combobox/useComboBoxState.ts
index d983edec580..094360e23db 100644
--- a/packages/@react-stately/combobox/src/useComboBoxState.ts
+++ b/packages/react-stately/src/combobox/useComboBoxState.ts
@@ -12,12 +12,13 @@
 
 import {Collection, CollectionStateBase, FocusStrategy, Key, Node, Selection} from '@react-types/shared';
 import {ComboBoxProps, MenuTriggerAction, SelectionMode, ValueType} from '@react-types/combobox';
-import {FormValidationState, useFormValidationState} from '@react-stately/form';
-import {getChildNodes} from '@react-stately/collections';
-import {ListCollection, ListState, useListState} from '@react-stately/list';
-import {OverlayTriggerState, useOverlayTriggerState} from '@react-stately/overlays';
+import {FormValidationState, useFormValidationState} from '../form/useFormValidationState';
+import {getChildNodes} from '../collections/getChildNodes';
+import {ListCollection} from '../list/ListCollection';
+import {ListState, useListState} from '../list/useListState';
+import {OverlayTriggerState, useOverlayTriggerState} from '../overlays/useOverlayTriggerState';
 import {useCallback, useEffect, useMemo, useRef, useState} from 'react';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 
 export interface ComboBoxState<T, M extends SelectionMode = 'single'> extends ListState<T>, OverlayTriggerState, FormValidationState {
   /**
@@ -183,9 +184,7 @@ export function useComboBoxState<T extends object, M extends SelectionMode = 'si
   let originalCollection = collection;
   let filteredCollection = useMemo(() => (
     // No default filter if items are controlled.
-    props.items != null || !defaultFilter
-      ? collection
-      : filterCollection(collection, inputValue, defaultFilter)
+    (props.items != null || !defaultFilter ? collection : filterCollection(collection, inputValue, defaultFilter))
   ), [collection, inputValue, defaultFilter, props.items]);
   let [lastCollection, setLastCollection] = useState(filteredCollection);
 
diff --git a/packages/@react-stately/data/src/useAsyncList.ts b/packages/react-stately/src/data/useAsyncList.ts
similarity index 99%
rename from packages/@react-stately/data/src/useAsyncList.ts
rename to packages/react-stately/src/data/useAsyncList.ts
index 24fd53dd602..c63ff8713b4 100644
--- a/packages/@react-stately/data/src/useAsyncList.ts
+++ b/packages/react-stately/src/data/useAsyncList.ts
@@ -158,7 +158,7 @@ function reducer<T, C>(data: AsyncListState<T, C>, action: Action<T, C>): AsyncL
             ...data,
             filterText: action.filterText ?? data.filterText,
             state: 'idle',
-            items: [...(action.items) ?? []],
+            items: [...((action.items) ?? [])],
             selectedKeys: selectedKeys === 'all' ? 'all' : new Set(selectedKeys),
             sortDescriptor: action.sortDescriptor ?? data.sortDescriptor,
             abortController: undefined,
diff --git a/packages/@react-stately/data/src/useListData.ts b/packages/react-stately/src/data/useListData.ts
similarity index 100%
rename from packages/@react-stately/data/src/useListData.ts
rename to packages/react-stately/src/data/useListData.ts
diff --git a/packages/@react-stately/data/src/useTreeData.ts b/packages/react-stately/src/data/useTreeData.ts
similarity index 100%
rename from packages/@react-stately/data/src/useTreeData.ts
rename to packages/react-stately/src/data/useTreeData.ts
diff --git a/packages/@react-stately/datepicker/src/IncompleteDate.ts b/packages/react-stately/src/datepicker/IncompleteDate.ts
similarity index 100%
rename from packages/@react-stately/datepicker/src/IncompleteDate.ts
rename to packages/react-stately/src/datepicker/IncompleteDate.ts
diff --git a/packages/@react-stately/datepicker/src/placeholders.ts b/packages/react-stately/src/datepicker/placeholders.ts
similarity index 100%
rename from packages/@react-stately/datepicker/src/placeholders.ts
rename to packages/react-stately/src/datepicker/placeholders.ts
diff --git a/packages/@react-stately/datepicker/src/useDateFieldState.ts b/packages/react-stately/src/datepicker/useDateFieldState.ts
similarity index 99%
rename from packages/@react-stately/datepicker/src/useDateFieldState.ts
rename to packages/react-stately/src/datepicker/useDateFieldState.ts
index b625ca952e0..5780160b008 100644
--- a/packages/@react-stately/datepicker/src/useDateFieldState.ts
+++ b/packages/react-stately/src/datepicker/useDateFieldState.ts
@@ -13,11 +13,11 @@
 import {Calendar, CalendarIdentifier, DateFormatter, GregorianCalendar, isEqualCalendar, toCalendar} from '@internationalized/date';
 import {convertValue, createPlaceholderDate, FieldOptions, FormatterOptions, getFormatOptions, getValidationResult, useDefaultProps} from './utils';
 import {DatePickerProps, DateValue, Granularity, MappedDateValue} from '@react-types/datepicker';
-import {FormValidationState, useFormValidationState} from '@react-stately/form';
+import {FormValidationState, useFormValidationState} from '../form/useFormValidationState';
 import {getPlaceholder} from './placeholders';
 import {IncompleteDate} from './IncompleteDate';
 import {NumberFormatter} from '@internationalized/number';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {useMemo, useState} from 'react';
 import {ValidationState} from '@react-types/shared';
 
diff --git a/packages/@react-stately/datepicker/src/useDatePickerState.ts b/packages/react-stately/src/datepicker/useDatePickerState.ts
similarity index 96%
rename from packages/@react-stately/datepicker/src/useDatePickerState.ts
rename to packages/react-stately/src/datepicker/useDatePickerState.ts
index ad1506bebf4..e30ac65975d 100644
--- a/packages/@react-stately/datepicker/src/useDatePickerState.ts
+++ b/packages/react-stately/src/datepicker/useDatePickerState.ts
@@ -13,9 +13,9 @@
 import {CalendarDate, DateFormatter, toCalendarDate, toCalendarDateTime} from '@internationalized/date';
 import {DatePickerProps, DateValue, Granularity, MappedDateValue, TimeValue} from '@react-types/datepicker';
 import {FieldOptions, FormatterOptions, getFormatOptions, getPlaceholderTime, getValidationResult, useDefaultProps} from './utils';
-import {FormValidationState, useFormValidationState} from '@react-stately/form';
-import {OverlayTriggerState, useOverlayTriggerState} from '@react-stately/overlays';
-import {useControlledState} from '@react-stately/utils';
+import {FormValidationState, useFormValidationState} from '../form/useFormValidationState';
+import {OverlayTriggerState, useOverlayTriggerState} from '../overlays/useOverlayTriggerState';
+import {useControlledState} from '../utils/useControlledState';
 import {useMemo, useState} from 'react';
 import {ValidationState} from '@react-types/shared';
 
diff --git a/packages/@react-stately/datepicker/src/useDateRangePickerState.ts b/packages/react-stately/src/datepicker/useDateRangePickerState.ts
similarity index 98%
rename from packages/@react-stately/datepicker/src/useDateRangePickerState.ts
rename to packages/react-stately/src/datepicker/useDateRangePickerState.ts
index 18b1231491d..a513dc52928 100644
--- a/packages/@react-stately/datepicker/src/useDateRangePickerState.ts
+++ b/packages/react-stately/src/datepicker/useDateRangePickerState.ts
@@ -14,10 +14,10 @@
 import {DateFormatter, toCalendarDate, toCalendarDateTime} from '@internationalized/date';
 import {DateRange, DateRangePickerProps, DateValue, Granularity, MappedDateValue, TimeValue} from '@react-types/datepicker';
 import {FieldOptions, FormatterOptions, getFormatOptions, getPlaceholderTime, getRangeValidationResult, useDefaultProps} from './utils';
-import {FormValidationState, useFormValidationState} from '@react-stately/form';
-import {OverlayTriggerState, useOverlayTriggerState} from '@react-stately/overlays';
+import {FormValidationState, useFormValidationState} from '../form/useFormValidationState';
+import {OverlayTriggerState, useOverlayTriggerState} from '../overlays/useOverlayTriggerState';
 import {RangeValue, ValidationState} from '@react-types/shared';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {useMemo, useState} from 'react';
 
 export interface DateRangePickerStateOptions<T extends DateValue = DateValue> extends DateRangePickerProps<T> {
diff --git a/packages/@react-stately/datepicker/src/useTimeFieldState.ts b/packages/react-stately/src/datepicker/useTimeFieldState.ts
similarity index 96%
rename from packages/@react-stately/datepicker/src/useTimeFieldState.ts
rename to packages/react-stately/src/datepicker/useTimeFieldState.ts
index f3c393a8202..4a13a9dc7b7 100644
--- a/packages/@react-stately/datepicker/src/useTimeFieldState.ts
+++ b/packages/react-stately/src/datepicker/useTimeFieldState.ts
@@ -10,11 +10,11 @@
  * governing permissions and limitations under the License.
  */
 
-import {DateFieldState, useDateFieldState} from '.';
+import {DateFieldState, useDateFieldState} from './useDateFieldState';
 import {DateValue, MappedTimeValue, TimePickerProps, TimeValue} from '@react-types/datepicker';
 import {getLocalTimeZone, GregorianCalendar, Time, toCalendarDateTime, today, toTime, toZoned} from '@internationalized/date';
 import {useCallback, useMemo} from 'react';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 
 export interface TimeFieldStateOptions<T extends TimeValue = TimeValue> extends TimePickerProps<T> {
   /** The locale to display and edit the value according to. */
diff --git a/packages/@react-stately/datepicker/src/utils.ts b/packages/react-stately/src/datepicker/utils.ts
similarity index 98%
rename from packages/@react-stately/datepicker/src/utils.ts
rename to packages/react-stately/src/datepicker/utils.ts
index fda08dcd123..75bfa7be458 100644
--- a/packages/@react-stately/datepicker/src/utils.ts
+++ b/packages/react-stately/src/datepicker/utils.ts
@@ -13,9 +13,9 @@
 import {Calendar, DateFormatter, getLocalTimeZone, now, Time, toCalendar, toCalendarDate, toCalendarDateTime} from '@internationalized/date';
 import {DatePickerProps, DateValue, Granularity, TimeValue} from '@react-types/datepicker';
 // @ts-ignore
-import i18nMessages from '../intl/*.json';
+import i18nMessages from '../../intl/datepicker/*.json';
 import {LocalizedStringDictionary, LocalizedStringFormatter} from '@internationalized/string';
-import {mergeValidation, VALID_VALIDITY_STATE} from '@react-stately/form';
+import {mergeValidation, VALID_VALIDITY_STATE} from '../form/useFormValidationState';
 import {RangeValue, ValidationResult} from '@react-types/shared';
 import {useState} from 'react';
 
diff --git a/packages/@react-stately/disclosure/src/useDisclosureGroupState.ts b/packages/react-stately/src/disclosure/useDisclosureGroupState.ts
similarity index 97%
rename from packages/@react-stately/disclosure/src/useDisclosureGroupState.ts
rename to packages/react-stately/src/disclosure/useDisclosureGroupState.ts
index ef880baa6e9..e49cafcce0f 100644
--- a/packages/@react-stately/disclosure/src/useDisclosureGroupState.ts
+++ b/packages/react-stately/src/disclosure/useDisclosureGroupState.ts
@@ -11,7 +11,7 @@
  */
 
 import {Key} from '@react-types/shared';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {useEffect, useMemo} from 'react';
 
 export interface DisclosureGroupProps {
diff --git a/packages/@react-stately/disclosure/src/useDisclosureState.ts b/packages/react-stately/src/disclosure/useDisclosureState.ts
similarity index 97%
rename from packages/@react-stately/disclosure/src/useDisclosureState.ts
rename to packages/react-stately/src/disclosure/useDisclosureState.ts
index c7b0d14b94c..93d70619c8a 100644
--- a/packages/@react-stately/disclosure/src/useDisclosureState.ts
+++ b/packages/react-stately/src/disclosure/useDisclosureState.ts
@@ -11,7 +11,7 @@
  */
 
 import {useCallback} from 'react';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 
 export interface DisclosureProps {
   /** Whether the disclosure is expanded (controlled). */
diff --git a/packages/@react-stately/dnd/src/useDraggableCollectionState.ts b/packages/react-stately/src/dnd/useDraggableCollectionState.ts
similarity index 98%
rename from packages/@react-stately/dnd/src/useDraggableCollectionState.ts
rename to packages/react-stately/src/dnd/useDraggableCollectionState.ts
index b3e733989f2..58f94d0286e 100644
--- a/packages/@react-stately/dnd/src/useDraggableCollectionState.ts
+++ b/packages/react-stately/src/dnd/useDraggableCollectionState.ts
@@ -11,7 +11,7 @@
  */
 
 import {Collection, DraggableCollectionEndEvent, DraggableCollectionProps, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DropOperation, Key, Node, RefObject} from '@react-types/shared';
-import {MultipleSelectionManager} from '@react-stately/selection';
+import {MultipleSelectionManager} from '../selection/types';
 import {useRef, useState} from 'react';
 
 export interface DraggableCollectionStateOptions<T = object> extends DraggableCollectionProps<T> {
diff --git a/packages/@react-stately/dnd/src/useDroppableCollectionState.ts b/packages/react-stately/src/dnd/useDroppableCollectionState.ts
similarity index 99%
rename from packages/@react-stately/dnd/src/useDroppableCollectionState.ts
rename to packages/react-stately/src/dnd/useDroppableCollectionState.ts
index e3c1c43e838..fd5f119c4be 100644
--- a/packages/@react-stately/dnd/src/useDroppableCollectionState.ts
+++ b/packages/react-stately/src/dnd/useDroppableCollectionState.ts
@@ -11,7 +11,7 @@
  */
 
 import {Collection, DragTypes, DropOperation, DroppableCollectionProps, DropTarget, ItemDropTarget, Key, Node} from '@react-types/shared';
-import {MultipleSelectionManager} from '@react-stately/selection';
+import {MultipleSelectionManager} from '../selection/types';
 import {useCallback, useRef, useState} from 'react';
 
 interface DropOperationEvent {
diff --git a/packages/@react-stately/flags/src/flags.ts b/packages/react-stately/src/flags/flags.ts
similarity index 100%
rename from packages/@react-stately/flags/src/flags.ts
rename to packages/react-stately/src/flags/flags.ts
diff --git a/packages/@react-stately/form/src/useFormValidationState.ts b/packages/react-stately/src/form/useFormValidationState.ts
similarity index 100%
rename from packages/@react-stately/form/src/useFormValidationState.ts
rename to packages/react-stately/src/form/useFormValidationState.ts
diff --git a/packages/@react-stately/grid/src/GridCollection.ts b/packages/react-stately/src/grid/GridCollection.ts
similarity index 100%
rename from packages/@react-stately/grid/src/GridCollection.ts
rename to packages/react-stately/src/grid/GridCollection.ts
diff --git a/packages/@react-stately/grid/src/useGridState.ts b/packages/react-stately/src/grid/useGridState.ts
similarity index 93%
rename from packages/@react-stately/grid/src/useGridState.ts
rename to packages/react-stately/src/grid/useGridState.ts
index 818c23391cb..bca3ec9b5e9 100644
--- a/packages/@react-stately/grid/src/useGridState.ts
+++ b/packages/react-stately/src/grid/useGridState.ts
@@ -1,7 +1,9 @@
-import {getChildNodes, getFirstItem, getLastItem} from '@react-stately/collections';
+import {getChildNodes, getFirstItem, getLastItem} from '../collections/getChildNodes';
 import {GridCollection, GridNode} from '@react-types/grid';
 import {Key} from '@react-types/shared';
-import {MultipleSelectionState, MultipleSelectionStateProps, SelectionManager, useMultipleSelectionState} from '@react-stately/selection';
+import {MultipleSelectionState} from '../selection/types';
+import {MultipleSelectionStateProps, useMultipleSelectionState} from '../selection/useMultipleSelectionState';
+import {SelectionManager} from '../selection/SelectionManager';
 import {useEffect, useMemo, useRef} from 'react';
 
 export interface GridState<T, C extends GridCollection<T>> {
diff --git a/packages/react-stately/src/index.ts b/packages/react-stately/src/index.ts
deleted file mode 100644
index 2226dc2d0cb..00000000000
--- a/packages/react-stately/src/index.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2020 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-export type {CalendarState, CalendarStateOptions, RangeCalendarState, RangeCalendarStateOptions} from '@react-stately/calendar';
-export type {CheckboxGroupProps, CheckboxGroupState} from '@react-stately/checkbox';
-export type {Color, ColorChannel, ColorFormat, ColorSpace, ColorAreaProps, ColorAreaState, ColorChannelFieldProps, ColorChannelFieldState, ColorChannelFieldStateOptions, ColorFieldProps, ColorFieldState, ColorPickerProps, ColorPickerState, ColorSliderState, ColorSliderStateOptions, ColorWheelProps, ColorWheelState} from '@react-stately/color';
-export type {ComboBoxState, ComboBoxStateOptions} from '@react-stately/combobox';
-export type {DateFieldState, DateFieldStateOptions, DatePickerState, DatePickerStateOptions, DateRangePickerState, DateRangePickerStateOptions, DateSegment, DateSegmentType, DateSegmentType as SegmentType, TimeFieldStateOptions, TimeFieldState} from '@react-stately/datepicker';
-export type {DisclosureState, DisclosureProps, DisclosureGroupState, DisclosureGroupProps} from '@react-stately/disclosure';
-export type {DraggableCollectionStateOptions, DraggableCollectionState, DroppableCollectionStateOptions, DroppableCollectionState} from '@react-stately/dnd';
-export type {AsyncListData, AsyncListOptions, ListData, ListOptions, TreeData, TreeOptions} from '@react-stately/data';
-export type {ListProps, ListState, SingleSelectListProps, SingleSelectListState} from '@react-stately/list';
-export type {MenuTriggerProps, MenuTriggerState, RootMenuTriggerState, SubmenuTriggerState, SubmenuTriggerProps} from '@react-stately/menu';
-export type {OverlayTriggerProps, OverlayTriggerState} from '@react-stately/overlays';
-export type {RadioGroupProps, RadioGroupState} from '@react-stately/radio';
-export type {SearchFieldProps, SearchFieldState} from '@react-stately/searchfield';
-export type {SelectProps, SelectState, SelectStateOptions} from '@react-stately/select';
-export type {SliderState, SliderStateOptions} from '@react-stately/slider';
-export type {MultipleSelectionManager, MultipleSelectionState, MultipleSelectionStateProps, SingleSelectionState} from '@react-stately/selection';
-export type {NumberFieldState, NumberFieldStateOptions} from '@react-stately/numberfield';
-export type {TableState, TableStateProps, TableHeaderProps, TableBodyProps, ColumnProps, RowProps, CellProps, TableColumnResizeState, TableColumnResizeStateProps} from '@react-stately/table';
-export type {TabListProps, TabListStateOptions, TabListState} from '@react-stately/tabs';
-export type {ToastState, QueuedToast, ToastStateProps, ToastOptions} from '@react-stately/toast';
-export type {ToggleProps, ToggleState, ToggleStateOptions, ToggleGroupProps, ToggleGroupState} from '@react-stately/toggle';
-export type {TooltipTriggerProps, TooltipTriggerState} from '@react-stately/tooltip';
-export type {TreeProps, TreeState} from '@react-stately/tree';
-export type {ItemProps, Key, SectionProps, Collection, Node, Orientation, DisabledBehavior, Selection, SelectionBehavior, SelectionMode, SortDescriptor, SortDirection, ValidationState} from '@react-types/shared';
-
-export {useCalendarState, useRangeCalendarState} from '@react-stately/calendar';
-export {useCheckboxGroupState} from '@react-stately/checkbox';
-export {getColorChannels, parseColor, useColorAreaState, useColorChannelFieldState, useColorFieldState, useColorPickerState, useColorSliderState, useColorWheelState} from '@react-stately/color';
-export {useComboBoxState} from '@react-stately/combobox';
-export {useDateFieldState, useDatePickerState, useDateRangePickerState, useTimeFieldState} from '@react-stately/datepicker';
-export {useDisclosureState, useDisclosureGroupState} from '@react-stately/disclosure';
-export {useDraggableCollectionState, useDroppableCollectionState} from '@react-stately/dnd';
-export {Item, Section, useCollection} from '@react-stately/collections';
-export {useAsyncList, useListData, useTreeData} from '@react-stately/data';
-export {useListState, useSingleSelectListState, UNSTABLE_useFilteredListState} from '@react-stately/list';
-export {useMenuTriggerState, useSubmenuTriggerState} from '@react-stately/menu';
-export {useNumberFieldState} from '@react-stately/numberfield';
-export {useOverlayTriggerState} from '@react-stately/overlays';
-export {useRadioGroupState} from '@react-stately/radio';
-export {useSearchFieldState} from '@react-stately/searchfield';
-export {useSelectState} from '@react-stately/select';
-export {useSliderState} from '@react-stately/slider';
-export {useMultipleSelectionState} from '@react-stately/selection';
-export {useTableState, TableHeader, TableBody, Column, Row, Cell, useTableColumnResizeState, UNSTABLE_useFilteredTableState} from '@react-stately/table';
-export {useTabListState} from '@react-stately/tabs';
-export {useToastState, ToastQueue, useToastQueue} from '@react-stately/toast';
-export {useToggleState, useToggleGroupState} from '@react-stately/toggle';
-export {useTooltipTriggerState} from '@react-stately/tooltip';
-export {useTreeState} from '@react-stately/tree';
-export {FormValidationContext} from '@react-stately/form';
diff --git a/packages/@react-stately/layout/src/GridLayout.ts b/packages/react-stately/src/layout/GridLayout.ts
similarity index 98%
rename from packages/@react-stately/layout/src/GridLayout.ts
rename to packages/react-stately/src/layout/GridLayout.ts
index 39c44f19074..6d06cf891b4 100644
--- a/packages/@react-stately/layout/src/GridLayout.ts
+++ b/packages/react-stately/src/layout/GridLayout.ts
@@ -11,7 +11,11 @@
  */
 
 import {DropTarget, DropTargetDelegate, ItemDropTarget, Key, Node} from '@react-types/shared';
-import {InvalidationContext, Layout, LayoutInfo, Rect, Size} from '@react-stately/virtualizer';
+import {InvalidationContext} from '../virtualizer/types';
+import {Layout} from '../virtualizer/Layout';
+import {LayoutInfo} from '../virtualizer/LayoutInfo';
+import {Rect} from '../virtualizer/Rect';
+import {Size} from '../virtualizer/Size';
 
 export interface GridLayoutOptions {
   /**
diff --git a/packages/@react-stately/layout/src/ListLayout.ts b/packages/react-stately/src/layout/ListLayout.ts
similarity index 98%
rename from packages/@react-stately/layout/src/ListLayout.ts
rename to packages/react-stately/src/layout/ListLayout.ts
index 7060ad08edc..5bd7c5d5813 100644
--- a/packages/@react-stately/layout/src/ListLayout.ts
+++ b/packages/react-stately/src/layout/ListLayout.ts
@@ -11,8 +11,12 @@
  */
 
 import {Collection, DropTarget, DropTargetDelegate, ItemDropTarget, Key, Node} from '@react-types/shared';
-import {getChildNodes} from '@react-stately/collections';
-import {InvalidationContext, Layout, LayoutInfo, Rect, Size} from '@react-stately/virtualizer';
+import {getChildNodes} from '../collections/getChildNodes';
+import {InvalidationContext} from '../virtualizer/types';
+import {Layout} from '../virtualizer/Layout';
+import {LayoutInfo} from '../virtualizer/LayoutInfo';
+import {Rect} from '../virtualizer/Rect';
+import {Size} from '../virtualizer/Size';
 
 export interface ListLayoutOptions {
   /**
diff --git a/packages/@react-stately/layout/src/TableLayout.ts b/packages/react-stately/src/layout/TableLayout.ts
similarity index 98%
rename from packages/@react-stately/layout/src/TableLayout.ts
rename to packages/react-stately/src/layout/TableLayout.ts
index 87d666fd6c5..b5da31800cc 100644
--- a/packages/@react-stately/layout/src/TableLayout.ts
+++ b/packages/react-stately/src/layout/TableLayout.ts
@@ -11,12 +11,16 @@
  */
 
 import {DropTarget, ItemDropTarget, Key} from '@react-types/shared';
-import {getChildNodes, getLastItem} from '@react-stately/collections';
+import {getChildNodes, getLastItem} from '../collections/getChildNodes';
 import {GridNode} from '@react-types/grid';
-import {InvalidationContext, LayoutInfo, Point, Rect, Size} from '@react-stately/virtualizer';
+import {InvalidationContext} from '../virtualizer/types';
+import {LayoutInfo} from '../virtualizer/LayoutInfo';
 import {LayoutNode, ListLayout, ListLayoutOptions} from './ListLayout';
+import {Point} from '../virtualizer/Point';
+import {Rect} from '../virtualizer/Rect';
+import {Size} from '../virtualizer/Size';
 import {TableCollection} from '@react-types/table';
-import {TableColumnLayout} from '@react-stately/table';
+import {TableColumnLayout} from '../table/TableColumnLayout';
 
 export interface TableLayoutProps extends ListLayoutOptions {
   columnWidths?: Map<Key, number>
diff --git a/packages/@react-stately/layout/src/WaterfallLayout.ts b/packages/react-stately/src/layout/WaterfallLayout.ts
similarity index 97%
rename from packages/@react-stately/layout/src/WaterfallLayout.ts
rename to packages/react-stately/src/layout/WaterfallLayout.ts
index 51f01806849..d1f98b56e7a 100644
--- a/packages/@react-stately/layout/src/WaterfallLayout.ts
+++ b/packages/react-stately/src/layout/WaterfallLayout.ts
@@ -11,7 +11,12 @@
  */
 
 import {DropTarget, DropTargetDelegate, Key, LayoutDelegate, Node} from '@react-types/shared';
-import {InvalidationContext, Layout, LayoutInfo, Point, Rect, Size} from '@react-stately/virtualizer';
+import {InvalidationContext} from '../virtualizer/types';
+import {Layout} from '../virtualizer/Layout';
+import {LayoutInfo} from '../virtualizer/LayoutInfo';
+import {Point} from '../virtualizer/Point';
+import {Rect} from '../virtualizer/Rect';
+import {Size} from '../virtualizer/Size';
 
 export interface WaterfallLayoutOptions {
   /**
diff --git a/packages/@react-stately/list/src/ListCollection.ts b/packages/react-stately/src/list/ListCollection.ts
similarity index 100%
rename from packages/@react-stately/list/src/ListCollection.ts
rename to packages/react-stately/src/list/ListCollection.ts
diff --git a/packages/@react-stately/list/src/useListState.ts b/packages/react-stately/src/list/useListState.ts
similarity index 95%
rename from packages/@react-stately/list/src/useListState.ts
rename to packages/react-stately/src/list/useListState.ts
index c373633426e..27d236db6b8 100644
--- a/packages/@react-stately/list/src/useListState.ts
+++ b/packages/react-stately/src/list/useListState.ts
@@ -12,9 +12,10 @@
 
 import {Collection, CollectionStateBase, Key, LayoutDelegate, Node} from '@react-types/shared';
 import {ListCollection} from './ListCollection';
-import {MultipleSelectionStateProps, SelectionManager, useMultipleSelectionState} from '@react-stately/selection';
+import {MultipleSelectionStateProps, useMultipleSelectionState} from '../selection/useMultipleSelectionState';
+import {SelectionManager} from '../selection/SelectionManager';
 import {useCallback, useEffect, useMemo, useRef} from 'react';
-import {useCollection} from '@react-stately/collections';
+import {useCollection} from '../collections/useCollection';
 
 export interface ListProps<T> extends CollectionStateBase<T>, MultipleSelectionStateProps {
   /** Filter function to generate a filtered list of nodes. */
diff --git a/packages/@react-stately/list/src/useSingleSelectListState.ts b/packages/react-stately/src/list/useSingleSelectListState.ts
similarity index 97%
rename from packages/@react-stately/list/src/useSingleSelectListState.ts
rename to packages/react-stately/src/list/useSingleSelectListState.ts
index b99a98af8ad..349e35621c5 100644
--- a/packages/@react-stately/list/src/useSingleSelectListState.ts
+++ b/packages/react-stately/src/list/useSingleSelectListState.ts
@@ -12,7 +12,7 @@
 
 import {CollectionStateBase, Key, Node, Selection, SingleSelection} from '@react-types/shared';
 import {ListState, useListState} from './useListState';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {useMemo} from 'react';
 
 export interface SingleSelectListProps<T> extends CollectionStateBase<T>, Omit<SingleSelection, 'disallowEmptySelection'> {
diff --git a/packages/@react-stately/menu/src/useMenuTriggerState.ts b/packages/react-stately/src/menu/useMenuTriggerState.ts
similarity index 97%
rename from packages/@react-stately/menu/src/useMenuTriggerState.ts
rename to packages/react-stately/src/menu/useMenuTriggerState.ts
index 0901c052323..52730226af8 100644
--- a/packages/@react-stately/menu/src/useMenuTriggerState.ts
+++ b/packages/react-stately/src/menu/useMenuTriggerState.ts
@@ -12,7 +12,7 @@
 
 import {FocusStrategy, Key} from '@react-types/shared';
 import {MenuTriggerProps} from '@react-types/menu';
-import {OverlayTriggerState, useOverlayTriggerState} from '@react-stately/overlays';
+import {OverlayTriggerState, useOverlayTriggerState} from '../overlays/useOverlayTriggerState';
 import {useState} from 'react';
 
 export interface MenuTriggerState extends OverlayTriggerState {
diff --git a/packages/@react-stately/menu/src/useSubmenuTriggerState.ts b/packages/react-stately/src/menu/useSubmenuTriggerState.ts
similarity index 97%
rename from packages/@react-stately/menu/src/useSubmenuTriggerState.ts
rename to packages/react-stately/src/menu/useSubmenuTriggerState.ts
index 991a526a10d..ee873a0ba69 100644
--- a/packages/@react-stately/menu/src/useSubmenuTriggerState.ts
+++ b/packages/react-stately/src/menu/useSubmenuTriggerState.ts
@@ -11,7 +11,7 @@
  */
 
 import {FocusStrategy, Key} from '@react-types/shared';
-import type {OverlayTriggerState} from '@react-stately/overlays';
+import type {OverlayTriggerState} from '../overlays/useOverlayTriggerState';
 import {RootMenuTriggerState} from './useMenuTriggerState';
 import {useCallback, useMemo, useState} from 'react';
 
diff --git a/packages/@react-stately/numberfield/src/useNumberFieldState.ts b/packages/react-stately/src/numberfield/useNumberFieldState.ts
similarity index 98%
rename from packages/@react-stately/numberfield/src/useNumberFieldState.ts
rename to packages/react-stately/src/numberfield/useNumberFieldState.ts
index 5bc374a4313..08ff87fa2d1 100644
--- a/packages/@react-stately/numberfield/src/useNumberFieldState.ts
+++ b/packages/react-stately/src/numberfield/useNumberFieldState.ts
@@ -10,11 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import {clamp, snapValueToStep, useControlledState} from '@react-stately/utils';
-import {FormValidationState, useFormValidationState} from '@react-stately/form';
+import {clamp, snapValueToStep} from '../utils/number';
+
+import {FormValidationState, useFormValidationState} from '../form/useFormValidationState';
 import {NumberFieldProps} from '@react-types/numberfield';
 import {NumberFormatter, NumberParser} from '@internationalized/number';
 import {useCallback, useMemo, useState} from 'react';
+import {useControlledState} from '../utils/useControlledState';
 
 export interface NumberFieldState extends FormValidationState {
   /**
diff --git a/packages/@react-stately/overlays/src/useOverlayTriggerState.ts b/packages/react-stately/src/overlays/useOverlayTriggerState.ts
similarity index 96%
rename from packages/@react-stately/overlays/src/useOverlayTriggerState.ts
rename to packages/react-stately/src/overlays/useOverlayTriggerState.ts
index 8e698afeea2..7f949464b8b 100644
--- a/packages/@react-stately/overlays/src/useOverlayTriggerState.ts
+++ b/packages/react-stately/src/overlays/useOverlayTriggerState.ts
@@ -12,7 +12,7 @@
 
 import {OverlayTriggerProps} from '@react-types/overlays';
 import {useCallback} from 'react';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 
 export interface OverlayTriggerState {
   /** Whether the overlay is currently open. */
diff --git a/packages/@react-stately/radio/src/useRadioGroupState.ts b/packages/react-stately/src/radio/useRadioGroupState.ts
similarity index 95%
rename from packages/@react-stately/radio/src/useRadioGroupState.ts
rename to packages/react-stately/src/radio/useRadioGroupState.ts
index 003e9f5e5d9..4b55513f4d0 100644
--- a/packages/@react-stately/radio/src/useRadioGroupState.ts
+++ b/packages/react-stately/src/radio/useRadioGroupState.ts
@@ -10,9 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {FormValidationState, useFormValidationState} from '@react-stately/form';
+import {FormValidationState, useFormValidationState} from '../form/useFormValidationState';
 import {RadioGroupProps} from '@react-types/radio';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {useMemo, useState} from 'react';
 import {ValidationState} from '@react-types/shared';
 
diff --git a/packages/@react-stately/searchfield/src/useSearchFieldState.ts b/packages/react-stately/src/searchfield/useSearchFieldState.ts
similarity index 95%
rename from packages/@react-stately/searchfield/src/useSearchFieldState.ts
rename to packages/react-stately/src/searchfield/useSearchFieldState.ts
index 3a338cf6ef0..1ab9d9c7394 100644
--- a/packages/@react-stately/searchfield/src/useSearchFieldState.ts
+++ b/packages/react-stately/src/searchfield/useSearchFieldState.ts
@@ -11,7 +11,7 @@
  */
 
 import {SearchFieldProps} from '@react-types/searchfield';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 
 export interface SearchFieldState {
   /** The current value of the search field. */
diff --git a/packages/@react-stately/select/src/useSelectState.ts b/packages/react-stately/src/select/useSelectState.ts
similarity index 95%
rename from packages/@react-stately/select/src/useSelectState.ts
rename to packages/react-stately/src/select/useSelectState.ts
index 2bcf82787a9..ce88c5b0ea5 100644
--- a/packages/@react-stately/select/src/useSelectState.ts
+++ b/packages/react-stately/src/select/useSelectState.ts
@@ -11,11 +11,11 @@
  */
 
 import {CollectionStateBase, FocusStrategy, Key, Node, Selection} from '@react-types/shared';
-import {FormValidationState, useFormValidationState} from '@react-stately/form';
-import {ListState, useListState} from '@react-stately/list';
-import {OverlayTriggerState, useOverlayTriggerState} from '@react-stately/overlays';
+import {FormValidationState, useFormValidationState} from '../form/useFormValidationState';
+import {ListState, useListState} from '../list/useListState';
+import {OverlayTriggerState, useOverlayTriggerState} from '../overlays/useOverlayTriggerState';
 import {SelectionMode, SelectProps, ValueType} from '@react-types/select';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {useMemo, useState} from 'react';
 
 export interface SelectStateOptions<T, M extends SelectionMode = 'single'> extends Omit<SelectProps<T, M>, 'children'>, CollectionStateBase<T> {}
diff --git a/packages/@react-stately/selection/src/Selection.ts b/packages/react-stately/src/selection/Selection.ts
similarity index 100%
rename from packages/@react-stately/selection/src/Selection.ts
rename to packages/react-stately/src/selection/Selection.ts
diff --git a/packages/@react-stately/selection/src/SelectionManager.ts b/packages/react-stately/src/selection/SelectionManager.ts
similarity index 99%
rename from packages/@react-stately/selection/src/SelectionManager.ts
rename to packages/react-stately/src/selection/SelectionManager.ts
index 0a0d9f8bd75..83f99e9dded 100644
--- a/packages/@react-stately/selection/src/SelectionManager.ts
+++ b/packages/react-stately/src/selection/SelectionManager.ts
@@ -22,7 +22,7 @@ import {
   SelectionBehavior,
   SelectionMode
 } from '@react-types/shared';
-import {compareNodeOrder, getChildNodes, getFirstItem} from '@react-stately/collections';
+import {compareNodeOrder, getChildNodes, getFirstItem} from '../collections/getChildNodes';
 import {MultipleSelectionManager, MultipleSelectionState} from './types';
 import {Selection} from './Selection';
 
diff --git a/packages/@react-stately/selection/src/types.ts b/packages/react-stately/src/selection/types.ts
similarity index 100%
rename from packages/@react-stately/selection/src/types.ts
rename to packages/react-stately/src/selection/types.ts
diff --git a/packages/@react-stately/selection/src/useMultipleSelectionState.ts b/packages/react-stately/src/selection/useMultipleSelectionState.ts
similarity index 98%
rename from packages/@react-stately/selection/src/useMultipleSelectionState.ts
rename to packages/react-stately/src/selection/useMultipleSelectionState.ts
index e58d0823850..b4f3b299dfa 100644
--- a/packages/@react-stately/selection/src/useMultipleSelectionState.ts
+++ b/packages/react-stately/src/selection/useMultipleSelectionState.ts
@@ -13,7 +13,7 @@
 import {DisabledBehavior, FocusStrategy, Key, MultipleSelection, SelectionBehavior, SelectionMode} from '@react-types/shared';
 import {MultipleSelectionState} from './types';
 import {Selection} from './Selection';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {useEffect, useMemo, useRef, useState} from 'react';
 
 function equalSets(setA, setB) {
diff --git a/packages/@react-stately/slider/src/useSliderState.ts b/packages/react-stately/src/slider/useSliderState.ts
similarity index 98%
rename from packages/@react-stately/slider/src/useSliderState.ts
rename to packages/react-stately/src/slider/useSliderState.ts
index 0f7350fc9a5..1bc4010f314 100644
--- a/packages/@react-stately/slider/src/useSliderState.ts
+++ b/packages/react-stately/src/slider/useSliderState.ts
@@ -10,10 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {clamp, snapValueToStep, useControlledState} from '@react-stately/utils';
+import {clamp, snapValueToStep} from '../utils/number';
+
 import {Orientation} from '@react-types/shared';
 import {SliderProps} from '@react-types/slider';
 import {useCallback, useMemo, useRef, useState} from 'react';
+import {useControlledState} from '../utils/useControlledState';
 
 export interface SliderState {
   /**
diff --git a/packages/@react-stately/steplist/src/useStepListState.ts b/packages/react-stately/src/steplist/useStepListState.ts
similarity index 97%
rename from packages/@react-stately/steplist/src/useStepListState.ts
rename to packages/react-stately/src/steplist/useStepListState.ts
index f2957971b44..e805afd13f3 100644
--- a/packages/@react-stately/steplist/src/useStepListState.ts
+++ b/packages/react-stately/src/steplist/useStepListState.ts
@@ -11,9 +11,9 @@
  */
 
 import {Collection, CollectionBase, Key, Node, SingleSelection} from '@react-types/shared';
-import {SingleSelectListState, useSingleSelectListState} from '@react-stately/list';
+import {SingleSelectListState, useSingleSelectListState} from '../list/useSingleSelectListState';
 import {useCallback, useEffect, useMemo} from 'react';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 
 export interface StepListProps<T> extends CollectionBase<T>, Omit<SingleSelection, 'onSelectionChange'> {
   /** The key of the last completed step (controlled). */
diff --git a/packages/@react-stately/table/src/Cell.ts b/packages/react-stately/src/table/Cell.ts
similarity index 96%
rename from packages/@react-stately/table/src/Cell.ts
rename to packages/react-stately/src/table/Cell.ts
index 58a45082d32..78385994b56 100644
--- a/packages/@react-stately/table/src/Cell.ts
+++ b/packages/react-stately/src/table/Cell.ts
@@ -12,7 +12,7 @@
 
 import {CellProps} from '@react-types/table';
 import {JSX, ReactElement} from 'react';
-import {PartialNode} from '@react-stately/collections';
+import {PartialNode} from '../collections/types';
 
 function Cell(props: CellProps): ReactElement | null { // eslint-disable-line @typescript-eslint/no-unused-vars
   return null;
diff --git a/packages/@react-stately/table/src/Column.ts b/packages/react-stately/src/table/Column.ts
similarity index 98%
rename from packages/@react-stately/table/src/Column.ts
rename to packages/react-stately/src/table/Column.ts
index 6fd872cab19..888d40e6474 100644
--- a/packages/@react-stately/table/src/Column.ts
+++ b/packages/react-stately/src/table/Column.ts
@@ -13,7 +13,7 @@
 import {CollectionBuilderContext} from './useTableState';
 import {ColumnProps} from '@react-types/table';
 import {GridNode} from '@react-types/grid';
-import {PartialNode} from '@react-stately/collections';
+import {PartialNode} from '../collections/types';
 import React, {JSX, ReactElement} from 'react';
 
 function Column<T>(props: ColumnProps<T>): ReactElement | null { // eslint-disable-line @typescript-eslint/no-unused-vars
diff --git a/packages/@react-stately/table/src/Row.ts b/packages/react-stately/src/table/Row.ts
similarity index 98%
rename from packages/@react-stately/table/src/Row.ts
rename to packages/react-stately/src/table/Row.ts
index 9cc5595538f..38ae5000cba 100644
--- a/packages/@react-stately/table/src/Row.ts
+++ b/packages/react-stately/src/table/Row.ts
@@ -11,7 +11,7 @@
  */
 
 import {CollectionBuilderContext} from './useTableState';
-import {PartialNode} from '@react-stately/collections';
+import {PartialNode} from '../collections/types';
 import React, {JSX, ReactElement} from 'react';
 import {RowProps} from '@react-types/table';
 
diff --git a/packages/@react-stately/table/src/TableBody.ts b/packages/react-stately/src/table/TableBody.ts
similarity index 97%
rename from packages/@react-stately/table/src/TableBody.ts
rename to packages/react-stately/src/table/TableBody.ts
index 6355c3326f6..087210704e2 100644
--- a/packages/@react-stately/table/src/TableBody.ts
+++ b/packages/react-stately/src/table/TableBody.ts
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {PartialNode} from '@react-stately/collections';
+import {PartialNode} from '../collections/types';
 import React, {JSX, ReactElement} from 'react';
 import {TableBodyProps} from '@react-types/table';
 
diff --git a/packages/@react-stately/table/src/TableCollection.ts b/packages/react-stately/src/table/TableCollection.ts
similarity index 98%
rename from packages/@react-stately/table/src/TableCollection.ts
rename to packages/react-stately/src/table/TableCollection.ts
index 2ca36d4f13a..1d2d2d9a9df 100644
--- a/packages/@react-stately/table/src/TableCollection.ts
+++ b/packages/react-stately/src/table/TableCollection.ts
@@ -10,8 +10,8 @@
  * governing permissions and limitations under the License.
  */
 
-import {getFirstItem, getLastItem} from '@react-stately/collections';
-import {GridCollection} from '@react-stately/grid';
+import {getFirstItem, getLastItem} from '../collections/getChildNodes';
+import {GridCollection} from '../grid/GridCollection';
 import {GridNode} from '@react-types/grid';
 import {TableCollection as ITableCollection} from '@react-types/table';
 import {Key} from '@react-types/shared';
diff --git a/packages/@react-stately/table/src/TableColumnLayout.ts b/packages/react-stately/src/table/TableColumnLayout.ts
similarity index 100%
rename from packages/@react-stately/table/src/TableColumnLayout.ts
rename to packages/react-stately/src/table/TableColumnLayout.ts
diff --git a/packages/@react-stately/table/src/TableHeader.ts b/packages/react-stately/src/table/TableHeader.ts
similarity index 97%
rename from packages/@react-stately/table/src/TableHeader.ts
rename to packages/react-stately/src/table/TableHeader.ts
index 70af4722f06..630203bba42 100644
--- a/packages/@react-stately/table/src/TableHeader.ts
+++ b/packages/react-stately/src/table/TableHeader.ts
@@ -11,7 +11,7 @@
  */
 
 import {CollectionBuilderContext} from './useTableState';
-import {PartialNode} from '@react-stately/collections';
+import {PartialNode} from '../collections/types';
 import React, {JSX, ReactElement} from 'react';
 import {TableHeaderProps} from '@react-types/table';
 
diff --git a/packages/@react-stately/table/src/TableUtils.ts b/packages/react-stately/src/table/TableUtils.ts
similarity index 100%
rename from packages/@react-stately/table/src/TableUtils.ts
rename to packages/react-stately/src/table/TableUtils.ts
diff --git a/packages/@react-stately/table/src/useTableColumnResizeState.ts b/packages/react-stately/src/table/useTableColumnResizeState.ts
similarity index 100%
rename from packages/@react-stately/table/src/useTableColumnResizeState.ts
rename to packages/react-stately/src/table/useTableColumnResizeState.ts
diff --git a/packages/@react-stately/table/src/useTableState.ts b/packages/react-stately/src/table/useTableState.ts
similarity index 94%
rename from packages/@react-stately/table/src/useTableState.ts
rename to packages/react-stately/src/table/useTableState.ts
index 603403e5e74..1b8f76f4478 100644
--- a/packages/@react-stately/table/src/useTableState.ts
+++ b/packages/react-stately/src/table/useTableState.ts
@@ -11,13 +11,14 @@
  */
 
 import {Expandable, Key, Node, SelectionMode, Sortable, SortDescriptor, SortDirection} from '@react-types/shared';
-import {GridState, useGridState} from '@react-stately/grid';
+import {GridState, useGridState} from '../grid/useGridState';
 import {TableCollection as ITableCollection, TableBodyProps, TableHeaderProps} from '@react-types/table';
-import {MultipleSelectionState, MultipleSelectionStateProps} from '@react-stately/selection';
+import {MultipleSelectionState} from '../selection/types';
+import {MultipleSelectionStateProps} from '../selection/useMultipleSelectionState';
 import {ReactElement, useCallback, useMemo, useState} from 'react';
 import {TableCollection} from './TableCollection';
-import {useCollection} from '@react-stately/collections';
-import {useControlledState} from '@react-stately/utils';
+import {useCollection} from '../collections/useCollection';
+import {useControlledState} from '../utils/useControlledState';
 
 export interface TableState<T> extends GridState<T, ITableCollection<T>> {
   /** A collection of rows and columns in the table. */
diff --git a/packages/@react-stately/table/src/useTreeGridState.ts b/packages/react-stately/src/table/useTreeGridState.ts
similarity index 97%
rename from packages/@react-stately/table/src/useTreeGridState.ts
rename to packages/react-stately/src/table/useTreeGridState.ts
index 7858492d37b..c9c930c8364 100644
--- a/packages/@react-stately/table/src/useTreeGridState.ts
+++ b/packages/react-stately/src/table/useTreeGridState.ts
@@ -10,14 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import {CollectionBuilder} from '@react-stately/collections';
+import {CollectionBuilder} from '../collections/CollectionBuilder';
 import {GridNode} from '@react-types/grid';
 import {Key} from '@react-types/shared';
 import {ReactElement, useMemo} from 'react';
 import {TableCollection} from './TableCollection';
-import {tableNestedRows} from '@react-stately/flags';
+import {tableNestedRows} from '../flags/flags';
 import {TableState, TableStateProps, useTableState} from './useTableState';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 
 export interface TreeGridState<T> extends Omit<TableState<T>, 'expandedKeys'> {
   /** A set of keys for items that are expanded. */
diff --git a/packages/@react-stately/tabs/src/useTabListState.ts b/packages/react-stately/src/tabs/useTabListState.ts
similarity index 97%
rename from packages/@react-stately/tabs/src/useTabListState.ts
rename to packages/react-stately/src/tabs/useTabListState.ts
index 116e39b059f..6da87fca37d 100644
--- a/packages/@react-stately/tabs/src/useTabListState.ts
+++ b/packages/react-stately/src/tabs/useTabListState.ts
@@ -11,7 +11,7 @@
  */
 
 import {Collection, CollectionStateBase, Key, Node} from '@react-types/shared';
-import {SingleSelectListState, useSingleSelectListState} from '@react-stately/list';
+import {SingleSelectListState, useSingleSelectListState} from '../list/useSingleSelectListState';
 import {TabListProps} from '@react-types/tabs';
 import {useEffect, useRef} from 'react';
 
diff --git a/packages/@react-stately/toast/src/useToastState.ts b/packages/react-stately/src/toast/useToastState.ts
similarity index 100%
rename from packages/@react-stately/toast/src/useToastState.ts
rename to packages/react-stately/src/toast/useToastState.ts
diff --git a/packages/@react-stately/toggle/src/useToggleGroupState.ts b/packages/react-stately/src/toggle/useToggleGroupState.ts
similarity index 98%
rename from packages/@react-stately/toggle/src/useToggleGroupState.ts
rename to packages/react-stately/src/toggle/useToggleGroupState.ts
index 00225db3d0a..0b455169857 100644
--- a/packages/@react-stately/toggle/src/useToggleGroupState.ts
+++ b/packages/react-stately/src/toggle/useToggleGroupState.ts
@@ -11,7 +11,7 @@
  */
 
 import {Key} from '@react-types/shared';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {useMemo} from 'react';
 
 export interface ToggleGroupProps {
diff --git a/packages/@react-stately/toggle/src/useToggleState.ts b/packages/react-stately/src/toggle/useToggleState.ts
similarity index 96%
rename from packages/@react-stately/toggle/src/useToggleState.ts
rename to packages/react-stately/src/toggle/useToggleState.ts
index 3e606ec3951..e16ac7e3fb8 100644
--- a/packages/@react-stately/toggle/src/useToggleState.ts
+++ b/packages/react-stately/src/toggle/useToggleState.ts
@@ -11,7 +11,7 @@
  */
 
 import {ToggleStateOptions} from '@react-types/checkbox';
-import {useControlledState} from '@react-stately/utils';
+import {useControlledState} from '../utils/useControlledState';
 import {useState} from 'react';
 
 export type {ToggleStateOptions};
diff --git a/packages/@react-stately/tooltip/src/useTooltipTriggerState.ts b/packages/react-stately/src/tooltip/useTooltipTriggerState.ts
similarity index 98%
rename from packages/@react-stately/tooltip/src/useTooltipTriggerState.ts
rename to packages/react-stately/src/tooltip/useTooltipTriggerState.ts
index 1d2af169d31..dd3e8d5d433 100644
--- a/packages/@react-stately/tooltip/src/useTooltipTriggerState.ts
+++ b/packages/react-stately/src/tooltip/useTooltipTriggerState.ts
@@ -12,7 +12,7 @@
 
 import {TooltipTriggerProps} from '@react-types/tooltip';
 import {useEffect, useMemo, useRef} from 'react';
-import {useOverlayTriggerState} from '@react-stately/overlays';
+import {useOverlayTriggerState} from '../overlays/useOverlayTriggerState';
 
 const TOOLTIP_DELAY = 1500; // this seems to be a 1.5 second delay, check with design
 const TOOLTIP_COOLDOWN = 500;
diff --git a/packages/@react-stately/tree/src/TreeCollection.ts b/packages/react-stately/src/tree/TreeCollection.ts
similarity index 100%
rename from packages/@react-stately/tree/src/TreeCollection.ts
rename to packages/react-stately/src/tree/TreeCollection.ts
diff --git a/packages/@react-stately/tree/src/useTreeState.ts b/packages/react-stately/src/tree/useTreeState.ts
similarity index 92%
rename from packages/@react-stately/tree/src/useTreeState.ts
rename to packages/react-stately/src/tree/useTreeState.ts
index c454a13a9fe..e956cd4859b 100644
--- a/packages/@react-stately/tree/src/useTreeState.ts
+++ b/packages/react-stately/src/tree/useTreeState.ts
@@ -11,11 +11,12 @@
  */
 
 import {Collection, CollectionStateBase, DisabledBehavior, Expandable, Key, MultipleSelection, Node} from '@react-types/shared';
-import {SelectionManager, useMultipleSelectionState} from '@react-stately/selection';
+import {SelectionManager} from '../selection/SelectionManager';
 import {TreeCollection} from './TreeCollection';
 import {useCallback, useEffect, useMemo} from 'react';
-import {useCollection} from '@react-stately/collections';
-import {useControlledState} from '@react-stately/utils';
+import {useCollection} from '../collections/useCollection';
+import {useControlledState} from '../utils/useControlledState';
+import {useMultipleSelectionState} from '../selection/useMultipleSelectionState';
 
 export interface TreeProps<T> extends CollectionStateBase<T>, Expandable, MultipleSelection {
   /** Whether `disabledKeys` applies to all interactions, or only selection. */
diff --git a/packages/@react-stately/utils/src/number.ts b/packages/react-stately/src/utils/number.ts
similarity index 100%
rename from packages/@react-stately/utils/src/number.ts
rename to packages/react-stately/src/utils/number.ts
diff --git a/packages/@react-stately/utils/src/useControlledState.ts b/packages/react-stately/src/utils/useControlledState.ts
similarity index 100%
rename from packages/@react-stately/utils/src/useControlledState.ts
rename to packages/react-stately/src/utils/useControlledState.ts
diff --git a/packages/@react-stately/virtualizer/src/Layout.ts b/packages/react-stately/src/virtualizer/Layout.ts
similarity index 100%
rename from packages/@react-stately/virtualizer/src/Layout.ts
rename to packages/react-stately/src/virtualizer/Layout.ts
diff --git a/packages/@react-stately/virtualizer/src/LayoutInfo.ts b/packages/react-stately/src/virtualizer/LayoutInfo.ts
similarity index 100%
rename from packages/@react-stately/virtualizer/src/LayoutInfo.ts
rename to packages/react-stately/src/virtualizer/LayoutInfo.ts
diff --git a/packages/@react-stately/virtualizer/src/OverscanManager.ts b/packages/react-stately/src/virtualizer/OverscanManager.ts
similarity index 100%
rename from packages/@react-stately/virtualizer/src/OverscanManager.ts
rename to packages/react-stately/src/virtualizer/OverscanManager.ts
diff --git a/packages/@react-stately/virtualizer/src/Point.ts b/packages/react-stately/src/virtualizer/Point.ts
similarity index 100%
rename from packages/@react-stately/virtualizer/src/Point.ts
rename to packages/react-stately/src/virtualizer/Point.ts
diff --git a/packages/@react-stately/virtualizer/src/Rect.ts b/packages/react-stately/src/virtualizer/Rect.ts
similarity index 100%
rename from packages/@react-stately/virtualizer/src/Rect.ts
rename to packages/react-stately/src/virtualizer/Rect.ts
diff --git a/packages/@react-stately/virtualizer/src/ReusableView.ts b/packages/react-stately/src/virtualizer/ReusableView.ts
similarity index 100%
rename from packages/@react-stately/virtualizer/src/ReusableView.ts
rename to packages/react-stately/src/virtualizer/ReusableView.ts
diff --git a/packages/@react-stately/virtualizer/src/Size.ts b/packages/react-stately/src/virtualizer/Size.ts
similarity index 100%
rename from packages/@react-stately/virtualizer/src/Size.ts
rename to packages/react-stately/src/virtualizer/Size.ts
diff --git a/packages/@react-stately/virtualizer/src/Virtualizer.ts b/packages/react-stately/src/virtualizer/Virtualizer.ts
similarity index 100%
rename from packages/@react-stately/virtualizer/src/Virtualizer.ts
rename to packages/react-stately/src/virtualizer/Virtualizer.ts
diff --git a/packages/@react-stately/virtualizer/src/types.ts b/packages/react-stately/src/virtualizer/types.ts
similarity index 100%
rename from packages/@react-stately/virtualizer/src/types.ts
rename to packages/react-stately/src/virtualizer/types.ts
diff --git a/packages/@react-stately/virtualizer/src/useVirtualizerState.ts b/packages/react-stately/src/virtualizer/useVirtualizerState.ts
similarity index 100%
rename from packages/@react-stately/virtualizer/src/useVirtualizerState.ts
rename to packages/react-stately/src/virtualizer/useVirtualizerState.ts
diff --git a/packages/@react-stately/virtualizer/src/utils.ts b/packages/react-stately/src/virtualizer/utils.ts
similarity index 100%
rename from packages/@react-stately/virtualizer/src/utils.ts
rename to packages/react-stately/src/virtualizer/utils.ts
diff --git a/packages/@react-stately/tree/stories/useTreeState.stories.tsx b/packages/react-stately/stories/tree/useTreeState.stories.tsx
similarity index 92%
rename from packages/@react-stately/tree/stories/useTreeState.stories.tsx
rename to packages/react-stately/stories/tree/useTreeState.stories.tsx
index a5ae9712f3f..f3518784fc3 100644
--- a/packages/@react-stately/tree/stories/useTreeState.stories.tsx
+++ b/packages/react-stately/stories/tree/useTreeState.stories.tsx
@@ -11,13 +11,14 @@
  */
 
 import {Collection, Key, Node} from '@react-types/shared';
-import {Item} from '@react-stately/collections';
+import {Item} from '../../src/collections/Item';
 import {Meta, StoryFn} from '@storybook/react';
 import React, {JSX, useMemo, useRef} from 'react';
-import {TreeCollection} from '../src/TreeCollection';
-import {usePress} from '@react-aria/interactions';
-import {useSelectableCollection, useSelectableItem} from '@react-aria/selection';
-import {useTreeState} from '../';
+import {TreeCollection} from '../../src/tree/TreeCollection';
+import {usePress} from 'react-aria/usePress';
+import {useSelectableCollection} from 'react-aria/private/selection/useSelectableCollection';
+import {useSelectableItem} from 'react-aria/private/selection/useSelectableItem';
+import {useTreeState} from '../../src/tree/useTreeState';
 
 export default {
   title: 'useTreeState'
diff --git a/packages/@react-stately/checkbox/test/useCheckboxGroupState.test.tsx b/packages/react-stately/test/checkbox/useCheckboxGroupState.test.tsx
similarity index 99%
rename from packages/@react-stately/checkbox/test/useCheckboxGroupState.test.tsx
rename to packages/react-stately/test/checkbox/useCheckboxGroupState.test.tsx
index 8cadf75f91b..e03cc38d3b3 100644
--- a/packages/@react-stately/checkbox/test/useCheckboxGroupState.test.tsx
+++ b/packages/react-stately/test/checkbox/useCheckboxGroupState.test.tsx
@@ -12,7 +12,7 @@
 
 import {act, render} from '@react-spectrum/test-utils-internal';
 import React, {useEffect} from 'react';
-import {useCheckboxGroupState} from '../';
+import {useCheckboxGroupState} from '../../src/checkbox/useCheckboxGroupState';
 
 describe('useCheckboxGroupState', () => {
   it('should return basic interface when no props are provided', () => {
diff --git a/packages/@react-stately/color/test/Color.test.tsx b/packages/react-stately/test/color/Color.test.tsx
similarity index 99%
rename from packages/@react-stately/color/test/Color.test.tsx
rename to packages/react-stately/test/color/Color.test.tsx
index 119fa12c9a3..fa12569cc64 100644
--- a/packages/@react-stately/color/test/Color.test.tsx
+++ b/packages/react-stately/test/color/Color.test.tsx
@@ -13,7 +13,7 @@
 import {ColorFormat} from '@react-types/color';
 import fc from 'fast-check';
 import {getDeltaE00} from 'delta-e';
-import {parseColor} from '../src/Color';
+import {parseColor} from '../../src/color/Color';
 import space from 'color-space';
 
 describe('Color', function () {
diff --git a/packages/@react-stately/color/test/useColor.test.js b/packages/react-stately/test/color/useColor.test.js
similarity index 93%
rename from packages/@react-stately/color/test/useColor.test.js
rename to packages/react-stately/test/color/useColor.test.js
index d9ef9a651c8..e0f730cc33b 100644
--- a/packages/@react-stately/color/test/useColor.test.js
+++ b/packages/react-stately/test/color/useColor.test.js
@@ -10,9 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {parseColor} from '../src/Color';
+import {parseColor} from '../../src/color/Color';
 import {renderHook} from '@react-spectrum/test-utils-internal';
-import {useColor} from '../src/useColor';
+import {useColor} from '../../src/color/useColor';
 
 describe('useColor tests', function () {
   it('should accept string value', function () {
diff --git a/packages/@react-stately/color/test/useColorFieldState.test.js b/packages/react-stately/test/color/useColorFieldState.test.js
similarity index 98%
rename from packages/@react-stately/color/test/useColorFieldState.test.js
rename to packages/react-stately/test/color/useColorFieldState.test.js
index 4b88686bc7b..0724af4396c 100644
--- a/packages/@react-stately/color/test/useColorFieldState.test.js
+++ b/packages/react-stately/test/color/useColorFieldState.test.js
@@ -11,8 +11,8 @@
  */
 
 import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
-import {parseColor} from '../src/Color';
-import {useColorFieldState} from '..';
+import {parseColor} from '../../src/color/Color';
+import {useColorFieldState} from '../../src/color/useColorFieldState';
 
 describe('useColorFieldState tests', function () {
   it.each`
diff --git a/packages/@react-stately/combobox/test/useComboBoxState.test.js b/packages/react-stately/test/combobox/useComboBoxState.test.js
similarity index 98%
rename from packages/@react-stately/combobox/test/useComboBoxState.test.js
rename to packages/react-stately/test/combobox/useComboBoxState.test.js
index 996476d4b02..4ef0d8ad5b7 100644
--- a/packages/@react-stately/combobox/test/useComboBoxState.test.js
+++ b/packages/react-stately/test/combobox/useComboBoxState.test.js
@@ -11,10 +11,10 @@
  */
 
 import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
-import {Item} from '@react-stately/collections';
+import {Item} from '../../src/collections/Item';
 import React from 'react';
-import {useComboBoxState} from '../';
-import {useFilter} from 'react-aria';
+import {useComboBoxState} from '../../src/combobox/useComboBoxState';
+import {useFilter} from 'react-aria/useFilter';
 
 describe('useComboBoxState tests', function () {
   describe('open state', function () {
diff --git a/packages/@react-stately/data/test/useAsyncList.test.js b/packages/react-stately/test/data/useAsyncList.test.js
similarity index 99%
rename from packages/@react-stately/data/test/useAsyncList.test.js
rename to packages/react-stately/test/data/useAsyncList.test.js
index 13ce5fec24b..fdfd95a5afd 100644
--- a/packages/@react-stately/data/test/useAsyncList.test.js
+++ b/packages/react-stately/test/data/useAsyncList.test.js
@@ -12,7 +12,7 @@
 
 import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {useAsyncList} from '../src';
+import {useAsyncList} from '../../src/data/useAsyncList';
 
 const ITEMS = [{id: 1, name: '1'}, {id: 2, name: '2'}];
 const ITEMS2 = [{id: 2, name: '1'}, {id: 1, name: '2'}];
diff --git a/packages/@react-stately/data/test/useListData.test.js b/packages/react-stately/test/data/useListData.test.js
similarity index 99%
rename from packages/@react-stately/data/test/useListData.test.js
rename to packages/react-stately/test/data/useListData.test.js
index 48086c69352..9b3a7d1a79a 100644
--- a/packages/@react-stately/data/test/useListData.test.js
+++ b/packages/react-stately/test/data/useListData.test.js
@@ -12,7 +12,7 @@
 
 import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {useListData} from '../src/useListData';
+import {useListData} from '../../src/data/useListData';
 
 const initial = [
   {name: 'David'},
diff --git a/packages/@react-stately/data/test/useTreeData.test.js b/packages/react-stately/test/data/useTreeData.test.js
similarity index 99%
rename from packages/@react-stately/data/test/useTreeData.test.js
rename to packages/react-stately/test/data/useTreeData.test.js
index f87660cbe8d..513d213c17b 100644
--- a/packages/@react-stately/data/test/useTreeData.test.js
+++ b/packages/react-stately/test/data/useTreeData.test.js
@@ -12,7 +12,7 @@
 
 import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
 import React from 'react';
-import {useTreeData} from '../src/useTreeData';
+import {useTreeData} from '../../src/data/useTreeData';
 
 const initial = [
   {
diff --git a/packages/@react-stately/disclosure/test/useDisclosureGroupState.test.ts b/packages/react-stately/test/disclosure/useDisclosureGroupState.test.ts
similarity index 97%
rename from packages/@react-stately/disclosure/test/useDisclosureGroupState.test.ts
rename to packages/react-stately/test/disclosure/useDisclosureGroupState.test.ts
index 23c9291efbc..d6f3fa385e4 100644
--- a/packages/@react-stately/disclosure/test/useDisclosureGroupState.test.ts
+++ b/packages/react-stately/test/disclosure/useDisclosureGroupState.test.ts
@@ -11,7 +11,7 @@
  */
 
 import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
-import {useDisclosureGroupState} from '../src/useDisclosureGroupState';
+import {useDisclosureGroupState} from '../../src/disclosure/useDisclosureGroupState';
 
 describe('useDisclosureGroupState', () => {
   it('should initialize with empty expandedKeys when not provided', () => {
diff --git a/packages/@react-stately/disclosure/test/useDisclosureState.test.ts b/packages/react-stately/test/disclosure/useDisclosureState.test.ts
similarity index 97%
rename from packages/@react-stately/disclosure/test/useDisclosureState.test.ts
rename to packages/react-stately/test/disclosure/useDisclosureState.test.ts
index d6a74523079..d7e5dbfa072 100644
--- a/packages/@react-stately/disclosure/test/useDisclosureState.test.ts
+++ b/packages/react-stately/test/disclosure/useDisclosureState.test.ts
@@ -11,7 +11,7 @@
  */
 
 import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
-import {useDisclosureState} from '../src/useDisclosureState';
+import {useDisclosureState} from '../../src/disclosure/useDisclosureState';
 
 describe('useDisclosureState', () => {
   it('should initialize as not expanded by default', () => {
diff --git a/packages/@react-stately/searchfield/test/useSearchFieldState.test.js b/packages/react-stately/test/searchfield/useSearchFieldState.test.js
similarity index 97%
rename from packages/@react-stately/searchfield/test/useSearchFieldState.test.js
rename to packages/react-stately/test/searchfield/useSearchFieldState.test.js
index 80ebf7e57a1..9a1629d68a6 100644
--- a/packages/@react-stately/searchfield/test/useSearchFieldState.test.js
+++ b/packages/react-stately/test/searchfield/useSearchFieldState.test.js
@@ -11,7 +11,7 @@
  */
 
 import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
-import {useSearchFieldState} from '../';
+import {useSearchFieldState} from '../../src/searchfield/useSearchFieldState';
 
 describe('useSearchFieldState', () => {
   let onChange = jest.fn();
diff --git a/packages/@react-stately/slider/test/useSliderState.test.js b/packages/react-stately/test/slider/useSliderState.test.js
similarity index 99%
rename from packages/@react-stately/slider/test/useSliderState.test.js
rename to packages/react-stately/test/slider/useSliderState.test.js
index ef6ba8dadc5..81ccc419b5b 100644
--- a/packages/@react-stately/slider/test/useSliderState.test.js
+++ b/packages/react-stately/test/slider/useSliderState.test.js
@@ -11,7 +11,7 @@
  */
 
 import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
-import {useSliderState} from '../';
+import {useSliderState} from '../../src/slider/useSliderState';
 
 describe('useSliderState', () => {
   let numberFormatter = new Intl.NumberFormat('en-US', {});
diff --git a/packages/@react-stately/table/test/TableUtils.test.js b/packages/react-stately/test/table/TableUtils.test.js
similarity index 98%
rename from packages/@react-stately/table/test/TableUtils.test.js
rename to packages/react-stately/test/table/TableUtils.test.js
index 421ac788d9c..b4e6d724a8c 100644
--- a/packages/@react-stately/table/test/TableUtils.test.js
+++ b/packages/react-stately/test/table/TableUtils.test.js
@@ -1,5 +1,5 @@
-import {calculateColumnSizes} from '../src/TableUtils';
-import {TableColumnLayout} from '../src/TableColumnLayout';
+import {calculateColumnSizes} from '../../src/table/TableUtils';
+import {TableColumnLayout} from '../../src/table/TableColumnLayout';
 
 describe('TableUtils', () => {
   describe('column building', () => {
diff --git a/packages/@react-stately/toast/test/useToastState.test.js b/packages/react-stately/test/toast/useToastState.test.js
similarity index 99%
rename from packages/@react-stately/toast/test/useToastState.test.js
rename to packages/react-stately/test/toast/useToastState.test.js
index 091632901d9..1b6e01010db 100644
--- a/packages/@react-stately/toast/test/useToastState.test.js
+++ b/packages/react-stately/test/toast/useToastState.test.js
@@ -11,7 +11,7 @@
  */
 
 import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
-import {useToastState} from '../';
+import {useToastState} from '../../src/toast/useToastState';
 
 describe('useToastState', () => {
   let newValue = [{
diff --git a/packages/@react-stately/tooltip/test/useTooltipTriggerState.test.js b/packages/react-stately/test/tooltip/useTooltipTriggerState.test.js
similarity index 98%
rename from packages/@react-stately/tooltip/test/useTooltipTriggerState.test.js
rename to packages/react-stately/test/tooltip/useTooltipTriggerState.test.js
index bb1f38ffe7d..1e929fe6fdf 100644
--- a/packages/@react-stately/tooltip/test/useTooltipTriggerState.test.js
+++ b/packages/react-stately/test/tooltip/useTooltipTriggerState.test.js
@@ -11,9 +11,10 @@
  */
 
 import {act, fireEvent, render} from '@react-spectrum/test-utils-internal';
-import {mergeProps, useTooltip, useTooltipTrigger} from 'react-aria';
+import {mergeProps} from 'react-aria/mergeProps';
 import React from 'react';
-import {useTooltipTriggerState} from '../src';
+import {useTooltip, useTooltipTrigger} from 'react-aria/useTooltipTrigger';
+import {useTooltipTriggerState} from '../../src/tooltip/useTooltipTriggerState';
 
 // Sync with TOOLTIP_COOLDOWN & TOOLTIP_DELAY in useTooltipTriggerState
 const TOOLTIP_COOLDOWN = 500;
diff --git a/packages/@react-stately/tree/test/useTreeState.test.js b/packages/react-stately/test/tree/useTreeState.test.js
similarity index 96%
rename from packages/@react-stately/tree/test/useTreeState.test.js
rename to packages/react-stately/test/tree/useTreeState.test.js
index 8eb67efb05c..61254ba85ec 100644
--- a/packages/@react-stately/tree/test/useTreeState.test.js
+++ b/packages/react-stately/test/tree/useTreeState.test.js
@@ -11,7 +11,7 @@
  */
 
 import {fireEvent, pointerMap, render} from '@react-spectrum/test-utils-internal';
-import {KeyboardNavigation} from '../stories/useTreeState.stories';
+import {KeyboardNavigation} from '../../stories/tree/useTreeState.stories';
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/@react-stately/utils/test/number.test.ts b/packages/react-stately/test/utils/number.test.ts
similarity index 96%
rename from packages/@react-stately/utils/test/number.test.ts
rename to packages/react-stately/test/utils/number.test.ts
index ed845f69e27..f40958f3537 100644
--- a/packages/@react-stately/utils/test/number.test.ts
+++ b/packages/react-stately/test/utils/number.test.ts
@@ -1,4 +1,4 @@
-import {clamp, roundToStepPrecision, snapValueToStep} from '../src/number';
+import {clamp, roundToStepPrecision, snapValueToStep} from '../../src/utils/number';
 
 describe('number utils', () => {
   describe('clamp', () => {
diff --git a/packages/@react-stately/utils/test/useControlledState.test.tsx b/packages/react-stately/test/utils/useControlledState.test.tsx
similarity index 99%
rename from packages/@react-stately/utils/test/useControlledState.test.tsx
rename to packages/react-stately/test/utils/useControlledState.test.tsx
index a2f3760d313..d709a12deab 100644
--- a/packages/@react-stately/utils/test/useControlledState.test.tsx
+++ b/packages/react-stately/test/utils/useControlledState.test.tsx
@@ -12,7 +12,7 @@
 
 import {actHook as act, pointerMap, render, renderHook} from '@react-spectrum/test-utils-internal';
 import React, {useEffect, useState} from 'react';
-import {useControlledState} from '../src';
+import {useControlledState} from '../../src/utils/useControlledState';
 import userEvent from '@testing-library/user-event';
 
 describe('useControlledState tests', function () {
diff --git a/packages/@react-stately/virtualizer/test/LayoutInfo.test.tsx b/packages/react-stately/test/virtualizer/LayoutInfo.test.tsx
similarity index 91%
rename from packages/@react-stately/virtualizer/test/LayoutInfo.test.tsx
rename to packages/react-stately/test/virtualizer/LayoutInfo.test.tsx
index 079b04e6e8a..46f9eaacbbb 100644
--- a/packages/@react-stately/virtualizer/test/LayoutInfo.test.tsx
+++ b/packages/react-stately/test/virtualizer/LayoutInfo.test.tsx
@@ -10,7 +10,9 @@
  * governing permissions and limitations under the License.
  */
 
-import {LayoutInfo, Rect} from '../';
+import {LayoutInfo} from '../../src/virtualizer/LayoutInfo';
+
+import {Rect} from '../../src/virtualizer/Rect';
 
 describe('LayoutInfo', () => {
   it('should return a copy of the current LayoutInfo after calling copy()', () => {

From dce18ec7a40b15db344c3b65ee49b0e6d84caa95 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 10 Mar 2026 16:57:43 -0700
Subject: [PATCH 51/68] fix types / tests

---
 lib/svg.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/svg.d.ts b/lib/svg.d.ts
index 9569e1964b5..bb0f28f7ce1 100644
--- a/lib/svg.d.ts
+++ b/lib/svg.d.ts
@@ -25,3 +25,8 @@ declare module '*.svg' {
   const content: FunctionComponent<SVGProps<SVGSVGElement>> ;
   export default content;
 }
+
+declare module '*.json' {
+  const content: any;
+  export default content;
+}

From b5e20fe56c0b68ffaaff23db8e1e369ee290b91b Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 10 Mar 2026 17:13:38 -0700
Subject: [PATCH 52/68] fix typecheck examples

---
 scripts/extractExamplesS2.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/extractExamplesS2.mjs b/scripts/extractExamplesS2.mjs
index 14d4a269672..b4feb550ea8 100644
--- a/scripts/extractExamplesS2.mjs
+++ b/scripts/extractExamplesS2.mjs
@@ -129,6 +129,7 @@ async function extractExamples() {
       "allowSyntheticDefaultImports": true,
       "module": "esnext",
       "moduleResolution": "bundler",
+      "customConditions": ["source"],
       "resolveJsonModule": true,
       "isolatedModules": true,
       "noEmit": true,

From 6ac1e2d5eb1b2a6b03860bc2dafe91ad1691c12f Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 10 Mar 2026 17:26:57 -0700
Subject: [PATCH 53/68] Remove unused dependencies

---
 packages/@adobe/react-spectrum/package.json   |    5 +-
 packages/@react-aria/actiongroup/package.json |    4 +-
 .../aria-modal-polyfill/package.json          |    1 -
 .../@react-aria/autocomplete/package.json     |    5 +-
 packages/@react-aria/breadcrumbs/package.json |    1 -
 packages/@react-aria/button/package.json      |    4 +-
 packages/@react-aria/calendar/package.json    |    6 +-
 packages/@react-aria/checkbox/package.json    |    4 +-
 packages/@react-aria/collections/package.json |    2 -
 packages/@react-aria/color/package.json       |    4 +-
 packages/@react-aria/combobox/package.json    |    5 +-
 packages/@react-aria/datepicker/package.json  |   10 +-
 packages/@react-aria/dialog/package.json      |    1 -
 packages/@react-aria/disclosure/package.json  |    4 +-
 packages/@react-aria/dnd/package.json         |    5 +-
 packages/@react-aria/focus/package.json       |    2 -
 packages/@react-aria/form/package.json        |    4 +-
 packages/@react-aria/grid/package.json        |    6 +-
 packages/@react-aria/gridlist/package.json    |    4 +-
 packages/@react-aria/i18n/package.json        |    2 -
 .../@react-aria/interactions/package.json     |    3 +-
 packages/@react-aria/label/package.json       |    1 -
 packages/@react-aria/landmark/package.json    |    2 -
 packages/@react-aria/link/package.json        |    2 -
 packages/@react-aria/listbox/package.json     |    4 +-
 packages/@react-aria/menu/package.json        |    5 +-
 packages/@react-aria/meter/package.json       |    1 -
 packages/@react-aria/numberfield/package.json |    5 +-
 packages/@react-aria/overlays/package.json    |    5 +-
 packages/@react-aria/progress/package.json    |    1 -
 packages/@react-aria/radio/package.json       |    3 +-
 packages/@react-aria/searchfield/package.json |    5 +-
 packages/@react-aria/select/package.json      |    5 +-
 packages/@react-aria/selection/package.json   |    4 +-
 packages/@react-aria/separator/package.json   |    1 -
 packages/@react-aria/slider/package.json      |    3 +-
 packages/@react-aria/spinbutton/package.json  |    2 -
 packages/@react-aria/steplist/package.json    |    4 +-
 packages/@react-aria/switch/package.json      |    4 +-
 packages/@react-aria/table/package.json       |    7 +-
 packages/@react-aria/tabs/package.json        |    3 +-
 packages/@react-aria/tag/package.json         |    5 +-
 packages/@react-aria/textfield/package.json   |    4 +-
 packages/@react-aria/toast/package.json       |    5 +-
 packages/@react-aria/toggle/package.json      |    4 +-
 packages/@react-aria/toolbar/package.json     |    1 -
 packages/@react-aria/tooltip/package.json     |    4 +-
 packages/@react-aria/tree/package.json        |    5 +-
 packages/@react-aria/utils/package.json       |    2 -
 packages/@react-aria/virtualizer/package.json |    4 +-
 .../@react-aria/visually-hidden/package.json  |    1 -
 .../@react-spectrum/accordion/package.json    |    8 +-
 .../@react-spectrum/actionbar/package.json    |    4 -
 .../@react-spectrum/actiongroup/package.json  |    5 -
 .../@react-spectrum/autocomplete/package.json |    5 -
 packages/@react-spectrum/avatar/package.json  |    5 +-
 packages/@react-spectrum/badge/package.json   |    5 +-
 .../@react-spectrum/breadcrumbs/package.json  |    4 -
 packages/@react-spectrum/button/package.json  |    7 +-
 .../@react-spectrum/buttongroup/package.json  |    5 +-
 .../@react-spectrum/calendar/package.json     |   10 +-
 packages/@react-spectrum/card/package.json    |    8 +-
 .../@react-spectrum/checkbox/package.json     |    9 +-
 packages/@react-spectrum/color/package.json   |    6 +-
 .../@react-spectrum/combobox/package.json     |    6 +-
 .../contextualhelp/package.json               |    7 +-
 .../@react-spectrum/datepicker/package.json   |   10 +-
 packages/@react-spectrum/dialog/package.json  |    9 +-
 packages/@react-spectrum/divider/package.json |    6 +-
 packages/@react-spectrum/dnd/package.json     |    5 +-
 .../@react-spectrum/dropzone/package.json     |    7 +-
 .../@react-spectrum/filetrigger/package.json  |    4 +-
 packages/@react-spectrum/form/package.json    |    7 +-
 packages/@react-spectrum/icon/package.json    |    6 +-
 .../illustratedmessage/package.json           |    6 +-
 packages/@react-spectrum/image/package.json   |    6 +-
 .../@react-spectrum/inlinealert/package.json  |    7 +-
 packages/@react-spectrum/label/package.json   |    8 +-
 .../@react-spectrum/labeledvalue/package.json |    7 +-
 packages/@react-spectrum/layout/package.json  |    5 +-
 packages/@react-spectrum/link/package.json    |    6 +-
 packages/@react-spectrum/list/package.json    |    7 +-
 packages/@react-spectrum/listbox/package.json |    5 +-
 packages/@react-spectrum/menu/package.json    |    7 +-
 packages/@react-spectrum/meter/package.json   |    6 +-
 .../@react-spectrum/numberfield/package.json  |   10 +-
 .../@react-spectrum/overlays/package.json     |    7 +-
 packages/@react-spectrum/picker/package.json  |    5 +-
 .../@react-spectrum/progress/package.json     |    6 +-
 .../@react-spectrum/provider/package.json     |    7 +-
 packages/@react-spectrum/radio/package.json   |    7 +-
 packages/@react-spectrum/s2/package.json      |    1 -
 .../@react-spectrum/searchfield/package.json  |    8 +-
 packages/@react-spectrum/slider/package.json  |    7 +-
 .../@react-spectrum/statuslight/package.json  |    6 +-
 .../@react-spectrum/steplist/package.json     |    5 +-
 packages/@react-spectrum/switch/package.json  |    7 +-
 packages/@react-spectrum/table/package.json   |    9 +-
 packages/@react-spectrum/tabs/package.json    |    5 +-
 packages/@react-spectrum/tag/package.json     |    4 +-
 packages/@react-spectrum/text/package.json    |    7 +-
 .../@react-spectrum/textfield/package.json    |    8 +-
 .../@react-spectrum/theme-dark/package.json   |    5 +-
 .../theme-default/package.json                |    5 +-
 .../theme-express/package.json                |    5 +-
 .../@react-spectrum/theme-light/package.json  |    5 +-
 packages/@react-spectrum/toast/package.json   |    7 +-
 packages/@react-spectrum/tooltip/package.json |    9 +-
 packages/@react-spectrum/tree/package.json    |    7 +-
 packages/@react-spectrum/utils/package.json   |    6 +-
 packages/@react-spectrum/view/package.json    |    6 +-
 packages/@react-spectrum/well/package.json    |    6 +-
 packages/@react-stately/calendar/package.json |    3 -
 packages/@react-stately/checkbox/package.json |    1 -
 .../@react-stately/collections/package.json   |    1 -
 packages/@react-stately/color/package.json    |    3 -
 packages/@react-stately/combobox/package.json |    2 -
 packages/@react-stately/data/package.json     |    1 -
 .../@react-stately/datepicker/package.json    |    5 -
 .../@react-stately/disclosure/package.json    |    1 -
 packages/@react-stately/dnd/package.json      |    1 -
 packages/@react-stately/form/package.json     |    1 -
 packages/@react-stately/grid/package.json     |    2 -
 packages/@react-stately/layout/package.json   |    3 -
 packages/@react-stately/list/package.json     |    1 -
 packages/@react-stately/menu/package.json     |    1 -
 .../@react-stately/numberfield/package.json   |    2 -
 packages/@react-stately/radio/package.json    |    1 -
 packages/@react-stately/select/package.json   |    1 -
 .../@react-stately/selection/package.json     |    1 -
 packages/@react-stately/slider/package.json   |    2 -
 packages/@react-stately/steplist/package.json |    1 -
 packages/@react-stately/table/package.json    |    2 -
 packages/@react-stately/tabs/package.json     |    1 -
 packages/@react-stately/toast/package.json    |    1 -
 packages/@react-stately/toggle/package.json   |    1 -
 packages/@react-stately/tree/package.json     |    1 -
 .../@react-stately/virtualizer/package.json   |    1 -
 packages/@react-types/sidenav/package.json    |    1 -
 packages/react-aria-components/package.json   |    4 +-
 packages/react-aria/package.json              |   24 +-
 packages/react-stately/package.json           |   16 +-
 scripts/removeUnusedDeps.js                   |    6 +-
 yarn.lock                                     | 1791 +++++------------
 144 files changed, 635 insertions(+), 1820 deletions(-)

diff --git a/packages/@adobe/react-spectrum/package.json b/packages/@adobe/react-spectrum/package.json
index cf1923d26d9..c1f7ad1f020 100644
--- a/packages/@adobe/react-spectrum/package.json
+++ b/packages/@adobe/react-spectrum/package.json
@@ -50,7 +50,6 @@
     "@adobe/react-spectrum": "3.46.2",
     "@internationalized/date": "^3.12.0",
     "@internationalized/message": "^3.1.8",
-    "@internationalized/string": "^3.2.7",
     "@react-spectrum/style-macro-s1": "3.0.0-alpha.5",
     "@react-types/actionbar": "^3.1.21",
     "@react-types/actiongroup": "^3.4.23",
@@ -116,9 +115,9 @@
     "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
   },
   "devDependencies": {
+    "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
     "@babel/cli": "^7.12.10",
-    "@babel/core": "^7.24.3",
-    "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
+    "@babel/core": "^7.24.3"
   },
   "targets": {
     "main": false,
diff --git a/packages/@react-aria/actiongroup/package.json b/packages/@react-aria/actiongroup/package.json
index 087ff95bfb7..c1fadff4c26 100644
--- a/packages/@react-aria/actiongroup/package.json
+++ b/packages/@react-aria/actiongroup/package.json
@@ -30,10 +30,8 @@
   },
   "dependencies": {
     "@react-types/actiongroup": "^3.4.23",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/aria-modal-polyfill/package.json b/packages/@react-aria/aria-modal-polyfill/package.json
index 5565865c417..ac8dd494763 100644
--- a/packages/@react-aria/aria-modal-polyfill/package.json
+++ b/packages/@react-aria/aria-modal-polyfill/package.json
@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "@swc/helpers": "^0.5.0",
-    "aria-hidden": "^1.2.3",
     "react-aria": "^3.47.0"
   },
   "peerDependencies": {
diff --git a/packages/@react-aria/autocomplete/package.json b/packages/@react-aria/autocomplete/package.json
index 89024cc46f5..ed8434f58f0 100644
--- a/packages/@react-aria/autocomplete/package.json
+++ b/packages/@react-aria/autocomplete/package.json
@@ -30,11 +30,8 @@
   },
   "dependencies": {
     "@react-types/autocomplete": "3.0.0-alpha.38",
-    "@react-types/button": "^3.15.1",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/breadcrumbs/package.json b/packages/@react-aria/breadcrumbs/package.json
index bef0695cf54..30c3e49041f 100644
--- a/packages/@react-aria/breadcrumbs/package.json
+++ b/packages/@react-aria/breadcrumbs/package.json
@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "@react-types/breadcrumbs": "^3.7.19",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-aria": "^3.47.0"
   },
diff --git a/packages/@react-aria/button/package.json b/packages/@react-aria/button/package.json
index ce411fea086..08b51736382 100644
--- a/packages/@react-aria/button/package.json
+++ b/packages/@react-aria/button/package.json
@@ -30,10 +30,8 @@
   },
   "dependencies": {
     "@react-types/button": "^3.15.1",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/calendar/package.json b/packages/@react-aria/calendar/package.json
index 5a823d60e58..7b7af74ace2 100644
--- a/packages/@react-aria/calendar/package.json
+++ b/packages/@react-aria/calendar/package.json
@@ -29,13 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@internationalized/date": "^3.12.0",
-    "@react-types/button": "^3.15.1",
     "@react-types/calendar": "^3.8.3",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/checkbox/package.json b/packages/@react-aria/checkbox/package.json
index d0b8d513c4d..dfc20d26a0a 100644
--- a/packages/@react-aria/checkbox/package.json
+++ b/packages/@react-aria/checkbox/package.json
@@ -30,10 +30,8 @@
   },
   "dependencies": {
     "@react-types/checkbox": "^3.10.4",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/collections/package.json b/packages/@react-aria/collections/package.json
index 2eb4ff69800..65ae3a308fb 100644
--- a/packages/@react-aria/collections/package.json
+++ b/packages/@react-aria/collections/package.json
@@ -29,9 +29,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "use-sync-external-store": "^1.6.0",
     "react-aria": "^3.47.0"
   },
   "peerDependencies": {
diff --git a/packages/@react-aria/color/package.json b/packages/@react-aria/color/package.json
index 13ea49e709b..c343da85b2c 100644
--- a/packages/@react-aria/color/package.json
+++ b/packages/@react-aria/color/package.json
@@ -30,10 +30,8 @@
   },
   "dependencies": {
     "@react-types/color": "^3.1.4",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/combobox/package.json b/packages/@react-aria/combobox/package.json
index 9e536b82ad6..49cdf0a2969 100644
--- a/packages/@react-aria/combobox/package.json
+++ b/packages/@react-aria/combobox/package.json
@@ -29,12 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/button": "^3.15.1",
     "@react-types/combobox": "^3.14.0",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/datepicker/package.json b/packages/@react-aria/datepicker/package.json
index 3d308940013..4e9e84c7264 100644
--- a/packages/@react-aria/datepicker/package.json
+++ b/packages/@react-aria/datepicker/package.json
@@ -29,17 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@internationalized/date": "^3.12.0",
-    "@internationalized/number": "^3.6.5",
-    "@internationalized/string": "^3.2.7",
-    "@react-types/button": "^3.15.1",
-    "@react-types/calendar": "^3.8.3",
     "@react-types/datepicker": "^3.13.5",
-    "@react-types/dialog": "^3.5.24",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/dialog/package.json b/packages/@react-aria/dialog/package.json
index 81b7f20409a..825d9ee6e10 100644
--- a/packages/@react-aria/dialog/package.json
+++ b/packages/@react-aria/dialog/package.json
@@ -34,7 +34,6 @@
   },
   "dependencies": {
     "@react-types/dialog": "^3.5.24",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-aria": "^3.47.0"
   },
diff --git a/packages/@react-aria/disclosure/package.json b/packages/@react-aria/disclosure/package.json
index 2294a79385e..b77f32ff370 100644
--- a/packages/@react-aria/disclosure/package.json
+++ b/packages/@react-aria/disclosure/package.json
@@ -29,10 +29,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/button": "^3.15.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/dnd/package.json b/packages/@react-aria/dnd/package.json
index 681aa8e49fb..a525d87f4e1 100644
--- a/packages/@react-aria/dnd/package.json
+++ b/packages/@react-aria/dnd/package.json
@@ -29,12 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@internationalized/string": "^3.2.7",
-    "@react-types/button": "^3.15.1",
     "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/focus/package.json b/packages/@react-aria/focus/package.json
index 92013cff638..fbb09b0c1a0 100644
--- a/packages/@react-aria/focus/package.json
+++ b/packages/@react-aria/focus/package.json
@@ -29,9 +29,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "clsx": "^2.0.0",
     "react-aria": "^3.47.0"
   },
   "peerDependencies": {
diff --git a/packages/@react-aria/form/package.json b/packages/@react-aria/form/package.json
index 3ad75ede9d7..4b0e2ae144d 100644
--- a/packages/@react-aria/form/package.json
+++ b/packages/@react-aria/form/package.json
@@ -29,10 +29,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/grid/package.json b/packages/@react-aria/grid/package.json
index 9c587f4b7e6..3a09e2fcf3e 100644
--- a/packages/@react-aria/grid/package.json
+++ b/packages/@react-aria/grid/package.json
@@ -29,12 +29,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/checkbox": "^3.10.4",
-    "@react-types/grid": "^3.3.8",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/gridlist/package.json b/packages/@react-aria/gridlist/package.json
index a140493c7b0..73c16a3c6ee 100644
--- a/packages/@react-aria/gridlist/package.json
+++ b/packages/@react-aria/gridlist/package.json
@@ -29,10 +29,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/i18n/package.json b/packages/@react-aria/i18n/package.json
index 66e8a1c3bcd..d4062547b5a 100644
--- a/packages/@react-aria/i18n/package.json
+++ b/packages/@react-aria/i18n/package.json
@@ -42,9 +42,7 @@
   "dependencies": {
     "@internationalized/date": "^3.12.0",
     "@internationalized/message": "^3.1.8",
-    "@internationalized/number": "^3.6.5",
     "@internationalized/string": "^3.2.7",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-aria": "^3.47.0"
   },
diff --git a/packages/@react-aria/interactions/package.json b/packages/@react-aria/interactions/package.json
index 48391ae7b2c..2e86db9fc7b 100644
--- a/packages/@react-aria/interactions/package.json
+++ b/packages/@react-aria/interactions/package.json
@@ -31,8 +31,7 @@
   "dependencies": {
     "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/label/package.json b/packages/@react-aria/label/package.json
index b28af5d8e83..6b366c95cb9 100644
--- a/packages/@react-aria/label/package.json
+++ b/packages/@react-aria/label/package.json
@@ -29,7 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-aria": "^3.47.0"
   },
diff --git a/packages/@react-aria/landmark/package.json b/packages/@react-aria/landmark/package.json
index 2466abdb4aa..c258abcc9c8 100644
--- a/packages/@react-aria/landmark/package.json
+++ b/packages/@react-aria/landmark/package.json
@@ -29,9 +29,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "use-sync-external-store": "^1.6.0",
     "react-aria": "^3.47.0"
   },
   "peerDependencies": {
diff --git a/packages/@react-aria/link/package.json b/packages/@react-aria/link/package.json
index 849e48388a9..ee7caa1f9de 100644
--- a/packages/@react-aria/link/package.json
+++ b/packages/@react-aria/link/package.json
@@ -29,8 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/link": "^3.6.7",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-aria": "^3.47.0"
   },
diff --git a/packages/@react-aria/listbox/package.json b/packages/@react-aria/listbox/package.json
index 5568bef4b04..966b96ed89f 100644
--- a/packages/@react-aria/listbox/package.json
+++ b/packages/@react-aria/listbox/package.json
@@ -30,10 +30,8 @@
   },
   "dependencies": {
     "@react-types/listbox": "^3.7.6",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/menu/package.json b/packages/@react-aria/menu/package.json
index f72f2aa5ba6..325fd151781 100644
--- a/packages/@react-aria/menu/package.json
+++ b/packages/@react-aria/menu/package.json
@@ -29,12 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/button": "^3.15.1",
     "@react-types/menu": "^3.10.7",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/meter/package.json b/packages/@react-aria/meter/package.json
index 9006fb30930..5f1b3f46cc8 100644
--- a/packages/@react-aria/meter/package.json
+++ b/packages/@react-aria/meter/package.json
@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "@react-types/meter": "^3.4.15",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-aria": "^3.47.0"
   },
diff --git a/packages/@react-aria/numberfield/package.json b/packages/@react-aria/numberfield/package.json
index dc99999b6f3..45eee44b42f 100644
--- a/packages/@react-aria/numberfield/package.json
+++ b/packages/@react-aria/numberfield/package.json
@@ -29,12 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/button": "^3.15.1",
     "@react-types/numberfield": "^3.8.18",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/overlays/package.json b/packages/@react-aria/overlays/package.json
index 622af346e2d..d889a29ecc2 100644
--- a/packages/@react-aria/overlays/package.json
+++ b/packages/@react-aria/overlays/package.json
@@ -29,12 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/button": "^3.15.1",
     "@react-types/overlays": "^3.9.4",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/progress/package.json b/packages/@react-aria/progress/package.json
index f21e54524d4..379c42d9666 100644
--- a/packages/@react-aria/progress/package.json
+++ b/packages/@react-aria/progress/package.json
@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "@react-types/progress": "^3.5.18",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-aria": "^3.47.0"
   },
diff --git a/packages/@react-aria/radio/package.json b/packages/@react-aria/radio/package.json
index 5ed2dc802c9..f02c340f12d 100644
--- a/packages/@react-aria/radio/package.json
+++ b/packages/@react-aria/radio/package.json
@@ -32,8 +32,7 @@
     "@react-types/radio": "^3.9.4",
     "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/searchfield/package.json b/packages/@react-aria/searchfield/package.json
index 2890aae6285..6cced9f84af 100644
--- a/packages/@react-aria/searchfield/package.json
+++ b/packages/@react-aria/searchfield/package.json
@@ -29,12 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/button": "^3.15.1",
     "@react-types/searchfield": "^3.6.8",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/select/package.json b/packages/@react-aria/select/package.json
index fa43af3cf07..62af94e12b6 100644
--- a/packages/@react-aria/select/package.json
+++ b/packages/@react-aria/select/package.json
@@ -29,12 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/button": "^3.15.1",
     "@react-types/select": "^3.12.2",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/selection/package.json b/packages/@react-aria/selection/package.json
index 682fd5bb812..9d1721112f4 100644
--- a/packages/@react-aria/selection/package.json
+++ b/packages/@react-aria/selection/package.json
@@ -29,10 +29,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/separator/package.json b/packages/@react-aria/separator/package.json
index 0e3c3bd3b47..b3d96908e45 100644
--- a/packages/@react-aria/separator/package.json
+++ b/packages/@react-aria/separator/package.json
@@ -29,7 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-aria": "^3.47.0"
   },
diff --git a/packages/@react-aria/slider/package.json b/packages/@react-aria/slider/package.json
index 15a53815739..01648c3e5d8 100644
--- a/packages/@react-aria/slider/package.json
+++ b/packages/@react-aria/slider/package.json
@@ -32,8 +32,7 @@
     "@react-types/shared": "^3.33.1",
     "@react-types/slider": "^3.8.4",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/spinbutton/package.json b/packages/@react-aria/spinbutton/package.json
index 6ea3bbfd62a..cd7e5a29d83 100644
--- a/packages/@react-aria/spinbutton/package.json
+++ b/packages/@react-aria/spinbutton/package.json
@@ -29,8 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/button": "^3.15.1",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-aria": "^3.47.0"
   },
diff --git a/packages/@react-aria/steplist/package.json b/packages/@react-aria/steplist/package.json
index b82b97f8ceb..149772dbd6a 100644
--- a/packages/@react-aria/steplist/package.json
+++ b/packages/@react-aria/steplist/package.json
@@ -29,10 +29,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/switch/package.json b/packages/@react-aria/switch/package.json
index 2a7cb8b9050..13565280fda 100644
--- a/packages/@react-aria/switch/package.json
+++ b/packages/@react-aria/switch/package.json
@@ -29,11 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@react-types/switch": "^3.5.17",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/table/package.json b/packages/@react-aria/table/package.json
index 0b361428ac6..759df43966c 100644
--- a/packages/@react-aria/table/package.json
+++ b/packages/@react-aria/table/package.json
@@ -29,13 +29,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/checkbox": "^3.10.4",
-    "@react-types/grid": "^3.3.8",
-    "@react-types/shared": "^3.33.1",
-    "@react-types/table": "^3.13.6",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/tabs/package.json b/packages/@react-aria/tabs/package.json
index 76604270ec6..9eb3e1c5b0d 100644
--- a/packages/@react-aria/tabs/package.json
+++ b/packages/@react-aria/tabs/package.json
@@ -32,8 +32,7 @@
     "@react-types/shared": "^3.33.1",
     "@react-types/tabs": "^3.3.22",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/tag/package.json b/packages/@react-aria/tag/package.json
index 391c32a4fc4..a6262d09325 100644
--- a/packages/@react-aria/tag/package.json
+++ b/packages/@react-aria/tag/package.json
@@ -29,11 +29,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/button": "^3.15.1",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/textfield/package.json b/packages/@react-aria/textfield/package.json
index 7d16ae16a92..1350036dd97 100644
--- a/packages/@react-aria/textfield/package.json
+++ b/packages/@react-aria/textfield/package.json
@@ -29,11 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@react-types/textfield": "^3.12.8",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/toast/package.json b/packages/@react-aria/toast/package.json
index 15755d460fa..389072b9fad 100644
--- a/packages/@react-aria/toast/package.json
+++ b/packages/@react-aria/toast/package.json
@@ -29,11 +29,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/button": "^3.15.1",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/toggle/package.json b/packages/@react-aria/toggle/package.json
index 7c3c166893e..afddc7bd369 100644
--- a/packages/@react-aria/toggle/package.json
+++ b/packages/@react-aria/toggle/package.json
@@ -30,10 +30,8 @@
   },
   "dependencies": {
     "@react-types/checkbox": "^3.10.4",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/toolbar/package.json b/packages/@react-aria/toolbar/package.json
index d3cde862b83..65b23e7b117 100644
--- a/packages/@react-aria/toolbar/package.json
+++ b/packages/@react-aria/toolbar/package.json
@@ -29,7 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-aria": "^3.47.0"
   },
diff --git a/packages/@react-aria/tooltip/package.json b/packages/@react-aria/tooltip/package.json
index 83490f8f199..3cbe9a4540f 100644
--- a/packages/@react-aria/tooltip/package.json
+++ b/packages/@react-aria/tooltip/package.json
@@ -29,11 +29,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@react-types/tooltip": "^3.5.2",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/tree/package.json b/packages/@react-aria/tree/package.json
index 5f39412a5c9..9119a59a4e1 100644
--- a/packages/@react-aria/tree/package.json
+++ b/packages/@react-aria/tree/package.json
@@ -29,11 +29,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/button": "^3.15.1",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/utils/package.json b/packages/@react-aria/utils/package.json
index ee7040d180f..51d5ccc6c59 100644
--- a/packages/@react-aria/utils/package.json
+++ b/packages/@react-aria/utils/package.json
@@ -29,9 +29,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "clsx": "^2.0.0",
     "react-aria": "^3.47.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-aria/virtualizer/package.json b/packages/@react-aria/virtualizer/package.json
index f7a83117cd6..a2ad3f20b66 100644
--- a/packages/@react-aria/virtualizer/package.json
+++ b/packages/@react-aria/virtualizer/package.json
@@ -29,10 +29,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-aria/visually-hidden/package.json b/packages/@react-aria/visually-hidden/package.json
index ac9eaf61126..9ca83dbb0be 100644
--- a/packages/@react-aria/visually-hidden/package.json
+++ b/packages/@react-aria/visually-hidden/package.json
@@ -31,7 +31,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-aria": "^3.47.0"
   },
diff --git a/packages/@react-spectrum/accordion/package.json b/packages/@react-spectrum/accordion/package.json
index deb810d0644..8330974dae5 100644
--- a/packages/@react-spectrum/accordion/package.json
+++ b/packages/@react-spectrum/accordion/package.json
@@ -34,12 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria-components": "^1.16.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@adobe/react-spectrum": "^3.46.2",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/actionbar/package.json b/packages/@react-spectrum/actionbar/package.json
index c9c30a950e6..565ed413ab3 100644
--- a/packages/@react-spectrum/actionbar/package.json
+++ b/packages/@react-spectrum/actionbar/package.json
@@ -35,11 +35,7 @@
   },
   "dependencies": {
     "@react-types/actionbar": "^3.1.21",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2",
     "react-stately": "^3.45.0"
   },
   "devDependencies": {
diff --git a/packages/@react-spectrum/actiongroup/package.json b/packages/@react-spectrum/actiongroup/package.json
index d2207e2fdde..533039964a3 100644
--- a/packages/@react-spectrum/actiongroup/package.json
+++ b/packages/@react-spectrum/actiongroup/package.json
@@ -35,12 +35,7 @@
   },
   "dependencies": {
     "@react-types/actiongroup": "^3.4.23",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@spectrum-icons/workflow": "^4.2.28",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2",
     "react-stately": "^3.45.0"
   },
   "devDependencies": {
diff --git a/packages/@react-spectrum/autocomplete/package.json b/packages/@react-spectrum/autocomplete/package.json
index d2b9c6bc7b9..dbef18d49e6 100644
--- a/packages/@react-spectrum/autocomplete/package.json
+++ b/packages/@react-spectrum/autocomplete/package.json
@@ -35,12 +35,7 @@
   },
   "dependencies": {
     "@react-types/autocomplete": "3.0.0-alpha.38",
-    "@react-types/button": "^3.15.1",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2",
     "react-stately": "^3.45.0"
   },
   "devDependencies": {
diff --git a/packages/@react-spectrum/avatar/package.json b/packages/@react-spectrum/avatar/package.json
index 3fd9e453e30..6598865c25d 100644
--- a/packages/@react-spectrum/avatar/package.json
+++ b/packages/@react-spectrum/avatar/package.json
@@ -35,10 +35,7 @@
   },
   "dependencies": {
     "@react-types/avatar": "^3.0.21",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/badge/package.json b/packages/@react-spectrum/badge/package.json
index 5fe560a3e57..c88e238cb3a 100644
--- a/packages/@react-spectrum/badge/package.json
+++ b/packages/@react-spectrum/badge/package.json
@@ -35,10 +35,7 @@
   },
   "dependencies": {
     "@react-types/badge": "^3.1.23",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/breadcrumbs/package.json b/packages/@react-spectrum/breadcrumbs/package.json
index 4605ef1d2c4..1c0b3785389 100644
--- a/packages/@react-spectrum/breadcrumbs/package.json
+++ b/packages/@react-spectrum/breadcrumbs/package.json
@@ -35,11 +35,7 @@
   },
   "dependencies": {
     "@react-types/breadcrumbs": "^3.7.19",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2",
     "react-stately": "^3.45.0"
   },
   "devDependencies": {
diff --git a/packages/@react-spectrum/button/package.json b/packages/@react-spectrum/button/package.json
index 0f9fc694f80..c4814ad1bbe 100644
--- a/packages/@react-spectrum/button/package.json
+++ b/packages/@react-spectrum/button/package.json
@@ -35,12 +35,7 @@
   },
   "dependencies": {
     "@react-types/button": "^3.15.1",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
diff --git a/packages/@react-spectrum/buttongroup/package.json b/packages/@react-spectrum/buttongroup/package.json
index f59a7e6e76c..13fce9a6a7e 100644
--- a/packages/@react-spectrum/buttongroup/package.json
+++ b/packages/@react-spectrum/buttongroup/package.json
@@ -35,10 +35,7 @@
   },
   "dependencies": {
     "@react-types/buttongroup": "^3.3.23",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
diff --git a/packages/@react-spectrum/calendar/package.json b/packages/@react-spectrum/calendar/package.json
index 5cfdc7cdd77..e0a7695b97b 100644
--- a/packages/@react-spectrum/calendar/package.json
+++ b/packages/@react-spectrum/calendar/package.json
@@ -34,15 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@internationalized/date": "^3.12.0",
-    "@react-types/button": "^3.15.1",
-    "@react-types/calendar": "^3.8.3",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@react-types/calendar": "^3.8.3",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
diff --git a/packages/@react-spectrum/card/package.json b/packages/@react-spectrum/card/package.json
index 3cfd8ad4fb3..82fe2801dbc 100644
--- a/packages/@react-spectrum/card/package.json
+++ b/packages/@react-spectrum/card/package.json
@@ -34,13 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/card": "3.0.0-alpha.43",
-    "@react-types/provider": "^3.8.15",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@react-types/card": "3.0.0-alpha.43",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/checkbox/package.json b/packages/@react-spectrum/checkbox/package.json
index 6fc38e9cd90..348a0dae4c5 100644
--- a/packages/@react-spectrum/checkbox/package.json
+++ b/packages/@react-spectrum/checkbox/package.json
@@ -34,14 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/checkbox": "^3.10.4",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria-components": "^1.16.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@react-types/checkbox": "^3.10.4",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
diff --git a/packages/@react-spectrum/color/package.json b/packages/@react-spectrum/color/package.json
index 6b54974ebd9..b09bc1a4b69 100644
--- a/packages/@react-spectrum/color/package.json
+++ b/packages/@react-spectrum/color/package.json
@@ -34,13 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/color": "^3.1.4",
-    "@react-types/shared": "^3.33.1",
-    "@react-types/textfield": "^3.12.8",
     "@swc/helpers": "^0.5.0",
-    "react-aria-components": "^1.16.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2",
     "react-stately": "^3.45.0"
   },
   "devDependencies": {
diff --git a/packages/@react-spectrum/combobox/package.json b/packages/@react-spectrum/combobox/package.json
index 272eba5e9d7..9ee3e5b897b 100644
--- a/packages/@react-spectrum/combobox/package.json
+++ b/packages/@react-spectrum/combobox/package.json
@@ -34,13 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/button": "^3.15.1",
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/combobox": "^3.14.0",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2",
     "react-stately": "^3.45.0"
   },
   "devDependencies": {
diff --git a/packages/@react-spectrum/contextualhelp/package.json b/packages/@react-spectrum/contextualhelp/package.json
index e0a765f16d3..5dc8f945d9c 100644
--- a/packages/@react-spectrum/contextualhelp/package.json
+++ b/packages/@react-spectrum/contextualhelp/package.json
@@ -34,12 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/contextualhelp": "^3.2.24",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/workflow": "^4.2.28",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
diff --git a/packages/@react-spectrum/datepicker/package.json b/packages/@react-spectrum/datepicker/package.json
index 8795b791afe..cfd6935e9ac 100644
--- a/packages/@react-spectrum/datepicker/package.json
+++ b/packages/@react-spectrum/datepicker/package.json
@@ -34,15 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@internationalized/date": "^3.12.0",
-    "@react-types/datepicker": "^3.13.5",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@spectrum-icons/workflow": "^4.2.28",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@react-types/datepicker": "^3.13.5",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
diff --git a/packages/@react-spectrum/dialog/package.json b/packages/@react-spectrum/dialog/package.json
index 0f501be4549..6c564ec3aad 100644
--- a/packages/@react-spectrum/dialog/package.json
+++ b/packages/@react-spectrum/dialog/package.json
@@ -34,14 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/button": "^3.15.1",
-    "@react-types/dialog": "^3.5.24",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@react-types/dialog": "^3.5.24",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
diff --git a/packages/@react-spectrum/divider/package.json b/packages/@react-spectrum/divider/package.json
index 91a53dcfa24..bbcab82baad 100644
--- a/packages/@react-spectrum/divider/package.json
+++ b/packages/@react-spectrum/divider/package.json
@@ -34,11 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/divider": "^3.3.23",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/dnd/package.json b/packages/@react-spectrum/dnd/package.json
index 57324640468..c29f6f0bc35 100644
--- a/packages/@react-spectrum/dnd/package.json
+++ b/packages/@react-spectrum/dnd/package.json
@@ -34,11 +34,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "react-aria": "^3.47.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/dropzone/package.json b/packages/@react-spectrum/dropzone/package.json
index acecd7e064a..dc6530abf7a 100644
--- a/packages/@react-spectrum/dropzone/package.json
+++ b/packages/@react-spectrum/dropzone/package.json
@@ -34,11 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria-components": "^1.16.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@adobe/react-spectrum": "^3.46.2",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
diff --git a/packages/@react-spectrum/filetrigger/package.json b/packages/@react-spectrum/filetrigger/package.json
index 6ad0495fc1e..e0cab2ba083 100644
--- a/packages/@react-spectrum/filetrigger/package.json
+++ b/packages/@react-spectrum/filetrigger/package.json
@@ -34,9 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@swc/helpers": "^0.5.0",
-    "react-aria-components": "^1.16.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "react-aria-components": "^1.16.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-spectrum/form/package.json b/packages/@react-spectrum/form/package.json
index 91bb369ba4f..118ec364683 100644
--- a/packages/@react-spectrum/form/package.json
+++ b/packages/@react-spectrum/form/package.json
@@ -34,12 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/form": "^3.7.18",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@react-types/form": "^3.7.18",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/icon/package.json b/packages/@react-spectrum/icon/package.json
index e4126590d2f..f8aa760ecca 100644
--- a/packages/@react-spectrum/icon/package.json
+++ b/packages/@react-spectrum/icon/package.json
@@ -34,10 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@adobe/react-spectrum": "^3.46.2",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/illustratedmessage/package.json b/packages/@react-spectrum/illustratedmessage/package.json
index e5ccd7662cf..a2ae72259cf 100644
--- a/packages/@react-spectrum/illustratedmessage/package.json
+++ b/packages/@react-spectrum/illustratedmessage/package.json
@@ -34,11 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/illustratedmessage": "^3.3.23",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/image/package.json b/packages/@react-spectrum/image/package.json
index 7f09aa1d001..d5acbd81d50 100644
--- a/packages/@react-spectrum/image/package.json
+++ b/packages/@react-spectrum/image/package.json
@@ -34,11 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/image": "^3.5.4",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/inlinealert/package.json b/packages/@react-spectrum/inlinealert/package.json
index 2ebeea29791..433c86abbbb 100644
--- a/packages/@react-spectrum/inlinealert/package.json
+++ b/packages/@react-spectrum/inlinealert/package.json
@@ -34,11 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@adobe/react-spectrum": "^3.46.2",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/label/package.json b/packages/@react-spectrum/label/package.json
index 56eb6d3b1a9..26b4e114e7d 100644
--- a/packages/@react-spectrum/label/package.json
+++ b/packages/@react-spectrum/label/package.json
@@ -34,12 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/label": "^3.9.17",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@adobe/react-spectrum": "^3.46.2",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/labeledvalue/package.json b/packages/@react-spectrum/labeledvalue/package.json
index d2befc8f25d..88245ca50b6 100644
--- a/packages/@react-spectrum/labeledvalue/package.json
+++ b/packages/@react-spectrum/labeledvalue/package.json
@@ -34,11 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@internationalized/date": "^3.12.0",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@adobe/react-spectrum": "^3.46.2",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/layout/package.json b/packages/@react-spectrum/layout/package.json
index 3ac3e5e9056..fc870583d0d 100644
--- a/packages/@react-spectrum/layout/package.json
+++ b/packages/@react-spectrum/layout/package.json
@@ -34,11 +34,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/layout": "^3.3.29",
     "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/link/package.json b/packages/@react-spectrum/link/package.json
index 9255e22ad8a..81d1aed13d4 100644
--- a/packages/@react-spectrum/link/package.json
+++ b/packages/@react-spectrum/link/package.json
@@ -34,11 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/link": "^3.6.7",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/list/package.json b/packages/@react-spectrum/list/package.json
index 4b24e1b2e41..663188416f1 100644
--- a/packages/@react-spectrum/list/package.json
+++ b/packages/@react-spectrum/list/package.json
@@ -34,13 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/grid": "^3.3.8",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0",
-    "react-transition-group": "^4.4.5",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
+    "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
   "devDependencies": {
diff --git a/packages/@react-spectrum/listbox/package.json b/packages/@react-spectrum/listbox/package.json
index 9bc0fbac113..78480a2294a 100644
--- a/packages/@react-spectrum/listbox/package.json
+++ b/packages/@react-spectrum/listbox/package.json
@@ -34,12 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/listbox": "^3.7.6",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2",
     "react-stately": "^3.45.0"
   },
   "devDependencies": {
diff --git a/packages/@react-spectrum/menu/package.json b/packages/@react-spectrum/menu/package.json
index 262148cb16a..8f0879b43c7 100644
--- a/packages/@react-spectrum/menu/package.json
+++ b/packages/@react-spectrum/menu/package.json
@@ -34,14 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/menu": "^3.10.7",
-    "@react-types/overlays": "^3.9.4",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@spectrum-icons/workflow": "^4.2.28",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2",
     "react-stately": "^3.45.0"
   },
   "devDependencies": {
diff --git a/packages/@react-spectrum/meter/package.json b/packages/@react-spectrum/meter/package.json
index b8a0ec1b7d2..32fbd93361c 100644
--- a/packages/@react-spectrum/meter/package.json
+++ b/packages/@react-spectrum/meter/package.json
@@ -34,11 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/meter": "^3.4.15",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/numberfield/package.json b/packages/@react-spectrum/numberfield/package.json
index 5ba497a472d..aeaf65bbe94 100644
--- a/packages/@react-spectrum/numberfield/package.json
+++ b/packages/@react-spectrum/numberfield/package.json
@@ -34,15 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/button": "^3.15.1",
-    "@react-types/numberfield": "^3.8.18",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@spectrum-icons/workflow": "^4.2.28",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@react-types/numberfield": "^3.8.18",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
diff --git a/packages/@react-spectrum/overlays/package.json b/packages/@react-spectrum/overlays/package.json
index 018393bd520..ee4f527e198 100644
--- a/packages/@react-spectrum/overlays/package.json
+++ b/packages/@react-spectrum/overlays/package.json
@@ -34,13 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/overlays": "^3.9.4",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-transition-group": "^4.4.5",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/picker/package.json b/packages/@react-spectrum/picker/package.json
index 76e82b1eadb..91d4ce4e804 100644
--- a/packages/@react-spectrum/picker/package.json
+++ b/packages/@react-spectrum/picker/package.json
@@ -34,12 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/select": "^3.12.2",
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2",
     "react-stately": "^3.45.0"
   },
   "devDependencies": {
diff --git a/packages/@react-spectrum/progress/package.json b/packages/@react-spectrum/progress/package.json
index dff5cea8b28..b40965927f2 100644
--- a/packages/@react-spectrum/progress/package.json
+++ b/packages/@react-spectrum/progress/package.json
@@ -34,11 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/progress": "^3.5.18",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/provider/package.json b/packages/@react-spectrum/provider/package.json
index c9012bd57ef..b8ee861ebb5 100644
--- a/packages/@react-spectrum/provider/package.json
+++ b/packages/@react-spectrum/provider/package.json
@@ -34,12 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/provider": "^3.8.15",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "clsx": "^2.0.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/radio/package.json b/packages/@react-spectrum/radio/package.json
index 5415406aee5..2d674920bb8 100644
--- a/packages/@react-spectrum/radio/package.json
+++ b/packages/@react-spectrum/radio/package.json
@@ -34,12 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/radio": "^3.9.4",
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@react-types/radio": "^3.9.4",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/s2/package.json b/packages/@react-spectrum/s2/package.json
index bedc684c9e4..e1a0b4001ed 100644
--- a/packages/@react-spectrum/s2/package.json
+++ b/packages/@react-spectrum/s2/package.json
@@ -164,7 +164,6 @@
     "jest": "^29.5.0"
   },
   "dependencies": {
-    "@adobe/react-spectrum": "3.46.2",
     "@internationalized/date": "^3.12.0",
     "@internationalized/number": "^3.6.5",
     "@parcel/macros": "^2.16.3",
diff --git a/packages/@react-spectrum/searchfield/package.json b/packages/@react-spectrum/searchfield/package.json
index 0232e63032b..031cc61af12 100644
--- a/packages/@react-spectrum/searchfield/package.json
+++ b/packages/@react-spectrum/searchfield/package.json
@@ -34,13 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/searchfield": "^3.6.8",
-    "@react-types/textfield": "^3.12.8",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@react-types/searchfield": "^3.6.8",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
diff --git a/packages/@react-spectrum/slider/package.json b/packages/@react-spectrum/slider/package.json
index 7f5f4bcd528..04d803e4100 100644
--- a/packages/@react-spectrum/slider/package.json
+++ b/packages/@react-spectrum/slider/package.json
@@ -34,12 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
-    "@react-types/slider": "^3.8.4",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@react-types/slider": "^3.8.4",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/statuslight/package.json b/packages/@react-spectrum/statuslight/package.json
index d47ab1431f0..6256dacff57 100644
--- a/packages/@react-spectrum/statuslight/package.json
+++ b/packages/@react-spectrum/statuslight/package.json
@@ -34,11 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/statuslight": "^3.3.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/steplist/package.json b/packages/@react-spectrum/steplist/package.json
index 4264a1b6865..f4b6dfe8b64 100644
--- a/packages/@react-spectrum/steplist/package.json
+++ b/packages/@react-spectrum/steplist/package.json
@@ -34,11 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
+    "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
   "devDependencies": {
diff --git a/packages/@react-spectrum/switch/package.json b/packages/@react-spectrum/switch/package.json
index 990657f000c..f3122816b2f 100644
--- a/packages/@react-spectrum/switch/package.json
+++ b/packages/@react-spectrum/switch/package.json
@@ -34,12 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
-    "@react-types/switch": "^3.5.17",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@react-types/switch": "^3.5.17",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/table/package.json b/packages/@react-spectrum/table/package.json
index cb2dca05b44..0b800d038ca 100644
--- a/packages/@react-spectrum/table/package.json
+++ b/packages/@react-spectrum/table/package.json
@@ -34,14 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/grid": "^3.3.8",
-    "@react-types/shared": "^3.33.1",
-    "@react-types/table": "^3.13.6",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@react-types/table": "^3.13.6",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
diff --git a/packages/@react-spectrum/tabs/package.json b/packages/@react-spectrum/tabs/package.json
index 995774ced98..4c8af8488ae 100644
--- a/packages/@react-spectrum/tabs/package.json
+++ b/packages/@react-spectrum/tabs/package.json
@@ -34,12 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/select": "^3.12.2",
-    "@react-types/shared": "^3.33.1",
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/tabs": "^3.3.22",
     "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2",
     "react-stately": "^3.45.0"
   },
   "devDependencies": {
diff --git a/packages/@react-spectrum/tag/package.json b/packages/@react-spectrum/tag/package.json
index 291982d542c..44c95534a7b 100644
--- a/packages/@react-spectrum/tag/package.json
+++ b/packages/@react-spectrum/tag/package.json
@@ -34,10 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
+    "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
   "devDependencies": {
diff --git a/packages/@react-spectrum/text/package.json b/packages/@react-spectrum/text/package.json
index d9e2b7084ad..672570fd0b4 100644
--- a/packages/@react-spectrum/text/package.json
+++ b/packages/@react-spectrum/text/package.json
@@ -34,12 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/text": "^3.3.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria-components": "^1.16.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
diff --git a/packages/@react-spectrum/textfield/package.json b/packages/@react-spectrum/textfield/package.json
index 2217f41e231..13118f0fa8c 100644
--- a/packages/@react-spectrum/textfield/package.json
+++ b/packages/@react-spectrum/textfield/package.json
@@ -34,13 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
-    "@react-types/textfield": "^3.12.8",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@react-types/textfield": "^3.12.8",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
diff --git a/packages/@react-spectrum/theme-dark/package.json b/packages/@react-spectrum/theme-dark/package.json
index 25a971e97af..c24a6071a73 100644
--- a/packages/@react-spectrum/theme-dark/package.json
+++ b/packages/@react-spectrum/theme-dark/package.json
@@ -34,9 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/provider": "^3.8.15",
-    "@swc/helpers": "^0.5.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@adobe/react-spectrum": "^3.46.2",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/theme-default/package.json b/packages/@react-spectrum/theme-default/package.json
index 61941270e46..96080805abd 100644
--- a/packages/@react-spectrum/theme-default/package.json
+++ b/packages/@react-spectrum/theme-default/package.json
@@ -34,9 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/provider": "^3.8.15",
-    "@swc/helpers": "^0.5.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@adobe/react-spectrum": "^3.46.2",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/theme-express/package.json b/packages/@react-spectrum/theme-express/package.json
index fd8ea67d210..bf445d73ecd 100644
--- a/packages/@react-spectrum/theme-express/package.json
+++ b/packages/@react-spectrum/theme-express/package.json
@@ -34,9 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/provider": "^3.8.15",
-    "@swc/helpers": "^0.5.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@adobe/react-spectrum": "^3.46.2",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/theme-light/package.json b/packages/@react-spectrum/theme-light/package.json
index d1924309f65..67918429983 100644
--- a/packages/@react-spectrum/theme-light/package.json
+++ b/packages/@react-spectrum/theme-light/package.json
@@ -34,9 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/provider": "^3.8.15",
-    "@swc/helpers": "^0.5.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@adobe/react-spectrum": "^3.46.2",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/toast/package.json b/packages/@react-spectrum/toast/package.json
index 8b07f048f67..f881181e3c7 100644
--- a/packages/@react-spectrum/toast/package.json
+++ b/packages/@react-spectrum/toast/package.json
@@ -34,13 +34,8 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0",
-    "use-sync-external-store": "^1.6.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1",
diff --git a/packages/@react-spectrum/tooltip/package.json b/packages/@react-spectrum/tooltip/package.json
index d2eececfab6..ad1f6d9f59b 100644
--- a/packages/@react-spectrum/tooltip/package.json
+++ b/packages/@react-spectrum/tooltip/package.json
@@ -34,14 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/overlays": "^3.9.4",
-    "@react-types/shared": "^3.33.1",
-    "@react-types/tooltip": "^3.5.2",
-    "@spectrum-icons/ui": "^3.6.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
     "@adobe/react-spectrum": "^3.46.2",
-    "react-stately": "^3.45.0"
+    "@react-types/tooltip": "^3.5.2",
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/tree/package.json b/packages/@react-spectrum/tree/package.json
index d15c06c66b9..b03cce90c0b 100644
--- a/packages/@react-spectrum/tree/package.json
+++ b/packages/@react-spectrum/tree/package.json
@@ -34,12 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
-    "@spectrum-icons/ui": "^3.6.23",
+    "@adobe/react-spectrum": "^3.46.2",
     "@swc/helpers": "^0.5.0",
-    "react-aria-components": "^1.16.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-spectrum/utils/package.json b/packages/@react-spectrum/utils/package.json
index 9a02796df2f..56a6d58106f 100644
--- a/packages/@react-spectrum/utils/package.json
+++ b/packages/@react-spectrum/utils/package.json
@@ -31,11 +31,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
+    "@adobe/react-spectrum": "^3.46.2",
     "@swc/helpers": "^0.5.0",
-    "clsx": "^2.0.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "react-aria": "^3.47.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/@react-spectrum/view/package.json b/packages/@react-spectrum/view/package.json
index 0ddff9bd112..6190b8abe38 100644
--- a/packages/@react-spectrum/view/package.json
+++ b/packages/@react-spectrum/view/package.json
@@ -34,11 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/view": "^3.4.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-spectrum/well/package.json b/packages/@react-spectrum/well/package.json
index 8caa7eb4648..95b4afbf32b 100644
--- a/packages/@react-spectrum/well/package.json
+++ b/packages/@react-spectrum/well/package.json
@@ -34,11 +34,9 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/well": "^3.3.23",
-    "@swc/helpers": "^0.5.0",
-    "react-aria": "^3.47.0",
-    "@adobe/react-spectrum": "^3.46.2"
+    "@swc/helpers": "^0.5.0"
   },
   "devDependencies": {
     "@adobe/spectrum-css-temp": "3.0.0-alpha.1"
diff --git a/packages/@react-stately/calendar/package.json b/packages/@react-stately/calendar/package.json
index 33942ce2f35..a92e9583cc3 100644
--- a/packages/@react-stately/calendar/package.json
+++ b/packages/@react-stately/calendar/package.json
@@ -29,9 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@internationalized/date": "^3.12.0",
-    "@react-types/calendar": "^3.8.3",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/checkbox/package.json b/packages/@react-stately/checkbox/package.json
index 45bc87f693b..5700acaa773 100644
--- a/packages/@react-stately/checkbox/package.json
+++ b/packages/@react-stately/checkbox/package.json
@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "@react-types/checkbox": "^3.10.4",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/collections/package.json b/packages/@react-stately/collections/package.json
index 43314ad1030..766b0fb548b 100644
--- a/packages/@react-stately/collections/package.json
+++ b/packages/@react-stately/collections/package.json
@@ -29,7 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/color/package.json b/packages/@react-stately/color/package.json
index 1e1b1f1e3ef..1040a4a85d5 100644
--- a/packages/@react-stately/color/package.json
+++ b/packages/@react-stately/color/package.json
@@ -29,10 +29,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@internationalized/number": "^3.6.5",
-    "@internationalized/string": "^3.2.7",
     "@react-types/color": "^3.1.4",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/combobox/package.json b/packages/@react-stately/combobox/package.json
index bde7b4a8d94..7726dfccd48 100644
--- a/packages/@react-stately/combobox/package.json
+++ b/packages/@react-stately/combobox/package.json
@@ -29,8 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/combobox": "^3.14.0",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/data/package.json b/packages/@react-stately/data/package.json
index 79f1a7f638e..3fc319579ae 100644
--- a/packages/@react-stately/data/package.json
+++ b/packages/@react-stately/data/package.json
@@ -29,7 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/datepicker/package.json b/packages/@react-stately/datepicker/package.json
index 7399a7d9403..90152e67be3 100644
--- a/packages/@react-stately/datepicker/package.json
+++ b/packages/@react-stately/datepicker/package.json
@@ -29,11 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@internationalized/date": "^3.12.0",
-    "@internationalized/number": "^3.6.5",
-    "@internationalized/string": "^3.2.7",
-    "@react-types/datepicker": "^3.13.5",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/disclosure/package.json b/packages/@react-stately/disclosure/package.json
index f96d166aa9a..597cda890a7 100644
--- a/packages/@react-stately/disclosure/package.json
+++ b/packages/@react-stately/disclosure/package.json
@@ -29,7 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/dnd/package.json b/packages/@react-stately/dnd/package.json
index ba382076888..44b1cca5c3c 100644
--- a/packages/@react-stately/dnd/package.json
+++ b/packages/@react-stately/dnd/package.json
@@ -29,7 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/form/package.json b/packages/@react-stately/form/package.json
index 4ff1066c5aa..dca38666fb8 100644
--- a/packages/@react-stately/form/package.json
+++ b/packages/@react-stately/form/package.json
@@ -29,7 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/grid/package.json b/packages/@react-stately/grid/package.json
index 92a51c84ad5..3e686574040 100644
--- a/packages/@react-stately/grid/package.json
+++ b/packages/@react-stately/grid/package.json
@@ -29,8 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/grid": "^3.3.8",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/layout/package.json b/packages/@react-stately/layout/package.json
index c4783ac316c..10e5c0116d0 100644
--- a/packages/@react-stately/layout/package.json
+++ b/packages/@react-stately/layout/package.json
@@ -29,9 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/grid": "^3.3.8",
-    "@react-types/shared": "^3.33.1",
-    "@react-types/table": "^3.13.6",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/list/package.json b/packages/@react-stately/list/package.json
index bb52b6411f3..a88b27ee7f9 100644
--- a/packages/@react-stately/list/package.json
+++ b/packages/@react-stately/list/package.json
@@ -29,7 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/menu/package.json b/packages/@react-stately/menu/package.json
index a59d68d6c51..58ca2cda67f 100644
--- a/packages/@react-stately/menu/package.json
+++ b/packages/@react-stately/menu/package.json
@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "@react-types/menu": "^3.10.7",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/numberfield/package.json b/packages/@react-stately/numberfield/package.json
index eafdc5d8366..62e5d9c15c3 100644
--- a/packages/@react-stately/numberfield/package.json
+++ b/packages/@react-stately/numberfield/package.json
@@ -29,8 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@internationalized/number": "^3.6.5",
-    "@react-types/numberfield": "^3.8.18",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/radio/package.json b/packages/@react-stately/radio/package.json
index 21506f21413..65b2042629e 100644
--- a/packages/@react-stately/radio/package.json
+++ b/packages/@react-stately/radio/package.json
@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "@react-types/radio": "^3.9.4",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/select/package.json b/packages/@react-stately/select/package.json
index c9a1d9faa74..16649c38a27 100644
--- a/packages/@react-stately/select/package.json
+++ b/packages/@react-stately/select/package.json
@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "@react-types/select": "^3.12.2",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/selection/package.json b/packages/@react-stately/selection/package.json
index c663781fab9..6f0e4cf684e 100644
--- a/packages/@react-stately/selection/package.json
+++ b/packages/@react-stately/selection/package.json
@@ -29,7 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/slider/package.json b/packages/@react-stately/slider/package.json
index 2cedf26f192..7e0b042c5f3 100644
--- a/packages/@react-stately/slider/package.json
+++ b/packages/@react-stately/slider/package.json
@@ -29,8 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
-    "@react-types/slider": "^3.8.4",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/steplist/package.json b/packages/@react-stately/steplist/package.json
index 4ab51bebee4..b4e5c4d617b 100644
--- a/packages/@react-stately/steplist/package.json
+++ b/packages/@react-stately/steplist/package.json
@@ -29,7 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/table/package.json b/packages/@react-stately/table/package.json
index 5f5ba27168a..a3be4f1205e 100644
--- a/packages/@react-stately/table/package.json
+++ b/packages/@react-stately/table/package.json
@@ -29,8 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/grid": "^3.3.8",
-    "@react-types/shared": "^3.33.1",
     "@react-types/table": "^3.13.6",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
diff --git a/packages/@react-stately/tabs/package.json b/packages/@react-stately/tabs/package.json
index 56355c96802..b969fcd0da8 100644
--- a/packages/@react-stately/tabs/package.json
+++ b/packages/@react-stately/tabs/package.json
@@ -29,7 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@react-types/tabs": "^3.3.22",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
diff --git a/packages/@react-stately/toast/package.json b/packages/@react-stately/toast/package.json
index 7c6f75d7e54..d693349b11d 100644
--- a/packages/@react-stately/toast/package.json
+++ b/packages/@react-stately/toast/package.json
@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "@swc/helpers": "^0.5.0",
-    "use-sync-external-store": "^1.6.0",
     "react-stately": "^3.45.0"
   },
   "devDependencies": {
diff --git a/packages/@react-stately/toggle/package.json b/packages/@react-stately/toggle/package.json
index b2ba6014805..e6ab742232d 100644
--- a/packages/@react-stately/toggle/package.json
+++ b/packages/@react-stately/toggle/package.json
@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "@react-types/checkbox": "^3.10.4",
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/tree/package.json b/packages/@react-stately/tree/package.json
index b8f83597c11..77d234a1d9f 100644
--- a/packages/@react-stately/tree/package.json
+++ b/packages/@react-stately/tree/package.json
@@ -29,7 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-stately/virtualizer/package.json b/packages/@react-stately/virtualizer/package.json
index e7f1043cfea..86601017de7 100644
--- a/packages/@react-stately/virtualizer/package.json
+++ b/packages/@react-stately/virtualizer/package.json
@@ -29,7 +29,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
   },
diff --git a/packages/@react-types/sidenav/package.json b/packages/@react-types/sidenav/package.json
index 46e815247fe..56640432ae0 100644
--- a/packages/@react-types/sidenav/package.json
+++ b/packages/@react-types/sidenav/package.json
@@ -10,7 +10,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-stately/virtualizer": "^4.0.0",
     "@react-types/shared": "^3.1.0"
   },
   "peerDependencies": {
diff --git a/packages/react-aria-components/package.json b/packages/react-aria-components/package.json
index 4b73f123230..8979a89bd22 100644
--- a/packages/react-aria-components/package.json
+++ b/packages/react-aria-components/package.json
@@ -47,7 +47,6 @@
   },
   "dependencies": {
     "@internationalized/date": "^3.12.0",
-    "@internationalized/string": "^3.2.7",
     "@react-types/breadcrumbs": "^3.7.19",
     "@react-types/button": "^3.15.1",
     "@react-types/calendar": "^3.8.3",
@@ -77,8 +76,7 @@
     "@swc/helpers": "^0.5.0",
     "client-only": "^0.0.1",
     "react-aria": "^3.47.0",
-    "react-stately": "^3.45.0",
-    "use-sync-external-store": "^1.6.0"
+    "react-stately": "^3.45.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/react-aria/package.json b/packages/react-aria/package.json
index 408a015bdcb..1f58a5162a8 100644
--- a/packages/react-aria/package.json
+++ b/packages/react-aria/package.json
@@ -45,28 +45,21 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@internationalized/date": "^3.12.0",
+    "@internationalized/message": "^3.1.8",
+    "@internationalized/number": "^3.6.5",
     "@internationalized/string": "^3.2.7",
-    "@react-types/shared": "^3.33.1",
-    "react-aria": "3.47.0",
-    "react-stately": "3.45.0",
     "@react-types/actiongroup": "^3.4.23",
-    "@swc/helpers": "^0.5.0",
-    "aria-hidden": "^1.2.3",
     "@react-types/autocomplete": "3.0.0-alpha.38",
-    "@react-types/button": "^3.15.1",
     "@react-types/breadcrumbs": "^3.7.19",
-    "@internationalized/date": "^3.12.0",
+    "@react-types/button": "^3.15.1",
     "@react-types/calendar": "^3.8.3",
     "@react-types/checkbox": "^3.10.4",
-    "use-sync-external-store": "^1.6.0",
     "@react-types/color": "^3.1.4",
     "@react-types/combobox": "^3.14.0",
-    "@internationalized/number": "^3.6.5",
     "@react-types/datepicker": "^3.13.5",
     "@react-types/dialog": "^3.5.24",
-    "clsx": "^2.0.0",
     "@react-types/grid": "^3.3.8",
-    "@internationalized/message": "^3.1.8",
     "@react-types/link": "^3.6.7",
     "@react-types/listbox": "^3.7.6",
     "@react-types/menu": "^3.10.7",
@@ -77,12 +70,19 @@
     "@react-types/radio": "^3.9.4",
     "@react-types/searchfield": "^3.6.8",
     "@react-types/select": "^3.12.2",
+    "@react-types/shared": "^3.33.1",
     "@react-types/slider": "^3.8.4",
     "@react-types/switch": "^3.5.17",
     "@react-types/table": "^3.13.6",
     "@react-types/tabs": "^3.3.22",
     "@react-types/textfield": "^3.12.8",
-    "@react-types/tooltip": "^3.5.2"
+    "@react-types/tooltip": "^3.5.2",
+    "@swc/helpers": "^0.5.0",
+    "aria-hidden": "^1.2.3",
+    "clsx": "^2.0.0",
+    "react-aria": "3.47.0",
+    "react-stately": "3.45.0",
+    "use-sync-external-store": "^1.6.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
diff --git a/packages/react-stately/package.json b/packages/react-stately/package.json
index 5de046d9666..6ea36b1bf6e 100644
--- a/packages/react-stately/package.json
+++ b/packages/react-stately/package.json
@@ -34,29 +34,29 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-types/shared": "^3.33.1",
-    "react-stately": "3.45.0",
-    "@swc/helpers": "^0.5.0",
     "@internationalized/date": "^3.12.0",
-    "@react-types/calendar": "^3.8.3",
-    "@react-types/checkbox": "^3.10.4",
     "@internationalized/number": "^3.6.5",
     "@internationalized/string": "^3.2.7",
+    "@react-types/calendar": "^3.8.3",
+    "@react-types/checkbox": "^3.10.4",
     "@react-types/color": "^3.1.4",
     "@react-types/combobox": "^3.14.0",
     "@react-types/datepicker": "^3.13.5",
     "@react-types/grid": "^3.3.8",
-    "@react-types/table": "^3.13.6",
     "@react-types/menu": "^3.10.7",
     "@react-types/numberfield": "^3.8.18",
     "@react-types/overlays": "^3.9.4",
     "@react-types/radio": "^3.9.4",
     "@react-types/searchfield": "^3.6.8",
     "@react-types/select": "^3.12.2",
+    "@react-types/shared": "^3.33.1",
     "@react-types/slider": "^3.8.4",
+    "@react-types/table": "^3.13.6",
     "@react-types/tabs": "^3.3.22",
-    "use-sync-external-store": "^1.6.0",
-    "@react-types/tooltip": "^3.5.2"
+    "@react-types/tooltip": "^3.5.2",
+    "@swc/helpers": "^0.5.0",
+    "react-stately": "3.45.0",
+    "use-sync-external-store": "^1.6.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
diff --git a/scripts/removeUnusedDeps.js b/scripts/removeUnusedDeps.js
index 11eed27ac0f..ba1ac33942d 100644
--- a/scripts/removeUnusedDeps.js
+++ b/scripts/removeUnusedDeps.js
@@ -3,7 +3,7 @@ const glob = require('glob').sync;
 const path = require('path');
 const fs = require('fs');
 
-for (let pkg of glob('packages/{react-aria-components,{@react-aria,@react-spectrum,@react-stately,@react-types,@internationalized}/*}/package.json')) {
+for (let pkg of glob('packages/{react-aria-components,react-aria,react-stately,@adobe/react-spectrum,{@react-aria,@react-spectrum,@react-stately,@react-types,@internationalized}/*}/package.json')) {
   let json = JSON.parse(fs.readFileSync(pkg, 'utf8'));
   if (json.name === '@internationalized/string-compiler') {
     // This is a CommonJS package, so we can't analyze it.
@@ -14,13 +14,13 @@ for (let pkg of glob('packages/{react-aria-components,{@react-aria,@react-spectr
   let dir = path.dirname(pkg);
   let seenDeps = new Set(['@swc/helpers']);
 
-  for (let file of glob(`${dir}/src/*.{ts,tsx}`)) {
+  for (let file of glob(`${dir}/**/*.{ts,tsx}`)) {
     let ast = parse(fs.readFileSync(file, 'utf8'), {
       filename: file,
       allowReturnOutsideFunction: true,
       strictMode: false,
       sourceType: 'module',
-      plugins: ['classProperties', 'exportDefaultFrom', 'exportNamespaceFrom', 'dynamicImport', 'typescript', 'jsx', 'classPrivateProperties', 'classPrivateMethods']
+      plugins: ['classProperties', 'exportDefaultFrom', 'exportNamespaceFrom', 'dynamicImport', 'typescript', 'jsx', 'classPrivateProperties', 'classPrivateMethods', 'importAttributes']
     });
 
     for (let node of ast.program.body) {
diff --git a/yarn.lock b/yarn.lock
index d4526bf9a25..2ddafc328d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -88,76 +88,72 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@adobe/react-spectrum@npm:^3.46.2, @adobe/react-spectrum@workspace:packages/@adobe/react-spectrum":
+"@adobe/react-spectrum@npm:3.46.2, @adobe/react-spectrum@npm:^3.46.2, @adobe/react-spectrum@workspace:packages/@adobe/react-spectrum":
   version: 0.0.0-use.local
   resolution: "@adobe/react-spectrum@workspace:packages/@adobe/react-spectrum"
   dependencies:
+    "@adobe/react-spectrum": "npm:3.46.2"
+    "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@babel/cli": "npm:^7.12.10"
     "@babel/core": "npm:^7.24.3"
-    "@internationalized/string": "npm:^3.2.7"
-    "@react-aria/collections": "npm:^3.0.3"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-aria/visually-hidden": "npm:^3.8.31"
-    "@react-spectrum/accordion": "npm:^3.0.16"
-    "@react-spectrum/actionbar": "npm:^3.6.17"
-    "@react-spectrum/actiongroup": "npm:^3.11.7"
-    "@react-spectrum/avatar": "npm:^3.0.29"
-    "@react-spectrum/badge": "npm:^3.1.33"
-    "@react-spectrum/breadcrumbs": "npm:^3.9.27"
-    "@react-spectrum/button": "npm:^3.17.7"
-    "@react-spectrum/buttongroup": "npm:^3.6.29"
-    "@react-spectrum/calendar": "npm:^3.7.11"
-    "@react-spectrum/checkbox": "npm:^3.10.7"
-    "@react-spectrum/color": "npm:^3.1.7"
-    "@react-spectrum/combobox": "npm:^3.16.7"
-    "@react-spectrum/contextualhelp": "npm:^3.6.31"
-    "@react-spectrum/datepicker": "npm:^3.14.11"
-    "@react-spectrum/dialog": "npm:^3.9.7"
-    "@react-spectrum/divider": "npm:^3.5.30"
-    "@react-spectrum/dnd": "npm:^3.6.5"
-    "@react-spectrum/dropzone": "npm:^3.0.21"
-    "@react-spectrum/filetrigger": "npm:^3.0.21"
-    "@react-spectrum/form": "npm:^3.7.22"
-    "@react-spectrum/icon": "npm:^3.8.12"
-    "@react-spectrum/illustratedmessage": "npm:^3.5.17"
-    "@react-spectrum/image": "npm:^3.6.5"
-    "@react-spectrum/inlinealert": "npm:^3.2.23"
-    "@react-spectrum/labeledvalue": "npm:^3.2.10"
-    "@react-spectrum/layout": "npm:^3.6.22"
-    "@react-spectrum/link": "npm:^3.6.25"
-    "@react-spectrum/list": "npm:^3.10.11"
-    "@react-spectrum/listbox": "npm:^3.15.11"
-    "@react-spectrum/menu": "npm:^3.22.11"
-    "@react-spectrum/meter": "npm:^3.5.17"
-    "@react-spectrum/numberfield": "npm:^3.10.5"
-    "@react-spectrum/overlays": "npm:^5.9.3"
-    "@react-spectrum/picker": "npm:^3.16.7"
-    "@react-spectrum/progress": "npm:^3.7.23"
-    "@react-spectrum/provider": "npm:^3.10.14"
-    "@react-spectrum/radio": "npm:^3.7.24"
-    "@react-spectrum/searchfield": "npm:^3.8.26"
-    "@react-spectrum/slider": "npm:^3.8.5"
-    "@react-spectrum/statuslight": "npm:^3.5.29"
-    "@react-spectrum/switch": "npm:^3.6.9"
-    "@react-spectrum/table": "npm:^3.17.11"
-    "@react-spectrum/tabs": "npm:^3.8.30"
-    "@react-spectrum/tag": "npm:^3.3.10"
-    "@react-spectrum/text": "npm:^3.5.25"
-    "@react-spectrum/textfield": "npm:^3.14.5"
-    "@react-spectrum/theme-dark": "npm:^3.5.24"
-    "@react-spectrum/theme-default": "npm:^3.5.24"
-    "@react-spectrum/theme-light": "npm:^3.4.24"
-    "@react-spectrum/toast": "npm:^3.1.7"
-    "@react-spectrum/tooltip": "npm:^3.8.2"
-    "@react-spectrum/tree": "npm:^3.1.11"
-    "@react-spectrum/view": "npm:^3.6.26"
-    "@react-spectrum/well": "npm:^3.4.30"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/data": "npm:^3.15.2"
+    "@internationalized/date": "npm:^3.12.0"
+    "@internationalized/message": "npm:^3.1.8"
+    "@react-spectrum/style-macro-s1": "npm:3.0.0-alpha.5"
+    "@react-types/actionbar": "npm:^3.1.21"
+    "@react-types/actiongroup": "npm:^3.4.23"
+    "@react-types/autocomplete": "npm:3.0.0-alpha.38"
+    "@react-types/avatar": "npm:^3.0.21"
+    "@react-types/badge": "npm:^3.1.23"
+    "@react-types/breadcrumbs": "npm:^3.7.19"
+    "@react-types/button": "npm:^3.15.1"
+    "@react-types/buttongroup": "npm:^3.3.23"
+    "@react-types/calendar": "npm:^3.8.3"
+    "@react-types/card": "npm:3.0.0-alpha.43"
+    "@react-types/checkbox": "npm:^3.10.4"
+    "@react-types/color": "npm:^3.1.4"
+    "@react-types/combobox": "npm:^3.14.0"
+    "@react-types/contextualhelp": "npm:^3.2.24"
+    "@react-types/datepicker": "npm:^3.13.5"
+    "@react-types/dialog": "npm:^3.5.24"
+    "@react-types/divider": "npm:^3.3.23"
+    "@react-types/form": "npm:^3.7.18"
+    "@react-types/grid": "npm:^3.3.8"
+    "@react-types/illustratedmessage": "npm:^3.3.23"
+    "@react-types/image": "npm:^3.5.4"
+    "@react-types/label": "npm:^3.9.17"
+    "@react-types/layout": "npm:^3.3.29"
+    "@react-types/link": "npm:^3.6.7"
+    "@react-types/listbox": "npm:^3.7.6"
+    "@react-types/menu": "npm:^3.10.7"
+    "@react-types/meter": "npm:^3.4.15"
+    "@react-types/numberfield": "npm:^3.8.18"
+    "@react-types/overlays": "npm:^3.9.4"
+    "@react-types/progress": "npm:^3.5.18"
+    "@react-types/provider": "npm:^3.8.15"
+    "@react-types/radio": "npm:^3.9.4"
+    "@react-types/searchfield": "npm:^3.6.8"
+    "@react-types/select": "npm:^3.12.2"
     "@react-types/shared": "npm:^3.33.1"
+    "@react-types/slider": "npm:^3.8.4"
+    "@react-types/statuslight": "npm:^3.3.23"
+    "@react-types/switch": "npm:^3.5.17"
+    "@react-types/table": "npm:^3.13.6"
+    "@react-types/tabs": "npm:^3.3.22"
+    "@react-types/text": "npm:^3.3.23"
+    "@react-types/textfield": "npm:^3.12.8"
+    "@react-types/tooltip": "npm:^3.5.2"
+    "@react-types/view": "npm:^3.4.23"
+    "@react-types/well": "npm:^3.3.23"
+    "@spectrum-icons/ui": "npm:^3.6.23"
+    "@spectrum-icons/workflow": "npm:^4.2.28"
+    "@swc/helpers": "npm:^0.5.0"
     client-only: "npm:^0.0.1"
+    clsx: "npm:^2.0.0"
+    react-aria: "npm:3.47.0"
+    react-aria-components: "npm:^1.16.0"
+    react-stately: "npm:3.45.0"
+    react-transition-group: "npm:^4.4.5"
+    use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5365,18 +5361,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-aria/actiongroup@npm:^3.7.24, @react-aria/actiongroup@workspace:packages/@react-aria/actiongroup":
+"@react-aria/actiongroup@workspace:packages/@react-aria/actiongroup":
   version: 0.0.0-use.local
   resolution: "@react-aria/actiongroup@workspace:packages/@react-aria/actiongroup"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/list": "npm:^3.13.4"
     "@react-types/actiongroup": "npm:^3.4.23"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5388,250 +5379,161 @@ __metadata:
   resolution: "@react-aria/aria-modal-polyfill@workspace:packages/@react-aria/aria-modal-polyfill"
   dependencies:
     "@swc/helpers": "npm:^0.5.0"
-    aria-hidden: "npm:^1.2.3"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/autocomplete@npm:3.0.0-rc.6, @react-aria/autocomplete@workspace:packages/@react-aria/autocomplete":
+"@react-aria/autocomplete@workspace:packages/@react-aria/autocomplete":
   version: 0.0.0-use.local
   resolution: "@react-aria/autocomplete@workspace:packages/@react-aria/autocomplete"
   dependencies:
-    "@react-aria/combobox": "npm:^3.15.0"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/listbox": "npm:^3.15.3"
-    "@react-aria/searchfield": "npm:^3.8.12"
-    "@react-aria/textfield": "npm:^3.18.5"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/autocomplete": "npm:3.0.0-beta.4"
-    "@react-stately/combobox": "npm:^3.13.0"
     "@react-types/autocomplete": "npm:3.0.0-alpha.38"
-    "@react-types/button": "npm:^3.15.1"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/breadcrumbs@npm:^3.5.32, @react-aria/breadcrumbs@workspace:packages/@react-aria/breadcrumbs":
+"@react-aria/breadcrumbs@workspace:packages/@react-aria/breadcrumbs":
   version: 0.0.0-use.local
   resolution: "@react-aria/breadcrumbs@workspace:packages/@react-aria/breadcrumbs"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/link": "npm:^3.8.9"
-    "@react-aria/utils": "npm:^3.33.1"
     "@react-types/breadcrumbs": "npm:^3.7.19"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/button@npm:^3.14.5, @react-aria/button@workspace:packages/@react-aria/button":
+"@react-aria/button@workspace:packages/@react-aria/button":
   version: 0.0.0-use.local
   resolution: "@react-aria/button@workspace:packages/@react-aria/button"
   dependencies:
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/toolbar": "npm:3.0.0-beta.24"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/toggle": "npm:^3.9.5"
     "@react-types/button": "npm:^3.15.1"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/calendar@npm:^3.9.5, @react-aria/calendar@workspace:packages/@react-aria/calendar":
+"@react-aria/calendar@workspace:packages/@react-aria/calendar":
   version: 0.0.0-use.local
   resolution: "@react-aria/calendar@workspace:packages/@react-aria/calendar"
   dependencies:
-    "@internationalized/date": "npm:^3.12.0"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/calendar": "npm:^3.9.3"
-    "@react-types/button": "npm:^3.15.1"
     "@react-types/calendar": "npm:^3.8.3"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/checkbox@npm:^3.16.5, @react-aria/checkbox@workspace:packages/@react-aria/checkbox":
+"@react-aria/checkbox@workspace:packages/@react-aria/checkbox":
   version: 0.0.0-use.local
   resolution: "@react-aria/checkbox@workspace:packages/@react-aria/checkbox"
   dependencies:
-    "@react-aria/form": "npm:^3.1.5"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/label": "npm:^3.7.25"
-    "@react-aria/toggle": "npm:^3.12.5"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/checkbox": "npm:^3.7.5"
-    "@react-stately/form": "npm:^3.2.4"
-    "@react-stately/toggle": "npm:^3.9.5"
     "@react-types/checkbox": "npm:^3.10.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/collections@npm:^3.0.3, @react-aria/collections@workspace:packages/@react-aria/collections":
+"@react-aria/collections@workspace:packages/@react-aria/collections":
   version: 0.0.0-use.local
   resolution: "@react-aria/collections@workspace:packages/@react-aria/collections"
   dependencies:
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
-    use-sync-external-store: "npm:^1.6.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/color@npm:^3.1.5, @react-aria/color@workspace:packages/@react-aria/color":
+"@react-aria/color@workspace:packages/@react-aria/color":
   version: 0.0.0-use.local
   resolution: "@react-aria/color@workspace:packages/@react-aria/color"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/numberfield": "npm:^3.12.5"
-    "@react-aria/slider": "npm:^3.8.5"
-    "@react-aria/spinbutton": "npm:^3.7.2"
-    "@react-aria/textfield": "npm:^3.18.5"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-aria/visually-hidden": "npm:^3.8.31"
-    "@react-stately/color": "npm:^3.9.5"
-    "@react-stately/form": "npm:^3.2.4"
     "@react-types/color": "npm:^3.1.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/combobox@npm:^3.15.0, @react-aria/combobox@workspace:packages/@react-aria/combobox":
+"@react-aria/combobox@workspace:packages/@react-aria/combobox":
   version: 0.0.0-use.local
   resolution: "@react-aria/combobox@workspace:packages/@react-aria/combobox"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/listbox": "npm:^3.15.3"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/menu": "npm:^3.21.0"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/selection": "npm:^3.27.2"
-    "@react-aria/textfield": "npm:^3.18.5"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/combobox": "npm:^3.13.0"
-    "@react-stately/form": "npm:^3.2.4"
-    "@react-types/button": "npm:^3.15.1"
     "@react-types/combobox": "npm:^3.14.0"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/datepicker@npm:^3.16.1, @react-aria/datepicker@workspace:packages/@react-aria/datepicker":
+"@react-aria/datepicker@workspace:packages/@react-aria/datepicker":
   version: 0.0.0-use.local
   resolution: "@react-aria/datepicker@workspace:packages/@react-aria/datepicker"
   dependencies:
-    "@internationalized/date": "npm:^3.12.0"
-    "@internationalized/number": "npm:^3.6.5"
-    "@internationalized/string": "npm:^3.2.7"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/form": "npm:^3.1.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/label": "npm:^3.7.25"
-    "@react-aria/spinbutton": "npm:^3.7.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/datepicker": "npm:^3.16.1"
-    "@react-stately/form": "npm:^3.2.4"
-    "@react-types/button": "npm:^3.15.1"
-    "@react-types/calendar": "npm:^3.8.3"
     "@react-types/datepicker": "npm:^3.13.5"
-    "@react-types/dialog": "npm:^3.5.24"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/dialog@npm:^3.5.34, @react-aria/dialog@workspace:packages/@react-aria/dialog":
+"@react-aria/dialog@workspace:packages/@react-aria/dialog":
   version: 0.0.0-use.local
   resolution: "@react-aria/dialog@workspace:packages/@react-aria/dialog"
   dependencies:
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/utils": "npm:^3.33.1"
     "@react-types/dialog": "npm:^3.5.24"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/disclosure@npm:^3.1.3, @react-aria/disclosure@workspace:packages/@react-aria/disclosure":
+"@react-aria/disclosure@workspace:packages/@react-aria/disclosure":
   version: 0.0.0-use.local
   resolution: "@react-aria/disclosure@workspace:packages/@react-aria/disclosure"
   dependencies:
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/disclosure": "npm:^3.0.11"
-    "@react-types/button": "npm:^3.15.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/dnd@npm:^3.0.0, @react-aria/dnd@npm:^3.1.0, @react-aria/dnd@npm:^3.11.6, @react-aria/dnd@workspace:packages/@react-aria/dnd":
+"@react-aria/dnd@npm:^3.0.0, @react-aria/dnd@npm:^3.1.0, @react-aria/dnd@workspace:packages/@react-aria/dnd":
   version: 0.0.0-use.local
   resolution: "@react-aria/dnd@workspace:packages/@react-aria/dnd"
   dependencies:
-    "@internationalized/string": "npm:^3.2.7"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/dnd": "npm:^3.7.4"
-    "@react-types/button": "npm:^3.15.1"
     "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5644,53 +5546,36 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-aria/focus@npm:^3.20.4, @react-aria/focus@npm:^3.21.5, @react-aria/focus@workspace:packages/@react-aria/focus":
+"@react-aria/focus@npm:^3.20.4, @react-aria/focus@workspace:packages/@react-aria/focus":
   version: 0.0.0-use.local
   resolution: "@react-aria/focus@workspace:packages/@react-aria/focus"
   dependencies:
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
-    clsx: "npm:^2.0.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/form@npm:^3.1.5, @react-aria/form@workspace:packages/@react-aria/form":
+"@react-aria/form@workspace:packages/@react-aria/form":
   version: 0.0.0-use.local
   resolution: "@react-aria/form@workspace:packages/@react-aria/form"
   dependencies:
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/form": "npm:^3.2.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/grid@npm:^3.14.8, @react-aria/grid@workspace:packages/@react-aria/grid":
+"@react-aria/grid@workspace:packages/@react-aria/grid":
   version: 0.0.0-use.local
   resolution: "@react-aria/grid@workspace:packages/@react-aria/grid"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/selection": "npm:^3.27.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/grid": "npm:^3.11.9"
-    "@react-stately/selection": "npm:^3.20.9"
-    "@react-types/checkbox": "npm:^3.10.4"
-    "@react-types/grid": "npm:^3.3.8"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5701,121 +5586,100 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-aria/gridlist@workspace:packages/@react-aria/gridlist"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/grid": "npm:^3.14.8"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/selection": "npm:^3.27.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/list": "npm:^3.13.4"
-    "@react-stately/tree": "npm:^3.9.6"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/i18n@npm:^3.12.10, @react-aria/i18n@npm:^3.12.16, @react-aria/i18n@workspace:packages/@react-aria/i18n":
+"@react-aria/i18n@npm:^3.12.10, @react-aria/i18n@workspace:packages/@react-aria/i18n":
   version: 0.0.0-use.local
   resolution: "@react-aria/i18n@workspace:packages/@react-aria/i18n"
   dependencies:
     "@internationalized/date": "npm:^3.12.0"
     "@internationalized/message": "npm:^3.1.8"
-    "@internationalized/number": "npm:^3.6.5"
     "@internationalized/string": "npm:^3.2.7"
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/interactions@npm:^3.1.0, @react-aria/interactions@npm:^3.25.1, @react-aria/interactions@npm:^3.27.1, @react-aria/interactions@workspace:packages/@react-aria/interactions":
+"@react-aria/interactions@npm:^3.1.0, @react-aria/interactions@npm:^3.25.1, @react-aria/interactions@workspace:packages/@react-aria/interactions":
   version: 0.0.0-use.local
   resolution: "@react-aria/interactions@workspace:packages/@react-aria/interactions"
   dependencies:
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/flags": "npm:^3.1.2"
     "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/label@npm:^3.7.25, @react-aria/label@workspace:packages/@react-aria/label":
+"@react-aria/label@workspace:packages/@react-aria/label":
   version: 0.0.0-use.local
   resolution: "@react-aria/label@workspace:packages/@react-aria/label"
   dependencies:
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/landmark@npm:^3.0.10, @react-aria/landmark@workspace:packages/@react-aria/landmark":
+"@react-aria/landmark@workspace:packages/@react-aria/landmark":
   version: 0.0.0-use.local
   resolution: "@react-aria/landmark@workspace:packages/@react-aria/landmark"
   dependencies:
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
-    use-sync-external-store: "npm:^1.6.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/link@npm:^3.8.9, @react-aria/link@workspace:packages/@react-aria/link":
+"@react-aria/link@workspace:packages/@react-aria/link":
   version: 0.0.0-use.local
   resolution: "@react-aria/link@workspace:packages/@react-aria/link"
   dependencies:
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-types/link": "npm:^3.6.7"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/listbox@npm:^3.15.3, @react-aria/listbox@workspace:packages/@react-aria/listbox":
+"@react-aria/listbox@workspace:packages/@react-aria/listbox":
   version: 0.0.0-use.local
   resolution: "@react-aria/listbox@workspace:packages/@react-aria/listbox"
   dependencies:
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/label": "npm:^3.7.25"
-    "@react-aria/selection": "npm:^3.27.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/list": "npm:^3.13.4"
     "@react-types/listbox": "npm:^3.7.6"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/live-announcer@npm:^3.4.4, @react-aria/live-announcer@workspace:packages/@react-aria/live-announcer":
+"@react-aria/live-announcer@workspace:packages/@react-aria/live-announcer":
   version: 0.0.0-use.local
   resolution: "@react-aria/live-announcer@workspace:packages/@react-aria/live-announcer"
   dependencies:
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -5832,60 +5696,39 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-aria/menu@npm:^3.21.0, @react-aria/menu@workspace:packages/@react-aria/menu":
+"@react-aria/menu@workspace:packages/@react-aria/menu":
   version: 0.0.0-use.local
   resolution: "@react-aria/menu@workspace:packages/@react-aria/menu"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/selection": "npm:^3.27.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/menu": "npm:^3.9.11"
-    "@react-stately/selection": "npm:^3.20.9"
-    "@react-stately/tree": "npm:^3.9.6"
-    "@react-types/button": "npm:^3.15.1"
     "@react-types/menu": "npm:^3.10.7"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/meter@npm:^3.4.30, @react-aria/meter@workspace:packages/@react-aria/meter":
+"@react-aria/meter@workspace:packages/@react-aria/meter":
   version: 0.0.0-use.local
   resolution: "@react-aria/meter@workspace:packages/@react-aria/meter"
   dependencies:
-    "@react-aria/progress": "npm:^3.4.30"
     "@react-types/meter": "npm:^3.4.15"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/numberfield@npm:^3.12.5, @react-aria/numberfield@workspace:packages/@react-aria/numberfield":
+"@react-aria/numberfield@workspace:packages/@react-aria/numberfield":
   version: 0.0.0-use.local
   resolution: "@react-aria/numberfield@workspace:packages/@react-aria/numberfield"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/spinbutton": "npm:^3.7.2"
-    "@react-aria/textfield": "npm:^3.18.5"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/form": "npm:^3.2.4"
-    "@react-stately/numberfield": "npm:^3.11.0"
-    "@react-types/button": "npm:^3.15.1"
     "@react-types/numberfield": "npm:^3.8.18"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5900,22 +5743,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-aria/overlays@npm:^3.31.2, @react-aria/overlays@workspace:packages/@react-aria/overlays":
+"@react-aria/overlays@workspace:packages/@react-aria/overlays":
   version: 0.0.0-use.local
   resolution: "@react-aria/overlays@workspace:packages/@react-aria/overlays"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-aria/visually-hidden": "npm:^3.8.31"
-    "@react-stately/flags": "npm:^3.1.2"
-    "@react-stately/overlays": "npm:^3.6.23"
-    "@react-types/button": "npm:^3.15.1"
     "@react-types/overlays": "npm:^3.9.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -5930,247 +5764,178 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-aria/progress@npm:^3.4.30, @react-aria/progress@workspace:packages/@react-aria/progress":
+"@react-aria/progress@workspace:packages/@react-aria/progress":
   version: 0.0.0-use.local
   resolution: "@react-aria/progress@workspace:packages/@react-aria/progress"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/label": "npm:^3.7.25"
-    "@react-aria/utils": "npm:^3.33.1"
     "@react-types/progress": "npm:^3.5.18"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/radio@npm:^3.12.5, @react-aria/radio@workspace:packages/@react-aria/radio":
+"@react-aria/radio@workspace:packages/@react-aria/radio":
   version: 0.0.0-use.local
   resolution: "@react-aria/radio@workspace:packages/@react-aria/radio"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/form": "npm:^3.1.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/label": "npm:^3.7.25"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/radio": "npm:^3.11.5"
     "@react-types/radio": "npm:^3.9.4"
     "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/searchfield@npm:^3.8.12, @react-aria/searchfield@workspace:packages/@react-aria/searchfield":
+"@react-aria/searchfield@workspace:packages/@react-aria/searchfield":
   version: 0.0.0-use.local
   resolution: "@react-aria/searchfield@workspace:packages/@react-aria/searchfield"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/textfield": "npm:^3.18.5"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/searchfield": "npm:^3.5.19"
-    "@react-types/button": "npm:^3.15.1"
     "@react-types/searchfield": "npm:^3.6.8"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/select@npm:^3.17.3, @react-aria/select@workspace:packages/@react-aria/select":
+"@react-aria/select@workspace:packages/@react-aria/select":
   version: 0.0.0-use.local
   resolution: "@react-aria/select@workspace:packages/@react-aria/select"
   dependencies:
-    "@react-aria/form": "npm:^3.1.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/label": "npm:^3.7.25"
-    "@react-aria/listbox": "npm:^3.15.3"
-    "@react-aria/menu": "npm:^3.21.0"
-    "@react-aria/selection": "npm:^3.27.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-aria/visually-hidden": "npm:^3.8.31"
-    "@react-stately/select": "npm:^3.9.2"
-    "@react-types/button": "npm:^3.15.1"
     "@react-types/select": "npm:^3.12.2"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/selection@npm:^3.27.2, @react-aria/selection@workspace:packages/@react-aria/selection":
+"@react-aria/selection@workspace:packages/@react-aria/selection":
   version: 0.0.0-use.local
   resolution: "@react-aria/selection@workspace:packages/@react-aria/selection"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/selection": "npm:^3.20.9"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/separator@npm:^3.4.16, @react-aria/separator@workspace:packages/@react-aria/separator":
+"@react-aria/separator@workspace:packages/@react-aria/separator":
   version: 0.0.0-use.local
   resolution: "@react-aria/separator@workspace:packages/@react-aria/separator"
   dependencies:
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/slider@npm:^3.8.5, @react-aria/slider@workspace:packages/@react-aria/slider":
+"@react-aria/slider@workspace:packages/@react-aria/slider":
   version: 0.0.0-use.local
   resolution: "@react-aria/slider@workspace:packages/@react-aria/slider"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/label": "npm:^3.7.25"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/slider": "npm:^3.7.5"
     "@react-types/shared": "npm:^3.33.1"
     "@react-types/slider": "npm:^3.8.4"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/spinbutton@npm:^3.7.2, @react-aria/spinbutton@workspace:packages/@react-aria/spinbutton":
+"@react-aria/spinbutton@workspace:packages/@react-aria/spinbutton":
   version: 0.0.0-use.local
   resolution: "@react-aria/spinbutton@workspace:packages/@react-aria/spinbutton"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-types/button": "npm:^3.15.1"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/ssr@npm:^3.0.0, @react-aria/ssr@npm:^3.9.10, @react-aria/ssr@workspace:packages/@react-aria/ssr":
+"@react-aria/ssr@npm:^3.0.0, @react-aria/ssr@workspace:packages/@react-aria/ssr":
   version: 0.0.0-use.local
   resolution: "@react-aria/ssr@workspace:packages/@react-aria/ssr"
   dependencies:
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/steplist@npm:3.0.0-alpha.25, @react-aria/steplist@workspace:packages/@react-aria/steplist":
+"@react-aria/steplist@workspace:packages/@react-aria/steplist":
   version: 0.0.0-use.local
   resolution: "@react-aria/steplist@workspace:packages/@react-aria/steplist"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/selection": "npm:^3.27.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/steplist": "npm:3.0.0-alpha.21"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/switch@npm:^3.7.11, @react-aria/switch@workspace:packages/@react-aria/switch":
+"@react-aria/switch@workspace:packages/@react-aria/switch":
   version: 0.0.0-use.local
   resolution: "@react-aria/switch@workspace:packages/@react-aria/switch"
   dependencies:
-    "@react-aria/toggle": "npm:^3.12.5"
-    "@react-stately/toggle": "npm:^3.9.5"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/switch": "npm:^3.5.17"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/table@npm:^3.17.11, @react-aria/table@workspace:packages/@react-aria/table":
+"@react-aria/table@workspace:packages/@react-aria/table":
   version: 0.0.0-use.local
   resolution: "@react-aria/table@workspace:packages/@react-aria/table"
   dependencies:
-    "@react-aria/button": "npm:^3.14.5"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/grid": "npm:^3.14.8"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-aria/visually-hidden": "npm:^3.8.31"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/flags": "npm:^3.1.2"
-    "@react-stately/table": "npm:^3.15.4"
-    "@react-types/checkbox": "npm:^3.10.4"
-    "@react-types/grid": "npm:^3.3.8"
-    "@react-types/shared": "npm:^3.33.1"
-    "@react-types/table": "npm:^3.13.6"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/tabs@npm:^3.11.1, @react-aria/tabs@workspace:packages/@react-aria/tabs":
+"@react-aria/tabs@workspace:packages/@react-aria/tabs":
   version: 0.0.0-use.local
   resolution: "@react-aria/tabs@workspace:packages/@react-aria/tabs"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/selection": "npm:^3.27.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/tabs": "npm:^3.8.9"
     "@react-types/shared": "npm:^3.33.1"
     "@react-types/tabs": "npm:^3.3.22"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/tag@npm:^3.8.1, @react-aria/tag@workspace:packages/@react-aria/tag":
+"@react-aria/tag@workspace:packages/@react-aria/tag":
   version: 0.0.0-use.local
   resolution: "@react-aria/tag@workspace:packages/@react-aria/tag"
   dependencies:
-    "@react-aria/gridlist": "npm:^3.14.4"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/label": "npm:^3.7.25"
-    "@react-aria/selection": "npm:^3.27.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/list": "npm:^3.13.4"
-    "@react-types/button": "npm:^3.15.1"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6191,223 +5956,154 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-aria/textfield@npm:^3.18.5, @react-aria/textfield@workspace:packages/@react-aria/textfield":
+"@react-aria/textfield@workspace:packages/@react-aria/textfield":
   version: 0.0.0-use.local
   resolution: "@react-aria/textfield@workspace:packages/@react-aria/textfield"
   dependencies:
-    "@react-aria/form": "npm:^3.1.5"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/label": "npm:^3.7.25"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/form": "npm:^3.2.4"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/textfield": "npm:^3.12.8"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/toast@npm:^3.0.11, @react-aria/toast@workspace:packages/@react-aria/toast":
+"@react-aria/toast@workspace:packages/@react-aria/toast":
   version: 0.0.0-use.local
   resolution: "@react-aria/toast@workspace:packages/@react-aria/toast"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/landmark": "npm:^3.0.10"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/toast": "npm:^3.1.3"
-    "@react-types/button": "npm:^3.15.1"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/toggle@npm:^3.12.5, @react-aria/toggle@workspace:packages/@react-aria/toggle":
+"@react-aria/toggle@workspace:packages/@react-aria/toggle":
   version: 0.0.0-use.local
   resolution: "@react-aria/toggle@workspace:packages/@react-aria/toggle"
   dependencies:
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/toggle": "npm:^3.9.5"
     "@react-types/checkbox": "npm:^3.10.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/toolbar@npm:3.0.0-beta.24, @react-aria/toolbar@workspace:packages/@react-aria/toolbar":
+"@react-aria/toolbar@workspace:packages/@react-aria/toolbar":
   version: 0.0.0-use.local
   resolution: "@react-aria/toolbar@workspace:packages/@react-aria/toolbar"
   dependencies:
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/tooltip@npm:^3.9.2, @react-aria/tooltip@workspace:packages/@react-aria/tooltip":
+"@react-aria/tooltip@workspace:packages/@react-aria/tooltip":
   version: 0.0.0-use.local
   resolution: "@react-aria/tooltip@workspace:packages/@react-aria/tooltip"
   dependencies:
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/tooltip": "npm:^3.5.11"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/tooltip": "npm:^3.5.2"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/tree@npm:^3.1.7, @react-aria/tree@workspace:packages/@react-aria/tree":
+"@react-aria/tree@workspace:packages/@react-aria/tree":
   version: 0.0.0-use.local
   resolution: "@react-aria/tree@workspace:packages/@react-aria/tree"
   dependencies:
-    "@react-aria/gridlist": "npm:^3.14.4"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/selection": "npm:^3.27.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/tree": "npm:^3.9.6"
-    "@react-types/button": "npm:^3.15.1"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/utils@npm:^3.29.0, @react-aria/utils@npm:^3.33.1, @react-aria/utils@npm:^3.8.0, @react-aria/utils@workspace:packages/@react-aria/utils":
+"@react-aria/utils@npm:^3.29.0, @react-aria/utils@npm:^3.8.0, @react-aria/utils@workspace:packages/@react-aria/utils":
   version: 0.0.0-use.local
   resolution: "@react-aria/utils@workspace:packages/@react-aria/utils"
   dependencies:
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-stately/flags": "npm:^3.1.2"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
-    clsx: "npm:^2.0.0"
+    react-aria: "npm:^3.47.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/virtualizer@npm:^4.1.13, @react-aria/virtualizer@workspace:packages/@react-aria/virtualizer":
+"@react-aria/virtualizer@workspace:packages/@react-aria/virtualizer":
   version: 0.0.0-use.local
   resolution: "@react-aria/virtualizer@workspace:packages/@react-aria/virtualizer"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-stately/virtualizer": "npm:^4.4.6"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-aria/visually-hidden@npm:^3.1.0, @react-aria/visually-hidden@npm:^3.8.31, @react-aria/visually-hidden@workspace:packages/@react-aria/visually-hidden":
+"@react-aria/visually-hidden@npm:^3.1.0, @react-aria/visually-hidden@workspace:packages/@react-aria/visually-hidden":
   version: 0.0.0-use.local
   resolution: "@react-aria/visually-hidden@workspace:packages/@react-aria/visually-hidden"
   dependencies:
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/accordion@npm:^3.0.16, @react-spectrum/accordion@workspace:packages/@react-spectrum/accordion":
+"@react-spectrum/accordion@workspace:packages/@react-spectrum/accordion":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/accordion@workspace:packages/@react-spectrum/accordion"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
-    react-aria-components: "npm:^1.16.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/actionbar@npm:^3.6.17, @react-spectrum/actionbar@workspace:packages/@react-spectrum/actionbar":
+"@react-spectrum/actionbar@workspace:packages/@react-spectrum/actionbar":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/actionbar@workspace:packages/@react-spectrum/actionbar"
   dependencies:
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/actiongroup": "npm:^3.11.7"
-    "@react-spectrum/button": "npm:^3.17.7"
-    "@react-spectrum/overlays": "npm:^5.9.3"
-    "@react-spectrum/text": "npm:^3.5.25"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/collections": "npm:^3.12.10"
     "@react-types/actionbar": "npm:^3.1.21"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/actiongroup@npm:^3.11.7, @react-spectrum/actiongroup@workspace:packages/@react-spectrum/actiongroup":
+"@react-spectrum/actiongroup@workspace:packages/@react-spectrum/actiongroup":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/actiongroup@workspace:packages/@react-spectrum/actiongroup"
   dependencies:
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/actiongroup": "npm:^3.7.24"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/button": "npm:^3.17.7"
-    "@react-spectrum/menu": "npm:^3.22.11"
-    "@react-spectrum/text": "npm:^3.5.25"
-    "@react-spectrum/tooltip": "npm:^3.8.2"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/list": "npm:^3.13.4"
     "@react-types/actiongroup": "npm:^3.4.23"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
-    "@spectrum-icons/workflow": "npm:^4.2.28"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.2.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6418,167 +6114,94 @@ __metadata:
   resolution: "@react-spectrum/autocomplete@workspace:packages/@react-spectrum/autocomplete"
   dependencies:
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/autocomplete": "npm:3.0.0-rc.6"
-    "@react-aria/button": "npm:^3.14.5"
-    "@react-aria/dialog": "npm:^3.5.34"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/form": "npm:^3.1.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/label": "npm:^3.7.25"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/button": "npm:^3.17.7"
-    "@react-spectrum/form": "npm:^3.7.22"
-    "@react-spectrum/label": "npm:^3.16.22"
-    "@react-spectrum/listbox": "npm:^3.15.11"
-    "@react-spectrum/overlays": "npm:^5.9.3"
-    "@react-spectrum/progress": "npm:^3.7.23"
-    "@react-spectrum/textfield": "npm:^3.14.5"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/combobox": "npm:^3.13.0"
     "@react-types/autocomplete": "npm:3.0.0-alpha.38"
-    "@react-types/button": "npm:^3.15.1"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/avatar@npm:^3.0.29, @react-spectrum/avatar@workspace:packages/@react-spectrum/avatar":
+"@react-spectrum/avatar@workspace:packages/@react-spectrum/avatar":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/avatar@workspace:packages/@react-spectrum/avatar"
   dependencies:
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
     "@react-types/avatar": "npm:^3.0.21"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.2.1
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/badge@npm:^3.1.33, @react-spectrum/badge@workspace:packages/@react-spectrum/badge":
+"@react-spectrum/badge@workspace:packages/@react-spectrum/badge":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/badge@workspace:packages/@react-spectrum/badge"
   dependencies:
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/text": "npm:^3.5.25"
-    "@react-spectrum/utils": "npm:^3.12.12"
     "@react-types/badge": "npm:^3.1.23"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/breadcrumbs@npm:^3.1.0, @react-spectrum/breadcrumbs@npm:^3.9.27, @react-spectrum/breadcrumbs@workspace:packages/@react-spectrum/breadcrumbs":
+"@react-spectrum/breadcrumbs@npm:^3.1.0, @react-spectrum/breadcrumbs@workspace:packages/@react-spectrum/breadcrumbs":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/breadcrumbs@workspace:packages/@react-spectrum/breadcrumbs"
   dependencies:
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/breadcrumbs": "npm:^3.5.32"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/button": "npm:^3.17.7"
-    "@react-spectrum/menu": "npm:^3.22.11"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/collections": "npm:^3.12.10"
     "@react-types/breadcrumbs": "npm:^3.7.19"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/button@npm:^3.1.0, @react-spectrum/button@npm:^3.17.7, @react-spectrum/button@npm:^3.8.1, @react-spectrum/button@workspace:packages/@react-spectrum/button":
+"@react-spectrum/button@npm:^3.1.0, @react-spectrum/button@npm:^3.8.1, @react-spectrum/button@workspace:packages/@react-spectrum/button":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/button@workspace:packages/@react-spectrum/button"
   dependencies:
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/button": "npm:^3.14.5"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/progress": "npm:^3.7.23"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/text": "npm:^3.5.25"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/toggle": "npm:^3.9.5"
     "@react-types/button": "npm:^3.15.1"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/buttongroup@npm:^3.6.29, @react-spectrum/buttongroup@workspace:packages/@react-spectrum/buttongroup":
+"@react-spectrum/buttongroup@workspace:packages/@react-spectrum/buttongroup":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/buttongroup@workspace:packages/@react-spectrum/buttongroup"
   dependencies:
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
     "@react-types/buttongroup": "npm:^3.3.23"
-    "@react-types/shared": "npm:^3.33.1"
     "@spectrum-icons/workflow": "npm:^4.0.0"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/calendar@npm:^3.7.11, @react-spectrum/calendar@workspace:packages/@react-spectrum/calendar":
+"@react-spectrum/calendar@workspace:packages/@react-spectrum/calendar":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/calendar@workspace:packages/@react-spectrum/calendar"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@internationalized/date": "npm:^3.12.0"
-    "@react-aria/calendar": "npm:^3.9.5"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-aria/visually-hidden": "npm:^3.8.31"
-    "@react-spectrum/button": "npm:^3.17.7"
-    "@react-spectrum/label": "npm:^3.16.22"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/calendar": "npm:^3.9.3"
-    "@react-types/button": "npm:^3.15.1"
     "@react-types/calendar": "npm:^3.8.3"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6588,52 +6211,26 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/card@workspace:packages/@react-spectrum/card"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/grid": "npm:^3.14.8"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-aria/virtualizer": "npm:^4.1.13"
-    "@react-spectrum/checkbox": "npm:^3.10.7"
-    "@react-spectrum/progress": "npm:^3.7.23"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/grid": "npm:^3.11.9"
-    "@react-stately/list": "npm:^3.13.4"
-    "@react-stately/virtualizer": "npm:^4.4.6"
     "@react-types/card": "npm:3.0.0-alpha.43"
-    "@react-types/provider": "npm:^3.8.15"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/checkbox@npm:^3.10.7, @react-spectrum/checkbox@workspace:packages/@react-spectrum/checkbox":
+"@react-spectrum/checkbox@workspace:packages/@react-spectrum/checkbox":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/checkbox@workspace:packages/@react-spectrum/checkbox"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/checkbox": "npm:^3.16.5"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-spectrum/form": "npm:^3.7.22"
-    "@react-spectrum/label": "npm:^3.16.22"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/checkbox": "npm:^3.7.5"
-    "@react-stately/toggle": "npm:^3.9.5"
     "@react-types/checkbox": "npm:^3.10.4"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
-    react-aria-components: "npm:^1.16.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6666,172 +6263,90 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/color@npm:^3.1.7, @react-spectrum/color@workspace:packages/@react-spectrum/color":
+"@react-spectrum/color@workspace:packages/@react-spectrum/color":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/color@workspace:packages/@react-spectrum/color"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/color": "npm:^3.1.5"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/dialog": "npm:^3.9.7"
-    "@react-spectrum/form": "npm:^3.7.22"
-    "@react-spectrum/label": "npm:^3.16.22"
-    "@react-spectrum/overlays": "npm:^5.9.3"
-    "@react-spectrum/picker": "npm:^3.16.7"
     "@react-spectrum/style-macro-s1": "npm:3.0.0-alpha.5"
-    "@react-spectrum/textfield": "npm:^3.14.5"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-spectrum/view": "npm:^3.6.26"
-    "@react-stately/color": "npm:^3.9.5"
     "@react-types/color": "npm:^3.1.4"
-    "@react-types/shared": "npm:^3.33.1"
-    "@react-types/textfield": "npm:^3.12.8"
     "@swc/helpers": "npm:^0.5.0"
-    react-aria-components: "npm:^1.16.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/combobox@npm:^3.16.7, @react-spectrum/combobox@workspace:packages/@react-spectrum/combobox":
+"@react-spectrum/combobox@workspace:packages/@react-spectrum/combobox":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/combobox@workspace:packages/@react-spectrum/combobox"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/button": "npm:^3.14.5"
-    "@react-aria/combobox": "npm:^3.15.0"
-    "@react-aria/dialog": "npm:^3.5.34"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/form": "npm:^3.1.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/label": "npm:^3.7.25"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/button": "npm:^3.17.7"
-    "@react-spectrum/form": "npm:^3.7.22"
-    "@react-spectrum/label": "npm:^3.16.22"
-    "@react-spectrum/listbox": "npm:^3.15.11"
-    "@react-spectrum/overlays": "npm:^5.9.3"
-    "@react-spectrum/progress": "npm:^3.7.23"
-    "@react-spectrum/textfield": "npm:^3.14.5"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/combobox": "npm:^3.13.0"
-    "@react-types/button": "npm:^3.15.1"
     "@react-types/combobox": "npm:^3.14.0"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/contextualhelp@npm:^3.6.31, @react-spectrum/contextualhelp@workspace:packages/@react-spectrum/contextualhelp":
+"@react-spectrum/contextualhelp@workspace:packages/@react-spectrum/contextualhelp":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/contextualhelp@workspace:packages/@react-spectrum/contextualhelp"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/button": "npm:^3.17.7"
-    "@react-spectrum/dialog": "npm:^3.9.7"
     "@react-spectrum/link": "npm:^3.2.0"
-    "@react-spectrum/utils": "npm:^3.12.12"
     "@react-spectrum/view": "npm:^3.1.3"
     "@react-types/contextualhelp": "npm:^3.2.24"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/workflow": "npm:^4.2.28"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/datepicker@npm:^3.14.11, @react-spectrum/datepicker@workspace:packages/@react-spectrum/datepicker":
+"@react-spectrum/datepicker@workspace:packages/@react-spectrum/datepicker":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/datepicker@workspace:packages/@react-spectrum/datepicker"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@internationalized/date": "npm:^3.12.0"
-    "@react-aria/datepicker": "npm:^3.16.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/button": "npm:^3.17.7"
-    "@react-spectrum/calendar": "npm:^3.7.11"
-    "@react-spectrum/dialog": "npm:^3.9.7"
-    "@react-spectrum/form": "npm:^3.7.22"
-    "@react-spectrum/label": "npm:^3.16.22"
-    "@react-spectrum/layout": "npm:^3.6.22"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-spectrum/view": "npm:^3.6.26"
-    "@react-stately/datepicker": "npm:^3.16.1"
     "@react-types/datepicker": "npm:^3.13.5"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
-    "@spectrum-icons/workflow": "npm:^4.2.28"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/dialog@npm:^3.1.0, @react-spectrum/dialog@npm:^3.9.7, @react-spectrum/dialog@workspace:packages/@react-spectrum/dialog":
+"@react-spectrum/dialog@npm:^3.1.0, @react-spectrum/dialog@workspace:packages/@react-spectrum/dialog":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/dialog@workspace:packages/@react-spectrum/dialog"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/dialog": "npm:^3.5.34"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/button": "npm:^3.17.7"
-    "@react-spectrum/buttongroup": "npm:^3.6.29"
-    "@react-spectrum/divider": "npm:^3.5.30"
-    "@react-spectrum/layout": "npm:^3.6.22"
-    "@react-spectrum/overlays": "npm:^5.9.3"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/text": "npm:^3.5.25"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-spectrum/view": "npm:^3.6.26"
-    "@react-stately/overlays": "npm:^3.6.23"
-    "@react-types/button": "npm:^3.15.1"
     "@react-types/dialog": "npm:^3.5.24"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/divider@npm:^3.1.0, @react-spectrum/divider@npm:^3.5.30, @react-spectrum/divider@workspace:packages/@react-spectrum/divider":
+"@react-spectrum/divider@npm:^3.1.0, @react-spectrum/divider@workspace:packages/@react-spectrum/divider":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/divider@workspace:packages/@react-spectrum/divider"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/separator": "npm:^3.4.16"
-    "@react-spectrum/utils": "npm:^3.12.12"
     "@react-types/divider": "npm:^3.3.23"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -6839,17 +6354,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/dnd@npm:^3.6.5, @react-spectrum/dnd@workspace:packages/@react-spectrum/dnd":
+"@react-spectrum/dnd@workspace:packages/@react-spectrum/dnd":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/dnd@workspace:packages/@react-spectrum/dnd"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/dnd": "npm:^3.11.6"
-    "@react-stately/dnd": "npm:^3.7.4"
     "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -6894,202 +6408,154 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/dropzone@npm:^3.0.21, @react-spectrum/dropzone@workspace:packages/@react-spectrum/dropzone":
+"@react-spectrum/dropzone@workspace:packages/@react-spectrum/dropzone":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/dropzone@workspace:packages/@react-spectrum/dropzone"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/utils": "npm:^3.33.1"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
-    react-aria-components: "npm:^1.16.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/filetrigger@npm:^3.0.21, @react-spectrum/filetrigger@workspace:packages/@react-spectrum/filetrigger":
+"@react-spectrum/filetrigger@workspace:packages/@react-spectrum/filetrigger":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/filetrigger@workspace:packages/@react-spectrum/filetrigger"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@swc/helpers": "npm:^0.5.0"
     react-aria-components: "npm:^1.16.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/form@npm:^3.7.22, @react-spectrum/form@workspace:packages/@react-spectrum/form":
+"@react-spectrum/form@workspace:packages/@react-spectrum/form":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/form@workspace:packages/@react-spectrum/form"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/form": "npm:^3.2.4"
     "@react-types/form": "npm:^3.7.18"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/icon@npm:^3.8.12, @react-spectrum/icon@workspace:packages/@react-spectrum/icon":
+"@react-spectrum/icon@workspace:packages/@react-spectrum/icon":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/icon@workspace:packages/@react-spectrum/icon"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/illustratedmessage@npm:^3.5.0, @react-spectrum/illustratedmessage@npm:^3.5.17, @react-spectrum/illustratedmessage@workspace:packages/@react-spectrum/illustratedmessage":
+"@react-spectrum/illustratedmessage@npm:^3.5.0, @react-spectrum/illustratedmessage@workspace:packages/@react-spectrum/illustratedmessage":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/illustratedmessage@workspace:packages/@react-spectrum/illustratedmessage"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/layout": "npm:^3.6.22"
-    "@react-spectrum/utils": "npm:^3.12.12"
     "@react-types/illustratedmessage": "npm:^3.3.23"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/image@npm:^3.6.5, @react-spectrum/image@workspace:packages/@react-spectrum/image":
+"@react-spectrum/image@workspace:packages/@react-spectrum/image":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/image@workspace:packages/@react-spectrum/image"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
     "@react-types/image": "npm:^3.5.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/inlinealert@npm:^3.2.23, @react-spectrum/inlinealert@workspace:packages/@react-spectrum/inlinealert":
+"@react-spectrum/inlinealert@workspace:packages/@react-spectrum/inlinealert":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/inlinealert@workspace:packages/@react-spectrum/inlinealert"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/layout": "npm:^3.6.22"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/label@npm:^3.16.22, @react-spectrum/label@workspace:packages/@react-spectrum/label":
+"@react-spectrum/label@workspace:packages/@react-spectrum/label":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/label@workspace:packages/@react-spectrum/label"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/form": "npm:^3.7.22"
-    "@react-spectrum/layout": "npm:^3.6.22"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-types/label": "npm:^3.9.17"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/labeledvalue@npm:^3.2.10, @react-spectrum/labeledvalue@workspace:packages/@react-spectrum/labeledvalue":
+"@react-spectrum/labeledvalue@workspace:packages/@react-spectrum/labeledvalue":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/labeledvalue@workspace:packages/@react-spectrum/labeledvalue"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@internationalized/date": "npm:^3.12.0"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/label": "npm:^3.16.22"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/layout@npm:^3.1.0, @react-spectrum/layout@npm:^3.6.22, @react-spectrum/layout@workspace:packages/@react-spectrum/layout":
+"@react-spectrum/layout@npm:^3.1.0, @react-spectrum/layout@workspace:packages/@react-spectrum/layout":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/layout@workspace:packages/@react-spectrum/layout"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
     "@react-types/layout": "npm:^3.3.29"
     "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/link@npm:^3.2.0, @react-spectrum/link@npm:^3.6.25, @react-spectrum/link@workspace:packages/@react-spectrum/link":
+"@react-spectrum/link@npm:^3.2.0, @react-spectrum/link@workspace:packages/@react-spectrum/link":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/link@workspace:packages/@react-spectrum/link"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/link": "npm:^3.8.9"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
     "@react-types/link": "npm:^3.6.7"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -7099,66 +6565,29 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/list@workspace:packages/@react-spectrum/list"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/button": "npm:^3.14.5"
     "@react-aria/dnd": "npm:^3.0.0"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/gridlist": "npm:^3.14.4"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/selection": "npm:^3.27.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-aria/virtualizer": "npm:^4.1.13"
-    "@react-aria/visually-hidden": "npm:^3.8.31"
     "@react-spectrum/button": "npm:^3.8.1"
-    "@react-spectrum/checkbox": "npm:^3.10.7"
-    "@react-spectrum/dnd": "npm:^3.6.5"
-    "@react-spectrum/layout": "npm:^3.6.22"
-    "@react-spectrum/progress": "npm:^3.7.23"
-    "@react-spectrum/text": "npm:^3.5.25"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/collections": "npm:^3.12.10"
     "@react-stately/dnd": "npm:^3.0.0"
-    "@react-stately/layout": "npm:^4.6.0"
-    "@react-stately/list": "npm:^3.13.4"
-    "@react-stately/virtualizer": "npm:^4.4.6"
-    "@react-types/grid": "npm:^3.3.8"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
-    react-transition-group: "npm:^4.4.5"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.2.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/listbox@npm:^3.15.11, @react-spectrum/listbox@workspace:packages/@react-spectrum/listbox":
+"@react-spectrum/listbox@workspace:packages/@react-spectrum/listbox":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/listbox@workspace:packages/@react-spectrum/listbox"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/listbox": "npm:^3.15.3"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-aria/virtualizer": "npm:^4.1.13"
-    "@react-spectrum/layout": "npm:^3.6.22"
-    "@react-spectrum/progress": "npm:^3.7.23"
-    "@react-spectrum/text": "npm:^3.5.25"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/layout": "npm:^4.6.0"
-    "@react-stately/list": "npm:^3.13.4"
-    "@react-stately/virtualizer": "npm:^4.4.6"
     "@react-types/listbox": "npm:^3.7.6"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.2.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -7178,104 +6607,58 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/menu@npm:^3.22.11, @react-spectrum/menu@workspace:packages/@react-spectrum/menu":
+"@react-spectrum/menu@workspace:packages/@react-spectrum/menu":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/menu@workspace:packages/@react-spectrum/menu"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/menu": "npm:^3.21.0"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/separator": "npm:^3.4.16"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/button": "npm:^3.17.7"
-    "@react-spectrum/layout": "npm:^3.6.22"
-    "@react-spectrum/overlays": "npm:^5.9.3"
-    "@react-spectrum/text": "npm:^3.5.25"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/menu": "npm:^3.9.11"
-    "@react-stately/overlays": "npm:^3.6.23"
-    "@react-stately/tree": "npm:^3.9.6"
     "@react-types/menu": "npm:^3.10.7"
-    "@react-types/overlays": "npm:^3.9.4"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
-    "@spectrum-icons/workflow": "npm:^4.2.28"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/meter@npm:^3.5.17, @react-spectrum/meter@workspace:packages/@react-spectrum/meter":
+"@react-spectrum/meter@workspace:packages/@react-spectrum/meter":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/meter@workspace:packages/@react-spectrum/meter"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/meter": "npm:^3.4.30"
-    "@react-spectrum/progress": "npm:^3.7.23"
-    "@react-spectrum/utils": "npm:^3.12.12"
     "@react-types/meter": "npm:^3.4.15"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/numberfield@npm:^3.10.5, @react-spectrum/numberfield@workspace:packages/@react-spectrum/numberfield":
+"@react-spectrum/numberfield@workspace:packages/@react-spectrum/numberfield":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/numberfield@workspace:packages/@react-spectrum/numberfield"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/button": "npm:^3.14.5"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/numberfield": "npm:^3.12.5"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/form": "npm:^3.7.22"
-    "@react-spectrum/label": "npm:^3.16.22"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/textfield": "npm:^3.14.5"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/numberfield": "npm:^3.11.0"
-    "@react-types/button": "npm:^3.15.1"
     "@react-types/numberfield": "npm:^3.8.18"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
-    "@spectrum-icons/workflow": "npm:^4.2.28"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/overlays@npm:^5.9.3, @react-spectrum/overlays@workspace:packages/@react-spectrum/overlays":
+"@react-spectrum/overlays@workspace:packages/@react-spectrum/overlays":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/overlays@workspace:packages/@react-spectrum/overlays"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/overlays": "npm:^3.6.23"
-    "@react-types/overlays": "npm:^3.9.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
-    react-transition-group: "npm:^4.4.5"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -7302,90 +6685,58 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/picker@npm:^3.1.0, @react-spectrum/picker@npm:^3.16.7, @react-spectrum/picker@workspace:packages/@react-spectrum/picker":
+"@react-spectrum/picker@npm:^3.1.0, @react-spectrum/picker@workspace:packages/@react-spectrum/picker":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/picker@workspace:packages/@react-spectrum/picker"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/select": "npm:^3.17.3"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/button": "npm:^3.17.7"
-    "@react-spectrum/form": "npm:^3.7.22"
-    "@react-spectrum/label": "npm:^3.16.22"
-    "@react-spectrum/listbox": "npm:^3.15.11"
-    "@react-spectrum/overlays": "npm:^5.9.3"
-    "@react-spectrum/progress": "npm:^3.7.23"
-    "@react-spectrum/text": "npm:^3.5.25"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/select": "npm:^3.9.2"
     "@react-types/select": "npm:^3.12.2"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.1.4
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/progress@npm:^3.7.23, @react-spectrum/progress@workspace:packages/@react-spectrum/progress":
+"@react-spectrum/progress@workspace:packages/@react-spectrum/progress":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/progress@workspace:packages/@react-spectrum/progress"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/progress": "npm:^3.4.30"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
     "@react-types/progress": "npm:^3.5.18"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/provider@npm:^3.1.0, @react-spectrum/provider@npm:^3.10.14, @react-spectrum/provider@workspace:packages/@react-spectrum/provider":
+"@react-spectrum/provider@npm:^3.1.0, @react-spectrum/provider@workspace:packages/@react-spectrum/provider":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/provider@workspace:packages/@react-spectrum/provider"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
     "@react-types/provider": "npm:^3.8.15"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
-    clsx: "npm:^2.0.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/radio@npm:^3.7.24, @react-spectrum/radio@workspace:packages/@react-spectrum/radio":
+"@react-spectrum/radio@workspace:packages/@react-spectrum/radio":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/radio@workspace:packages/@react-spectrum/radio"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/radio": "npm:^3.12.5"
-    "@react-spectrum/form": "npm:^3.7.22"
-    "@react-spectrum/label": "npm:^3.16.22"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/radio": "npm:^3.11.5"
     "@react-types/radio": "npm:^3.9.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -7469,17 +6820,9 @@ __metadata:
     "@internationalized/date": "npm:^3.12.0"
     "@internationalized/number": "npm:^3.6.5"
     "@parcel/macros": "npm:^2.16.3"
-    "@react-aria/calendar": "npm:^3.9.5"
-    "@react-aria/collections": "npm:^3.0.3"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/live-announcer": "npm:^3.4.4"
     "@react-aria/test-utils": "npm:^1.0.0-alpha.8"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/layout": "npm:^4.6.0"
-    "@react-stately/utils": "npm:^3.11.0"
+    "@react-types/color": "npm:^3.1.4"
+    "@react-types/datepicker": "npm:^3.13.5"
     "@react-types/dialog": "npm:^3.5.24"
     "@react-types/grid": "npm:^3.3.8"
     "@react-types/overlays": "npm:^3.9.4"
@@ -7502,64 +6845,44 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/searchfield@npm:^3.8.26, @react-spectrum/searchfield@workspace:packages/@react-spectrum/searchfield":
+"@react-spectrum/searchfield@workspace:packages/@react-spectrum/searchfield":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/searchfield@workspace:packages/@react-spectrum/searchfield"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/searchfield": "npm:^3.8.12"
-    "@react-spectrum/button": "npm:^3.17.7"
-    "@react-spectrum/form": "npm:^3.7.22"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/textfield": "npm:^3.14.5"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/searchfield": "npm:^3.5.19"
     "@react-types/searchfield": "npm:^3.6.8"
-    "@react-types/textfield": "npm:^3.12.8"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/slider@npm:^3.8.5, @react-spectrum/slider@workspace:packages/@react-spectrum/slider":
+"@react-spectrum/slider@workspace:packages/@react-spectrum/slider":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/slider@workspace:packages/@react-spectrum/slider"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/slider": "npm:^3.8.5"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-aria/visually-hidden": "npm:^3.8.31"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/slider": "npm:^3.7.5"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/slider": "npm:^3.8.4"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/statuslight@npm:^3.5.29, @react-spectrum/statuslight@workspace:packages/@react-spectrum/statuslight":
+"@react-spectrum/statuslight@workspace:packages/@react-spectrum/statuslight":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/statuslight@workspace:packages/@react-spectrum/statuslight"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/statuslight": "npm:^3.3.23"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -7569,21 +6892,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/steplist@workspace:packages/@react-spectrum/steplist"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/steplist": "npm:3.0.0-alpha.25"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-aria/visually-hidden": "npm:^3.8.31"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/steplist": "npm:3.0.0-alpha.21"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -7608,115 +6921,60 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/switch@npm:^3.6.9, @react-spectrum/switch@workspace:packages/@react-spectrum/switch":
+"@react-spectrum/switch@workspace:packages/@react-spectrum/switch":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/switch@workspace:packages/@react-spectrum/switch"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/switch": "npm:^3.7.11"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/toggle": "npm:^3.9.5"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/switch": "npm:^3.5.17"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/table@npm:^3.17.11, @react-spectrum/table@workspace:packages/@react-spectrum/table":
+"@react-spectrum/table@workspace:packages/@react-spectrum/table":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/table@workspace:packages/@react-spectrum/table"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/button": "npm:^3.14.5"
     "@react-aria/dnd": "npm:^3.1.0"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/selection": "npm:^3.27.2"
-    "@react-aria/table": "npm:^3.17.11"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-aria/virtualizer": "npm:^4.1.13"
-    "@react-aria/visually-hidden": "npm:^3.8.31"
-    "@react-spectrum/checkbox": "npm:^3.10.7"
-    "@react-spectrum/dnd": "npm:^3.6.5"
-    "@react-spectrum/layout": "npm:^3.6.22"
-    "@react-spectrum/menu": "npm:^3.22.11"
-    "@react-spectrum/progress": "npm:^3.7.23"
-    "@react-spectrum/tooltip": "npm:^3.8.2"
-    "@react-spectrum/utils": "npm:^3.12.12"
     "@react-stately/dnd": "npm:^3.1.0"
-    "@react-stately/flags": "npm:^3.1.2"
-    "@react-stately/layout": "npm:^4.6.0"
-    "@react-stately/table": "npm:^3.15.4"
-    "@react-stately/virtualizer": "npm:^4.4.6"
-    "@react-types/grid": "npm:^3.3.8"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/table": "npm:^3.13.6"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/tabs@npm:^3.8.30, @react-spectrum/tabs@workspace:packages/@react-spectrum/tabs":
+"@react-spectrum/tabs@workspace:packages/@react-spectrum/tabs":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/tabs@workspace:packages/@react-spectrum/tabs"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/tabs": "npm:^3.11.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/picker": "npm:^3.16.7"
-    "@react-spectrum/text": "npm:^3.5.25"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/list": "npm:^3.13.4"
-    "@react-stately/tabs": "npm:^3.8.9"
-    "@react-types/select": "npm:^3.12.2"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/tabs": "npm:^3.3.22"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/tag@npm:^3.3.10, @react-spectrum/tag@workspace:packages/@react-spectrum/tag":
+"@react-spectrum/tag@workspace:packages/@react-spectrum/tag":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/tag@workspace:packages/@react-spectrum/tag"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/selection": "npm:^3.27.2"
-    "@react-aria/tag": "npm:^3.8.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/button": "npm:^3.17.7"
-    "@react-spectrum/form": "npm:^3.7.22"
-    "@react-spectrum/label": "npm:^3.16.22"
-    "@react-spectrum/text": "npm:^3.5.25"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/list": "npm:^3.13.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -7761,72 +7019,59 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/text@npm:^3.1.0, @react-spectrum/text@npm:^3.5.25, @react-spectrum/text@workspace:packages/@react-spectrum/text":
+"@react-spectrum/text@npm:^3.1.0, @react-spectrum/text@workspace:packages/@react-spectrum/text":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/text@workspace:packages/@react-spectrum/text"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/text": "npm:^3.3.23"
     "@swc/helpers": "npm:^0.5.0"
-    react-aria-components: "npm:^1.16.0"
     react-dom: "npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/textfield@npm:^3.14.5, @react-spectrum/textfield@workspace:packages/@react-spectrum/textfield":
+"@react-spectrum/textfield@workspace:packages/@react-spectrum/textfield":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/textfield@workspace:packages/@react-spectrum/textfield"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/textfield": "npm:^3.18.5"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/form": "npm:^3.7.22"
-    "@react-spectrum/label": "npm:^3.16.22"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/textfield": "npm:^3.12.8"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@spectrum-icons/workflow": "npm:^4.0.0"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/theme-dark@npm:^3.5.24, @react-spectrum/theme-dark@workspace:packages/@react-spectrum/theme-dark":
+"@react-spectrum/theme-dark@workspace:packages/@react-spectrum/theme-dark":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/theme-dark@workspace:packages/@react-spectrum/theme-dark"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-types/provider": "npm:^3.8.15"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/theme-default@npm:^3.1.0, @react-spectrum/theme-default@npm:^3.5.13, @react-spectrum/theme-default@npm:^3.5.24, @react-spectrum/theme-default@workspace:packages/@react-spectrum/theme-default":
+"@react-spectrum/theme-default@npm:^3.1.0, @react-spectrum/theme-default@npm:^3.5.13, @react-spectrum/theme-default@workspace:packages/@react-spectrum/theme-default":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/theme-default@workspace:packages/@react-spectrum/theme-default"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-types/provider": "npm:^3.8.15"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
@@ -7834,96 +7079,67 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/theme-express@workspace:packages/@react-spectrum/theme-express"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-spectrum/theme-default": "npm:^3.5.24"
-    "@react-types/provider": "npm:^3.8.15"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/theme-light@npm:^3.4.24, @react-spectrum/theme-light@workspace:packages/@react-spectrum/theme-light":
+"@react-spectrum/theme-light@workspace:packages/@react-spectrum/theme-light":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/theme-light@workspace:packages/@react-spectrum/theme-light"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-types/provider": "npm:^3.8.15"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/toast@npm:^3.1.7, @react-spectrum/toast@workspace:packages/@react-spectrum/toast":
+"@react-spectrum/toast@workspace:packages/@react-spectrum/toast":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/toast@workspace:packages/@react-spectrum/toast"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/toast": "npm:^3.0.11"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/button": "npm:^3.17.7"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/toast": "npm:^3.1.3"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
     "@types/use-sync-external-store": "npm:^0.0.3"
-    use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/tooltip@npm:^3.8.2, @react-spectrum/tooltip@workspace:packages/@react-spectrum/tooltip":
+"@react-spectrum/tooltip@workspace:packages/@react-spectrum/tooltip":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/tooltip@workspace:packages/@react-spectrum/tooltip"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/tooltip": "npm:^3.9.2"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/overlays": "npm:^5.9.3"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-stately/tooltip": "npm:^3.5.11"
-    "@react-types/overlays": "npm:^3.9.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/tooltip": "npm:^3.5.2"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/tree@npm:^3.1.11, @react-spectrum/tree@workspace:packages/@react-spectrum/tree":
+"@react-spectrum/tree@workspace:packages/@react-spectrum/tree":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/tree@workspace:packages/@react-spectrum/tree"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/button": "npm:^3.14.5"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/tree": "npm:^3.1.7"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/checkbox": "npm:^3.10.7"
     "@react-spectrum/style-macro-s1": "npm:3.0.0-alpha.5"
-    "@react-spectrum/text": "npm:^3.5.25"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-types/shared": "npm:^3.33.1"
-    "@spectrum-icons/ui": "npm:^3.6.23"
     "@swc/helpers": "npm:^0.5.0"
-    react-aria-components: "npm:^1.16.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -7935,47 +7151,39 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/utils@npm:^3.12.12, @react-spectrum/utils@npm:^3.12.6, @react-spectrum/utils@workspace:packages/@react-spectrum/utils":
+"@react-spectrum/utils@npm:^3.12.6, @react-spectrum/utils@workspace:packages/@react-spectrum/utils":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/utils@workspace:packages/@react-spectrum/utils"
   dependencies:
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-types/shared": "npm:^3.33.1"
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@swc/helpers": "npm:^0.5.0"
-    clsx: "npm:^2.0.0"
+    react-aria: "npm:^3.47.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/view@npm:^3.1.0, @react-spectrum/view@npm:^3.1.3, @react-spectrum/view@npm:^3.6.26, @react-spectrum/view@workspace:packages/@react-spectrum/view":
+"@react-spectrum/view@npm:^3.1.0, @react-spectrum/view@npm:^3.1.3, @react-spectrum/view@workspace:packages/@react-spectrum/view":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/view@workspace:packages/@react-spectrum/view"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/view": "npm:^3.4.23"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    "@react-spectrum/provider": ^3.0.0
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-spectrum/well@npm:^3.4.30, @react-spectrum/well@workspace:packages/@react-spectrum/well":
+"@react-spectrum/well@workspace:packages/@react-spectrum/well":
   version: 0.0.0-use.local
   resolution: "@react-spectrum/well@workspace:packages/@react-spectrum/well"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-spectrum/utils": "npm:^3.12.12"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/well": "npm:^3.3.23"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
@@ -7984,426 +7192,396 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@react-stately/autocomplete@npm:3.0.0-beta.4, @react-stately/autocomplete@workspace:packages/@react-stately/autocomplete":
+"@react-stately/autocomplete@workspace:packages/@react-stately/autocomplete":
   version: 0.0.0-use.local
   resolution: "@react-stately/autocomplete@workspace:packages/@react-stately/autocomplete"
   dependencies:
-    "@react-stately/utils": "npm:^3.11.0"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/calendar@npm:^3.9.3, @react-stately/calendar@workspace:packages/@react-stately/calendar":
+"@react-stately/calendar@workspace:packages/@react-stately/calendar":
   version: 0.0.0-use.local
   resolution: "@react-stately/calendar@workspace:packages/@react-stately/calendar"
   dependencies:
-    "@internationalized/date": "npm:^3.12.0"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/calendar": "npm:^3.8.3"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/checkbox@npm:^3.7.5, @react-stately/checkbox@workspace:packages/@react-stately/checkbox":
+"@react-stately/checkbox@workspace:packages/@react-stately/checkbox":
   version: 0.0.0-use.local
   resolution: "@react-stately/checkbox@workspace:packages/@react-stately/checkbox"
   dependencies:
-    "@react-stately/form": "npm:^3.2.4"
-    "@react-stately/utils": "npm:^3.11.0"
     "@react-types/checkbox": "npm:^3.10.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/collections@npm:^3.12.10, @react-stately/collections@workspace:packages/@react-stately/collections":
+"@react-stately/collections@workspace:packages/@react-stately/collections":
   version: 0.0.0-use.local
   resolution: "@react-stately/collections@workspace:packages/@react-stately/collections"
   dependencies:
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/color@npm:^3.9.5, @react-stately/color@workspace:packages/@react-stately/color":
+"@react-stately/color@workspace:packages/@react-stately/color":
   version: 0.0.0-use.local
   resolution: "@react-stately/color@workspace:packages/@react-stately/color"
   dependencies:
-    "@internationalized/number": "npm:^3.6.5"
-    "@internationalized/string": "npm:^3.2.7"
-    "@react-stately/form": "npm:^3.2.4"
-    "@react-stately/numberfield": "npm:^3.11.0"
-    "@react-stately/slider": "npm:^3.7.5"
-    "@react-stately/utils": "npm:^3.11.0"
     "@react-types/color": "npm:^3.1.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/combobox@npm:^3.13.0, @react-stately/combobox@workspace:packages/@react-stately/combobox":
+"@react-stately/combobox@workspace:packages/@react-stately/combobox":
   version: 0.0.0-use.local
   resolution: "@react-stately/combobox@workspace:packages/@react-stately/combobox"
   dependencies:
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/form": "npm:^3.2.4"
-    "@react-stately/list": "npm:^3.13.4"
-    "@react-stately/overlays": "npm:^3.6.23"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/combobox": "npm:^3.14.0"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/data@npm:^3.15.2, @react-stately/data@workspace:packages/@react-stately/data":
+"@react-stately/data@workspace:packages/@react-stately/data":
   version: 0.0.0-use.local
   resolution: "@react-stately/data@workspace:packages/@react-stately/data"
   dependencies:
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/datepicker@npm:^3.16.1, @react-stately/datepicker@workspace:packages/@react-stately/datepicker":
+"@react-stately/datepicker@workspace:packages/@react-stately/datepicker":
   version: 0.0.0-use.local
   resolution: "@react-stately/datepicker@workspace:packages/@react-stately/datepicker"
   dependencies:
-    "@internationalized/date": "npm:^3.12.0"
-    "@internationalized/number": "npm:^3.6.5"
-    "@internationalized/string": "npm:^3.2.7"
-    "@react-stately/form": "npm:^3.2.4"
-    "@react-stately/overlays": "npm:^3.6.23"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/datepicker": "npm:^3.13.5"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/disclosure@npm:^3.0.11, @react-stately/disclosure@workspace:packages/@react-stately/disclosure":
+"@react-stately/disclosure@workspace:packages/@react-stately/disclosure":
   version: 0.0.0-use.local
   resolution: "@react-stately/disclosure@workspace:packages/@react-stately/disclosure"
   dependencies:
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/dnd@npm:^3.0.0, @react-stately/dnd@npm:^3.1.0, @react-stately/dnd@npm:^3.7.4, @react-stately/dnd@workspace:packages/@react-stately/dnd":
+"@react-stately/dnd@npm:^3.0.0, @react-stately/dnd@npm:^3.1.0, @react-stately/dnd@workspace:packages/@react-stately/dnd":
   version: 0.0.0-use.local
   resolution: "@react-stately/dnd@workspace:packages/@react-stately/dnd"
   dependencies:
-    "@react-stately/selection": "npm:^3.20.9"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/flags@npm:^3.1.2, @react-stately/flags@workspace:packages/@react-stately/flags":
+"@react-stately/flags@workspace:packages/@react-stately/flags":
   version: 0.0.0-use.local
   resolution: "@react-stately/flags@workspace:packages/@react-stately/flags"
   dependencies:
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/form@npm:^3.2.4, @react-stately/form@workspace:packages/@react-stately/form":
+"@react-stately/form@workspace:packages/@react-stately/form":
   version: 0.0.0-use.local
   resolution: "@react-stately/form@workspace:packages/@react-stately/form"
   dependencies:
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/grid@npm:^3.11.9, @react-stately/grid@workspace:packages/@react-stately/grid":
+"@react-stately/grid@workspace:packages/@react-stately/grid":
   version: 0.0.0-use.local
   resolution: "@react-stately/grid@workspace:packages/@react-stately/grid"
   dependencies:
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/selection": "npm:^3.20.9"
-    "@react-types/grid": "npm:^3.3.8"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/layout@npm:^4.6.0, @react-stately/layout@workspace:packages/@react-stately/layout":
+"@react-stately/layout@workspace:packages/@react-stately/layout":
   version: 0.0.0-use.local
   resolution: "@react-stately/layout@workspace:packages/@react-stately/layout"
   dependencies:
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/table": "npm:^3.15.4"
-    "@react-stately/virtualizer": "npm:^4.4.6"
-    "@react-types/grid": "npm:^3.3.8"
-    "@react-types/shared": "npm:^3.33.1"
-    "@react-types/table": "npm:^3.13.6"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/list@npm:^3.13.4, @react-stately/list@workspace:packages/@react-stately/list":
+"@react-stately/list@workspace:packages/@react-stately/list":
   version: 0.0.0-use.local
   resolution: "@react-stately/list@workspace:packages/@react-stately/list"
   dependencies:
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/selection": "npm:^3.20.9"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/menu@npm:^3.9.11, @react-stately/menu@workspace:packages/@react-stately/menu":
+"@react-stately/menu@workspace:packages/@react-stately/menu":
   version: 0.0.0-use.local
   resolution: "@react-stately/menu@workspace:packages/@react-stately/menu"
   dependencies:
-    "@react-stately/overlays": "npm:^3.6.23"
     "@react-types/menu": "npm:^3.10.7"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/numberfield@npm:^3.11.0, @react-stately/numberfield@workspace:packages/@react-stately/numberfield":
+"@react-stately/numberfield@workspace:packages/@react-stately/numberfield":
   version: 0.0.0-use.local
   resolution: "@react-stately/numberfield@workspace:packages/@react-stately/numberfield"
   dependencies:
-    "@internationalized/number": "npm:^3.6.5"
-    "@react-stately/form": "npm:^3.2.4"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/numberfield": "npm:^3.8.18"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/overlays@npm:^3.6.23, @react-stately/overlays@workspace:packages/@react-stately/overlays":
+"@react-stately/overlays@workspace:packages/@react-stately/overlays":
   version: 0.0.0-use.local
   resolution: "@react-stately/overlays@workspace:packages/@react-stately/overlays"
   dependencies:
-    "@react-stately/utils": "npm:^3.11.0"
     "@react-types/overlays": "npm:^3.9.4"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/radio@npm:^3.11.5, @react-stately/radio@workspace:packages/@react-stately/radio":
+"@react-stately/radio@workspace:packages/@react-stately/radio":
   version: 0.0.0-use.local
   resolution: "@react-stately/radio@workspace:packages/@react-stately/radio"
   dependencies:
-    "@react-stately/form": "npm:^3.2.4"
-    "@react-stately/utils": "npm:^3.11.0"
     "@react-types/radio": "npm:^3.9.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/searchfield@npm:^3.5.19, @react-stately/searchfield@workspace:packages/@react-stately/searchfield":
+"@react-stately/searchfield@workspace:packages/@react-stately/searchfield":
   version: 0.0.0-use.local
   resolution: "@react-stately/searchfield@workspace:packages/@react-stately/searchfield"
   dependencies:
-    "@react-stately/utils": "npm:^3.11.0"
     "@react-types/searchfield": "npm:^3.6.8"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/select@npm:^3.9.2, @react-stately/select@workspace:packages/@react-stately/select":
+"@react-stately/select@workspace:packages/@react-stately/select":
   version: 0.0.0-use.local
   resolution: "@react-stately/select@workspace:packages/@react-stately/select"
   dependencies:
-    "@react-stately/form": "npm:^3.2.4"
-    "@react-stately/list": "npm:^3.13.4"
-    "@react-stately/overlays": "npm:^3.6.23"
-    "@react-stately/utils": "npm:^3.11.0"
     "@react-types/select": "npm:^3.12.2"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/selection@npm:^3.20.9, @react-stately/selection@workspace:packages/@react-stately/selection":
+"@react-stately/selection@workspace:packages/@react-stately/selection":
   version: 0.0.0-use.local
   resolution: "@react-stately/selection@workspace:packages/@react-stately/selection"
   dependencies:
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/slider@npm:^3.7.5, @react-stately/slider@workspace:packages/@react-stately/slider":
+"@react-stately/slider@workspace:packages/@react-stately/slider":
   version: 0.0.0-use.local
   resolution: "@react-stately/slider@workspace:packages/@react-stately/slider"
   dependencies:
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.33.1"
-    "@react-types/slider": "npm:^3.8.4"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/steplist@npm:3.0.0-alpha.21, @react-stately/steplist@workspace:packages/@react-stately/steplist":
+"@react-stately/steplist@workspace:packages/@react-stately/steplist":
   version: 0.0.0-use.local
   resolution: "@react-stately/steplist@workspace:packages/@react-stately/steplist"
   dependencies:
-    "@react-stately/list": "npm:^3.13.4"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/table@npm:^3.15.4, @react-stately/table@workspace:packages/@react-stately/table":
+"@react-stately/table@workspace:packages/@react-stately/table":
   version: 0.0.0-use.local
   resolution: "@react-stately/table@workspace:packages/@react-stately/table"
   dependencies:
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/flags": "npm:^3.1.2"
-    "@react-stately/grid": "npm:^3.11.9"
-    "@react-stately/selection": "npm:^3.20.9"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/grid": "npm:^3.3.8"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/table": "npm:^3.13.6"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/tabs@npm:^3.8.9, @react-stately/tabs@workspace:packages/@react-stately/tabs":
+"@react-stately/tabs@workspace:packages/@react-stately/tabs":
   version: 0.0.0-use.local
   resolution: "@react-stately/tabs@workspace:packages/@react-stately/tabs"
   dependencies:
-    "@react-stately/list": "npm:^3.13.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@react-types/tabs": "npm:^3.3.22"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/toast@npm:^3.1.3, @react-stately/toast@workspace:packages/@react-stately/toast":
+"@react-stately/toast@workspace:packages/@react-stately/toast":
   version: 0.0.0-use.local
   resolution: "@react-stately/toast@workspace:packages/@react-stately/toast"
   dependencies:
     "@swc/helpers": "npm:^0.5.0"
     "@types/use-sync-external-store": "npm:^0.0.3"
-    use-sync-external-store: "npm:^1.6.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/toggle@npm:^3.9.5, @react-stately/toggle@workspace:packages/@react-stately/toggle":
+"@react-stately/toggle@workspace:packages/@react-stately/toggle":
   version: 0.0.0-use.local
   resolution: "@react-stately/toggle@workspace:packages/@react-stately/toggle"
   dependencies:
-    "@react-stately/utils": "npm:^3.11.0"
     "@react-types/checkbox": "npm:^3.10.4"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/tooltip@npm:^3.5.11, @react-stately/tooltip@workspace:packages/@react-stately/tooltip":
+"@react-stately/tooltip@workspace:packages/@react-stately/tooltip":
   version: 0.0.0-use.local
   resolution: "@react-stately/tooltip@workspace:packages/@react-stately/tooltip"
   dependencies:
-    "@react-stately/overlays": "npm:^3.6.23"
     "@react-types/tooltip": "npm:^3.5.2"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/tree@npm:^3.9.6, @react-stately/tree@workspace:packages/@react-stately/tree":
+"@react-stately/tree@workspace:packages/@react-stately/tree":
   version: 0.0.0-use.local
   resolution: "@react-stately/tree@workspace:packages/@react-stately/tree"
   dependencies:
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/selection": "npm:^3.20.9"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/utils@npm:^3.11.0, @react-stately/utils@workspace:packages/@react-stately/utils":
+"@react-stately/utils@workspace:packages/@react-stately/utils":
   version: 0.0.0-use.local
   resolution: "@react-stately/utils@workspace:packages/@react-stately/utils"
   dependencies:
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"@react-stately/virtualizer@npm:^4.0.0, @react-stately/virtualizer@npm:^4.4.6, @react-stately/virtualizer@workspace:packages/@react-stately/virtualizer":
+"@react-stately/virtualizer@npm:^4.4.6, @react-stately/virtualizer@workspace:packages/@react-stately/virtualizer":
   version: 0.0.0-use.local
   resolution: "@react-stately/virtualizer@workspace:packages/@react-stately/virtualizer"
   dependencies:
-    "@react-types/shared": "npm:^3.33.1"
     "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:^3.45.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -8790,7 +7968,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-types/sidenav@workspace:packages/@react-types/sidenav"
   dependencies:
-    "@react-stately/virtualizer": "npm:^4.0.0"
     "@react-types/shared": "npm:^3.1.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -24199,89 +23376,87 @@ __metadata:
   resolution: "react-aria-components@workspace:packages/react-aria-components"
   dependencies:
     "@internationalized/date": "npm:^3.12.0"
-    "@internationalized/string": "npm:^3.2.7"
-    "@react-aria/autocomplete": "npm:3.0.0-rc.6"
-    "@react-aria/collections": "npm:^3.0.3"
-    "@react-aria/dnd": "npm:^3.11.6"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/live-announcer": "npm:^3.4.4"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/textfield": "npm:^3.18.5"
-    "@react-aria/toolbar": "npm:3.0.0-beta.24"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-aria/virtualizer": "npm:^4.1.13"
-    "@react-stately/autocomplete": "npm:3.0.0-beta.4"
-    "@react-stately/layout": "npm:^4.6.0"
-    "@react-stately/selection": "npm:^3.20.9"
-    "@react-stately/table": "npm:^3.15.4"
-    "@react-stately/utils": "npm:^3.11.0"
-    "@react-stately/virtualizer": "npm:^4.4.6"
+    "@react-types/breadcrumbs": "npm:^3.7.19"
+    "@react-types/button": "npm:^3.15.1"
+    "@react-types/calendar": "npm:^3.8.3"
+    "@react-types/checkbox": "npm:^3.10.4"
+    "@react-types/color": "npm:^3.1.4"
+    "@react-types/combobox": "npm:^3.14.0"
+    "@react-types/datepicker": "npm:^3.13.5"
+    "@react-types/dialog": "npm:^3.5.24"
     "@react-types/form": "npm:^3.7.18"
     "@react-types/grid": "npm:^3.3.8"
+    "@react-types/listbox": "npm:^3.7.6"
+    "@react-types/menu": "npm:^3.10.7"
+    "@react-types/meter": "npm:^3.4.15"
+    "@react-types/numberfield": "npm:^3.8.18"
+    "@react-types/overlays": "npm:^3.9.4"
+    "@react-types/progress": "npm:^3.5.18"
+    "@react-types/radio": "npm:^3.9.4"
+    "@react-types/searchfield": "npm:^3.6.8"
+    "@react-types/select": "npm:^3.12.2"
     "@react-types/shared": "npm:^3.33.1"
+    "@react-types/slider": "npm:^3.8.4"
+    "@react-types/switch": "npm:^3.5.17"
     "@react-types/table": "npm:^3.13.6"
+    "@react-types/tabs": "npm:^3.3.22"
+    "@react-types/textfield": "npm:^3.12.8"
+    "@react-types/tooltip": "npm:^3.5.2"
     "@swc/helpers": "npm:^0.5.0"
     "@tailwindcss/postcss": "npm:^4.0.0"
     client-only: "npm:^0.0.1"
     react-aria: "npm:^3.47.0"
     react-stately: "npm:^3.45.0"
-    use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
   linkType: soft
 
-"react-aria@npm:^3.40.0, react-aria@npm:^3.47.0, react-aria@workspace:packages/react-aria":
+"react-aria@npm:3.47.0, react-aria@npm:^3.40.0, react-aria@npm:^3.47.0, react-aria@workspace:packages/react-aria":
   version: 0.0.0-use.local
   resolution: "react-aria@workspace:packages/react-aria"
   dependencies:
     "@babel/cli": "npm:^7.24.1"
     "@babel/core": "npm:^7.24.3"
+    "@internationalized/date": "npm:^3.12.0"
+    "@internationalized/message": "npm:^3.1.8"
+    "@internationalized/number": "npm:^3.6.5"
     "@internationalized/string": "npm:^3.2.7"
-    "@react-aria/breadcrumbs": "npm:^3.5.32"
-    "@react-aria/button": "npm:^3.14.5"
-    "@react-aria/calendar": "npm:^3.9.5"
-    "@react-aria/checkbox": "npm:^3.16.5"
-    "@react-aria/color": "npm:^3.1.5"
-    "@react-aria/combobox": "npm:^3.15.0"
-    "@react-aria/datepicker": "npm:^3.16.1"
-    "@react-aria/dialog": "npm:^3.5.34"
-    "@react-aria/disclosure": "npm:^3.1.3"
-    "@react-aria/dnd": "npm:^3.11.6"
-    "@react-aria/focus": "npm:^3.21.5"
-    "@react-aria/gridlist": "npm:^3.14.4"
-    "@react-aria/i18n": "npm:^3.12.16"
-    "@react-aria/interactions": "npm:^3.27.1"
-    "@react-aria/label": "npm:^3.7.25"
-    "@react-aria/landmark": "npm:^3.0.10"
-    "@react-aria/link": "npm:^3.8.9"
-    "@react-aria/listbox": "npm:^3.15.3"
-    "@react-aria/menu": "npm:^3.21.0"
-    "@react-aria/meter": "npm:^3.4.30"
-    "@react-aria/numberfield": "npm:^3.12.5"
-    "@react-aria/overlays": "npm:^3.31.2"
-    "@react-aria/progress": "npm:^3.4.30"
-    "@react-aria/radio": "npm:^3.12.5"
-    "@react-aria/searchfield": "npm:^3.8.12"
-    "@react-aria/select": "npm:^3.17.3"
-    "@react-aria/selection": "npm:^3.27.2"
-    "@react-aria/separator": "npm:^3.4.16"
-    "@react-aria/slider": "npm:^3.8.5"
-    "@react-aria/ssr": "npm:^3.9.10"
-    "@react-aria/switch": "npm:^3.7.11"
-    "@react-aria/table": "npm:^3.17.11"
-    "@react-aria/tabs": "npm:^3.11.1"
-    "@react-aria/tag": "npm:^3.8.1"
-    "@react-aria/textfield": "npm:^3.18.5"
-    "@react-aria/toast": "npm:^3.0.11"
-    "@react-aria/tooltip": "npm:^3.9.2"
-    "@react-aria/tree": "npm:^3.1.7"
-    "@react-aria/utils": "npm:^3.33.1"
-    "@react-aria/visually-hidden": "npm:^3.8.31"
+    "@react-types/actiongroup": "npm:^3.4.23"
+    "@react-types/autocomplete": "npm:3.0.0-alpha.38"
+    "@react-types/breadcrumbs": "npm:^3.7.19"
+    "@react-types/button": "npm:^3.15.1"
+    "@react-types/calendar": "npm:^3.8.3"
+    "@react-types/checkbox": "npm:^3.10.4"
+    "@react-types/color": "npm:^3.1.4"
+    "@react-types/combobox": "npm:^3.14.0"
+    "@react-types/datepicker": "npm:^3.13.5"
+    "@react-types/dialog": "npm:^3.5.24"
+    "@react-types/grid": "npm:^3.3.8"
+    "@react-types/link": "npm:^3.6.7"
+    "@react-types/listbox": "npm:^3.7.6"
+    "@react-types/menu": "npm:^3.10.7"
+    "@react-types/meter": "npm:^3.4.15"
+    "@react-types/numberfield": "npm:^3.8.18"
+    "@react-types/overlays": "npm:^3.9.4"
+    "@react-types/progress": "npm:^3.5.18"
+    "@react-types/radio": "npm:^3.9.4"
+    "@react-types/searchfield": "npm:^3.6.8"
+    "@react-types/select": "npm:^3.12.2"
     "@react-types/shared": "npm:^3.33.1"
+    "@react-types/slider": "npm:^3.8.4"
+    "@react-types/switch": "npm:^3.5.17"
+    "@react-types/table": "npm:^3.13.6"
+    "@react-types/tabs": "npm:^3.3.22"
+    "@react-types/textfield": "npm:^3.12.8"
+    "@react-types/tooltip": "npm:^3.5.2"
+    "@swc/helpers": "npm:^0.5.0"
+    aria-hidden: "npm:^1.2.3"
+    clsx: "npm:^2.0.0"
+    react-aria: "npm:3.47.0"
+    react-stately: "npm:3.45.0"
+    use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
     react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -24511,38 +23686,35 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"react-stately@npm:^3.38.0, react-stately@npm:^3.45.0, react-stately@workspace:packages/react-stately":
+"react-stately@npm:3.45.0, react-stately@npm:^3.38.0, react-stately@npm:^3.45.0, react-stately@workspace:packages/react-stately":
   version: 0.0.0-use.local
   resolution: "react-stately@workspace:packages/react-stately"
   dependencies:
     "@babel/cli": "npm:^7.24.1"
     "@babel/core": "npm:^7.24.3"
-    "@react-stately/calendar": "npm:^3.9.3"
-    "@react-stately/checkbox": "npm:^3.7.5"
-    "@react-stately/collections": "npm:^3.12.10"
-    "@react-stately/color": "npm:^3.9.5"
-    "@react-stately/combobox": "npm:^3.13.0"
-    "@react-stately/data": "npm:^3.15.2"
-    "@react-stately/datepicker": "npm:^3.16.1"
-    "@react-stately/disclosure": "npm:^3.0.11"
-    "@react-stately/dnd": "npm:^3.7.4"
-    "@react-stately/form": "npm:^3.2.4"
-    "@react-stately/list": "npm:^3.13.4"
-    "@react-stately/menu": "npm:^3.9.11"
-    "@react-stately/numberfield": "npm:^3.11.0"
-    "@react-stately/overlays": "npm:^3.6.23"
-    "@react-stately/radio": "npm:^3.11.5"
-    "@react-stately/searchfield": "npm:^3.5.19"
-    "@react-stately/select": "npm:^3.9.2"
-    "@react-stately/selection": "npm:^3.20.9"
-    "@react-stately/slider": "npm:^3.7.5"
-    "@react-stately/table": "npm:^3.15.4"
-    "@react-stately/tabs": "npm:^3.8.9"
-    "@react-stately/toast": "npm:^3.1.3"
-    "@react-stately/toggle": "npm:^3.9.5"
-    "@react-stately/tooltip": "npm:^3.5.11"
-    "@react-stately/tree": "npm:^3.9.6"
+    "@internationalized/date": "npm:^3.12.0"
+    "@internationalized/number": "npm:^3.6.5"
+    "@internationalized/string": "npm:^3.2.7"
+    "@react-types/calendar": "npm:^3.8.3"
+    "@react-types/checkbox": "npm:^3.10.4"
+    "@react-types/color": "npm:^3.1.4"
+    "@react-types/combobox": "npm:^3.14.0"
+    "@react-types/datepicker": "npm:^3.13.5"
+    "@react-types/grid": "npm:^3.3.8"
+    "@react-types/menu": "npm:^3.10.7"
+    "@react-types/numberfield": "npm:^3.8.18"
+    "@react-types/overlays": "npm:^3.9.4"
+    "@react-types/radio": "npm:^3.9.4"
+    "@react-types/searchfield": "npm:^3.6.8"
+    "@react-types/select": "npm:^3.12.2"
     "@react-types/shared": "npm:^3.33.1"
+    "@react-types/slider": "npm:^3.8.4"
+    "@react-types/table": "npm:^3.13.6"
+    "@react-types/tabs": "npm:^3.3.22"
+    "@react-types/tooltip": "npm:^3.5.2"
+    "@swc/helpers": "npm:^0.5.0"
+    react-stately: "npm:3.45.0"
+    use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
   languageName: unknown
@@ -24575,10 +23747,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0":
-  version: 19.1.0
-  resolution: "react@npm:19.1.0"
-  checksum: 10c0/530fb9a62237d54137a13d2cfb67a7db6a2156faed43eecc423f4713d9b20c6f2728b026b45e28fcd72e8eadb9e9ed4b089e99f5e295d2f0ad3134251bdd3698
+"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0, react@npm:^19.2.0":
+  version: 19.2.1
+  resolution: "react@npm:19.2.1"
+  checksum: 10c0/2b5eaf407abb3db84090434c20d6c5a8e447ab7abcd8fe9eaf1ddc299babcf31284ee9db7ea5671d21c85ac5298bd632fa1a7da1ed78d5b368a537f5e1cd5d62
   languageName: node
   linkType: hard
 
@@ -24589,13 +23761,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react@npm:^19.2.0":
-  version: 19.2.1
-  resolution: "react@npm:19.2.1"
-  checksum: 10c0/2b5eaf407abb3db84090434c20d6c5a8e447ab7abcd8fe9eaf1ddc299babcf31284ee9db7ea5671d21c85ac5298bd632fa1a7da1ed78d5b368a537f5e1cd5d62
-  languageName: node
-  linkType: hard
-
 "read-cache@npm:^1.0.0":
   version: 1.0.0
   resolution: "read-cache@npm:1.0.0"

From eeefbd2fc1060f26650501708b9bc8e3021dec82 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 10 Mar 2026 19:18:45 -0700
Subject: [PATCH 54/68] fix ssr tests

---
 .../test/accordion/Accordion.ssr.test.js      |   2 +-
 .../test/actiongroup/ActionGroup.ssr.test.js  |   2 +-
 .../test/badge/Badge.ssr.test.js              |   2 +-
 .../test/breadcrumbs/Breadcrumbs.ssr.test.js  |   2 +-
 .../test/button/Button.ssr.test.js            |  10 +-
 .../test/buttongroup/ButtonGroup.ssr.test.js  |   2 +-
 .../test/calendar/Calendar.ssr.test.js        |   4 +-
 .../test/checkbox/Checkbox.ssr.test.js        |   2 +-
 .../test/datepicker/DatePicker.ssr.test.js    |   8 +-
 .../test/dialog/Dialog.ssr.test.js            |   2 +-
 .../test/divider/Divider.ssr.test.js          |   2 +-
 .../react-spectrum/test/form/Form.ssr.test.js |   2 +-
 .../IllustratedMessage.ssr.test.js            |   2 +-
 .../test/layout/Flex.ssr.test.js              |   2 +-
 .../test/layout/Grid.ssr.test.js              |   2 +-
 .../react-spectrum/test/link/Link.ssr.test.js |   2 +-
 .../test/list/ListView.ssr.test.js            |   2 +-
 .../test/listbox/ListBox.ssr.test.js          |   2 +-
 .../react-spectrum/test/menu/Menu.ssr.test.js |   2 +-
 .../test/menu/MenuTrigger.ssr.test.js         |   2 +-
 .../test/meter/Meter.ssr.test.js              |   2 +-
 .../test/numberfield/NumberField.ssr.test.js  |   2 +-
 .../test/picker/Picker.ssr.test.js            |   2 +-
 .../test/progress/ProgressBar.ssr.test.js     |   2 +-
 .../test/progress/ProgressCircle.ssr.test.js  |   2 +-
 .../test/provider/Provider.ssr.test.js        |   2 +-
 .../test/radio/Radio.ssr.test.js              |   2 +-
 .../test/searchfield/SearchField.ssr.test.js  |   2 +-
 .../test/statuslight/StatusLight.ssr.test.js  |   2 +-
 .../test/switch/Switch.ssr.test.js            |   2 +-
 .../test/table/Table.ssr.test.js              |   6 +-
 .../test/tag/TagGroup.ssr.test.js             |   2 +-
 .../test/text/Heading.ssr.test.js             |   2 +-
 .../test/text/Keyboard.ssr.test.js            |   2 +-
 .../react-spectrum/test/text/Text.ssr.test.js |   2 +-
 .../test/textfield/TextArea.ssr.test.js       |   2 +-
 .../test/textfield/TextField.ssr.test.js      |   2 +-
 .../test/toast/ToastContainer.ssr.test.js     |   2 +-
 .../test/tree/TreeView.ssr.test.tsx           |   2 +-
 .../test/view/Content.ssr.test.js             |   2 +-
 .../test/view/Footer.ssr.test.js              |   2 +-
 .../test/view/Header.ssr.test.js              |   2 +-
 .../react-spectrum/test/view/View.ssr.test.js |   2 +-
 .../react-spectrum/test/well/Well.ssr.test.js |   2 +-
 .../date/tests/string.test.js                 |   2 +-
 packages/dev/test-utils/package.json          |   3 +-
 packages/dev/test-utils/src/ssrUtils.js       |   2 +-
 packages/dev/test-utils/src/ssrWorker.js      |   2 +-
 packages/dev/test-utils/src/testSSR.tsx       |   2 +-
 .../test/Breadcrumbs.ssr.test.js              |   2 +-
 .../test/ComboBox.ssr.test.js                 |   4 +-
 .../test/Dialog.ssr.test.js                   |   2 +-
 .../test/Disclosure.ssr.test.js               |   2 +-
 .../test/GridList.ssr.test.js                 |   2 +-
 .../test/ListBox.ssr.test.js                  |   4 +-
 .../test/Select.ssr.test.js                   |   2 +-
 .../test/Table.ssr.test.js                    |   2 +-
 .../test/Tabs.ssr.test.js                     |   2 +-
 .../test/TagGroup.ssr.test.js                 |   2 +-
 .../test/Tree.ssr.test.js                     |   2 +-
 .../test/landmark/useLandmark.ssr.test.js     |   2 +-
 .../test/overlays/useModal.ssr.test.js        |   2 +-
 .../test/ssr/SSRProvider.ssr.test.js          |   6 +-
 .../test/utils/useViewportSize.ssr.test.tsx   |   4 +-
 yarn.lock                                     | 724 +++++++++++++++++-
 65 files changed, 781 insertions(+), 102 deletions(-)

diff --git a/packages/@adobe/react-spectrum/test/accordion/Accordion.ssr.test.js b/packages/@adobe/react-spectrum/test/accordion/Accordion.ssr.test.js
index 295457eb6a0..4481342840d 100644
--- a/packages/@adobe/react-spectrum/test/accordion/Accordion.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/accordion/Accordion.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Accordion SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Accordion, Disclosure, DisclosureTitle, DisclosurePanel} from '../';
+      import {Accordion, Disclosure, DisclosureTitle, DisclosurePanel} from '../../exports/index.ts';
       <Accordion>
         <Disclosure id="files">
           <DisclosureTitle>
diff --git a/packages/@adobe/react-spectrum/test/actiongroup/ActionGroup.ssr.test.js b/packages/@adobe/react-spectrum/test/actiongroup/ActionGroup.ssr.test.js
index 9eed9f2c154..c6be9543526 100644
--- a/packages/@adobe/react-spectrum/test/actiongroup/ActionGroup.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/actiongroup/ActionGroup.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('ActionGroup SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {ActionGroup, Item} from '../';
+      import {ActionGroup, Item} from '../../exports/index.ts';
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
 
diff --git a/packages/@adobe/react-spectrum/test/badge/Badge.ssr.test.js b/packages/@adobe/react-spectrum/test/badge/Badge.ssr.test.js
index 6fd2d310a01..03a5124444f 100644
--- a/packages/@adobe/react-spectrum/test/badge/Badge.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/badge/Badge.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Badge SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Badge} from '../';
+      import {Badge} from '../../exports/index.ts';
 
       <Badge>Badge text</Badge>
     `);
diff --git a/packages/@adobe/react-spectrum/test/breadcrumbs/Breadcrumbs.ssr.test.js b/packages/@adobe/react-spectrum/test/breadcrumbs/Breadcrumbs.ssr.test.js
index 3fa751c0244..729702b30cf 100644
--- a/packages/@adobe/react-spectrum/test/breadcrumbs/Breadcrumbs.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/breadcrumbs/Breadcrumbs.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Breadcrumbs SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Breadcrumbs, Item} from '../';
+      import {Breadcrumbs, Item} from '../../exports/index.ts';
 
       <Breadcrumbs>
         <Item key="one">One</Item>
diff --git a/packages/@adobe/react-spectrum/test/button/Button.ssr.test.js b/packages/@adobe/react-spectrum/test/button/Button.ssr.test.js
index 4eeaf48f0b7..63171dc4347 100644
--- a/packages/@adobe/react-spectrum/test/button/Button.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/button/Button.ssr.test.js
@@ -17,12 +17,18 @@ describe('Button SSR', function () {
     Name              | props
     ${'ActionButton'} | ${{}}
     ${'Button'}       | ${{}}
-    ${'FieldButton'}  | ${{}}
     ${'LogicButton'}  | ${{}}
   `('$Name should render without errors', async function ({Name, props}) {
     await testSSR(__filename, `
-      import {${Name}} from '../';
+      import {${Name}} from '../../exports/index.ts';
       <${Name}>Button</${Name}>
     `);
   });
+
+  it('FieldButton', async function () {
+    await testSSR(__filename, `
+      import {FieldButton} from '../../exports/private/button/FieldButton.ts';
+      <FieldButton>Button</FieldButton>
+    `);
+  });
 });
diff --git a/packages/@adobe/react-spectrum/test/buttongroup/ButtonGroup.ssr.test.js b/packages/@adobe/react-spectrum/test/buttongroup/ButtonGroup.ssr.test.js
index b90c7715932..c17e9413c27 100644
--- a/packages/@adobe/react-spectrum/test/buttongroup/ButtonGroup.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/buttongroup/ButtonGroup.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('ButtonGroup SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {ButtonGroup} from '../';
+      import {ButtonGroup} from '../../exports/index.ts';
       import {Button} from '@react-spectrum/button';
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
diff --git a/packages/@adobe/react-spectrum/test/calendar/Calendar.ssr.test.js b/packages/@adobe/react-spectrum/test/calendar/Calendar.ssr.test.js
index 91db5a8dbb9..d4a3c951037 100644
--- a/packages/@adobe/react-spectrum/test/calendar/Calendar.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/calendar/Calendar.ssr.test.js
@@ -15,14 +15,14 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Calendar SSR', function () {
   it('should render a Calendar without errors', async function () {
     await testSSR(__filename, `
-      import {Calendar} from '../';
+      import {Calendar} from '../../exports/index.ts';
       <Calendar />
     `);
   });
 
   it('should render a RangeCalendar without errors', async function () {
     await testSSR(__filename, `
-      import {RangeCalendar} from '../';
+      import {RangeCalendar} from '../../exports/index.ts';
       <RangeCalendar />
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/checkbox/Checkbox.ssr.test.js b/packages/@adobe/react-spectrum/test/checkbox/Checkbox.ssr.test.js
index aa2a5ae4b5c..5cd3a1f7ac2 100644
--- a/packages/@adobe/react-spectrum/test/checkbox/Checkbox.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/checkbox/Checkbox.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Checkbox SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Checkbox} from '../';
+      import {Checkbox} from '../../exports/index.ts';
       <Checkbox>Test</Checkbox>
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/datepicker/DatePicker.ssr.test.js b/packages/@adobe/react-spectrum/test/datepicker/DatePicker.ssr.test.js
index 624c4320029..5fd9bc2f782 100644
--- a/packages/@adobe/react-spectrum/test/datepicker/DatePicker.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/datepicker/DatePicker.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('DatePicker SSR', function () {
   it('should render a DatePicker without errors', async function () {
     await testSSR(__filename, `
-      import {DatePicker} from '../';
+      import {DatePicker} from '../../exports/index.ts';
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
 
@@ -27,7 +27,7 @@ describe('DatePicker SSR', function () {
 
   it('should render a DateRangePicker without errors', async function () {
     await testSSR(__filename, `
-      import {DateRangePicker} from '../';
+      import {DateRangePicker} from '../../exports/index.ts';
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
 
@@ -39,7 +39,7 @@ describe('DatePicker SSR', function () {
 
   it('should render a DateField without errors', async function () {
     await testSSR(__filename, `
-      import {DateField} from '../';
+      import {DateField} from '../../exports/index.ts';
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
 
@@ -51,7 +51,7 @@ describe('DatePicker SSR', function () {
 
   it('should render a TimeField without errors', async function () {
     await testSSR(__filename, `
-      import {TimeField} from '../';
+      import {TimeField} from '../../exports/index.ts';
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
 
diff --git a/packages/@adobe/react-spectrum/test/dialog/Dialog.ssr.test.js b/packages/@adobe/react-spectrum/test/dialog/Dialog.ssr.test.js
index b8a0a884842..ac2a74e0671 100644
--- a/packages/@adobe/react-spectrum/test/dialog/Dialog.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/dialog/Dialog.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Dialog SSR', function () {
   it('Dialog should render without errors', async function () {
     await testSSR(__filename, `
-      import {Dialog} from '../';
+      import {Dialog} from '../../exports/index.ts';
 
       <Dialog>
         contents
diff --git a/packages/@adobe/react-spectrum/test/divider/Divider.ssr.test.js b/packages/@adobe/react-spectrum/test/divider/Divider.ssr.test.js
index 2567e6bc993..b82c8d34055 100644
--- a/packages/@adobe/react-spectrum/test/divider/Divider.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/divider/Divider.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Divider SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Divider} from '../';
+      import {Divider} from '../../exports/index.ts';
       <Divider />
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/form/Form.ssr.test.js b/packages/@adobe/react-spectrum/test/form/Form.ssr.test.js
index aa7c8b0faf3..bed017d14a5 100644
--- a/packages/@adobe/react-spectrum/test/form/Form.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/form/Form.ssr.test.js
@@ -17,7 +17,7 @@ describe('Form SSR', function () {
     await testSSR(__filename, `
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
-      import {Form} from '../';
+      import {Form} from '../../exports/index.ts';
 
       <Provider theme={theme}>
         <Form aria-label="Home" />
diff --git a/packages/@adobe/react-spectrum/test/illustratedmessage/IllustratedMessage.ssr.test.js b/packages/@adobe/react-spectrum/test/illustratedmessage/IllustratedMessage.ssr.test.js
index 735d1432811..9a9c73114e5 100644
--- a/packages/@adobe/react-spectrum/test/illustratedmessage/IllustratedMessage.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/illustratedmessage/IllustratedMessage.ssr.test.js
@@ -17,7 +17,7 @@ describe('IllustratedMessage SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
       import {Heading} from '@react-spectrum/text';
-      import {IllustratedMessage} from '../';
+      import {IllustratedMessage} from '../../exports/index.ts';
 
       <IllustratedMessage>
         <Heading>Message</Heading>
diff --git a/packages/@adobe/react-spectrum/test/layout/Flex.ssr.test.js b/packages/@adobe/react-spectrum/test/layout/Flex.ssr.test.js
index bf3428c1392..884b95143d4 100644
--- a/packages/@adobe/react-spectrum/test/layout/Flex.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/layout/Flex.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Flex SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Flex} from '../';
+      import {Flex} from '../../exports/index.ts';
       <Flex />
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/layout/Grid.ssr.test.js b/packages/@adobe/react-spectrum/test/layout/Grid.ssr.test.js
index a75a99b8ddd..ce122b12dcb 100644
--- a/packages/@adobe/react-spectrum/test/layout/Grid.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/layout/Grid.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Grid SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Grid} from '../';
+      import {Grid} from '../../exports/index.ts';
       <Grid />
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/link/Link.ssr.test.js b/packages/@adobe/react-spectrum/test/link/Link.ssr.test.js
index 2940f23d5d9..8d43e1b1eb3 100644
--- a/packages/@adobe/react-spectrum/test/link/Link.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/link/Link.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Link SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Link} from '../';
+      import {Link} from '../../exports/index.ts';
       <Link>the link</Link>
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/list/ListView.ssr.test.js b/packages/@adobe/react-spectrum/test/list/ListView.ssr.test.js
index aae2eb071cb..475e7e5891c 100644
--- a/packages/@adobe/react-spectrum/test/list/ListView.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/list/ListView.ssr.test.js
@@ -17,7 +17,7 @@ describe('ListView SSR', function () {
     await testSSR(__filename, `
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
-      import {ListView, Item} from '../';
+      import {ListView, Item} from '../../exports/index.ts';
 
       <Provider theme={theme}>
         <ListView aria-label="List view">
diff --git a/packages/@adobe/react-spectrum/test/listbox/ListBox.ssr.test.js b/packages/@adobe/react-spectrum/test/listbox/ListBox.ssr.test.js
index e0824a0b1a0..f4976cf9613 100644
--- a/packages/@adobe/react-spectrum/test/listbox/ListBox.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/listbox/ListBox.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('ListBox SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {ListBox, Item} from '../';
+      import {ListBox, Item} from '../../exports/index.ts';
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
 
diff --git a/packages/@adobe/react-spectrum/test/menu/Menu.ssr.test.js b/packages/@adobe/react-spectrum/test/menu/Menu.ssr.test.js
index 596bf8cb866..5e9d5ce1b53 100644
--- a/packages/@adobe/react-spectrum/test/menu/Menu.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/menu/Menu.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Menu SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Menu, Item} from '../';
+      import {Menu, Item} from '../../exports/index.ts';
       <Menu aria-label="Menu">
         <Item>Left</Item>
         <Item>Middle</Item>
diff --git a/packages/@adobe/react-spectrum/test/menu/MenuTrigger.ssr.test.js b/packages/@adobe/react-spectrum/test/menu/MenuTrigger.ssr.test.js
index 6e407d1aa17..7b923e97cc2 100644
--- a/packages/@adobe/react-spectrum/test/menu/MenuTrigger.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/menu/MenuTrigger.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('MenuTrigger SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {MenuTrigger, Menu, Item} from '../';
+      import {MenuTrigger, Menu, Item} from '../../exports/index.ts';
       import {ActionButton} from '@react-spectrum/button';
       <MenuTrigger>
         <ActionButton>Edit</ActionButton>
diff --git a/packages/@adobe/react-spectrum/test/meter/Meter.ssr.test.js b/packages/@adobe/react-spectrum/test/meter/Meter.ssr.test.js
index 50da9422766..ee5344470f3 100644
--- a/packages/@adobe/react-spectrum/test/meter/Meter.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/meter/Meter.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Meter SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Meter} from '../';
+      import {Meter} from '../../exports/index.ts';
       <Meter label="Storage space" variant="positive" />
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/numberfield/NumberField.ssr.test.js b/packages/@adobe/react-spectrum/test/numberfield/NumberField.ssr.test.js
index 2cceba64d56..281b474c80c 100644
--- a/packages/@adobe/react-spectrum/test/numberfield/NumberField.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/numberfield/NumberField.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('NumberField SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {NumberField} from '../';
+      import {NumberField} from '../../exports/index.ts';
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
 
diff --git a/packages/@adobe/react-spectrum/test/picker/Picker.ssr.test.js b/packages/@adobe/react-spectrum/test/picker/Picker.ssr.test.js
index daec81bde2e..e7d131214e2 100644
--- a/packages/@adobe/react-spectrum/test/picker/Picker.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/picker/Picker.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Picker SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Picker, Item} from '../';
+      import {Picker, Item} from '../../exports/index.ts';
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
 
diff --git a/packages/@adobe/react-spectrum/test/progress/ProgressBar.ssr.test.js b/packages/@adobe/react-spectrum/test/progress/ProgressBar.ssr.test.js
index efb6720dbdf..3552a2efa43 100644
--- a/packages/@adobe/react-spectrum/test/progress/ProgressBar.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/progress/ProgressBar.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('ProgressBar SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {ProgressBar} from '../';
+      import {ProgressBar} from '../../exports/index.ts';
       <ProgressBar aria-label="progress" />
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/progress/ProgressCircle.ssr.test.js b/packages/@adobe/react-spectrum/test/progress/ProgressCircle.ssr.test.js
index f8e0862e848..63314dc756e 100644
--- a/packages/@adobe/react-spectrum/test/progress/ProgressCircle.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/progress/ProgressCircle.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('ProgressCircle SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {ProgressCircle} from '../';
+      import {ProgressCircle} from '../../exports/index.ts';
       <ProgressCircle aria-label="progress" />
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/provider/Provider.ssr.test.js b/packages/@adobe/react-spectrum/test/provider/Provider.ssr.test.js
index 3272b47481d..310ae0d2fc1 100644
--- a/packages/@adobe/react-spectrum/test/provider/Provider.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/provider/Provider.ssr.test.js
@@ -16,7 +16,7 @@ describe('Provider SSR', function () {
   it('should render without errors', async function () {
     jest.spyOn(navigator, 'language', 'get').mockImplementation(() => 'fr');
     await testSSR(__filename, `
-      import {Provider} from '../';
+      import {Provider} from '../../exports/index.ts';
       import {theme} from '@react-spectrum/theme-default';
 
       <Provider theme={theme}>
diff --git a/packages/@adobe/react-spectrum/test/radio/Radio.ssr.test.js b/packages/@adobe/react-spectrum/test/radio/Radio.ssr.test.js
index 3accbd057c5..ded2b9550ff 100644
--- a/packages/@adobe/react-spectrum/test/radio/Radio.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/radio/Radio.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Radio SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Radio, RadioGroup} from '../';
+      import {Radio, RadioGroup} from '../../exports/index.ts';
 
       <RadioGroup label="radio">
         <Radio>One</Radio>
diff --git a/packages/@adobe/react-spectrum/test/searchfield/SearchField.ssr.test.js b/packages/@adobe/react-spectrum/test/searchfield/SearchField.ssr.test.js
index ec782410f85..09b01fc1f5e 100644
--- a/packages/@adobe/react-spectrum/test/searchfield/SearchField.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/searchfield/SearchField.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('SearchField SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {SearchField} from '../';
+      import {SearchField} from '../../exports/index.ts';
 
       <SearchField label="search" />
     `);
diff --git a/packages/@adobe/react-spectrum/test/statuslight/StatusLight.ssr.test.js b/packages/@adobe/react-spectrum/test/statuslight/StatusLight.ssr.test.js
index 733ca394e2c..0c92a867934 100644
--- a/packages/@adobe/react-spectrum/test/statuslight/StatusLight.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/statuslight/StatusLight.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('StatusLight SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {StatusLight} from '../';
+      import {StatusLight} from '../../exports/index.ts';
 
       <StatusLight>Status</StatusLight>
     `);
diff --git a/packages/@adobe/react-spectrum/test/switch/Switch.ssr.test.js b/packages/@adobe/react-spectrum/test/switch/Switch.ssr.test.js
index 36e2765d9c0..99aa19f14f6 100644
--- a/packages/@adobe/react-spectrum/test/switch/Switch.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/switch/Switch.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Switch SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Switch} from '../';
+      import {Switch} from '../../exports/index.ts';
 
       <Switch>Switching</Switch>
     `);
diff --git a/packages/@adobe/react-spectrum/test/table/Table.ssr.test.js b/packages/@adobe/react-spectrum/test/table/Table.ssr.test.js
index 820c8b13ddf..b1ad63625ec 100644
--- a/packages/@adobe/react-spectrum/test/table/Table.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/table/Table.ssr.test.js
@@ -17,7 +17,7 @@ describe('Table SSR', function () {
     await testSSR(__filename, `
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
-      import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../';
+      import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../exports/index.ts';
       <Provider theme={theme}>
         <TableView aria-label="Table">
           <TableHeader>
@@ -48,7 +48,7 @@ describe('Table Nested Rows SSR', function () {
     await testSSR(__filename, `
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
-      import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../';
+      import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../exports/index.ts';
       import {enableTableNestedRows} from '@react-stately/flags';
       enableTableNestedRows();
 
@@ -93,7 +93,7 @@ describe('Table Static SSR', function () {
     await testSSR(__filename, `
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
-      import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../';
+      import {Cell, Column, Row, TableBody, TableHeader, TableView} from '../../exports/index.ts';
       import {enableTableNestedRows} from '@react-stately/flags';
       enableTableNestedRows();
 
diff --git a/packages/@adobe/react-spectrum/test/tag/TagGroup.ssr.test.js b/packages/@adobe/react-spectrum/test/tag/TagGroup.ssr.test.js
index 4b12caa8ec0..3cd2d356c25 100644
--- a/packages/@adobe/react-spectrum/test/tag/TagGroup.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/tag/TagGroup.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('TagGroup SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {TagGroup, Item} from '../';
+      import {TagGroup, Item} from '../../exports/index.ts';
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
       <Provider theme={theme}>
diff --git a/packages/@adobe/react-spectrum/test/text/Heading.ssr.test.js b/packages/@adobe/react-spectrum/test/text/Heading.ssr.test.js
index 49d809a336a..c661339a5db 100644
--- a/packages/@adobe/react-spectrum/test/text/Heading.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/text/Heading.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Heading SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Heading} from '../';
+      import {Heading} from '../../exports/index.ts';
       <Heading />
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/text/Keyboard.ssr.test.js b/packages/@adobe/react-spectrum/test/text/Keyboard.ssr.test.js
index 7c23b378bb0..cf61bbdd09a 100644
--- a/packages/@adobe/react-spectrum/test/text/Keyboard.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/text/Keyboard.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Keyboard SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Keyboard} from '../';
+      import {Keyboard} from '../../exports/index.ts';
       <Keyboard />
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/text/Text.ssr.test.js b/packages/@adobe/react-spectrum/test/text/Text.ssr.test.js
index 92aca7e08f5..0f4ac1ed444 100644
--- a/packages/@adobe/react-spectrum/test/text/Text.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/text/Text.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Text SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Text} from '../';
+      import {Text} from '../../exports/index.ts';
       <Text />
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/textfield/TextArea.ssr.test.js b/packages/@adobe/react-spectrum/test/textfield/TextArea.ssr.test.js
index 51f1e15c98f..d20a2ae8e12 100644
--- a/packages/@adobe/react-spectrum/test/textfield/TextArea.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/textfield/TextArea.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('TextArea SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {TextArea} from '../';
+      import {TextArea} from '../../exports/index.ts';
 
       <TextArea label="area" />
     `);
diff --git a/packages/@adobe/react-spectrum/test/textfield/TextField.ssr.test.js b/packages/@adobe/react-spectrum/test/textfield/TextField.ssr.test.js
index f988bf0eee9..6517d5c589f 100644
--- a/packages/@adobe/react-spectrum/test/textfield/TextField.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/textfield/TextField.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('TextField SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {TextField} from '../';
+      import {TextField} from '../../exports/index.ts';
 
       <TextField label="text" />
     `);
diff --git a/packages/@adobe/react-spectrum/test/toast/ToastContainer.ssr.test.js b/packages/@adobe/react-spectrum/test/toast/ToastContainer.ssr.test.js
index 51d07b3605d..4044e3944a3 100644
--- a/packages/@adobe/react-spectrum/test/toast/ToastContainer.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/toast/ToastContainer.ssr.test.js
@@ -17,7 +17,7 @@ describe('ToastContainer SSR', function () {
     await testSSR(__filename, `
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
-      import {ToastContainer} from '../';
+      import {ToastContainer} from '../../exports/index.ts';
 
       <Provider theme={theme}>
         <ToastContainer />
diff --git a/packages/@adobe/react-spectrum/test/tree/TreeView.ssr.test.tsx b/packages/@adobe/react-spectrum/test/tree/TreeView.ssr.test.tsx
index e58101da4b6..28fad490436 100644
--- a/packages/@adobe/react-spectrum/test/tree/TreeView.ssr.test.tsx
+++ b/packages/@adobe/react-spectrum/test/tree/TreeView.ssr.test.tsx
@@ -18,7 +18,7 @@ describe('TreeView SSR', function () {
     await testSSR(__filename, `
       import {Provider} from '@react-spectrum/provider';
       import {theme} from '@react-spectrum/theme-default';
-      import {TreeView, TreeViewItem, TreeViewItemContent} from '../';
+      import {TreeView, TreeViewItem, TreeViewItemContent} from '../../exports/index.ts';
       import {Text} from '@react-spectrum/text';
       <Provider theme={theme}>
         <TreeView aria-label="Example tree with static contents" defaultExpandedKeys={['documents', 'photos']} height="size-4600" maxWidth="size-6000">
diff --git a/packages/@adobe/react-spectrum/test/view/Content.ssr.test.js b/packages/@adobe/react-spectrum/test/view/Content.ssr.test.js
index c4668dc128c..2c4b3141e3a 100644
--- a/packages/@adobe/react-spectrum/test/view/Content.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/view/Content.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Content SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Content} from '../';
+      import {Content} from '../../exports/index.ts';
       <Content />
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/view/Footer.ssr.test.js b/packages/@adobe/react-spectrum/test/view/Footer.ssr.test.js
index 17658c9c652..efa201c928a 100644
--- a/packages/@adobe/react-spectrum/test/view/Footer.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/view/Footer.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Footer SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Footer} from '../';
+      import {Footer} from '../../exports/index.ts';
       <Footer />
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/view/Header.ssr.test.js b/packages/@adobe/react-spectrum/test/view/Header.ssr.test.js
index 1e57af5c162..41b30de6a2f 100644
--- a/packages/@adobe/react-spectrum/test/view/Header.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/view/Header.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Header SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Header} from '../';
+      import {Header} from '../../exports/index.ts';
       <Header />
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/view/View.ssr.test.js b/packages/@adobe/react-spectrum/test/view/View.ssr.test.js
index e1fcf3e79ca..523d3b4b9ce 100644
--- a/packages/@adobe/react-spectrum/test/view/View.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/view/View.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('View SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {View} from '../';
+      import {View} from '../../exports/index.ts';
       <View />
     `);
   });
diff --git a/packages/@adobe/react-spectrum/test/well/Well.ssr.test.js b/packages/@adobe/react-spectrum/test/well/Well.ssr.test.js
index cce5f1e1eb5..fdf283083ae 100644
--- a/packages/@adobe/react-spectrum/test/well/Well.ssr.test.js
+++ b/packages/@adobe/react-spectrum/test/well/Well.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('Well SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Well} from '../';
+      import {Well} from '../../exports/index.ts';
       <Well />
     `);
   });
diff --git a/packages/@internationalized/date/tests/string.test.js b/packages/@internationalized/date/tests/string.test.js
index 87c97d61218..aa6e3d69d76 100644
--- a/packages/@internationalized/date/tests/string.test.js
+++ b/packages/@internationalized/date/tests/string.test.js
@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import {CalendarDate, CalendarDateTime, parseAbsolute, parseDate, parseDateTime, parseDuration, parseTime, parseZonedDateTime, Time, ZonedDateTime} from '../';
+import {CalendarDate, CalendarDateTime, parseAbsolute, parseDate, parseDateTime, parseDuration, parseTime, parseZonedDateTime, Time, ZonedDateTime} from '../src/index';
 
 describe('string conversion', function () {
   describe('parseTime', function () {
diff --git a/packages/dev/test-utils/package.json b/packages/dev/test-utils/package.json
index 8d2ad6806d9..279b211743e 100644
--- a/packages/dev/test-utils/package.json
+++ b/packages/dev/test-utils/package.json
@@ -29,7 +29,8 @@
     "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "^14.0.0",
     "jest": "^29.5.0",
-    "resolve": "^1.17.0"
+    "react-aria": "^3.47.0",
+    "resolve": "^2.0.0-next.6"
   },
   "peerDependencies": {
     "@react-spectrum/provider": "^3.9.12",
diff --git a/packages/dev/test-utils/src/ssrUtils.js b/packages/dev/test-utils/src/ssrUtils.js
index 94f68bb417b..6da1f3ca942 100644
--- a/packages/dev/test-utils/src/ssrUtils.js
+++ b/packages/dev/test-utils/src/ssrUtils.js
@@ -45,7 +45,7 @@ Module._resolveFilename = (request, parent) => {
   let resolved = resolver(request, {
     basedir: path.dirname(parent.filename),
     extensions: ['.js', '.json', '.ts', '.tsx'],
-    defaultResolver: (request, opts) => resolve.sync(request, opts)
+    defaultResolver: (request, opts) => resolve.sync(request, {...opts, engines: '>= 24', conditions: ['source']})
   });
 
   return fs.realpathSync(resolved);
diff --git a/packages/dev/test-utils/src/ssrWorker.js b/packages/dev/test-utils/src/ssrWorker.js
index 18ff2495df5..207f8ff8583 100644
--- a/packages/dev/test-utils/src/ssrWorker.js
+++ b/packages/dev/test-utils/src/ssrWorker.js
@@ -29,7 +29,7 @@ require('@babel/register')({
 });
 
 let {evaluate} = require('./ssrUtils');
-let {SSRProvider} = require('@react-aria/ssr');
+let {SSRProvider} = require('react-aria/SSRProvider');
 
 http.createServer((req, res) => {
   let body = '';
diff --git a/packages/dev/test-utils/src/testSSR.tsx b/packages/dev/test-utils/src/testSSR.tsx
index 0695dd99e14..8acf0437458 100644
--- a/packages/dev/test-utils/src/testSSR.tsx
+++ b/packages/dev/test-utils/src/testSSR.tsx
@@ -20,7 +20,7 @@ import {evaluate} from './ssrUtils';
 import http from 'http';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import {SSRProvider} from '@react-aria/ssr';
+import {SSRProvider} from 'react-aria/SSRProvider';
 import util from 'util';
 
 let ReactDOMClient;
diff --git a/packages/react-aria-components/test/Breadcrumbs.ssr.test.js b/packages/react-aria-components/test/Breadcrumbs.ssr.test.js
index 3ab6c826490..274c89db1e5 100644
--- a/packages/react-aria-components/test/Breadcrumbs.ssr.test.js
+++ b/packages/react-aria-components/test/Breadcrumbs.ssr.test.js
@@ -15,7 +15,7 @@ import {screen, testSSR} from '@react-spectrum/test-utils-internal';
 describe('Breadcrumbs SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Breadcrumbs, Breadcrumb} from '../';
+      import {Breadcrumbs, Breadcrumb} from '../exports/index.ts';
 
       <React.StrictMode>
         <Breadcrumbs>
diff --git a/packages/react-aria-components/test/ComboBox.ssr.test.js b/packages/react-aria-components/test/ComboBox.ssr.test.js
index 4b565d3a8b2..7ef32e921a9 100644
--- a/packages/react-aria-components/test/ComboBox.ssr.test.js
+++ b/packages/react-aria-components/test/ComboBox.ssr.test.js
@@ -15,7 +15,7 @@ import {fireEvent, screen, testSSR} from '@react-spectrum/test-utils-internal';
 describe('ComboBox SSR', function () {
   it('should render text of default selected key', async function () {
     await testSSR(__filename, `
-      import {ComboBox, Label, Input, Popover, ListBox, ListBoxItem} from '../';
+      import {ComboBox, Label, Input, Popover, ListBox, ListBoxItem} from '../exports/index.ts';
 
       <React.StrictMode>
         <ComboBox defaultSelectedKey="dog">
@@ -43,7 +43,7 @@ describe('ComboBox SSR', function () {
 
   it('should point ref correctly after hydration', async function () {
     await testSSR(__filename, `
-      import {ComboBox, Label, Input, Popover, ListBox, ListBoxItem} from '../';
+      import {ComboBox, Label, Input, Popover, ListBox, ListBoxItem} from '../exports/index.ts';
       import {useState, useRef} from 'react';
       import {useLayoutEffect} from '@react-aria/utils';
 
diff --git a/packages/react-aria-components/test/Dialog.ssr.test.js b/packages/react-aria-components/test/Dialog.ssr.test.js
index 45894b71c12..13cd12d0f6e 100644
--- a/packages/react-aria-components/test/Dialog.ssr.test.js
+++ b/packages/react-aria-components/test/Dialog.ssr.test.js
@@ -15,7 +15,7 @@ import {screen, testSSR} from '@react-spectrum/test-utils-internal';
 describe('Dialog SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Button, Dialog, DialogTrigger, Heading, Input, Label, Modal, TextField} from '../';
+      import {Button, Dialog, DialogTrigger, Heading, Input, Label, Modal, TextField} from '../exports/index.ts';
 
       <React.StrictMode>
         <DialogTrigger isOpen>
diff --git a/packages/react-aria-components/test/Disclosure.ssr.test.js b/packages/react-aria-components/test/Disclosure.ssr.test.js
index ce8c5dafd6c..bd9b258e889 100644
--- a/packages/react-aria-components/test/Disclosure.ssr.test.js
+++ b/packages/react-aria-components/test/Disclosure.ssr.test.js
@@ -15,7 +15,7 @@ import {screen, testSSR} from '@react-spectrum/test-utils-internal';
 describe('Disclosure SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {DisclosureGroup, Disclosure, DisclosurePanel, Heading, Button} from '../';
+      import {DisclosureGroup, Disclosure, DisclosurePanel, Heading, Button} from '../exports/index.ts';
 
       <React.StrictMode>
         <DisclosureGroup>
diff --git a/packages/react-aria-components/test/GridList.ssr.test.js b/packages/react-aria-components/test/GridList.ssr.test.js
index e0593a0cf13..0b1d7403ebf 100644
--- a/packages/react-aria-components/test/GridList.ssr.test.js
+++ b/packages/react-aria-components/test/GridList.ssr.test.js
@@ -15,7 +15,7 @@ import {fireEvent, screen, testSSR} from '@react-spectrum/test-utils-internal';
 describe('GridList SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {GridList, GridListItem} from '../';
+      import {GridList, GridListItem} from '../exports/index.ts';
 
       function Test() {
         let [show, setShow] = React.useState(false);
diff --git a/packages/react-aria-components/test/ListBox.ssr.test.js b/packages/react-aria-components/test/ListBox.ssr.test.js
index 3b90263c9bb..279eaad37b7 100644
--- a/packages/react-aria-components/test/ListBox.ssr.test.js
+++ b/packages/react-aria-components/test/ListBox.ssr.test.js
@@ -15,7 +15,7 @@ import {fireEvent, screen, testSSR, within} from '@react-spectrum/test-utils-int
 describe('ListBox SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {ListBox, ListBoxItem} from '../';
+      import {ListBox, ListBoxItem} from '../exports/index.ts';
 
       function Test() {
         let [show, setShow] = React.useState(false);
@@ -54,7 +54,7 @@ describe('ListBox SSR', function () {
 
   it('should render with sections', async function () {
     await testSSR(__filename, `
-      import {ListBox, ListBoxSection, ListBoxItem, Header} from '../';
+      import {ListBox, ListBoxSection, ListBoxItem, Header} from '../exports/index.ts';
 
       <React.StrictMode>
         <ListBox aria-label="Listbox">
diff --git a/packages/react-aria-components/test/Select.ssr.test.js b/packages/react-aria-components/test/Select.ssr.test.js
index cf919272806..6bf8d0af078 100644
--- a/packages/react-aria-components/test/Select.ssr.test.js
+++ b/packages/react-aria-components/test/Select.ssr.test.js
@@ -15,7 +15,7 @@ import {screen, testSSR} from '@react-spectrum/test-utils-internal';
 describe('Select SSR', function () {
   it('should render text of default selected key', async function () {
     await testSSR(__filename, `
-      import {Select, Label, Button, SelectValue, Popover, ListBox, ListBoxItem} from '../';
+      import {Select, Label, Button, SelectValue, Popover, ListBox, ListBoxItem} from '../exports/index.ts';
 
       <React.StrictMode>
         <Select defaultSelectedKey="dog">
diff --git a/packages/react-aria-components/test/Table.ssr.test.js b/packages/react-aria-components/test/Table.ssr.test.js
index fda9cb25323..75faa13ab91 100644
--- a/packages/react-aria-components/test/Table.ssr.test.js
+++ b/packages/react-aria-components/test/Table.ssr.test.js
@@ -15,7 +15,7 @@ import {fireEvent, screen, testSSR} from '@react-spectrum/test-utils-internal';
 describe('Table SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Table, TableHeader, Column, TableBody, Row, Cell} from '../';
+      import {Table, TableHeader, Column, TableBody, Row, Cell} from '../exports/index.ts';
 
       function Test() {
         let [show, setShow] = React.useState(false);
diff --git a/packages/react-aria-components/test/Tabs.ssr.test.js b/packages/react-aria-components/test/Tabs.ssr.test.js
index 60503c1011f..3e6f2401514 100644
--- a/packages/react-aria-components/test/Tabs.ssr.test.js
+++ b/packages/react-aria-components/test/Tabs.ssr.test.js
@@ -15,7 +15,7 @@ import {screen, testSSR} from '@react-spectrum/test-utils-internal';
 describe('Tabs SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Tabs, TabList, Tab, TabPanel, Label} from '../';
+      import {Tabs, TabList, Tab, TabPanel, Label} from '../exports/index.ts';
 
       <React.StrictMode>
         <Tabs aria-label="Tabs">
diff --git a/packages/react-aria-components/test/TagGroup.ssr.test.js b/packages/react-aria-components/test/TagGroup.ssr.test.js
index c35740bdab4..54ba057391f 100644
--- a/packages/react-aria-components/test/TagGroup.ssr.test.js
+++ b/packages/react-aria-components/test/TagGroup.ssr.test.js
@@ -15,7 +15,7 @@ import {fireEvent, screen, testSSR} from '@react-spectrum/test-utils-internal';
 describe('TagGroup SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {TagGroup, TagList, Tag, Label} from '../';
+      import {TagGroup, TagList, Tag, Label} from '../exports/index.ts';
 
       function Test() {
         let [show, setShow] = React.useState(false);
diff --git a/packages/react-aria-components/test/Tree.ssr.test.js b/packages/react-aria-components/test/Tree.ssr.test.js
index c8ddaa9a542..beebd17ef8e 100644
--- a/packages/react-aria-components/test/Tree.ssr.test.js
+++ b/packages/react-aria-components/test/Tree.ssr.test.js
@@ -15,7 +15,7 @@ import {fireEvent, screen, testSSR} from '@react-spectrum/test-utils-internal';
 describe('Tree SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {Button, Tree, TreeItem, TreeItemContent} from '../';
+      import {Button, Tree, TreeItem, TreeItemContent} from '../exports/index.ts';
 
       function MyTreeItemContent(props) {
         return (
diff --git a/packages/react-aria/test/landmark/useLandmark.ssr.test.js b/packages/react-aria/test/landmark/useLandmark.ssr.test.js
index 09f21a66703..87d62570020 100644
--- a/packages/react-aria/test/landmark/useLandmark.ssr.test.js
+++ b/packages/react-aria/test/landmark/useLandmark.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('useLandmark SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {useLandmark} from '../';
+      import {useLandmark} from '../../exports/index.ts';
 
       function Main(props) {
         let ref = React.useRef();
diff --git a/packages/react-aria/test/overlays/useModal.ssr.test.js b/packages/react-aria/test/overlays/useModal.ssr.test.js
index 9a785ba8731..e899288453f 100644
--- a/packages/react-aria/test/overlays/useModal.ssr.test.js
+++ b/packages/react-aria/test/overlays/useModal.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('OverlayContainer SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {OverlayContainer, OverlayProvider} from '..';
+      import {OverlayContainer, OverlayProvider} from '../../exports/index.ts';
       import React from 'react';
 
       <OverlayProvider data-testid="root-provider">
diff --git a/packages/react-aria/test/ssr/SSRProvider.ssr.test.js b/packages/react-aria/test/ssr/SSRProvider.ssr.test.js
index bf7ea3b99e8..504d0bde218 100644
--- a/packages/react-aria/test/ssr/SSRProvider.ssr.test.js
+++ b/packages/react-aria/test/ssr/SSRProvider.ssr.test.js
@@ -15,7 +15,7 @@ import {testSSR} from '@react-spectrum/test-utils-internal';
 describe('SSRProvider SSR', function () {
   it('should render without errors', async function () {
     await testSSR(__filename, `
-      import {SSRProvider, useSSRSafeId} from '../';
+      import {SSRProvider, useSSRSafeId} from '../../src/ssr/SSRProvider.tsx';
 
       function Test() {
         return <div id={useSSRSafeId()} />;
@@ -30,7 +30,7 @@ describe('SSRProvider SSR', function () {
 
   it('should render without errors in StrictMode', async function () {
     await testSSR(__filename, `
-      import {SSRProvider, useSSRSafeId} from '../';
+      import {SSRProvider, useSSRSafeId} from '../../src/ssr/SSRProvider.tsx';
 
       function Test() {
         return <div id={useSSRSafeId()} />;
@@ -47,7 +47,7 @@ describe('SSRProvider SSR', function () {
 
   it('should render without errors in StrictMode with nested SSRProviders', async function () {
     await testSSR(__filename, `
-      import {SSRProvider, useSSRSafeId} from '../';
+      import {SSRProvider, useSSRSafeId} from '../../src/ssr/SSRProvider.tsx';
 
       function Test() {
         return <div id={useSSRSafeId()} />;
diff --git a/packages/react-aria/test/utils/useViewportSize.ssr.test.tsx b/packages/react-aria/test/utils/useViewportSize.ssr.test.tsx
index e14deb7b3bc..bc6467ddc3a 100644
--- a/packages/react-aria/test/utils/useViewportSize.ssr.test.tsx
+++ b/packages/react-aria/test/utils/useViewportSize.ssr.test.tsx
@@ -15,7 +15,7 @@ import {screen, testSSR} from '@react-spectrum/test-utils-internal';
 describe('useViewportSize SSR', () => {
   it('should render without errors', async () => {
     await testSSR(__filename, `
-      import {useViewportSize} from '../src';
+      import {useViewportSize} from '../../src/utils/useViewportSize.ts';
 
       function Viewport() {
         useViewportSize();
@@ -28,7 +28,7 @@ describe('useViewportSize SSR', () => {
 
   it('should update dimensions after hydration', async () => {
     await testSSR(__filename, `
-      import {useViewportSize} from '../src';
+      import {useViewportSize} from '../../src/utils/useViewportSize.ts';
 
       function Viewport() {
         let size = useViewportSize();
diff --git a/yarn.lock b/yarn.lock
index 2ddafc328d2..4d67626680a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6994,7 +6994,8 @@ __metadata:
     "@testing-library/react": "npm:^16.0.0"
     "@testing-library/user-event": "npm:^14.0.0"
     jest: "npm:^29.5.0"
-    resolve: "npm:^1.17.0"
+    react-aria: "npm:^3.47.0"
+    resolve: "npm:^2.0.0-next.6"
   peerDependencies:
     "@react-spectrum/provider": ^3.9.12
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
@@ -10557,6 +10558,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array-buffer-byte-length@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "array-buffer-byte-length@npm:1.0.2"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+    is-array-buffer: "npm:^3.0.5"
+  checksum: 10c0/74e1d2d996941c7a1badda9cabb7caab8c449db9086407cad8a1b71d2604cc8abf105db8ca4e02c04579ec58b7be40279ddb09aea4784832984485499f48432d
+  languageName: node
+  linkType: hard
+
 "array-differ@npm:^2.0.3":
   version: 2.1.0
   resolution: "array-differ@npm:2.1.0"
@@ -10688,6 +10699,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array.prototype.flatmap@npm:^1.3.3":
+  version: 1.3.3
+  resolution: "array.prototype.flatmap@npm:1.3.3"
+  dependencies:
+    call-bind: "npm:^1.0.8"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.5"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10c0/ba899ea22b9dc9bf276e773e98ac84638ed5e0236de06f13d63a90b18ca9e0ec7c97d622d899796e3773930b946cd2413d098656c0c5d8cc58c6f25c21e6bd54
+  languageName: node
+  linkType: hard
+
 "array.prototype.tosorted@npm:^1.1.4":
   version: 1.1.4
   resolution: "array.prototype.tosorted@npm:1.1.4"
@@ -10717,6 +10740,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"arraybuffer.prototype.slice@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "arraybuffer.prototype.slice@npm:1.0.4"
+  dependencies:
+    array-buffer-byte-length: "npm:^1.0.1"
+    call-bind: "npm:^1.0.8"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.5"
+    es-errors: "npm:^1.3.0"
+    get-intrinsic: "npm:^1.2.6"
+    is-array-buffer: "npm:^3.0.4"
+  checksum: 10c0/2f2459caa06ae0f7f615003f9104b01f6435cc803e11bd2a655107d52a1781dc040532dc44d93026b694cc18793993246237423e13a5337e86b43ed604932c06
+  languageName: node
+  linkType: hard
+
 "arrify@npm:^1.0.1":
   version: 1.0.1
   resolution: "arrify@npm:1.0.1"
@@ -10797,6 +10835,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"async-function@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "async-function@npm:1.0.0"
+  checksum: 10c0/669a32c2cb7e45091330c680e92eaeb791bc1d4132d827591e499cd1f776ff5a873e77e5f92d0ce795a8d60f10761dec9ddfe7225a5de680f5d357f67b1aac73
+  languageName: node
+  linkType: hard
+
+"async-generator-function@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "async-generator-function@npm:1.0.0"
+  checksum: 10c0/2c50ef856c543ad500d8d8777d347e3c1ba623b93e99c9263ecc5f965c1b12d2a140e2ab6e43c3d0b85366110696f28114649411cbcd10b452a92a2318394186
+  languageName: node
+  linkType: hard
+
 "async-settle@npm:^2.0.0":
   version: 2.0.0
   resolution: "async-settle@npm:2.0.0"
@@ -11622,7 +11674,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"call-bind-apply-helpers@npm:^1.0.1, call-bind-apply-helpers@npm:^1.0.2":
+"call-bind-apply-helpers@npm:^1.0.0, call-bind-apply-helpers@npm:^1.0.1, call-bind-apply-helpers@npm:^1.0.2":
   version: 1.0.2
   resolution: "call-bind-apply-helpers@npm:1.0.2"
   dependencies:
@@ -11645,7 +11697,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"call-bound@npm:^1.0.2":
+"call-bind@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "call-bind@npm:1.0.8"
+  dependencies:
+    call-bind-apply-helpers: "npm:^1.0.0"
+    es-define-property: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.2.4"
+    set-function-length: "npm:^1.2.2"
+  checksum: 10c0/a13819be0681d915144467741b69875ae5f4eba8961eb0bf322aab63ec87f8250eb6d6b0dcbb2e1349876412a56129ca338592b3829ef4343527f5f18a0752d4
+  languageName: node
+  linkType: hard
+
+"call-bound@npm:^1.0.2, call-bound@npm:^1.0.3, call-bound@npm:^1.0.4":
   version: 1.0.4
   resolution: "call-bound@npm:1.0.4"
   dependencies:
@@ -13088,6 +13152,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"data-view-buffer@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "data-view-buffer@npm:1.0.2"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.2"
+  checksum: 10c0/7986d40fc7979e9e6241f85db8d17060dd9a71bd53c894fa29d126061715e322a4cd47a00b0b8c710394854183d4120462b980b8554012acc1c0fa49df7ad38c
+  languageName: node
+  linkType: hard
+
 "data-view-byte-length@npm:^1.0.1":
   version: 1.0.1
   resolution: "data-view-byte-length@npm:1.0.1"
@@ -13099,6 +13174,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"data-view-byte-length@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "data-view-byte-length@npm:1.0.2"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.2"
+  checksum: 10c0/f8a4534b5c69384d95ac18137d381f18a5cfae1f0fc1df0ef6feef51ef0d568606d970b69e02ea186c6c0f0eac77fe4e6ad96fec2569cc86c3afcc7475068c55
+  languageName: node
+  linkType: hard
+
 "data-view-byte-offset@npm:^1.0.0":
   version: 1.0.0
   resolution: "data-view-byte-offset@npm:1.0.0"
@@ -13110,6 +13196,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"data-view-byte-offset@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "data-view-byte-offset@npm:1.0.1"
+  dependencies:
+    call-bound: "npm:^1.0.2"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10c0/fa7aa40078025b7810dcffc16df02c480573b7b53ef1205aa6a61533011005c1890e5ba17018c692ce7c900212b547262d33279fde801ad9843edc0863bf78c4
+  languageName: node
+  linkType: hard
+
 "date-fns@npm:^2.16.1":
   version: 2.21.1
   resolution: "date-fns@npm:2.21.1"
@@ -13730,7 +13827,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dunder-proto@npm:^1.0.1":
+"dunder-proto@npm:^1.0.0, dunder-proto@npm:^1.0.1":
   version: 1.0.1
   resolution: "dunder-proto@npm:1.0.1"
   dependencies:
@@ -14031,6 +14128,68 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-abstract@npm:^1.23.5, es-abstract@npm:^1.23.9":
+  version: 1.24.1
+  resolution: "es-abstract@npm:1.24.1"
+  dependencies:
+    array-buffer-byte-length: "npm:^1.0.2"
+    arraybuffer.prototype.slice: "npm:^1.0.4"
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.4"
+    data-view-buffer: "npm:^1.0.2"
+    data-view-byte-length: "npm:^1.0.2"
+    data-view-byte-offset: "npm:^1.0.1"
+    es-define-property: "npm:^1.0.1"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.1.1"
+    es-set-tostringtag: "npm:^2.1.0"
+    es-to-primitive: "npm:^1.3.0"
+    function.prototype.name: "npm:^1.1.8"
+    get-intrinsic: "npm:^1.3.0"
+    get-proto: "npm:^1.0.1"
+    get-symbol-description: "npm:^1.1.0"
+    globalthis: "npm:^1.0.4"
+    gopd: "npm:^1.2.0"
+    has-property-descriptors: "npm:^1.0.2"
+    has-proto: "npm:^1.2.0"
+    has-symbols: "npm:^1.1.0"
+    hasown: "npm:^2.0.2"
+    internal-slot: "npm:^1.1.0"
+    is-array-buffer: "npm:^3.0.5"
+    is-callable: "npm:^1.2.7"
+    is-data-view: "npm:^1.0.2"
+    is-negative-zero: "npm:^2.0.3"
+    is-regex: "npm:^1.2.1"
+    is-set: "npm:^2.0.3"
+    is-shared-array-buffer: "npm:^1.0.4"
+    is-string: "npm:^1.1.1"
+    is-typed-array: "npm:^1.1.15"
+    is-weakref: "npm:^1.1.1"
+    math-intrinsics: "npm:^1.1.0"
+    object-inspect: "npm:^1.13.4"
+    object-keys: "npm:^1.1.1"
+    object.assign: "npm:^4.1.7"
+    own-keys: "npm:^1.0.1"
+    regexp.prototype.flags: "npm:^1.5.4"
+    safe-array-concat: "npm:^1.1.3"
+    safe-push-apply: "npm:^1.0.0"
+    safe-regex-test: "npm:^1.1.0"
+    set-proto: "npm:^1.0.0"
+    stop-iteration-iterator: "npm:^1.1.0"
+    string.prototype.trim: "npm:^1.2.10"
+    string.prototype.trimend: "npm:^1.0.9"
+    string.prototype.trimstart: "npm:^1.0.8"
+    typed-array-buffer: "npm:^1.0.3"
+    typed-array-byte-length: "npm:^1.0.3"
+    typed-array-byte-offset: "npm:^1.0.4"
+    typed-array-length: "npm:^1.0.7"
+    unbox-primitive: "npm:^1.1.0"
+    which-typed-array: "npm:^1.1.19"
+  checksum: 10c0/fca062ef8b5daacf743732167d319a212d45cb655b0bb540821d38d715416ae15b04b84fc86da9e2c89135aa7b337337b6c867f84dcde698d75d55688d5d765c
+  languageName: node
+  linkType: hard
+
 "es-define-property@npm:^1.0.0, es-define-property@npm:^1.0.1":
   version: 1.0.1
   resolution: "es-define-property@npm:1.0.1"
@@ -14132,6 +14291,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-to-primitive@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "es-to-primitive@npm:1.3.0"
+  dependencies:
+    is-callable: "npm:^1.2.7"
+    is-date-object: "npm:^1.0.5"
+    is-symbol: "npm:^1.0.4"
+  checksum: 10c0/c7e87467abb0b438639baa8139f701a06537d2b9bc758f23e8622c3b42fd0fdb5bde0f535686119e446dd9d5e4c0f238af4e14960f4771877cf818d023f6730b
+  languageName: node
+  linkType: hard
+
 "es6-error@npm:^4.0.1":
   version: 4.1.1
   resolution: "es6-error@npm:4.1.1"
@@ -15413,6 +15583,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"for-each@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "for-each@npm:0.3.5"
+  dependencies:
+    is-callable: "npm:^1.2.7"
+  checksum: 10c0/0e0b50f6a843a282637d43674d1fb278dda1dd85f4f99b640024cfb10b85058aac0cc781bf689d5fe50b4b7f638e91e548560723a4e76e04fe96ae35ef039cee
+  languageName: node
+  linkType: hard
+
 "for-in@npm:^1.0.1, for-in@npm:^1.0.2":
   version: 1.0.2
   resolution: "for-in@npm:1.0.2"
@@ -15706,6 +15885,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"function.prototype.name@npm:^1.1.8":
+  version: 1.1.8
+  resolution: "function.prototype.name@npm:1.1.8"
+  dependencies:
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.3"
+    define-properties: "npm:^1.2.1"
+    functions-have-names: "npm:^1.2.3"
+    hasown: "npm:^2.0.2"
+    is-callable: "npm:^1.2.7"
+  checksum: 10c0/e920a2ab52663005f3cbe7ee3373e3c71c1fb5558b0b0548648cdf3e51961085032458e26c71ff1a8c8c20e7ee7caeb03d43a5d1fa8610c459333323a2e71253
+  languageName: node
+  linkType: hard
+
 "functions-have-names@npm:^1.2.3":
   version: 1.2.3
   resolution: "functions-have-names@npm:1.2.3"
@@ -15729,6 +15922,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"generator-function@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "generator-function@npm:2.0.1"
+  checksum: 10c0/8a9f59df0f01cfefafdb3b451b80555e5cf6d76487095db91ac461a0e682e4ff7a9dbce15f4ecec191e53586d59eece01949e05a4b4492879600bbbe8e28d6b8
+  languageName: node
+  linkType: hard
+
 "genfun@npm:^5.0.0":
   version: 5.0.0
   resolution: "genfun@npm:5.0.0"
@@ -15768,6 +15968,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-intrinsic@npm:^1.2.7":
+  version: 1.3.1
+  resolution: "get-intrinsic@npm:1.3.1"
+  dependencies:
+    async-function: "npm:^1.0.0"
+    async-generator-function: "npm:^1.0.0"
+    call-bind-apply-helpers: "npm:^1.0.2"
+    es-define-property: "npm:^1.0.1"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.1.1"
+    function-bind: "npm:^1.1.2"
+    generator-function: "npm:^2.0.0"
+    get-proto: "npm:^1.0.1"
+    gopd: "npm:^1.2.0"
+    has-symbols: "npm:^1.1.0"
+    hasown: "npm:^2.0.2"
+    math-intrinsics: "npm:^1.1.0"
+  checksum: 10c0/9f4ab0cf7efe0fd2c8185f52e6f637e708f3a112610c88869f8f041bb9ecc2ce44bf285dfdbdc6f4f7c277a5b88d8e94a432374d97cca22f3de7fc63795deb5d
+  languageName: node
+  linkType: hard
+
 "get-monorepo-packages@npm:^1.1.0":
   version: 1.2.0
   resolution: "get-monorepo-packages@npm:1.2.0"
@@ -15858,6 +16079,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-symbol-description@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "get-symbol-description@npm:1.1.0"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+    es-errors: "npm:^1.3.0"
+    get-intrinsic: "npm:^1.2.6"
+  checksum: 10c0/d6a7d6afca375779a4b307738c9e80dbf7afc0bdbe5948768d54ab9653c865523d8920e670991a925936eb524b7cb6a6361d199a760b21d0ca7620194455aa4b
+  languageName: node
+  linkType: hard
+
 "get-value@npm:^2.0.3, get-value@npm:^2.0.6":
   version: 2.0.6
   resolution: "get-value@npm:2.0.6"
@@ -16432,6 +16664,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"has-proto@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "has-proto@npm:1.2.0"
+  dependencies:
+    dunder-proto: "npm:^1.0.0"
+  checksum: 10c0/46538dddab297ec2f43923c3d35237df45d8c55a6fc1067031e04c13ed8a9a8f94954460632fd4da84c31a1721eefee16d901cbb1ae9602bab93bb6e08f93b95
+  languageName: node
+  linkType: hard
+
 "has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.3, has-symbols@npm:^1.1.0":
   version: 1.1.0
   resolution: "has-symbols@npm:1.1.0"
@@ -17149,6 +17390,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"internal-slot@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "internal-slot@npm:1.1.0"
+  dependencies:
+    es-errors: "npm:^1.3.0"
+    hasown: "npm:^2.0.2"
+    side-channel: "npm:^1.1.0"
+  checksum: 10c0/03966f5e259b009a9bf1a78d60da920df198af4318ec004f57b8aef1dd3fe377fbc8cce63a96e8c810010302654de89f9e19de1cd8ad0061d15be28a695465c7
+  languageName: node
+  linkType: hard
+
 "interpret@npm:^3.1.1":
   version: 3.1.1
   resolution: "interpret@npm:3.1.1"
@@ -17266,6 +17518,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-array-buffer@npm:^3.0.5":
+  version: 3.0.5
+  resolution: "is-array-buffer@npm:3.0.5"
+  dependencies:
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.3"
+    get-intrinsic: "npm:^1.2.6"
+  checksum: 10c0/c5c9f25606e86dbb12e756694afbbff64bc8b348d1bc989324c037e1068695131930199d6ad381952715dad3a9569333817f0b1a72ce5af7f883ce802e49c83d
+  languageName: node
+  linkType: hard
+
 "is-arrayish@npm:^0.2.1":
   version: 0.2.1
   resolution: "is-arrayish@npm:0.2.1"
@@ -17298,6 +17561,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-bigint@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "is-bigint@npm:1.1.0"
+  dependencies:
+    has-bigints: "npm:^1.0.2"
+  checksum: 10c0/f4f4b905ceb195be90a6ea7f34323bf1c18e3793f18922e3e9a73c684c29eeeeff5175605c3a3a74cc38185fe27758f07efba3dbae812e5c5afbc0d2316b40e4
+  languageName: node
+  linkType: hard
+
 "is-binary-path@npm:~2.1.0":
   version: 2.1.0
   resolution: "is-binary-path@npm:2.1.0"
@@ -17317,6 +17589,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-boolean-object@npm:^1.2.1":
+  version: 1.2.2
+  resolution: "is-boolean-object@npm:1.2.2"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+    has-tostringtag: "npm:^1.0.2"
+  checksum: 10c0/36ff6baf6bd18b3130186990026f5a95c709345c39cd368468e6c1b6ab52201e9fd26d8e1f4c066357b4938b0f0401e1a5000e08257787c1a02f3a719457001e
+  languageName: node
+  linkType: hard
+
 "is-buffer@npm:^1.1.5, is-buffer@npm:~1.1.1":
   version: 1.1.6
   resolution: "is-buffer@npm:1.1.6"
@@ -17369,6 +17651,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-core-module@npm:^2.16.1":
+  version: 2.16.1
+  resolution: "is-core-module@npm:2.16.1"
+  dependencies:
+    hasown: "npm:^2.0.2"
+  checksum: 10c0/898443c14780a577e807618aaae2b6f745c8538eca5c7bc11388a3f2dc6de82b9902bcc7eb74f07be672b11bbe82dd6a6edded44a00cb3d8f933d0459905eedd
+  languageName: node
+  linkType: hard
+
 "is-data-descriptor@npm:^0.1.4":
   version: 0.1.4
   resolution: "is-data-descriptor@npm:0.1.4"
@@ -17396,6 +17687,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-data-view@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "is-data-view@npm:1.0.2"
+  dependencies:
+    call-bound: "npm:^1.0.2"
+    get-intrinsic: "npm:^1.2.6"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10c0/ef3548a99d7e7f1370ce21006baca6d40c73e9f15c941f89f0049c79714c873d03b02dae1c64b3f861f55163ecc16da06506c5b8a1d4f16650b3d9351c380153
+  languageName: node
+  linkType: hard
+
 "is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5":
   version: 1.0.5
   resolution: "is-date-object@npm:1.0.5"
@@ -17405,6 +17707,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-date-object@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "is-date-object@npm:1.1.0"
+  dependencies:
+    call-bound: "npm:^1.0.2"
+    has-tostringtag: "npm:^1.0.2"
+  checksum: 10c0/1a4d199c8e9e9cac5128d32e6626fa7805175af9df015620ac0d5d45854ccf348ba494679d872d37301032e35a54fc7978fba1687e8721b2139aea7870cafa2f
+  languageName: node
+  linkType: hard
+
 "is-decimal@npm:^2.0.0":
   version: 2.0.1
   resolution: "is-decimal@npm:2.0.1"
@@ -17489,6 +17801,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-finalizationregistry@npm:^1.1.0":
+  version: 1.1.1
+  resolution: "is-finalizationregistry@npm:1.1.1"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+  checksum: 10c0/818dff679b64f19e228a8205a1e2d09989a98e98def3a817f889208cfcbf918d321b251aadf2c05918194803ebd2eb01b14fc9d0b2bea53d984f4137bfca5e97
+  languageName: node
+  linkType: hard
+
 "is-finite@npm:^1.0.0":
   version: 1.0.2
   resolution: "is-finite@npm:1.0.2"
@@ -17630,6 +17951,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-number-object@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "is-number-object@npm:1.1.1"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+    has-tostringtag: "npm:^1.0.2"
+  checksum: 10c0/97b451b41f25135ff021d85c436ff0100d84a039bb87ffd799cbcdbea81ef30c464ced38258cdd34f080be08fc3b076ca1f472086286d2aa43521d6ec6a79f53
+  languageName: node
+  linkType: hard
+
 "is-number@npm:^3.0.0":
   version: 3.0.0
   resolution: "is-number@npm:3.0.0"
@@ -17753,6 +18084,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-regex@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "is-regex@npm:1.2.1"
+  dependencies:
+    call-bound: "npm:^1.0.2"
+    gopd: "npm:^1.2.0"
+    has-tostringtag: "npm:^1.0.2"
+    hasown: "npm:^2.0.2"
+  checksum: 10c0/1d3715d2b7889932349241680032e85d0b492cfcb045acb75ffc2c3085e8d561184f1f7e84b6f8321935b4aea39bc9c6ba74ed595b57ce4881a51dfdbc214e04
+  languageName: node
+  linkType: hard
+
 "is-relative@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-relative@npm:1.0.0"
@@ -17785,6 +18128,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-shared-array-buffer@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "is-shared-array-buffer@npm:1.0.4"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+  checksum: 10c0/65158c2feb41ff1edd6bbd6fd8403a69861cf273ff36077982b5d4d68e1d59278c71691216a4a64632bd76d4792d4d1d2553901b6666d84ade13bba5ea7bc7db
+  languageName: node
+  linkType: hard
+
 "is-ssh@npm:^1.3.0":
   version: 1.3.1
   resolution: "is-ssh@npm:1.3.1"
@@ -17817,6 +18169,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-string@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "is-string@npm:1.1.1"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+    has-tostringtag: "npm:^1.0.2"
+  checksum: 10c0/2f518b4e47886bb81567faba6ffd0d8a8333cf84336e2e78bf160693972e32ad00fe84b0926491cc598dee576fdc55642c92e62d0cbe96bf36f643b6f956f94d
+  languageName: node
+  linkType: hard
+
 "is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3":
   version: 1.0.3
   resolution: "is-symbol@npm:1.0.3"
@@ -17826,6 +18188,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-symbol@npm:^1.0.4, is-symbol@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "is-symbol@npm:1.1.1"
+  dependencies:
+    call-bound: "npm:^1.0.2"
+    has-symbols: "npm:^1.1.0"
+    safe-regex-test: "npm:^1.1.0"
+  checksum: 10c0/f08f3e255c12442e833f75a9e2b84b2d4882fdfd920513cf2a4a2324f0a5b076c8fd913778e3ea5d258d5183e9d92c0cd20e04b03ab3df05316b049b2670af1e
+  languageName: node
+  linkType: hard
+
 "is-text-path@npm:^2.0.0":
   version: 2.0.0
   resolution: "is-text-path@npm:2.0.0"
@@ -17844,6 +18217,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-typed-array@npm:^1.1.14, is-typed-array@npm:^1.1.15":
+  version: 1.1.15
+  resolution: "is-typed-array@npm:1.1.15"
+  dependencies:
+    which-typed-array: "npm:^1.1.16"
+  checksum: 10c0/415511da3669e36e002820584e264997ffe277ff136643a3126cc949197e6ca3334d0f12d084e83b1994af2e9c8141275c741cf2b7da5a2ff62dd0cac26f76c4
+  languageName: node
+  linkType: hard
+
 "is-typedarray@npm:^1.0.0, is-typedarray@npm:~1.0.0":
   version: 1.0.0
   resolution: "is-typedarray@npm:1.0.0"
@@ -17890,6 +18272,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-weakref@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "is-weakref@npm:1.1.1"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+  checksum: 10c0/8e0a9c07b0c780949a100e2cab2b5560a48ecd4c61726923c1a9b77b6ab0aa0046c9e7fb2206042296817045376dee2c8ab1dabe08c7c3dfbf195b01275a085b
+  languageName: node
+  linkType: hard
+
 "is-weakset@npm:^2.0.3":
   version: 2.0.3
   resolution: "is-weakset@npm:2.0.3"
@@ -21304,6 +21695,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-exports-info@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "node-exports-info@npm:1.6.0"
+  dependencies:
+    array.prototype.flatmap: "npm:^1.3.3"
+    es-errors: "npm:^1.3.0"
+    object.entries: "npm:^1.1.9"
+    semver: "npm:^6.3.1"
+  checksum: 10c0/3613f21c60b047e66f168d3499a6be0060d89fb01ddceaa7032c2fb318aff12e4b9b111449c1a9aeb3b848bfdc1d4b6bc8fab327af692319597d21a1e7063692
+  languageName: node
+  linkType: hard
+
 "node-fetch-npm@npm:^2.0.2":
   version: 2.0.2
   resolution: "node-fetch-npm@npm:2.0.2"
@@ -21732,7 +22135,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-inspect@npm:^1.13.3":
+"object-inspect@npm:^1.13.3, object-inspect@npm:^1.13.4":
   version: 1.13.4
   resolution: "object-inspect@npm:1.13.4"
   checksum: 10c0/d7f8711e803b96ea3191c745d6f8056ce1f2496e530e6a19a0e92d89b0fa3c76d910c31f0aa270432db6bd3b2f85500a376a83aaba849a8d518c8845b3211692
@@ -21777,6 +22180,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object.assign@npm:^4.1.7":
+  version: 4.1.7
+  resolution: "object.assign@npm:4.1.7"
+  dependencies:
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.3"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+    has-symbols: "npm:^1.1.0"
+    object-keys: "npm:^1.1.1"
+  checksum: 10c0/3b2732bd860567ea2579d1567525168de925a8d852638612846bd8082b3a1602b7b89b67b09913cbb5b9bd6e95923b2ae73580baa9d99cb4e990564e8cbf5ddc
+  languageName: node
+  linkType: hard
+
 "object.defaults@npm:^1.1.0":
   version: 1.1.0
   resolution: "object.defaults@npm:1.1.0"
@@ -21800,6 +22217,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object.entries@npm:^1.1.9":
+  version: 1.1.9
+  resolution: "object.entries@npm:1.1.9"
+  dependencies:
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.4"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.1.1"
+  checksum: 10c0/d4b8c1e586650407da03370845f029aa14076caca4e4d4afadbc69cfb5b78035fd3ee7be417141abdb0258fa142e59b11923b4c44d8b1255b28f5ffcc50da7db
+  languageName: node
+  linkType: hard
+
 "object.fromentries@npm:^2.0.8":
   version: 2.0.8
   resolution: "object.fromentries@npm:2.0.8"
@@ -21976,6 +22405,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"own-keys@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "own-keys@npm:1.0.1"
+  dependencies:
+    get-intrinsic: "npm:^1.2.6"
+    object-keys: "npm:^1.1.1"
+    safe-push-apply: "npm:^1.0.0"
+  checksum: 10c0/6dfeb3455bff92ec3f16a982d4e3e65676345f6902d9f5ded1d8265a6318d0200ce461956d6d1c70053c7fe9f9fe65e552faac03f8140d37ef0fdd108e67013a
+  languageName: node
+  linkType: hard
+
 "p-finally@npm:^1.0.0":
   version: 1.0.0
   resolution: "p-finally@npm:1.0.0"
@@ -24012,6 +24452,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"reflect.getprototypeof@npm:^1.0.6, reflect.getprototypeof@npm:^1.0.9":
+  version: 1.0.10
+  resolution: "reflect.getprototypeof@npm:1.0.10"
+  dependencies:
+    call-bind: "npm:^1.0.8"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.9"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.2.7"
+    get-proto: "npm:^1.0.1"
+    which-builtin-type: "npm:^1.2.1"
+  checksum: 10c0/7facec28c8008876f8ab98e80b7b9cb4b1e9224353fd4756dda5f2a4ab0d30fa0a5074777c6df24e1e0af463a2697513b0a11e548d99cf52f21f7bc6ba48d3ac
+  languageName: node
+  linkType: hard
+
 "regenerate-unicode-properties@npm:^10.1.0":
   version: 10.1.0
   resolution: "regenerate-unicode-properties@npm:10.1.0"
@@ -24080,6 +24536,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"regexp.prototype.flags@npm:^1.5.4":
+  version: 1.5.4
+  resolution: "regexp.prototype.flags@npm:1.5.4"
+  dependencies:
+    call-bind: "npm:^1.0.8"
+    define-properties: "npm:^1.2.1"
+    es-errors: "npm:^1.3.0"
+    get-proto: "npm:^1.0.1"
+    gopd: "npm:^1.2.0"
+    set-function-name: "npm:^2.0.2"
+  checksum: 10c0/83b88e6115b4af1c537f8dabf5c3744032cb875d63bc05c288b1b8c0ef37cbe55353f95d8ca817e8843806e3e150b118bc624e4279b24b4776b4198232735a77
+  languageName: node
+  linkType: hard
+
 "regexparam@npm:^1.3.0":
   version: 1.3.0
   resolution: "regexparam@npm:1.3.0"
@@ -24431,55 +24901,61 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4":
-  version: 1.22.8
-  resolution: "resolve@npm:1.22.8"
+"resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4":
+  version: 1.22.11
+  resolution: "resolve@npm:1.22.11"
   dependencies:
-    is-core-module: "npm:^2.13.0"
+    is-core-module: "npm:^2.16.1"
     path-parse: "npm:^1.0.7"
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 10c0/07e179f4375e1fd072cfb72ad66d78547f86e6196c4014b31cb0b8bb1db5f7ca871f922d08da0fbc05b94e9fd42206f819648fa3b5b873ebbc8e1dc68fec433a
+  checksum: 10c0/f657191507530f2cbecb5815b1ee99b20741ea6ee02a59c57028e9ec4c2c8d7681afcc35febbd554ac0ded459db6f2d8153382c53a2f266cee2575e512674409
   languageName: node
   linkType: hard
 
-"resolve@npm:^2.0.0-next.5":
-  version: 2.0.0-next.5
-  resolution: "resolve@npm:2.0.0-next.5"
+"resolve@npm:^2.0.0-next.5, resolve@npm:^2.0.0-next.6":
+  version: 2.0.0-next.6
+  resolution: "resolve@npm:2.0.0-next.6"
   dependencies:
-    is-core-module: "npm:^2.13.0"
+    es-errors: "npm:^1.3.0"
+    is-core-module: "npm:^2.16.1"
+    node-exports-info: "npm:^1.6.0"
+    object-keys: "npm:^1.1.1"
     path-parse: "npm:^1.0.7"
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 10c0/a6c33555e3482ea2ec4c6e3d3bf0d78128abf69dca99ae468e64f1e30acaa318fd267fb66c8836b04d558d3e2d6ed875fe388067e7d8e0de647d3c21af21c43a
+  checksum: 10c0/4e44cb84aa9a3c7c82d4a98e8111879671150496160a53ca6cdbed6101bf239f19105f8b8b84e40c0b76d46b0d9626813510b19a80e01f4ae18692e9d0b47749
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A^1.1.7#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.17.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":
-  version: 1.22.8
-  resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
+"resolve@patch:resolve@npm%3A^1.1.7#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":
+  version: 1.22.11
+  resolution: "resolve@patch:resolve@npm%3A1.22.11#optional!builtin<compat/resolve>::version=1.22.11&hash=c3c19d"
   dependencies:
-    is-core-module: "npm:^2.13.0"
+    is-core-module: "npm:^2.16.1"
     path-parse: "npm:^1.0.7"
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 10c0/0446f024439cd2e50c6c8fa8ba77eaa8370b4180f401a96abf3d1ebc770ac51c1955e12764cde449fde3fff480a61f84388e3505ecdbab778f4bef5f8212c729
+  checksum: 10c0/ee5b182f2e37cb1165465e58c6abc797fec0a80b5ba3231607beb4677db0c9291ac010c47cf092b6daa2b7f518d69a0e21888e7e2b633f68d501a874212a8c63
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin<compat/resolve>":
-  version: 2.0.0-next.5
-  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=c3c19d"
+"resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^2.0.0-next.6#optional!builtin<compat/resolve>":
+  version: 2.0.0-next.6
+  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.6#optional!builtin<compat/resolve>::version=2.0.0-next.6&hash=c3c19d"
   dependencies:
-    is-core-module: "npm:^2.13.0"
+    es-errors: "npm:^1.3.0"
+    is-core-module: "npm:^2.16.1"
+    node-exports-info: "npm:^1.6.0"
+    object-keys: "npm:^1.1.1"
     path-parse: "npm:^1.0.7"
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 10c0/78ad6edb8309a2bfb720c2c1898f7907a37f858866ce11a5974643af1203a6a6e05b2fa9c53d8064a673a447b83d42569260c306d43628bff5bb101969708355
+  checksum: 10c0/dca533e38820b0d8d636f269824cef3b7435802ab7401211c6f10af03be0e2f7e216047234e1623046c0a6791577079767e0c04f0d36e42c7f567b1bff7b0742
   languageName: node
   linkType: hard
 
@@ -24659,6 +25135,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"safe-array-concat@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "safe-array-concat@npm:1.1.3"
+  dependencies:
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.2"
+    get-intrinsic: "npm:^1.2.6"
+    has-symbols: "npm:^1.1.0"
+    isarray: "npm:^2.0.5"
+  checksum: 10c0/43c86ffdddc461fb17ff8a17c5324f392f4868f3c7dd2c6a5d9f5971713bc5fd755667212c80eab9567595f9a7509cc2f83e590ddaebd1bd19b780f9c79f9a8d
+  languageName: node
+  linkType: hard
+
 "safe-buffer@npm:5.2.1, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0":
   version: 5.2.1
   resolution: "safe-buffer@npm:5.2.1"
@@ -24673,6 +25162,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"safe-push-apply@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "safe-push-apply@npm:1.0.0"
+  dependencies:
+    es-errors: "npm:^1.3.0"
+    isarray: "npm:^2.0.5"
+  checksum: 10c0/831f1c9aae7436429e7862c7e46f847dfe490afac20d0ee61bae06108dbf5c745a0de3568ada30ccdd3eeb0864ca8331b2eef703abd69bfea0745b21fd320750
+  languageName: node
+  linkType: hard
+
 "safe-regex-test@npm:^1.0.3":
   version: 1.0.3
   resolution: "safe-regex-test@npm:1.0.3"
@@ -24684,6 +25183,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"safe-regex-test@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "safe-regex-test@npm:1.1.0"
+  dependencies:
+    call-bound: "npm:^1.0.2"
+    es-errors: "npm:^1.3.0"
+    is-regex: "npm:^1.2.1"
+  checksum: 10c0/f2c25281bbe5d39cddbbce7f86fca5ea9b3ce3354ea6cd7c81c31b006a5a9fff4286acc5450a3b9122c56c33eba69c56b9131ad751457b2b4a585825e6a10665
+  languageName: node
+  linkType: hard
+
 "safe-regex@npm:^1.1.0":
   version: 1.1.0
   resolution: "safe-regex@npm:1.1.0"
@@ -24893,7 +25403,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"set-function-length@npm:^1.2.1":
+"set-function-length@npm:^1.2.1, set-function-length@npm:^1.2.2":
   version: 1.2.2
   resolution: "set-function-length@npm:1.2.2"
   dependencies:
@@ -24919,6 +25429,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"set-proto@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "set-proto@npm:1.0.0"
+  dependencies:
+    dunder-proto: "npm:^1.0.1"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/ca5c3ccbba479d07c30460e367e66337cec825560b11e8ba9c5ebe13a2a0d6021ae34eddf94ff3dfe17a3104dc1f191519cb6c48378b503e5c3f36393938776a
+  languageName: node
+  linkType: hard
+
 "set-value@npm:^2.0.0, set-value@npm:^2.0.1":
   version: 2.0.1
   resolution: "set-value@npm:2.0.1"
@@ -25632,6 +26153,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stop-iteration-iterator@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "stop-iteration-iterator@npm:1.1.0"
+  dependencies:
+    es-errors: "npm:^1.3.0"
+    internal-slot: "npm:^1.1.0"
+  checksum: 10c0/de4e45706bb4c0354a4b1122a2b8cc45a639e86206807ce0baf390ee9218d3ef181923fa4d2b67443367c491aa255c5fbaa64bb74648e3c5b48299928af86c09
+  languageName: node
+  linkType: hard
+
 "storybook-builder-parcel@npm:>=0.0.1, storybook-builder-parcel@workspace:packages/dev/storybook-builder-parcel":
   version: 0.0.0-use.local
   resolution: "storybook-builder-parcel@workspace:packages/dev/storybook-builder-parcel"
@@ -25856,6 +26387,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string.prototype.trim@npm:^1.2.10":
+  version: 1.2.10
+  resolution: "string.prototype.trim@npm:1.2.10"
+  dependencies:
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.2"
+    define-data-property: "npm:^1.1.4"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.5"
+    es-object-atoms: "npm:^1.0.0"
+    has-property-descriptors: "npm:^1.0.2"
+  checksum: 10c0/8a8854241c4b54a948e992eb7dd6b8b3a97185112deb0037a134f5ba57541d8248dd610c966311887b6c2fd1181a3877bffb14d873ce937a344535dabcc648f8
+  languageName: node
+  linkType: hard
+
 "string.prototype.trim@npm:^1.2.9":
   version: 1.2.9
   resolution: "string.prototype.trim@npm:1.2.9"
@@ -25879,6 +26425,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string.prototype.trimend@npm:^1.0.9":
+  version: 1.0.9
+  resolution: "string.prototype.trimend@npm:1.0.9"
+  dependencies:
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.2"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/59e1a70bf9414cb4c536a6e31bef5553c8ceb0cf44d8b4d0ed65c9653358d1c64dd0ec203b100df83d0413bbcde38b8c5d49e14bc4b86737d74adc593a0d35b6
+  languageName: node
+  linkType: hard
+
 "string.prototype.trimstart@npm:^1.0.8":
   version: 1.0.8
   resolution: "string.prototype.trimstart@npm:1.0.8"
@@ -26941,6 +27499,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typed-array-buffer@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "typed-array-buffer@npm:1.0.3"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+    es-errors: "npm:^1.3.0"
+    is-typed-array: "npm:^1.1.14"
+  checksum: 10c0/1105071756eb248774bc71646bfe45b682efcad93b55532c6ffa4518969fb6241354e4aa62af679ae83899ec296d69ef88f1f3763657cdb3a4d29321f7b83079
+  languageName: node
+  linkType: hard
+
 "typed-array-byte-length@npm:^1.0.1":
   version: 1.0.1
   resolution: "typed-array-byte-length@npm:1.0.1"
@@ -26954,6 +27523,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typed-array-byte-length@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "typed-array-byte-length@npm:1.0.3"
+  dependencies:
+    call-bind: "npm:^1.0.8"
+    for-each: "npm:^0.3.3"
+    gopd: "npm:^1.2.0"
+    has-proto: "npm:^1.2.0"
+    is-typed-array: "npm:^1.1.14"
+  checksum: 10c0/6ae083c6f0354f1fce18b90b243343b9982affd8d839c57bbd2c174a5d5dc71be9eb7019ffd12628a96a4815e7afa85d718d6f1e758615151d5f35df841ffb3e
+  languageName: node
+  linkType: hard
+
 "typed-array-byte-offset@npm:^1.0.2":
   version: 1.0.2
   resolution: "typed-array-byte-offset@npm:1.0.2"
@@ -26968,6 +27550,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typed-array-byte-offset@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "typed-array-byte-offset@npm:1.0.4"
+  dependencies:
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.8"
+    for-each: "npm:^0.3.3"
+    gopd: "npm:^1.2.0"
+    has-proto: "npm:^1.2.0"
+    is-typed-array: "npm:^1.1.15"
+    reflect.getprototypeof: "npm:^1.0.9"
+  checksum: 10c0/3d805b050c0c33b51719ee52de17c1cd8e6a571abdf0fffb110e45e8dd87a657e8b56eee94b776b13006d3d347a0c18a730b903cf05293ab6d92e99ff8f77e53
+  languageName: node
+  linkType: hard
+
 "typed-array-length@npm:^1.0.6":
   version: 1.0.6
   resolution: "typed-array-length@npm:1.0.6"
@@ -26982,6 +27579,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typed-array-length@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "typed-array-length@npm:1.0.7"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    for-each: "npm:^0.3.3"
+    gopd: "npm:^1.0.1"
+    is-typed-array: "npm:^1.1.13"
+    possible-typed-array-names: "npm:^1.0.0"
+    reflect.getprototypeof: "npm:^1.0.6"
+  checksum: 10c0/e38f2ae3779584c138a2d8adfa8ecf749f494af3cd3cdafe4e688ce51418c7d2c5c88df1bd6be2bbea099c3f7cea58c02ca02ed438119e91f162a9de23f61295
+  languageName: node
+  linkType: hard
+
 "typedarray-to-buffer@npm:^3.1.5":
   version: 3.1.5
   resolution: "typedarray-to-buffer@npm:3.1.5"
@@ -27071,6 +27682,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unbox-primitive@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "unbox-primitive@npm:1.1.0"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+    has-bigints: "npm:^1.0.2"
+    has-symbols: "npm:^1.1.0"
+    which-boxed-primitive: "npm:^1.1.1"
+  checksum: 10c0/7dbd35ab02b0e05fe07136c72cb9355091242455473ec15057c11430129bab38b7b3624019b8778d02a881c13de44d63cd02d122ee782fb519e1de7775b5b982
+  languageName: node
+  linkType: hard
+
 "unc-path-regex@npm:^0.1.2":
   version: 0.1.2
   resolution: "unc-path-regex@npm:0.1.2"
@@ -28106,6 +28729,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"which-boxed-primitive@npm:^1.1.0, which-boxed-primitive@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "which-boxed-primitive@npm:1.1.1"
+  dependencies:
+    is-bigint: "npm:^1.1.0"
+    is-boolean-object: "npm:^1.2.1"
+    is-number-object: "npm:^1.1.1"
+    is-string: "npm:^1.1.1"
+    is-symbol: "npm:^1.1.1"
+  checksum: 10c0/aceea8ede3b08dede7dce168f3883323f7c62272b49801716e8332ff750e7ae59a511ae088840bc6874f16c1b7fd296c05c949b0e5b357bfe3c431b98c417abe
+  languageName: node
+  linkType: hard
+
 "which-builtin-type@npm:^1.1.3":
   version: 1.1.4
   resolution: "which-builtin-type@npm:1.1.4"
@@ -28126,6 +28762,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"which-builtin-type@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "which-builtin-type@npm:1.2.1"
+  dependencies:
+    call-bound: "npm:^1.0.2"
+    function.prototype.name: "npm:^1.1.6"
+    has-tostringtag: "npm:^1.0.2"
+    is-async-function: "npm:^2.0.0"
+    is-date-object: "npm:^1.1.0"
+    is-finalizationregistry: "npm:^1.1.0"
+    is-generator-function: "npm:^1.0.10"
+    is-regex: "npm:^1.2.1"
+    is-weakref: "npm:^1.0.2"
+    isarray: "npm:^2.0.5"
+    which-boxed-primitive: "npm:^1.1.0"
+    which-collection: "npm:^1.0.2"
+    which-typed-array: "npm:^1.1.16"
+  checksum: 10c0/8dcf323c45e5c27887800df42fbe0431d0b66b1163849bb7d46b5a730ad6a96ee8bfe827d078303f825537844ebf20c02459de41239a0a9805e2fcb3cae0d471
+  languageName: node
+  linkType: hard
+
 "which-collection@npm:^1.0.1, which-collection@npm:^1.0.2":
   version: 1.0.2
   resolution: "which-collection@npm:1.0.2"
@@ -28158,6 +28815,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"which-typed-array@npm:^1.1.16, which-typed-array@npm:^1.1.19":
+  version: 1.1.20
+  resolution: "which-typed-array@npm:1.1.20"
+  dependencies:
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.4"
+    for-each: "npm:^0.3.5"
+    get-proto: "npm:^1.0.1"
+    gopd: "npm:^1.2.0"
+    has-tostringtag: "npm:^1.0.2"
+  checksum: 10c0/16fcdada95c8afb821cd1117f0ab50b4d8551677ac08187f21d4e444530913c9ffd2dac634f0c1183345f96344b69280f40f9a8bc52164ef409e555567c2604b
+  languageName: node
+  linkType: hard
+
 "which@npm:1, which@npm:^1.2.12, which@npm:^1.2.14, which@npm:^1.2.9, which@npm:^1.3.1":
   version: 1.3.1
   resolution: "which@npm:1.3.1"

From a7aed363edb65cb95fd18052e35d9ed824e1dbcc Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Tue, 10 Mar 2026 19:32:46 -0700
Subject: [PATCH 55/68] remove circular dependencies

---
 packages/@adobe/react-spectrum/package.json        |  1 -
 packages/@react-spectrum/actionbar/package.json    |  1 +
 packages/@react-spectrum/actiongroup/package.json  |  1 +
 packages/@react-spectrum/autocomplete/package.json |  1 +
 packages/@react-spectrum/avatar/package.json       |  1 +
 packages/@react-spectrum/badge/package.json        |  1 +
 packages/@react-spectrum/breadcrumbs/package.json  |  1 +
 packages/@react-spectrum/button/package.json       |  1 +
 packages/@react-spectrum/buttongroup/package.json  |  1 +
 packages/react-aria/package.json                   |  1 -
 packages/react-stately/package.json                |  1 -
 yarn.lock                                          | 13 +++++++++----
 12 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/@adobe/react-spectrum/package.json b/packages/@adobe/react-spectrum/package.json
index c1f7ad1f020..1acdfb398ca 100644
--- a/packages/@adobe/react-spectrum/package.json
+++ b/packages/@adobe/react-spectrum/package.json
@@ -47,7 +47,6 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@adobe/react-spectrum": "3.46.2",
     "@internationalized/date": "^3.12.0",
     "@internationalized/message": "^3.1.8",
     "@react-spectrum/style-macro-s1": "3.0.0-alpha.5",
diff --git a/packages/@react-spectrum/actionbar/package.json b/packages/@react-spectrum/actionbar/package.json
index 565ed413ab3..931ace6778f 100644
--- a/packages/@react-spectrum/actionbar/package.json
+++ b/packages/@react-spectrum/actionbar/package.json
@@ -34,6 +34,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/actionbar": "^3.1.21",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
diff --git a/packages/@react-spectrum/actiongroup/package.json b/packages/@react-spectrum/actiongroup/package.json
index 533039964a3..ec0f0efaab5 100644
--- a/packages/@react-spectrum/actiongroup/package.json
+++ b/packages/@react-spectrum/actiongroup/package.json
@@ -34,6 +34,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/actiongroup": "^3.4.23",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
diff --git a/packages/@react-spectrum/autocomplete/package.json b/packages/@react-spectrum/autocomplete/package.json
index dbef18d49e6..fff0cbc9651 100644
--- a/packages/@react-spectrum/autocomplete/package.json
+++ b/packages/@react-spectrum/autocomplete/package.json
@@ -34,6 +34,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/autocomplete": "3.0.0-alpha.38",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
diff --git a/packages/@react-spectrum/avatar/package.json b/packages/@react-spectrum/avatar/package.json
index 6598865c25d..20fc46d02f3 100644
--- a/packages/@react-spectrum/avatar/package.json
+++ b/packages/@react-spectrum/avatar/package.json
@@ -34,6 +34,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/avatar": "^3.0.21",
     "@swc/helpers": "^0.5.0"
   },
diff --git a/packages/@react-spectrum/badge/package.json b/packages/@react-spectrum/badge/package.json
index c88e238cb3a..d29caa47a37 100644
--- a/packages/@react-spectrum/badge/package.json
+++ b/packages/@react-spectrum/badge/package.json
@@ -34,6 +34,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/badge": "^3.1.23",
     "@swc/helpers": "^0.5.0"
   },
diff --git a/packages/@react-spectrum/breadcrumbs/package.json b/packages/@react-spectrum/breadcrumbs/package.json
index 1c0b3785389..168949b47f7 100644
--- a/packages/@react-spectrum/breadcrumbs/package.json
+++ b/packages/@react-spectrum/breadcrumbs/package.json
@@ -34,6 +34,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/breadcrumbs": "^3.7.19",
     "@swc/helpers": "^0.5.0",
     "react-stately": "^3.45.0"
diff --git a/packages/@react-spectrum/button/package.json b/packages/@react-spectrum/button/package.json
index c4814ad1bbe..ff2aedf2fbe 100644
--- a/packages/@react-spectrum/button/package.json
+++ b/packages/@react-spectrum/button/package.json
@@ -34,6 +34,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/button": "^3.15.1",
     "@swc/helpers": "^0.5.0"
   },
diff --git a/packages/@react-spectrum/buttongroup/package.json b/packages/@react-spectrum/buttongroup/package.json
index 13fce9a6a7e..bef50cb99b8 100644
--- a/packages/@react-spectrum/buttongroup/package.json
+++ b/packages/@react-spectrum/buttongroup/package.json
@@ -34,6 +34,7 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
+    "@adobe/react-spectrum": "^3.46.2",
     "@react-types/buttongroup": "^3.3.23",
     "@swc/helpers": "^0.5.0"
   },
diff --git a/packages/react-aria/package.json b/packages/react-aria/package.json
index 1f58a5162a8..2abe0d86390 100644
--- a/packages/react-aria/package.json
+++ b/packages/react-aria/package.json
@@ -80,7 +80,6 @@
     "@swc/helpers": "^0.5.0",
     "aria-hidden": "^1.2.3",
     "clsx": "^2.0.0",
-    "react-aria": "3.47.0",
     "react-stately": "3.45.0",
     "use-sync-external-store": "^1.6.0"
   },
diff --git a/packages/react-stately/package.json b/packages/react-stately/package.json
index 6ea36b1bf6e..0d765b20564 100644
--- a/packages/react-stately/package.json
+++ b/packages/react-stately/package.json
@@ -55,7 +55,6 @@
     "@react-types/tabs": "^3.3.22",
     "@react-types/tooltip": "^3.5.2",
     "@swc/helpers": "^0.5.0",
-    "react-stately": "3.45.0",
     "use-sync-external-store": "^1.6.0"
   },
   "peerDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 4d67626680a..a48ae129610 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -88,11 +88,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@adobe/react-spectrum@npm:3.46.2, @adobe/react-spectrum@npm:^3.46.2, @adobe/react-spectrum@workspace:packages/@adobe/react-spectrum":
+"@adobe/react-spectrum@npm:^3.46.2, @adobe/react-spectrum@workspace:packages/@adobe/react-spectrum":
   version: 0.0.0-use.local
   resolution: "@adobe/react-spectrum@workspace:packages/@adobe/react-spectrum"
   dependencies:
-    "@adobe/react-spectrum": "npm:3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@babel/cli": "npm:^7.12.10"
     "@babel/core": "npm:^7.24.3"
@@ -6085,6 +6084,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/actionbar@workspace:packages/@react-spectrum/actionbar"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-types/actionbar": "npm:^3.1.21"
     "@swc/helpers": "npm:^0.5.0"
@@ -6099,6 +6099,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/actiongroup@workspace:packages/@react-spectrum/actiongroup"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-types/actiongroup": "npm:^3.4.23"
     "@swc/helpers": "npm:^0.5.0"
@@ -6113,6 +6114,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/autocomplete@workspace:packages/@react-spectrum/autocomplete"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-types/autocomplete": "npm:3.0.0-alpha.38"
     "@swc/helpers": "npm:^0.5.0"
@@ -6127,6 +6129,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/avatar@workspace:packages/@react-spectrum/avatar"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-types/avatar": "npm:^3.0.21"
     "@swc/helpers": "npm:^0.5.0"
@@ -6140,6 +6143,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/badge@workspace:packages/@react-spectrum/badge"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-types/badge": "npm:^3.1.23"
     "@swc/helpers": "npm:^0.5.0"
@@ -6153,6 +6157,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/breadcrumbs@workspace:packages/@react-spectrum/breadcrumbs"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-types/breadcrumbs": "npm:^3.7.19"
     "@swc/helpers": "npm:^0.5.0"
@@ -6167,6 +6172,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/button@workspace:packages/@react-spectrum/button"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-spectrum/test-utils-internal": "npm:3.0.0-alpha.1"
     "@react-types/button": "npm:^3.15.1"
@@ -6182,6 +6188,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@react-spectrum/buttongroup@workspace:packages/@react-spectrum/buttongroup"
   dependencies:
+    "@adobe/react-spectrum": "npm:^3.46.2"
     "@adobe/spectrum-css-temp": "npm:3.0.0-alpha.1"
     "@react-types/buttongroup": "npm:^3.3.23"
     "@spectrum-icons/workflow": "npm:^4.0.0"
@@ -23894,7 +23901,6 @@ __metadata:
     "@swc/helpers": "npm:^0.5.0"
     aria-hidden: "npm:^1.2.3"
     clsx: "npm:^2.0.0"
-    react-aria: "npm:3.47.0"
     react-stately: "npm:3.45.0"
     use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
@@ -24153,7 +24159,6 @@ __metadata:
     "@react-types/tabs": "npm:^3.3.22"
     "@react-types/tooltip": "npm:^3.5.2"
     "@swc/helpers": "npm:^0.5.0"
-    react-stately: "npm:3.45.0"
     use-sync-external-store: "npm:^1.6.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1

From 40c4929b17d682e5ce3f1d2e43c4513067e49e47 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 12 Mar 2026 15:36:36 -0700
Subject: [PATCH 56/68] backward compatibility for bundlers without
 package.json exports support

---
 Makefile                                    |  5 ++-
 packages/@adobe/react-spectrum/.gitignore   |  5 ++-
 packages/@adobe/react-spectrum/package.json | 10 +++---
 packages/@react-spectrum/s2/package.json    |  4 ++-
 packages/react-aria/.gitignore              |  3 ++
 packages/react-aria/package.json            | 10 +++---
 packages/react-stately/.gitignore           |  3 ++
 packages/react-stately/package.json         | 10 +++---
 scripts/buildEsm.js                         | 39 ++++++++++++++++-----
 9 files changed, 63 insertions(+), 26 deletions(-)
 create mode 100644 packages/react-stately/.gitignore

diff --git a/Makefile b/Makefile
index 4998d317cf4..fef0b226168 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,7 @@ clean_dist:
 	rm -rf packages/@adobe/react-spectrum/i18n
 	rm -rf packages/@react-aria/i18n/server
 	rm -rf packages/@react-spectrum/s2/style/dist packages/@react-spectrum/s2/page.css packages/@react-spectrum/s2/icons packages/@react-spectrum/s2/illustrations
+	rm -rf packages/{@adobe/react-spectrum,@react-spectrum/s2,react-aria,react-stately}/*.{mjs,cjs}
 
 clean_parcel:
 	rm -rf .parcel-cache
@@ -101,9 +102,7 @@ build:
 	yarn tsgo --project tsconfig.build.json --declaration --emitDeclarationOnly --outDir types --rootDir packages
 	parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/{react-aria,react-stately,react-aria-components,@adobe/react-spectrum} --no-optimize --config .parcelrc-build
 	# yarn workspaces foreach --all -pt run prepublishOnly
-	for pkg in packages/@react-{spectrum,aria,stately}/*/  packages/@internationalized/{message,string,date,number}/; \
-		do node scripts/buildEsm.js $$pkg; \
-	done
+	node scripts/buildEsm.js
 	node scripts/buildI18n.js
 	node scripts/generateIconDts.js
 	# node scripts/fixUseClient.js
diff --git a/packages/@adobe/react-spectrum/.gitignore b/packages/@adobe/react-spectrum/.gitignore
index 5669308ee0f..083ef66fe96 100644
--- a/packages/@adobe/react-spectrum/.gitignore
+++ b/packages/@adobe/react-spectrum/.gitignore
@@ -1 +1,4 @@
-i18n
+/i18n
+/*.mjs
+/*.cjs
+/private
diff --git a/packages/@adobe/react-spectrum/package.json b/packages/@adobe/react-spectrum/package.json
index 1acdfb398ca..791af338b82 100644
--- a/packages/@adobe/react-spectrum/package.json
+++ b/packages/@adobe/react-spectrum/package.json
@@ -3,8 +3,8 @@
   "version": "3.46.2",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
-  "main": "dist/main.js",
-  "module": "dist/module.js",
+  "main": "./dist/exports/index.cjs",
+  "module": "./dist/exports/index.mjs",
   "exports": {
     ".": {
       "source": "./exports/index.ts",
@@ -30,11 +30,13 @@
       "require": "./dist/exports/*.cjs"
     }
   },
-  "types": "dist/types.d.ts",
+  "types": "./dist/types/exports/index.d.ts",
   "source": "exports/index.ts",
   "files": [
     "dist",
-    "i18n"
+    "i18n",
+    "*.mjs",
+    "*.cjs"
   ],
   "sideEffects": [
     "*.css"
diff --git a/packages/@react-spectrum/s2/package.json b/packages/@react-spectrum/s2/package.json
index e1a0b4001ed..575af961fbd 100644
--- a/packages/@react-spectrum/s2/package.json
+++ b/packages/@react-spectrum/s2/package.json
@@ -147,7 +147,9 @@
     "page.css.map",
     "icons",
     "illustrations",
-    "src"
+    "src",
+    "*.mjs",
+    "*.cjs"
   ],
   "scripts": {
     "prepublishOnly": "rm -rf dist/page.cjs* && mv dist/page*.css page.css && mv dist/page.css.map page.css.map || true",
diff --git a/packages/react-aria/.gitignore b/packages/react-aria/.gitignore
index 58d7e6e5ccb..083ef66fe96 100644
--- a/packages/react-aria/.gitignore
+++ b/packages/react-aria/.gitignore
@@ -1 +1,4 @@
 /i18n
+/*.mjs
+/*.cjs
+/private
diff --git a/packages/react-aria/package.json b/packages/react-aria/package.json
index 2abe0d86390..c5783a383e8 100644
--- a/packages/react-aria/package.json
+++ b/packages/react-aria/package.json
@@ -3,8 +3,8 @@
   "version": "3.47.0",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
-  "main": "dist/main.js",
-  "module": "dist/module.js",
+  "main": "./dist/exports/index.cjs",
+  "module": "./dist/exports/index.mjs",
   "exports": {
     ".": {
       "source": "./exports/index.ts",
@@ -30,11 +30,13 @@
       "require": "./dist/exports/*.cjs"
     }
   },
-  "types": "dist/types.d.ts",
+  "types": "./dist/types/exports/index.d.ts",
   "source": "exports/index.ts",
   "files": [
     "dist",
-    "i18n"
+    "i18n",
+    "*.mjs",
+    "*.cjs"
   ],
   "sideEffects": false,
   "scripts": {
diff --git a/packages/react-stately/.gitignore b/packages/react-stately/.gitignore
new file mode 100644
index 00000000000..3cea21eccc5
--- /dev/null
+++ b/packages/react-stately/.gitignore
@@ -0,0 +1,3 @@
+/*.mjs
+/*.cjs
+/private
diff --git a/packages/react-stately/package.json b/packages/react-stately/package.json
index 0d765b20564..416f8b201c2 100644
--- a/packages/react-stately/package.json
+++ b/packages/react-stately/package.json
@@ -3,8 +3,8 @@
   "version": "3.45.0",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
-  "main": "dist/main.js",
-  "module": "dist/module.js",
+  "main": "./dist/exports/index.cjs",
+  "module": "./dist/exports/index.mjs",
   "exports": {
     ".": {
       "source": "./exports/index.ts",
@@ -20,10 +20,12 @@
       "require": "./dist/exports/*.cjs"
     }
   },
-  "types": "dist/types.d.ts",
+  "types": "./dist/types/exports/index.d.ts",
   "source": "exports/index.ts",
   "files": [
-    "dist"
+    "dist",
+    "*.mjs",
+    "*.cjs"
   ],
   "sideEffects": false,
   "scripts": {
diff --git a/scripts/buildEsm.js b/scripts/buildEsm.js
index b2b77f902b4..bebcdc873a1 100644
--- a/scripts/buildEsm.js
+++ b/scripts/buildEsm.js
@@ -1,16 +1,37 @@
 const fs = require('fs');
 const glob = require('glob');
+const path = require('path');
 
-let pkg = process.argv[process.argv.length - 1];
 let regex = /(.*)\.module\.js(?!.map)/g;
-if (fs.existsSync(`${pkg}/dist/module.js`)) {
-  let js = fs.readFileSync(`${pkg}/dist/module.js`, 'utf8');
-  js = js.replace(regex, '$1.mjs');
-  fs.writeFileSync(`${pkg}/dist/import.mjs`, js);
+
+// Add .mjs equivalents for individual packages for Node.js.
+for (let pkg of fs.globSync(['packages/@react-{spectrum,aria,stately}/*/', 'packages/@internationalized/{message,string,date,number}/'])) {
+  if (fs.existsSync(`${pkg}/dist/module.js`)) {
+    let js = fs.readFileSync(`${pkg}/dist/module.js`, 'utf8');
+    js = js.replace(regex, '$1.mjs');
+    fs.writeFileSync(`${pkg}/dist/import.mjs`, js);
+  }
+
+  for (let file of glob.sync(`${pkg}/dist/*.module.js`)) {
+    let js = fs.readFileSync(file, 'utf8');
+    js = js.replace(regex, '$1.mjs');
+    fs.writeFileSync(file.replace(regex, '$1.mjs'), js);
+  }
 }
 
-for (let file of glob.sync(`${pkg}/dist/*.module.js`)) {
-  let js = fs.readFileSync(file, 'utf8');
-  js = js.replace(regex, '$1.mjs');
-  fs.writeFileSync(file.replace(regex, '$1.mjs'), js);
+// Add extra shims for bundlers that don't support package.json exports.
+for (let pkg of ['@adobe/react-spectrum', 'react-aria', 'react-stately']) {
+  for (let file of fs.globSync(`packages/${pkg}/dist/exports/**/*.{mjs,cjs}`)) {
+    let shim = file.replace('/dist/exports/', '/');
+    let specifier = `./${file.replace(`packages/${pkg}/`, '')}`;
+    let contents = '';
+    if (path.extname(shim) === '.cjs') {
+      contents = `module.exports = require('${specifier}');\n`;
+    } else {
+      contents = `export * from '${specifier}';\n`;
+    }
+
+    fs.mkdirSync(path.dirname(shim), {recursive: true});
+    fs.writeFileSync(shim, contents);
+  }
 }

From 6d11372ca6199342960f98c80b3ca2201d74281b Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 12 Mar 2026 16:12:27 -0700
Subject: [PATCH 57/68] fix style macro build

---
 packages/@react-spectrum/s2/package.json       | 5 +----
 packages/@react-spectrum/s2/style/package.json | 2 +-
 packages/dev/parcel-namer-s2/S2Namer.js        | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/@react-spectrum/s2/package.json b/packages/@react-spectrum/s2/package.json
index 575af961fbd..4a83c34ae59 100644
--- a/packages/@react-spectrum/s2/package.json
+++ b/packages/@react-spectrum/s2/package.json
@@ -28,10 +28,7 @@
     },
     "./style": {
       "source": "./style/index.ts",
-      "types": [
-        "./style/dist/types.d.ts",
-        "./style/index.ts"
-      ],
+      "types": "./dist/types/style/index.d.ts",
       "module": "./style/dist/module.mjs",
       "import": "./style/dist/module.mjs",
       "require": "./style/dist/main.cjs"
diff --git a/packages/@react-spectrum/s2/style/package.json b/packages/@react-spectrum/s2/style/package.json
index d79a0442cf4..96d55139792 100644
--- a/packages/@react-spectrum/s2/style/package.json
+++ b/packages/@react-spectrum/s2/style/package.json
@@ -1,5 +1,5 @@
 {
-  "types": "./dist/types.d.ts",
+  "types": "../dist/types/style/index.d.ts",
   "module": "./dist/module.mjs",
   "main": "./dist/main.cjs"
 }
diff --git a/packages/dev/parcel-namer-s2/S2Namer.js b/packages/dev/parcel-namer-s2/S2Namer.js
index a2fafdcc57d..9a36dd6bf3b 100644
--- a/packages/dev/parcel-namer-s2/S2Namer.js
+++ b/packages/dev/parcel-namer-s2/S2Namer.js
@@ -36,7 +36,7 @@ module.exports = new Namer({
     } else if (mainAsset.filePath.includes('/exports/')) {
       let index = mainAsset.filePath.indexOf('/exports/');
       name = path.dirname(mainAsset.filePath.slice(index + 1)) + '/' + name;
-    } else if (bundle.target.distDir.endsWith('/dist')) {
+    } else if (bundle.target.distDir.endsWith('/dist') && !bundle.target.distDir.includes('/style/')) {
       let index = mainAsset.filePath.indexOf('/src/');
       if (index >= 0) {
         name = 'private/' + path.dirname(mainAsset.filePath.slice(index + 5)) + '/' + name;

From 2e558de3edd63122ede643be7d0fe8a02e745b7f Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 12 Mar 2026 16:56:14 -0700
Subject: [PATCH 58/68] fixes

---
 examples/rsp-cra-18/src/AutocompleteExample.tsx            | 2 +-
 examples/rsp-cra-18/src/sections/StatusExamples.tsx        | 3 +--
 examples/rsp-cra-18/tsconfig.json                          | 2 +-
 examples/rsp-next-ts-17/components/ReorderableListView.tsx | 3 +--
 examples/rsp-next-ts-17/pages/_app.tsx                     | 4 ++--
 examples/rsp-next-ts-17/pages/index.tsx                    | 6 +++---
 examples/rsp-next-ts-17/tsconfig.json                      | 2 +-
 examples/rsp-next-ts/components/AutocompleteExample.tsx    | 2 +-
 examples/rsp-next-ts/components/ReorderableListView.tsx    | 3 +--
 examples/rsp-next-ts/pages/_app.tsx                        | 4 ++--
 examples/rsp-next-ts/pages/index.tsx                       | 6 +++---
 examples/rsp-next-ts/tsconfig.json                         | 2 +-
 packages/@react-spectrum/s2/package.json                   | 2 +-
 scripts/buildEsm.js                                        | 2 +-
 14 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/examples/rsp-cra-18/src/AutocompleteExample.tsx b/examples/rsp-cra-18/src/AutocompleteExample.tsx
index e92c4d8d763..66d82987f64 100644
--- a/examples/rsp-cra-18/src/AutocompleteExample.tsx
+++ b/examples/rsp-cra-18/src/AutocompleteExample.tsx
@@ -1,5 +1,5 @@
 import {Autocomplete, Input, Label, Menu, MenuItem, SearchField, Text, useFilter} from 'react-aria-components'
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
 import styles from './autocomplete.css';
 
 interface AutocompleteItem {
diff --git a/examples/rsp-cra-18/src/sections/StatusExamples.tsx b/examples/rsp-cra-18/src/sections/StatusExamples.tsx
index 03375a112cc..d2a478ffc93 100644
--- a/examples/rsp-cra-18/src/sections/StatusExamples.tsx
+++ b/examples/rsp-cra-18/src/sections/StatusExamples.tsx
@@ -1,5 +1,4 @@
-import {Flex, Divider, Badge, InlineAlert, Heading, Content, LabeledValue, Meter, ProgressBar, ProgressCircle, StatusLight, Button} from '@adobe/react-spectrum';
-import {ToastContainer, ToastQueue} from '@react-spectrum/toast'
+import {Flex, Divider, Badge, InlineAlert, Heading, Content, LabeledValue, Meter, ProgressBar, ProgressCircle, StatusLight, Button, ToastContainer, ToastQueue} from '@adobe/react-spectrum';
 
 export default function StatusExamples() {
   return (
diff --git a/examples/rsp-cra-18/tsconfig.json b/examples/rsp-cra-18/tsconfig.json
index d2befe045b8..ff87c41a6b7 100644
--- a/examples/rsp-cra-18/tsconfig.json
+++ b/examples/rsp-cra-18/tsconfig.json
@@ -14,7 +14,7 @@
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
diff --git a/examples/rsp-next-ts-17/components/ReorderableListView.tsx b/examples/rsp-next-ts-17/components/ReorderableListView.tsx
index 5c7d9b58d93..43fd81cf40c 100644
--- a/examples/rsp-next-ts-17/components/ReorderableListView.tsx
+++ b/examples/rsp-next-ts-17/components/ReorderableListView.tsx
@@ -1,5 +1,4 @@
-import { Item, ListView, Text, useListData } from "@adobe/react-spectrum";
-import { useDragAndDrop } from "@react-spectrum/dnd";
+import { Item, ListView, Text, useListData, useDragAndDrop } from "@adobe/react-spectrum";
 import Folder from "@spectrum-icons/illustrations/Folder";
 
 export default function ReorderableListView() {
diff --git a/examples/rsp-next-ts-17/pages/_app.tsx b/examples/rsp-next-ts-17/pages/_app.tsx
index d5a7ef8d618..b73773d8de8 100644
--- a/examples/rsp-next-ts-17/pages/_app.tsx
+++ b/examples/rsp-next-ts-17/pages/_app.tsx
@@ -8,13 +8,13 @@ import {
   Flex,
   Grid,
   View,
+  ToastContainer,
 } from "@adobe/react-spectrum";
 import { ColorScheme } from "@react-types/provider";
 import { useState } from "react";
 import Moon from "@spectrum-icons/workflow/Moon";
 import Light from "@spectrum-icons/workflow/Light";
-import { ToastContainer } from "@react-spectrum/toast";
-import {enableTableNestedRows} from '@react-stately/flags';
+import {enableTableNestedRows} from 'react-stately/private/flags/flags';
 
 function MyApp({ Component, pageProps }: AppProps) {
   const [theme, setTheme] = useState<ColorScheme>("light");
diff --git a/examples/rsp-next-ts-17/pages/index.tsx b/examples/rsp-next-ts-17/pages/index.tsx
index 09f8d7da63f..55b5e295ed0 100644
--- a/examples/rsp-next-ts-17/pages/index.tsx
+++ b/examples/rsp-next-ts-17/pages/index.tsx
@@ -84,14 +84,14 @@ import {
   DisclosurePanel,
   TreeView,
   TreeViewItem,
-  TreeViewItemContent
+  TreeViewItemContent,
+  ToastQueue,
+  SubmenuTrigger
 } from "@adobe/react-spectrum";
 import Edit from "@spectrum-icons/workflow/Edit";
 import NotFound from "@spectrum-icons/illustrations/NotFound";
 import Section from "../components/Section";
 import ReorderableListView from "../components/ReorderableListView";
-import {ToastQueue} from '@react-spectrum/toast';
-import {SubmenuTrigger} from "@react-spectrum/menu";
 
 import FileTxt from '@spectrum-icons/workflow/FileTxt';
 import Folder from '@spectrum-icons/workflow/Folder';
diff --git a/examples/rsp-next-ts-17/tsconfig.json b/examples/rsp-next-ts-17/tsconfig.json
index 73e4afb1513..caeef2192cc 100644
--- a/examples/rsp-next-ts-17/tsconfig.json
+++ b/examples/rsp-next-ts-17/tsconfig.json
@@ -9,7 +9,7 @@
     "noEmit": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
diff --git a/examples/rsp-next-ts/components/AutocompleteExample.tsx b/examples/rsp-next-ts/components/AutocompleteExample.tsx
index 7228c5688f8..5c1c8d3dbe9 100644
--- a/examples/rsp-next-ts/components/AutocompleteExample.tsx
+++ b/examples/rsp-next-ts/components/AutocompleteExample.tsx
@@ -1,5 +1,5 @@
 import {Autocomplete, Input, Label, Menu, MenuItem, SearchField, Text, useFilter} from 'react-aria-components'
-import {classNames} from '@react-spectrum/utils';
+import {classNames} from '@adobe/react-spectrum/private/utils/classNames';
 import React from 'react';
 import styles from './autocomplete.module.css';
 
diff --git a/examples/rsp-next-ts/components/ReorderableListView.tsx b/examples/rsp-next-ts/components/ReorderableListView.tsx
index 5c7d9b58d93..43fd81cf40c 100644
--- a/examples/rsp-next-ts/components/ReorderableListView.tsx
+++ b/examples/rsp-next-ts/components/ReorderableListView.tsx
@@ -1,5 +1,4 @@
-import { Item, ListView, Text, useListData } from "@adobe/react-spectrum";
-import { useDragAndDrop } from "@react-spectrum/dnd";
+import { Item, ListView, Text, useListData, useDragAndDrop } from "@adobe/react-spectrum";
 import Folder from "@spectrum-icons/illustrations/Folder";
 
 export default function ReorderableListView() {
diff --git a/examples/rsp-next-ts/pages/_app.tsx b/examples/rsp-next-ts/pages/_app.tsx
index d791494cdf9..e64d05ed668 100644
--- a/examples/rsp-next-ts/pages/_app.tsx
+++ b/examples/rsp-next-ts/pages/_app.tsx
@@ -7,13 +7,13 @@ import {
   Flex,
   Grid,
   View,
+  ToastContainer,
 } from "@adobe/react-spectrum";
 import { ColorScheme } from "@react-types/provider";
 import { useState } from "react";
 import Moon from "@spectrum-icons/workflow/Moon";
 import Light from "@spectrum-icons/workflow/Light";
-import { ToastContainer } from "@react-spectrum/toast";
-import {enableTableNestedRows} from '@react-stately/flags';
+import {enableTableNestedRows} from 'react-stately/private/flags/flags';
 import {useRouter, type NextRouter} from 'next/router';
 import Script from 'next/script';
 
diff --git a/examples/rsp-next-ts/pages/index.tsx b/examples/rsp-next-ts/pages/index.tsx
index 4b94a2f0447..51edad1361a 100644
--- a/examples/rsp-next-ts/pages/index.tsx
+++ b/examples/rsp-next-ts/pages/index.tsx
@@ -84,15 +84,15 @@ import {
   DisclosurePanel,
   TreeView,
   TreeViewItem,
-  TreeViewItemContent
+  TreeViewItemContent,
+  ToastQueue,
+  SubmenuTrigger
 } from "@adobe/react-spectrum";
 import {AutocompleteExample} from "../components/AutocompleteExample";
 import Edit from "@spectrum-icons/workflow/Edit";
 import NotFound from "@spectrum-icons/illustrations/NotFound";
 import Section from "../components/Section";
 import ReorderableListView from "../components/ReorderableListView";
-import {ToastQueue} from '@react-spectrum/toast';
-import {SubmenuTrigger} from "@react-spectrum/menu";
 
 import FileTxt from '@spectrum-icons/workflow/FileTxt';
 import Folder from '@spectrum-icons/workflow/Folder';
diff --git a/examples/rsp-next-ts/tsconfig.json b/examples/rsp-next-ts/tsconfig.json
index dc358701300..e4dacbf0e0d 100644
--- a/examples/rsp-next-ts/tsconfig.json
+++ b/examples/rsp-next-ts/tsconfig.json
@@ -9,7 +9,7 @@
     "noEmit": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
diff --git a/packages/@react-spectrum/s2/package.json b/packages/@react-spectrum/s2/package.json
index 4a83c34ae59..3cd3953b2bb 100644
--- a/packages/@react-spectrum/s2/package.json
+++ b/packages/@react-spectrum/s2/package.json
@@ -149,7 +149,7 @@
     "*.cjs"
   ],
   "scripts": {
-    "prepublishOnly": "rm -rf dist/page.cjs* && mv dist/page*.css page.css && mv dist/page.css.map page.css.map || true",
+    "prepublishOnly": "rm -rf dist/private/page.cjs* && mv dist/private/page*.css page.css && mv dist/private/page.css.map page.css.map || true",
     "prepack": "npm pkg delete scripts devDependencies resolutions alias targets",
     "postpack": "git checkout -- package.json"
   },
diff --git a/scripts/buildEsm.js b/scripts/buildEsm.js
index bebcdc873a1..47ca3e47f0a 100644
--- a/scripts/buildEsm.js
+++ b/scripts/buildEsm.js
@@ -20,7 +20,7 @@ for (let pkg of fs.globSync(['packages/@react-{spectrum,aria,stately}/*/', 'pack
 }
 
 // Add extra shims for bundlers that don't support package.json exports.
-for (let pkg of ['@adobe/react-spectrum', 'react-aria', 'react-stately']) {
+for (let pkg of ['@adobe/react-spectrum', 'react-aria', 'react-stately', 'react-aria-components']) {
   for (let file of fs.globSync(`packages/${pkg}/dist/exports/**/*.{mjs,cjs}`)) {
     let shim = file.replace('/dist/exports/', '/');
     let specifier = `./${file.replace(`packages/${pkg}/`, '')}`;

From e30f0fe8d5bebe4844c3ef30d877518ebb48370b Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 12 Mar 2026 17:23:14 -0700
Subject: [PATCH 59/68] more fixes

---
 packages/@react-spectrum/s2/package.json    | 8 ++++----
 packages/react-aria-components/.gitignore   | 5 ++++-
 packages/react-aria-components/package.json | 4 ++--
 scripts/buildEsm.js                         | 5 ++++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/@react-spectrum/s2/package.json b/packages/@react-spectrum/s2/package.json
index 3cd3953b2bb..a4010ffe6f0 100644
--- a/packages/@react-spectrum/s2/package.json
+++ b/packages/@react-spectrum/s2/package.json
@@ -9,7 +9,7 @@
   },
   "main": "./dist/exports/index.cjs",
   "module": "./dist/exports/index.mjs",
-  "types": "./dist/types/exports/index.ts",
+  "types": "./dist/types/exports/index.d.ts",
   "page": "dist/page.cjs",
   "style-module": "style/dist/module.mjs",
   "style-main": "style/dist/main.cjs",
@@ -17,8 +17,8 @@
   "exports": {
     ".": {
       "source": "./exports/index.ts",
-      "types": "./dist/types/exports/index.ts",
-      "module": "./dist/module.mjs",
+      "types": "./dist/types/exports/index.d.ts",
+      "module": "./dist/exports/index.mjs",
       "import": "./dist/exports/index.mjs",
       "require": "./dist/exports/index.cjs"
     },
@@ -149,7 +149,7 @@
     "*.cjs"
   ],
   "scripts": {
-    "prepublishOnly": "rm -rf dist/private/page.cjs* && mv dist/private/page*.css page.css && mv dist/private/page.css.map page.css.map || true",
+    "prepublishOnly": "rm -rf dist/page.cjs* && mv dist/private/page*.css page.css && mv dist/private/page.css.map page.css.map || true",
     "prepack": "npm pkg delete scripts devDependencies resolutions alias targets",
     "postpack": "git checkout -- package.json"
   },
diff --git a/packages/react-aria-components/.gitignore b/packages/react-aria-components/.gitignore
index 5669308ee0f..083ef66fe96 100644
--- a/packages/react-aria-components/.gitignore
+++ b/packages/react-aria-components/.gitignore
@@ -1 +1,4 @@
-i18n
+/i18n
+/*.mjs
+/*.cjs
+/private
diff --git a/packages/react-aria-components/package.json b/packages/react-aria-components/package.json
index 8979a89bd22..b28503024d4 100644
--- a/packages/react-aria-components/package.json
+++ b/packages/react-aria-components/package.json
@@ -5,12 +5,12 @@
   "license": "Apache-2.0",
   "main": "./dist/exports/index.cjs",
   "module": "./dist/exports/index.mjs",
-  "types": "./dist/types/exports/index.ts",
+  "types": "./dist/types/exports/index.d.ts",
   "source": "exports/index.ts",
   "exports": {
     ".": {
       "source": "./exports/index.ts",
-      "types": "./dist/types/exports/index.ts",
+      "types": "./dist/types/exports/index.d.ts",
       "import": "./dist/exports/index.mjs",
       "require": "./dist/exports/index.cjs"
     },
diff --git a/scripts/buildEsm.js b/scripts/buildEsm.js
index 47ca3e47f0a..5fc1352c6c6 100644
--- a/scripts/buildEsm.js
+++ b/scripts/buildEsm.js
@@ -23,7 +23,10 @@ for (let pkg of fs.globSync(['packages/@react-{spectrum,aria,stately}/*/', 'pack
 for (let pkg of ['@adobe/react-spectrum', 'react-aria', 'react-stately', 'react-aria-components']) {
   for (let file of fs.globSync(`packages/${pkg}/dist/exports/**/*.{mjs,cjs}`)) {
     let shim = file.replace('/dist/exports/', '/');
-    let specifier = `./${file.replace(`packages/${pkg}/`, '')}`;
+    let specifier = path.relative(path.dirname(shim), file);
+    if (!specifier.startsWith('.')) {
+      specifier = './' + specifier;
+    }
     let contents = '';
     if (path.extname(shim) === '.cjs') {
       contents = `module.exports = require('${specifier}');\n`;

From 7cd0261bdae5a3c3146cfea1b3adf35ca21b5764 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 12 Mar 2026 17:26:16 -0700
Subject: [PATCH 60/68] fix constraints

---
 yarn.config.cjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.config.cjs b/yarn.config.cjs
index 7564de2664c..10e84b31330 100644
--- a/yarn.config.cjs
+++ b/yarn.config.cjs
@@ -171,7 +171,7 @@ function enforceWorkspaceDependencies({Yarn}) {
               ...workspace.manifest.peerDependencies,
               [dependency.ident]: dependency.range
             });
-          } else if (!seen.has(workspace.ident)) {
+          } else if (!seen.has(workspace.ident) && workspace.ident !== dependency.ident) {
             seen.set(workspace.ident, [dependency.ident]);
             workspace.set('peerDependencies', {
               ...workspace.manifest.peerDependencies,

From 95d77b74eee46afa9d406da09d8e5bee8e5388e6 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 12 Mar 2026 17:57:16 -0700
Subject: [PATCH 61/68] more fixes

---
 Makefile                                    | 2 +-
 packages/react-aria-components/package.json | 4 +++-
 scripts/fixUseClient.js                     | 5 ++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index fef0b226168..bece64f5f76 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,7 @@ build:
 	node scripts/buildEsm.js
 	node scripts/buildI18n.js
 	node scripts/generateIconDts.js
-	# node scripts/fixUseClient.js
+	node scripts/fixUseClient.js
 	for pkg in types/@react-{spectrum,aria,stately}/*/ types/@internationalized/{message,string,date,number}/ types/{react-aria,react-stately,react-aria-components,@adobe/react-spectrum}; do \
 		mkdir -p packages/$${pkg#types/}/dist; \
 		mv $$pkg packages/$${pkg#types/}/dist/types; \
diff --git a/packages/react-aria-components/package.json b/packages/react-aria-components/package.json
index b28503024d4..e1eb529285b 100644
--- a/packages/react-aria-components/package.json
+++ b/packages/react-aria-components/package.json
@@ -36,7 +36,9 @@
   "files": [
     "dist",
     "src",
-    "i18n"
+    "i18n",
+    "*.mjs",
+    "*.cjs"
   ],
   "sideEffects": [
     "*.css"
diff --git a/scripts/fixUseClient.js b/scripts/fixUseClient.js
index a8196a96859..e31cdb7968c 100644
--- a/scripts/fixUseClient.js
+++ b/scripts/fixUseClient.js
@@ -1,14 +1,13 @@
 const fs = require('fs');
-const glob = require('glob');
 
-let iconFiles = glob.sync('packages/@react-spectrum/s2/{icons,illustrations}/**/*.{cjs,mjs}');
+let iconFiles = fs.globSync('packages/@react-spectrum/s2/{icons,illustrations}/**/*.{cjs,mjs}');
 for (let f of iconFiles) {
   let contents = fs.readFileSync(f, 'utf8');
   contents = contents.replace(/['"]use client['"];?/g, '');
   fs.writeFileSync(f, contents);
 }
 
-for (let f of ['packages/@react-spectrum/s2/dist/module.mjs', 'packages/@react-spectrum/s2/dist/main.cjs']) {
+for (let f of fs.globSync(['packages/@react-spectrum/s2/dist/**/*.mjs', 'packages/@react-spectrum/s2/dist/**/*.cjs'])) {
   let contents = fs.readFileSync(f, 'utf8');
   contents = contents.replace(/['"]use client['"];?/g, '');
   fs.writeFileSync(f, contents);

From 69ab78a962466897e7a28f759caa69aa1fccdef4 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 12 Mar 2026 19:24:19 -0700
Subject: [PATCH 62/68] fixes

---
 Makefile                                           | 2 +-
 packages/@adobe/react-spectrum/package.json        | 3 ---
 packages/react-aria/exports/private/i18n/server.ts | 1 +
 packages/react-aria/package.json                   | 3 ---
 packages/react-stately/package.json                | 3 ---
 scripts/buildI18n.js                               | 2 +-
 6 files changed, 3 insertions(+), 11 deletions(-)
 create mode 100644 packages/react-aria/exports/private/i18n/server.ts

diff --git a/Makefile b/Makefile
index bece64f5f76..7e9ae65aa01 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ publish-nightly: build
 build:
 	yarn tsgo --project tsconfig.build.json --declaration --emitDeclarationOnly --outDir types --rootDir packages
 	parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/{react-aria,react-stately,react-aria-components,@adobe/react-spectrum} --no-optimize --config .parcelrc-build
-	# yarn workspaces foreach --all -pt run prepublishOnly
+	yarn workspaces foreach --all -pt run prepublishOnly
 	node scripts/buildEsm.js
 	node scripts/buildI18n.js
 	node scripts/generateIconDts.js
diff --git a/packages/@adobe/react-spectrum/package.json b/packages/@adobe/react-spectrum/package.json
index 791af338b82..32c44cacb29 100644
--- a/packages/@adobe/react-spectrum/package.json
+++ b/packages/@adobe/react-spectrum/package.json
@@ -41,9 +41,6 @@
   "sideEffects": [
     "*.css"
   ],
-  "scripts": {
-    "prepublishOnly": "mkdir -p dist; cp src/index.ts dist/types.d.ts; grep -v '^export type' src/index.ts > dist/module.js; babel --root-mode upward src/index.ts -o dist/main.js"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
diff --git a/packages/react-aria/exports/private/i18n/server.ts b/packages/react-aria/exports/private/i18n/server.ts
new file mode 100644
index 00000000000..eb50aeefa94
--- /dev/null
+++ b/packages/react-aria/exports/private/i18n/server.ts
@@ -0,0 +1 @@
+export {PackageLocalizationProvider, getPackageLocalizationScript} from '../../../src/i18n/server';
diff --git a/packages/react-aria/package.json b/packages/react-aria/package.json
index c5783a383e8..173ca5880f7 100644
--- a/packages/react-aria/package.json
+++ b/packages/react-aria/package.json
@@ -39,9 +39,6 @@
     "*.cjs"
   ],
   "sideEffects": false,
-  "scripts": {
-    "prepublishOnly": "mkdir -p dist; cp src/index.ts dist/types.d.ts; grep -v '^export type' src/index.ts > dist/module.js; babel --root-mode upward src/index.ts -o dist/main.js"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
diff --git a/packages/react-stately/package.json b/packages/react-stately/package.json
index 416f8b201c2..4febd20db23 100644
--- a/packages/react-stately/package.json
+++ b/packages/react-stately/package.json
@@ -28,9 +28,6 @@
     "*.cjs"
   ],
   "sideEffects": false,
-  "scripts": {
-    "prepublishOnly": "mkdir -p dist; cp src/index.ts dist/types.d.ts; grep -v '^export type' src/index.ts > dist/module.js; babel --root-mode upward src/index.ts -o dist/main.js"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/adobe/react-spectrum"
diff --git a/scripts/buildI18n.js b/scripts/buildI18n.js
index 2a44bd65fd7..af13505e715 100644
--- a/scripts/buildI18n.js
+++ b/scripts/buildI18n.js
@@ -66,7 +66,7 @@ export default PackageLocalizedStrings;
   // Generate index files.
   for (let ext of ['.js', '.mjs']) {
     let generateImport = (exports, from) => ext === '.mjs' ? `import ${exports} from '${from}'` : `let ${exports} = require('${from}')`;
-    let index = generateImport('{PackageLocalizationProvider, getPackageLocalizationScript}', '@react-aria/i18n/server') + ';\n';
+    let index = generateImport('{PackageLocalizationProvider, getPackageLocalizationScript}', 'react-aria/private/i18n/server') + ';\n';
     index += generateImport('{LocalizedStringDictionary}', '@internationalized/string') + ';\n';
     index += generateImport('{createElement}', 'react') + ';\n';
     for (let lang in languages) {

From 4f7d2aa0f4ddad5935b311cdb7272c9304068c5b Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 12 Mar 2026 19:41:53 -0700
Subject: [PATCH 63/68] fix mcp

---
 packages/dev/mcp/react-aria/tsconfig.json | 3 ++-
 packages/dev/mcp/s2/tsconfig.json         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/dev/mcp/react-aria/tsconfig.json b/packages/dev/mcp/react-aria/tsconfig.json
index 3f0a13a0930..766aac45770 100644
--- a/packages/dev/mcp/react-aria/tsconfig.json
+++ b/packages/dev/mcp/react-aria/tsconfig.json
@@ -10,7 +10,8 @@
     "target": "es2020",
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
-    "noEmit": false
+    "noEmit": false,
+    "allowImportingTsExtensions": false
   },
   "include": [
     "src/**/*",
diff --git a/packages/dev/mcp/s2/tsconfig.json b/packages/dev/mcp/s2/tsconfig.json
index 3f0a13a0930..766aac45770 100644
--- a/packages/dev/mcp/s2/tsconfig.json
+++ b/packages/dev/mcp/s2/tsconfig.json
@@ -10,7 +10,8 @@
     "target": "es2020",
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
-    "noEmit": false
+    "noEmit": false,
+    "allowImportingTsExtensions": false
   },
   "include": [
     "src/**/*",

From 855d2414efd84d9ad065f0ffb31d16ad2c75c664 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 12 Mar 2026 20:32:28 -0700
Subject: [PATCH 64/68] fix typescript moduleResolution

---
 examples/rac-spectrum-tailwind/tsconfig.json           | 2 +-
 examples/rsp-cra-18/src/App.tsx                        | 2 +-
 examples/rsp-webpack-4/src/App.js                      | 2 +-
 examples/s2-esbuild-starter-app/tsconfig.json          | 2 +-
 examples/s2-webpack-5-typescript-example/tsconfig.json | 2 +-
 starters/docs/tsconfig.json                            | 2 +-
 starters/tailwind/tsconfig.json                        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/rac-spectrum-tailwind/tsconfig.json b/examples/rac-spectrum-tailwind/tsconfig.json
index 0163835a93a..66c175a102c 100644
--- a/examples/rac-spectrum-tailwind/tsconfig.json
+++ b/examples/rac-spectrum-tailwind/tsconfig.json
@@ -13,7 +13,7 @@
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
diff --git a/examples/rsp-cra-18/src/App.tsx b/examples/rsp-cra-18/src/App.tsx
index 0abebf7ad5d..1ca5cd4f2f3 100644
--- a/examples/rsp-cra-18/src/App.tsx
+++ b/examples/rsp-cra-18/src/App.tsx
@@ -3,7 +3,7 @@ import {Provider, defaultTheme, Item, TagGroup, Cell, Column, Row, TableBody, Ta
 import Lighting from './Lighting';
 import {useState} from 'react'
 import BodyContent from './BodyContent';
-import {enableTableNestedRows} from '@react-stately/flags';
+import {enableTableNestedRows} from 'react-stately/private/flags/flags';
 import ButtonExamples from './sections/ButtonExamples';
 import CollectionExamples from './sections/CollectionExamples';
 import DateTimeExamples from './sections/DateTimeExamples';
diff --git a/examples/rsp-webpack-4/src/App.js b/examples/rsp-webpack-4/src/App.js
index da8eca112de..ed65587e902 100644
--- a/examples/rsp-webpack-4/src/App.js
+++ b/examples/rsp-webpack-4/src/App.js
@@ -3,7 +3,7 @@ import {Provider, defaultTheme, Item, TagGroup, Cell, Column, InlineAlert, Row,
 import Lighting from './Lighting';
 import {useState} from 'react'
 import BodyContent from './BodyContent';
-import {enableTableNestedRows} from '@react-stately/flags';
+import {enableTableNestedRows} from 'react-stately/private/flags/flags';
 
 let columns = [
   {name: 'Foo', key: 'foo'},
diff --git a/examples/s2-esbuild-starter-app/tsconfig.json b/examples/s2-esbuild-starter-app/tsconfig.json
index 554e640ede2..b1cae0c6f72 100644
--- a/examples/s2-esbuild-starter-app/tsconfig.json
+++ b/examples/s2-esbuild-starter-app/tsconfig.json
@@ -12,7 +12,7 @@
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
diff --git a/examples/s2-webpack-5-typescript-example/tsconfig.json b/examples/s2-webpack-5-typescript-example/tsconfig.json
index 115bb034d22..411a1e99288 100644
--- a/examples/s2-webpack-5-typescript-example/tsconfig.json
+++ b/examples/s2-webpack-5-typescript-example/tsconfig.json
@@ -10,7 +10,7 @@
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "react-jsx",
diff --git a/starters/docs/tsconfig.json b/starters/docs/tsconfig.json
index f33bf5b785c..c60c9b47f35 100644
--- a/starters/docs/tsconfig.json
+++ b/starters/docs/tsconfig.json
@@ -13,7 +13,7 @@
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
diff --git a/starters/tailwind/tsconfig.json b/starters/tailwind/tsconfig.json
index 091bceaa3ac..a24aef4a587 100644
--- a/starters/tailwind/tsconfig.json
+++ b/starters/tailwind/tsconfig.json
@@ -13,7 +13,7 @@
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,

From eb6abd5cfba304abacd918eda1e23bae3ad45853 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 12 Mar 2026 20:51:57 -0700
Subject: [PATCH 65/68] add .js versions for webpack 4

---
 Makefile                                    |  2 +-
 packages/@adobe/react-spectrum/.gitignore   |  3 +--
 packages/@adobe/react-spectrum/package.json |  3 +--
 packages/@react-spectrum/s2/package.json    |  3 +--
 packages/react-aria-components/.gitignore   |  3 +--
 packages/react-aria-components/package.json |  3 +--
 packages/react-aria/.gitignore              |  3 +--
 packages/react-aria/package.json            |  3 +--
 packages/react-stately/.gitignore           |  3 +--
 packages/react-stately/package.json         |  3 +--
 scripts/buildEsm.js                         | 25 ++++++++++++---------
 11 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index 7e9ae65aa01..ddf13f1694c 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ clean_dist:
 	rm -rf packages/@adobe/react-spectrum/i18n
 	rm -rf packages/@react-aria/i18n/server
 	rm -rf packages/@react-spectrum/s2/style/dist packages/@react-spectrum/s2/page.css packages/@react-spectrum/s2/icons packages/@react-spectrum/s2/illustrations
-	rm -rf packages/{@adobe/react-spectrum,@react-spectrum/s2,react-aria,react-stately}/*.{mjs,cjs}
+	rm -rf packages/{@adobe/react-spectrum,@react-spectrum/s2,react-aria,react-stately,react-aria-components}/*.js
 
 clean_parcel:
 	rm -rf .parcel-cache
diff --git a/packages/@adobe/react-spectrum/.gitignore b/packages/@adobe/react-spectrum/.gitignore
index 083ef66fe96..2b7c9c109c4 100644
--- a/packages/@adobe/react-spectrum/.gitignore
+++ b/packages/@adobe/react-spectrum/.gitignore
@@ -1,4 +1,3 @@
 /i18n
-/*.mjs
-/*.cjs
+/*.js
 /private
diff --git a/packages/@adobe/react-spectrum/package.json b/packages/@adobe/react-spectrum/package.json
index 32c44cacb29..5e90025be4a 100644
--- a/packages/@adobe/react-spectrum/package.json
+++ b/packages/@adobe/react-spectrum/package.json
@@ -35,8 +35,7 @@
   "files": [
     "dist",
     "i18n",
-    "*.mjs",
-    "*.cjs"
+    "*.js"
   ],
   "sideEffects": [
     "*.css"
diff --git a/packages/@react-spectrum/s2/package.json b/packages/@react-spectrum/s2/package.json
index a4010ffe6f0..f663a5940fe 100644
--- a/packages/@react-spectrum/s2/package.json
+++ b/packages/@react-spectrum/s2/package.json
@@ -145,8 +145,7 @@
     "icons",
     "illustrations",
     "src",
-    "*.mjs",
-    "*.cjs"
+    "*.js"
   ],
   "scripts": {
     "prepublishOnly": "rm -rf dist/page.cjs* && mv dist/private/page*.css page.css && mv dist/private/page.css.map page.css.map || true",
diff --git a/packages/react-aria-components/.gitignore b/packages/react-aria-components/.gitignore
index 083ef66fe96..2b7c9c109c4 100644
--- a/packages/react-aria-components/.gitignore
+++ b/packages/react-aria-components/.gitignore
@@ -1,4 +1,3 @@
 /i18n
-/*.mjs
-/*.cjs
+/*.js
 /private
diff --git a/packages/react-aria-components/package.json b/packages/react-aria-components/package.json
index e1eb529285b..27bfb9eaa76 100644
--- a/packages/react-aria-components/package.json
+++ b/packages/react-aria-components/package.json
@@ -37,8 +37,7 @@
     "dist",
     "src",
     "i18n",
-    "*.mjs",
-    "*.cjs"
+    "*.js"
   ],
   "sideEffects": [
     "*.css"
diff --git a/packages/react-aria/.gitignore b/packages/react-aria/.gitignore
index 083ef66fe96..2b7c9c109c4 100644
--- a/packages/react-aria/.gitignore
+++ b/packages/react-aria/.gitignore
@@ -1,4 +1,3 @@
 /i18n
-/*.mjs
-/*.cjs
+/*.js
 /private
diff --git a/packages/react-aria/package.json b/packages/react-aria/package.json
index 173ca5880f7..8070b4968ed 100644
--- a/packages/react-aria/package.json
+++ b/packages/react-aria/package.json
@@ -35,8 +35,7 @@
   "files": [
     "dist",
     "i18n",
-    "*.mjs",
-    "*.cjs"
+    "*.js"
   ],
   "sideEffects": false,
   "repository": {
diff --git a/packages/react-stately/.gitignore b/packages/react-stately/.gitignore
index 3cea21eccc5..6f0ff0bb8be 100644
--- a/packages/react-stately/.gitignore
+++ b/packages/react-stately/.gitignore
@@ -1,3 +1,2 @@
-/*.mjs
-/*.cjs
+/*.js
 /private
diff --git a/packages/react-stately/package.json b/packages/react-stately/package.json
index 4febd20db23..b6690f82ad2 100644
--- a/packages/react-stately/package.json
+++ b/packages/react-stately/package.json
@@ -24,8 +24,7 @@
   "source": "exports/index.ts",
   "files": [
     "dist",
-    "*.mjs",
-    "*.cjs"
+    "*.js"
   ],
   "sideEffects": false,
   "repository": {
diff --git a/scripts/buildEsm.js b/scripts/buildEsm.js
index 5fc1352c6c6..237b39c09f4 100644
--- a/scripts/buildEsm.js
+++ b/scripts/buildEsm.js
@@ -19,22 +19,27 @@ for (let pkg of fs.globSync(['packages/@react-{spectrum,aria,stately}/*/', 'pack
   }
 }
 
-// Add extra shims for bundlers that don't support package.json exports.
+// Add extra shims for bundlers that don't support package.json exports, specifically webpack 4 and Parcel (without config).
 for (let pkg of ['@adobe/react-spectrum', 'react-aria', 'react-stately', 'react-aria-components']) {
-  for (let file of fs.globSync(`packages/${pkg}/dist/exports/**/*.{mjs,cjs}`)) {
-    let shim = file.replace('/dist/exports/', '/');
-    let specifier = path.relative(path.dirname(shim), file);
+  for (let file of fs.globSync(`packages/${pkg}/dist/exports/**/*.mjs`)) {
+    // webpack 4 does not support importing non-ESM modules from .mjs files, so rename to .js
+    // This should be sufficient because Parcel prioritizes .js over .cjs.
+    // We do not support any tools that only support CommonJS.
+    let shim = file.replace('/dist/exports/', '/').replace('.mjs', '.js');
+    let specifier = path.relative(path.dirname(shim), file.replace('.mjs', '.js'));
     if (!specifier.startsWith('.')) {
       specifier = './' + specifier;
     }
-    let contents = '';
-    if (path.extname(shim) === '.cjs') {
-      contents = `module.exports = require('${specifier}');\n`;
-    } else {
-      contents = `export * from '${specifier}';\n`;
-    }
+    let contents = `export * from '${specifier}';\n`;
 
     fs.mkdirSync(path.dirname(shim), {recursive: true});
     fs.writeFileSync(shim, contents);
   }
+
+  // Copy all .mjs files in the dist directory into .js files for webpack 4.
+  for (let file of fs.globSync(`packages/${pkg}/dist/**/*.mjs`)) {
+    let contents = fs.readFileSync(file, 'utf8');
+    contents = contents.replace(/\.mjs(['"])/g, '.js$1');
+    fs.writeFileSync(file.replace('.mjs', '.js'), contents);
+  }
 }

From 9b488603c579fb28302296959e0de151e674a31d Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Thu, 12 Mar 2026 21:08:27 -0700
Subject: [PATCH 66/68] fix module field

---
 packages/@adobe/react-spectrum/package.json | 2 +-
 packages/react-aria-components/package.json | 2 +-
 packages/react-aria/package.json            | 2 +-
 packages/react-stately/package.json         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/@adobe/react-spectrum/package.json b/packages/@adobe/react-spectrum/package.json
index 5e90025be4a..2aab6438120 100644
--- a/packages/@adobe/react-spectrum/package.json
+++ b/packages/@adobe/react-spectrum/package.json
@@ -4,7 +4,7 @@
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "./dist/exports/index.cjs",
-  "module": "./dist/exports/index.mjs",
+  "module": "./dist/exports/index.js",
   "exports": {
     ".": {
       "source": "./exports/index.ts",
diff --git a/packages/react-aria-components/package.json b/packages/react-aria-components/package.json
index 27bfb9eaa76..a04660b2fe0 100644
--- a/packages/react-aria-components/package.json
+++ b/packages/react-aria-components/package.json
@@ -4,7 +4,7 @@
   "description": "A library of styleable components built using React Aria",
   "license": "Apache-2.0",
   "main": "./dist/exports/index.cjs",
-  "module": "./dist/exports/index.mjs",
+  "module": "./dist/exports/index.js",
   "types": "./dist/types/exports/index.d.ts",
   "source": "exports/index.ts",
   "exports": {
diff --git a/packages/react-aria/package.json b/packages/react-aria/package.json
index 8070b4968ed..984e6b7f722 100644
--- a/packages/react-aria/package.json
+++ b/packages/react-aria/package.json
@@ -4,7 +4,7 @@
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "./dist/exports/index.cjs",
-  "module": "./dist/exports/index.mjs",
+  "module": "./dist/exports/index.js",
   "exports": {
     ".": {
       "source": "./exports/index.ts",
diff --git a/packages/react-stately/package.json b/packages/react-stately/package.json
index b6690f82ad2..ed70fd86e67 100644
--- a/packages/react-stately/package.json
+++ b/packages/react-stately/package.json
@@ -4,7 +4,7 @@
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
   "main": "./dist/exports/index.cjs",
-  "module": "./dist/exports/index.mjs",
+  "module": "./dist/exports/index.js",
   "exports": {
     ".": {
       "source": "./exports/index.ts",

From 75ea750724027a845e29e3c406f7be6232ca1ab6 Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Fri, 13 Mar 2026 11:01:08 -0700
Subject: [PATCH 67/68] webpack 4

---
 scripts/buildEsm.js | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/scripts/buildEsm.js b/scripts/buildEsm.js
index 237b39c09f4..e5c447e2737 100644
--- a/scripts/buildEsm.js
+++ b/scripts/buildEsm.js
@@ -2,20 +2,32 @@ const fs = require('fs');
 const glob = require('glob');
 const path = require('path');
 
-let regex = /(.*)\.module\.js(?!.map)/g;
+let regex = /\.mjs(['"])/g;
 
 // Add .mjs equivalents for individual packages for Node.js.
 for (let pkg of fs.globSync(['packages/@react-{spectrum,aria,stately}/*/', 'packages/@internationalized/{message,string,date,number}/'])) {
-  if (fs.existsSync(`${pkg}/dist/module.js`)) {
-    let js = fs.readFileSync(`${pkg}/dist/module.js`, 'utf8');
-    js = js.replace(regex, '$1.mjs');
-    fs.writeFileSync(`${pkg}/dist/import.mjs`, js);
+  if (pkg === 'packages/@react-spectrum/s2') {
+    continue;
   }
 
-  for (let file of glob.sync(`${pkg}/dist/*.module.js`)) {
+  let modulePath = `${pkg}/dist/module.js`;
+  if (fs.existsSync(modulePath)) {
+    fs.copyFileSync(modulePath, `${pkg}/dist/import.mjs`);
+
+    // Replace .mjs with .js for webpack 4.
+    let js = fs.readFileSync(modulePath, 'utf8');
+    js = js.replace(regex, '.js$1');
+    fs.writeFileSync(modulePath, js);
+  }
+  
+  // Create .js versions.
+  for (let file of glob.sync(`${pkg}/dist/**/*.mjs`)) {
+    if (file === `${pkg}/dist/import.mjs`) {
+      continue;
+    }
     let js = fs.readFileSync(file, 'utf8');
-    js = js.replace(regex, '$1.mjs');
-    fs.writeFileSync(file.replace(regex, '$1.mjs'), js);
+    js = js.replace(regex, '.js$1');
+    fs.writeFileSync(file.replace('.mjs', '.js'), js);
   }
 }
 
@@ -39,7 +51,7 @@ for (let pkg of ['@adobe/react-spectrum', 'react-aria', 'react-stately', 'react-
   // Copy all .mjs files in the dist directory into .js files for webpack 4.
   for (let file of fs.globSync(`packages/${pkg}/dist/**/*.mjs`)) {
     let contents = fs.readFileSync(file, 'utf8');
-    contents = contents.replace(/\.mjs(['"])/g, '.js$1');
+    contents = contents.replace(regex, '.js$1');
     fs.writeFileSync(file.replace('.mjs', '.js'), contents);
   }
 }

From 1707a8d3c59ed981a88a010e3e7c90995e2cf23b Mon Sep 17 00:00:00 2001
From: Devon Govett <devongovett@gmail.com>
Date: Fri, 13 Mar 2026 11:43:27 -0700
Subject: [PATCH 68/68] fix types

---
 Makefile              |  8 +++-----
 scripts/moveTypes.mjs | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 scripts/moveTypes.mjs

diff --git a/Makefile b/Makefile
index ddf13f1694c..6b7a9f96748 100644
--- a/Makefile
+++ b/Makefile
@@ -99,17 +99,15 @@ publish-nightly: build
 	yarn publish:nightly
 
 build:
-	yarn tsgo --project tsconfig.build.json --declaration --emitDeclarationOnly --outDir types --rootDir packages
+	mkdir -p dist
+	yarn tsgo --project tsconfig.build.json --declaration --emitDeclarationOnly --outDir dist/types --rootDir packages
 	parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/{react-aria,react-stately,react-aria-components,@adobe/react-spectrum} --no-optimize --config .parcelrc-build
 	yarn workspaces foreach --all -pt run prepublishOnly
 	node scripts/buildEsm.js
 	node scripts/buildI18n.js
 	node scripts/generateIconDts.js
 	node scripts/fixUseClient.js
-	for pkg in types/@react-{spectrum,aria,stately}/*/ types/@internationalized/{message,string,date,number}/ types/{react-aria,react-stately,react-aria-components,@adobe/react-spectrum}; do \
-		mkdir -p packages/$${pkg#types/}/dist; \
-		mv $$pkg packages/$${pkg#types/}/dist/types; \
-	done
+	node scripts/moveTypes.mjs
 	rm -rf types
 
 website:
diff --git a/scripts/moveTypes.mjs b/scripts/moveTypes.mjs
new file mode 100644
index 00000000000..8e92a063236
--- /dev/null
+++ b/scripts/moveTypes.mjs
@@ -0,0 +1,21 @@
+import fs from 'fs';
+import path from 'path';
+
+// Move the generated types into the package dist folders.
+for (let file of fs.globSync('dist/types/**/*.d.ts')) {
+  if (file.includes('@spectrum-icons') || file.includes('/dev/')) {
+    continue;
+  }
+
+  let dest = file.replace(/dist\/types\/((?:@[^/]+\/[^/]+)|[^/]+)/, 'packages/$1/dist/types');
+  let contents = fs.readFileSync(file, 'utf8');
+
+  // TypeScript generates absolute paths that don't work when published to npm. Fix that.
+  contents = contents.replace(/import\(['"]\/(packages\/.+?)['"]\)/g, (_, p) => {
+    let relative = path.relative(path.dirname(dest), p.replace(/packages\/((?:@[^/]+\/[^/]+)|[^/]+)/, 'packages/$1/dist/types'));
+    return `import("${relative}")`;
+  });
+
+  fs.mkdirSync(path.dirname(dest), {recursive: true});
+  fs.writeFileSync(dest, contents);
+}