diff --git a/.changeset/tall-dancers-wonder.md b/.changeset/tall-dancers-wonder.md
new file mode 100644
index 0000000000..195190b52b
--- /dev/null
+++ b/.changeset/tall-dancers-wonder.md
@@ -0,0 +1,5 @@
+---
+'react-select': minor
+---
+
+Move files around to as to be compatible with version 2 of `@preconstruct/cli`
diff --git a/docs/PropTypes/Select.ts b/docs/PropTypes/Select.ts
index 0c8fd9fa64..b6784caf79 100644
--- a/docs/PropTypes/Select.ts
+++ b/docs/PropTypes/Select.ts
@@ -1,6 +1,6 @@
 import { Component } from 'react';
 
-import { Props, defaultProps } from 'react-select/src/Select';
+import { Props, defaultProps } from 'react-select/src/base';
 import { GroupBase } from 'react-select';
 
 export default class Select extends Component<
diff --git a/docs/generate-magical-types/generate/package.json b/docs/generate-magical-types/generate/package.json
index fc99df9b47..c8cade72a6 100644
--- a/docs/generate-magical-types/generate/package.json
+++ b/docs/generate-magical-types/generate/package.json
@@ -1,6 +1,3 @@
 {
-  "main": "dist/generate-magical-types.cjs.js",
-  "preconstruct": {
-    "source": "../src/generate"
-  }
+  "main": "dist/react-select-generate-magical-types-generate.cjs.js"
 }
diff --git a/docs/generate-magical-types/package.json b/docs/generate-magical-types/package.json
index 29b35c8069..9af9564a97 100644
--- a/docs/generate-magical-types/package.json
+++ b/docs/generate-magical-types/package.json
@@ -12,8 +12,8 @@
   },
   "preconstruct": {
     "entrypoints": [
-      "generate",
-      "serialize"
+      "generate.ts",
+      "serialize.ts"
     ]
   }
 }
diff --git a/docs/generate-magical-types/serialize/package.json b/docs/generate-magical-types/serialize/package.json
index edbc5569c0..2b2d88a1f4 100644
--- a/docs/generate-magical-types/serialize/package.json
+++ b/docs/generate-magical-types/serialize/package.json
@@ -1,6 +1,3 @@
 {
-  "main": "dist/generate-magical-types.cjs.js",
-  "preconstruct": {
-    "source": "../src/serialize"
-  }
+  "main": "dist/react-select-generate-magical-types-serialize.cjs.js"
 }
diff --git a/package.json b/package.json
index b1924e9ef7..92495b5010 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "@emotion/babel-plugin": "^11.0.0",
     "@emotion/jest": "^11.1.0",
     "@manypkg/cli": "^0.19.2",
-    "@preconstruct/cli": "^1.0.0",
+    "@preconstruct/cli": "^2.2.2",
     "@testing-library/dom": "7.0.4",
     "@testing-library/jest-dom": "5.1.1",
     "@testing-library/react": "10.0.1",
diff --git a/packages/react-select/animated/package.json b/packages/react-select/animated/package.json
index b2af8543d0..480f66dd01 100644
--- a/packages/react-select/animated/package.json
+++ b/packages/react-select/animated/package.json
@@ -1,8 +1,5 @@
 {
-  "main": "dist/react-select.cjs.js",
-  "module": "dist/react-select.esm.js",
-  "types": "dist/react-select.cjs.d.ts",
-  "preconstruct": {
-    "source": "../src/animated"
-  }
+  "main": "dist/react-select-animated.cjs.js",
+  "module": "dist/react-select-animated.esm.js",
+  "types": "dist/react-select-animated.cjs.d.ts"
 }
diff --git a/packages/react-select/async-creatable/package.json b/packages/react-select/async-creatable/package.json
index 3117f827dc..0a3bddde09 100644
--- a/packages/react-select/async-creatable/package.json
+++ b/packages/react-select/async-creatable/package.json
@@ -1,8 +1,5 @@
 {
-  "main": "dist/react-select.cjs.js",
-  "module": "dist/react-select.esm.js",
-  "types": "dist/react-select.cjs.d.ts",
-  "preconstruct": {
-    "source": "../src/AsyncCreatable"
-  }
+  "main": "dist/react-select-async-creatable.cjs.js",
+  "module": "dist/react-select-async-creatable.esm.js",
+  "types": "dist/react-select-async-creatable.cjs.d.ts"
 }
diff --git a/packages/react-select/async/package.json b/packages/react-select/async/package.json
index 69034f9131..b58d5d1e27 100644
--- a/packages/react-select/async/package.json
+++ b/packages/react-select/async/package.json
@@ -1,8 +1,5 @@
 {
-  "main": "dist/react-select.cjs.js",
-  "module": "dist/react-select.esm.js",
-  "types": "dist/react-select.cjs.d.ts",
-  "preconstruct": {
-    "source": "../src/Async"
-  }
+  "main": "dist/react-select-async.cjs.js",
+  "module": "dist/react-select-async.esm.js",
+  "types": "dist/react-select-async.cjs.d.ts"
 }
diff --git a/packages/react-select/base/package.json b/packages/react-select/base/package.json
index f538122b58..957568d890 100644
--- a/packages/react-select/base/package.json
+++ b/packages/react-select/base/package.json
@@ -1,8 +1,5 @@
 {
-  "main": "dist/react-select.cjs.js",
-  "module": "dist/react-select.esm.js",
-  "types": "dist/react-select.cjs.d.ts",
-  "preconstruct": {
-    "source": "../src/Select"
-  }
+  "main": "dist/react-select-base.cjs.js",
+  "module": "dist/react-select-base.esm.js",
+  "types": "dist/react-select-base.cjs.d.ts"
 }
diff --git a/packages/react-select/creatable/package.json b/packages/react-select/creatable/package.json
index 0be16fc266..347a42cf5c 100644
--- a/packages/react-select/creatable/package.json
+++ b/packages/react-select/creatable/package.json
@@ -1,8 +1,5 @@
 {
-  "main": "dist/react-select.cjs.js",
-  "module": "dist/react-select.esm.js",
-  "types": "dist/react-select.cjs.d.ts",
-  "preconstruct": {
-    "source": "../src/Creatable"
-  }
+  "main": "dist/react-select-creatable.cjs.js",
+  "module": "dist/react-select-creatable.esm.js",
+  "types": "dist/react-select-creatable.cjs.d.ts"
 }
diff --git a/packages/react-select/package.json b/packages/react-select/package.json
index 10d73e3648..a676dbe02c 100644
--- a/packages/react-select/package.json
+++ b/packages/react-select/package.json
@@ -52,12 +52,12 @@
   ],
   "preconstruct": {
     "entrypoints": [
-      ".",
-      "base",
-      "animated",
-      "async",
-      "creatable",
-      "async-creatable"
+      "index.ts",
+      "base/index.ts",
+      "animated/index.ts",
+      "async/index.ts",
+      "creatable/index.ts",
+      "async-creatable/index.ts"
     ]
   }
 }
diff --git a/packages/react-select/src/__tests__/AsyncCreatable.test.tsx b/packages/react-select/src/__tests__/AsyncCreatable.test.tsx
index d855717bd7..08309cc9d3 100644
--- a/packages/react-select/src/__tests__/AsyncCreatable.test.tsx
+++ b/packages/react-select/src/__tests__/AsyncCreatable.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import AsyncCreatable from '../AsyncCreatable';
+import AsyncCreatable from '../async-creatable';
 import { Option, OPTIONS } from './constants';
 import { render, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/react-select/src/__tests__/Select.test.tsx b/packages/react-select/src/__tests__/Select.test.tsx
index b48171c1a2..3e77a322f8 100644
--- a/packages/react-select/src/__tests__/Select.test.tsx
+++ b/packages/react-select/src/__tests__/Select.test.tsx
@@ -13,7 +13,7 @@ import {
   OptionNumberValue,
   OptionBooleanValue,
 } from './constants';
-import Select, { FormatOptionLabelMeta } from '../Select';
+import Select, { FormatOptionLabelMeta } from '../base';
 import { FilterOptionOption } from '../filters';
 
 import { matchers } from '@emotion/jest';
diff --git a/packages/react-select/src/AsyncCreatable.tsx b/packages/react-select/src/async-creatable/AsyncCreatable.tsx
similarity index 81%
rename from packages/react-select/src/AsyncCreatable.tsx
rename to packages/react-select/src/async-creatable/AsyncCreatable.tsx
index e2b0d700cb..9b55f6952b 100644
--- a/packages/react-select/src/AsyncCreatable.tsx
+++ b/packages/react-select/src/async-creatable/AsyncCreatable.tsx
@@ -5,11 +5,11 @@ import {
   ReactElement,
   RefAttributes,
 } from 'react';
-import Select from './Select';
-import { GroupBase } from './types';
-import useAsync, { AsyncAdditionalProps } from './useAsync';
-import useStateManager, { StateManagerProps } from './useStateManager';
-import useCreatable, { CreatableAdditionalProps } from './useCreatable';
+import Select from '../base';
+import { GroupBase } from '../types';
+import useAsync, { AsyncAdditionalProps } from '../useAsync';
+import useStateManager, { StateManagerProps } from '../useStateManager';
+import useCreatable, { CreatableAdditionalProps } from '../useCreatable';
 
 export type AsyncCreatableProps<
   Option,
diff --git a/packages/react-select/src/async-creatable/index.ts b/packages/react-select/src/async-creatable/index.ts
new file mode 100644
index 0000000000..d537c06d1f
--- /dev/null
+++ b/packages/react-select/src/async-creatable/index.ts
@@ -0,0 +1,2 @@
+export * from './AsyncCreatable';
+export { default } from './AsyncCreatable';
diff --git a/packages/react-select/src/Async.tsx b/packages/react-select/src/async/Async.tsx
similarity index 82%
rename from packages/react-select/src/Async.tsx
rename to packages/react-select/src/async/Async.tsx
index 35a1de7055..052d082cb6 100644
--- a/packages/react-select/src/Async.tsx
+++ b/packages/react-select/src/async/Async.tsx
@@ -5,11 +5,11 @@ import {
   ReactElement,
   RefAttributes,
 } from 'react';
-import Select from './Select';
-import { GroupBase } from './types';
-import useStateManager from './useStateManager';
-import useAsync from './useAsync';
-import type { AsyncProps } from './useAsync';
+import Select from '../base';
+import { GroupBase } from '../types';
+import useStateManager from '../useStateManager';
+import useAsync from '../useAsync';
+import type { AsyncProps } from '../useAsync';
 export type { AsyncProps };
 
 type AsyncSelect = <
diff --git a/packages/react-select/src/async/index.ts b/packages/react-select/src/async/index.ts
new file mode 100644
index 0000000000..49352feab0
--- /dev/null
+++ b/packages/react-select/src/async/index.ts
@@ -0,0 +1,2 @@
+export * from './Async';
+export { default } from './Async';
diff --git a/packages/react-select/src/Select.tsx b/packages/react-select/src/base/Select.tsx
similarity index 99%
rename from packages/react-select/src/Select.tsx
rename to packages/react-select/src/base/Select.tsx
index 361226a011..d6b5672129 100644
--- a/packages/react-select/src/Select.tsx
+++ b/packages/react-select/src/base/Select.tsx
@@ -10,12 +10,12 @@ import {
   RefCallback,
   TouchEventHandler,
 } from 'react';
-import { MenuPlacer } from './components/Menu';
-import LiveRegion from './components/LiveRegion';
+import { MenuPlacer } from '../components/Menu';
+import LiveRegion from '../components/LiveRegion';
 
-import { createFilter, FilterOptionOption } from './filters';
-import { DummyInput, ScrollManager } from './internal/index';
-import { AriaLiveMessages, AriaSelection } from './accessibility/index';
+import { createFilter, FilterOptionOption } from '../filters';
+import { DummyInput, ScrollManager } from '../internal/index';
+import { AriaLiveMessages, AriaSelection } from '../accessibility/index';
 
 import {
   classNames,
@@ -29,19 +29,19 @@ import {
   valueTernary,
   multiValueAsValue,
   singleValueAsValue,
-} from './utils';
+} from '../utils';
 
 import {
   formatGroupLabel as formatGroupLabelBuiltin,
   getOptionLabel as getOptionLabelBuiltin,
   getOptionValue as getOptionValueBuiltin,
   isOptionDisabled as isOptionDisabledBuiltin,
-} from './builtins';
+} from '../builtins';
 
-import { defaultComponents, SelectComponentsConfig } from './components/index';
+import { defaultComponents, SelectComponentsConfig } from '../components/index';
 
-import { defaultStyles, StylesConfig, StylesProps } from './styles';
-import { defaultTheme, ThemeConfig } from './theme';
+import { defaultStyles, StylesConfig, StylesProps } from '../styles';
+import { defaultTheme, ThemeConfig } from '../theme';
 
 import {
   ActionMeta,
@@ -57,7 +57,7 @@ import {
   OptionsOrGroups,
   PropsValue,
   SetValueAction,
-} from './types';
+} from '../types';
 
 export type FormatOptionLabelContext = 'menu' | 'value';
 export interface FormatOptionLabelMeta<Option> {
diff --git a/packages/react-select/src/base/index.ts b/packages/react-select/src/base/index.ts
new file mode 100644
index 0000000000..148fa550c6
--- /dev/null
+++ b/packages/react-select/src/base/index.ts
@@ -0,0 +1,2 @@
+export * from './Select';
+export { default } from './Select';
diff --git a/packages/react-select/src/components/Group.tsx b/packages/react-select/src/components/Group.tsx
index cc3dee2d30..8858d73aed 100644
--- a/packages/react-select/src/components/Group.tsx
+++ b/packages/react-select/src/components/Group.tsx
@@ -12,7 +12,7 @@ import {
   Options,
   Theme,
 } from '../types';
-import { Props } from '../Select';
+import { Props } from '../base';
 
 export interface ForwardedHeadingProps<
   Option,
diff --git a/packages/react-select/src/components/MultiValue.tsx b/packages/react-select/src/components/MultiValue.tsx
index 173d9cd000..b597056c30 100644
--- a/packages/react-select/src/components/MultiValue.tsx
+++ b/packages/react-select/src/components/MultiValue.tsx
@@ -7,7 +7,7 @@ import {
   CSSObjectWithLabel,
   GroupBase,
 } from '../types';
-import { Props } from '../Select';
+import { Props } from '../base';
 
 interface MultiValueComponents<
   Option,
diff --git a/packages/react-select/src/Creatable.tsx b/packages/react-select/src/creatable/Creatable.tsx
similarity index 84%
rename from packages/react-select/src/Creatable.tsx
rename to packages/react-select/src/creatable/Creatable.tsx
index 52d616a011..7d4877ba06 100644
--- a/packages/react-select/src/Creatable.tsx
+++ b/packages/react-select/src/creatable/Creatable.tsx
@@ -5,10 +5,10 @@ import {
   ReactElement,
   RefAttributes,
 } from 'react';
-import Select from './Select';
-import { GroupBase } from './types';
-import useStateManager, { StateManagerProps } from './useStateManager';
-import useCreatable, { CreatableAdditionalProps } from './useCreatable';
+import Select from '../base';
+import { GroupBase } from '../types';
+import useStateManager, { StateManagerProps } from '../useStateManager';
+import useCreatable, { CreatableAdditionalProps } from '../useCreatable';
 
 export type CreatableProps<
   Option,
diff --git a/packages/react-select/src/creatable/index.ts b/packages/react-select/src/creatable/index.ts
new file mode 100644
index 0000000000..ec7e9fd5d9
--- /dev/null
+++ b/packages/react-select/src/creatable/index.ts
@@ -0,0 +1,2 @@
+export * from './Creatable';
+export { default } from './Creatable';
diff --git a/packages/react-select/src/index.ts b/packages/react-select/src/index.ts
index c0ea65444a..143b344858 100644
--- a/packages/react-select/src/index.ts
+++ b/packages/react-select/src/index.ts
@@ -1,4 +1,4 @@
-import Select from './Select';
+import Select from './base';
 import type { GroupBase } from './types';
 import useStateManager from './useStateManager';
 
@@ -56,4 +56,4 @@ export type {
   AriaOnFilter,
   AriaOnFocus,
 } from './accessibility';
-export type { FormatOptionLabelContext, FormatOptionLabelMeta } from './Select';
+export type { FormatOptionLabelContext, FormatOptionLabelMeta } from './base';
diff --git a/packages/react-select/src/stateManager.tsx b/packages/react-select/src/stateManager.tsx
index 3efe781536..76dfd0ee41 100644
--- a/packages/react-select/src/stateManager.tsx
+++ b/packages/react-select/src/stateManager.tsx
@@ -7,7 +7,7 @@ import {
 } from 'react';
 
 import { GroupBase } from './types';
-import Select from './Select';
+import Select from './base';
 import useStateManager from './useStateManager';
 import type { StateManagerProps } from './useStateManager';
 export type { StateManagerProps };
diff --git a/packages/react-select/src/types.ts b/packages/react-select/src/types.ts
index 2926a715ba..b2248febff 100644
--- a/packages/react-select/src/types.ts
+++ b/packages/react-select/src/types.ts
@@ -1,5 +1,5 @@
 import { CSSObject } from '@emotion/react';
-import { Props } from './Select';
+import { Props } from './base';
 import { StylesProps } from './styles';
 
 export interface GroupBase<Option> {
diff --git a/packages/react-select/src/useCreatable.ts b/packages/react-select/src/useCreatable.ts
index b6b3ed7708..af7ad1624e 100644
--- a/packages/react-select/src/useCreatable.ts
+++ b/packages/react-select/src/useCreatable.ts
@@ -1,5 +1,5 @@
 import { ReactNode, useCallback, useMemo } from 'react';
-import { PublicBaseSelectProps } from './Select';
+import { PublicBaseSelectProps } from './base';
 import {
   ActionMeta,
   GetOptionLabel,
diff --git a/packages/react-select/src/useStateManager.ts b/packages/react-select/src/useStateManager.ts
index 262ecdbea0..872c02963d 100644
--- a/packages/react-select/src/useStateManager.ts
+++ b/packages/react-select/src/useStateManager.ts
@@ -5,7 +5,7 @@ import {
   OnChangeValue,
   PropsValue,
 } from './types';
-import { PublicBaseSelectProps } from './Select';
+import { PublicBaseSelectProps } from './base';
 import { useCallback, useState } from 'react';
 
 type StateManagedPropKeys =
diff --git a/yarn.lock b/yarn.lock
index 81671eb782..2172d0155f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3140,10 +3140,10 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
   integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==
 
-"@preconstruct/cli@^1.0.0":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@preconstruct/cli/-/cli-1.2.2.tgz#379d432cf911b42bf04999161d5200685d4de4bb"
-  integrity sha512-0Thzanz4MGy+E0v+2Srbe4oc1sPsfc+Ce61M/JOvGa3cgAl/4TzlSWh66XAvf8lnyTLkvip1paoBjVdWaFF80A==
+"@preconstruct/cli@^2.2.2":
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/@preconstruct/cli/-/cli-2.2.2.tgz#2327aa2486f7c3650cfa726e667a9d80007e50d8"
+  integrity sha512-7Zk8g/G+SPusoL1Ir3oslj19QDoFuAKeQO8B6fnNkRRgvIntxnylGZyC4wdKVX/eeDHwca1LNLT/GyjXx1f1nA==
   dependencies:
     "@babel/code-frame" "^7.5.5"
     "@babel/core" "^7.7.7"
@@ -3153,7 +3153,7 @@
     "@rollup/plugin-alias" "^3.1.1"
     "@rollup/plugin-commonjs" "^15.0.0"
     "@rollup/plugin-json" "^4.1.0"
-    "@rollup/plugin-node-resolve" "^9.0.0"
+    "@rollup/plugin-node-resolve" "^11.2.1"
     "@rollup/plugin-replace" "^2.4.1"
     builtin-modules "^3.1.0"
     chalk "^4.1.0"
@@ -3162,14 +3162,13 @@
     enquirer "^2.3.6"
     estree-walker "^2.0.1"
     fast-deep-equal "^2.0.1"
+    fast-glob "^3.2.4"
     fs-extra "^9.0.1"
-    globby "^11.0.1"
     is-ci "^2.0.0"
     is-reference "^1.2.1"
     jest-worker "^26.3.0"
     magic-string "^0.25.7"
     meow "^7.1.0"
-    micromatch "^4.0.2"
     ms "^2.1.2"
     normalize-path "^3.0.0"
     npm-packlist "^2.1.2"
@@ -3180,6 +3179,7 @@
     resolve "^1.17.0"
     resolve-from "^5.0.0"
     rollup "^2.32.0"
+    semver "^7.3.4"
     terser "^5.2.1"
     v8-compile-cache "^2.1.1"
 
@@ -3220,17 +3220,17 @@
   dependencies:
     "@rollup/pluginutils" "^3.0.8"
 
-"@rollup/plugin-node-resolve@^9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-9.0.0.tgz#39bd0034ce9126b39c1699695f440b4b7d2b62e6"
-  integrity sha512-gPz+utFHLRrd41WMP13Jq5mqqzHL3OXrfj3/MkSyB6UBIcuNt9j60GCbarzMzdf1VHFpOxfQh/ez7wyadLMqkg==
+"@rollup/plugin-node-resolve@^11.2.1":
+  version "11.2.1"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz#82aa59397a29cd4e13248b106e6a4a1880362a60"
+  integrity sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==
   dependencies:
     "@rollup/pluginutils" "^3.1.0"
     "@types/resolve" "1.17.1"
     builtin-modules "^3.1.0"
     deepmerge "^4.2.2"
     is-module "^1.0.0"
-    resolve "^1.17.0"
+    resolve "^1.19.0"
 
 "@rollup/plugin-replace@^2.4.1":
   version "2.4.2"
@@ -9502,7 +9502,7 @@ fast-glob@^3.1.1, fast-glob@^3.2.2:
     micromatch "^4.0.2"
     picomatch "^2.2.1"
 
-fast-glob@^3.2.9:
+fast-glob@^3.2.4, fast-glob@^3.2.9:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
   integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
@@ -10452,7 +10452,7 @@ globalthis@^1.0.0:
   dependencies:
     define-properties "^1.1.3"
 
-globby@^11.0.0, globby@^11.0.1, globby@^11.0.3:
+globby@^11.0.0, globby@^11.0.3:
   version "11.0.3"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
   integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==